diff --git a/AGENTS.md b/AGENTS.md
index 16ab9ece6240..b0ce50892229 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -79,7 +79,7 @@ not checks at all: return an error, `AbortNode()`, or `InitError()`.
 
 Vendored or subtree-style code should normally be left alone:
 
-- `src/{crc32c,dashbls,gsl,immer,leveldb,minisketch,secp256k1,univalue}`
+- `src/{crc32c,gsl,immer,leveldb,mimalloc,minisketch,secp256k1,univalue}`
 - `src/crypto/{ctaes,x11}`
 
 `test/util/data/non-backported.txt` lists Dash-specific files used by Dash
diff --git a/CLAUDE.md b/CLAUDE.md
index 16ab9ece6240..b0ce50892229 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -79,7 +79,7 @@ not checks at all: return an error, `AbortNode()`, or `InitError()`.
 
 Vendored or subtree-style code should normally be left alone:
 
-- `src/{crc32c,dashbls,gsl,immer,leveldb,minisketch,secp256k1,univalue}`
+- `src/{crc32c,gsl,immer,leveldb,mimalloc,minisketch,secp256k1,univalue}`
 - `src/crypto/{ctaes,x11}`
 
 `test/util/data/non-backported.txt` lists Dash-specific files used by Dash
diff --git a/Makefile.am b/Makefile.am
index ea2cba9fd2fa..753c0f863748 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,7 +170,7 @@ LCOV_FILTER_PATTERN = \
 	-p "/usr/include/" \
 	-p "/usr/lib/" \
 	-p "/usr/lib64/" \
-	-p "src/dashbls/" \
+	-p "src/mimalloc/" \
 	-p "src/immer/" \
 	-p "src/leveldb/" \
 	-p "src/crc32c/" \
diff --git a/configure.ac b/configure.ac
index 55b98d06336d..cd18845b68cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -883,18 +883,6 @@ case $host in
            export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
          fi
 
-        gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
-        if test "$gmp_prefix" != ""; then
-          if test "$suppress_external_warnings" != "no"; then
-            GMP_CPPFLAGS="-isystem $gmp_prefix/include"
-          else
-            GMP_CPPFLAGS="-I$gmp_prefix/include"
-          fi
-          GMP_LDFLAGS="-L$gmp_prefix/lib"
-          CORE_CPPFLAGS="$CORE_CPPFLAGS $GMP_CPPFLAGS"
-          CORE_LDFLAGS="$CORE_LDFLAGS $GMP_LDFLAGS"
-        fi
-
          case $host in
            *aarch64*)
              dnl The preferred Homebrew prefix for Apple Silicon is /opt/homebrew.
@@ -1695,15 +1683,9 @@ if test "$use_zmq" = "yes"; then
   esac
 fi
 
-dnl check if libgmp is present
-TEMP_CPPFLAGS="$CPPFLAGS"
-TEMP_LDFLAGS="$LDFLAGS"
-CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
-LDFLAGS="$LDFLAGS $GMP_LDFLAGS"
-AC_CHECK_HEADER([gmp.h],, AC_MSG_ERROR(libgmp headers missing))
-AC_CHECK_LIB([gmp],  [__gmpz_init],GMP_LIBS=-lgmp, AC_MSG_ERROR(libgmp missing))
-CPPFLAGS="$TEMP_CPPFLAGS"
-LDFLAGS="$TEMP_LDFLAGS"
+dnl blst (BLS12-381 backend of src/bls), provided by depends or the system
+AC_CHECK_HEADER([blst.h],, AC_MSG_ERROR([blst headers missing]))
+AC_CHECK_LIB([blst], [blst_p1_compress], [BLST_LIBS=-lblst], AC_MSG_ERROR([libblst missing]))
 
 AM_CONDITIONAL([ENABLE_ZMQ], [test "$use_zmq" = "yes"])
 
@@ -2040,7 +2022,7 @@ AC_SUBST(MINIUPNPC_LIBS)
 AC_SUBST(BACKTRACE_FLAGS)
 AC_SUBST(BACKTRACE_LDFLAGS)
 AC_SUBST(BACKTRACE_LIBS)
-AC_SUBST(GMP_LIBS)
+AC_SUBST(BLST_LIBS)
 AC_SUBST(NATPMP_CPPFLAGS)
 AC_SUBST(NATPMP_LIBS)
 AC_SUBST(DSYMUTIL_FLAT)
@@ -2081,7 +2063,7 @@ fi
 dnl The ECDH module is required by the wallet's Platform key provider
 dnl (DashPay contact request encryption, wallet/platformkeys.cpp).
 ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-ecdh --disable-openssl-tests"
-AC_CONFIG_SUBDIRS([src/dashbls src/secp256k1])
+AC_CONFIG_SUBDIRS([src/secp256k1])
 
 AC_OUTPUT
 
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 19302d80a525..f25b3ab1ca5c 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -27,6 +27,11 @@ Files: src/qt/res/fonts/RobotoMono-Bold.ttf
 License: Apache-2.0
 Comment: Site: https://fonts.google.com/specimen/Roboto+Mono
 
+Files: src/mimalloc/*
+Copyright: 2018-2025 Microsoft Corporation, Daan Leijen
+License: Expat
+Comment: Site: https://github.com/microsoft/mimalloc
+
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index effd8633aa10..fabd0e182609 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -37,7 +37,7 @@
     # git subtrees
     "src/crc32c/",
     "src/crypto/ctaes/",
-    "src/dashbls/",
+    "src/mimalloc/",
     "src/gsl/",
     "src/immer/",
     "src/leveldb/",
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 0c9fda7ad11d..942bc0cabd5c 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -270,7 +270,7 @@ mkdir -p "$DISTSRC"
                     ${HOST_CXXFLAGS:+CXXFLAGS="${HOST_CXXFLAGS}"} \
                     ${HOST_LDFLAGS:+LDFLAGS="${HOST_LDFLAGS}"}
 
-    sed -i.old 's/-lstdc++ //g' {./,src/dashbls/,src/secp256k1/}{config.status,libtool}
+    sed -i.old 's/-lstdc++ //g' {./,src/secp256k1/}{config.status,libtool}
 
 
     # Build Dash Core
diff --git a/depends/packages/blst.mk b/depends/packages/blst.mk
new file mode 100644
index 000000000000..3fd4d7020734
--- /dev/null
+++ b/depends/packages/blst.mk
@@ -0,0 +1,24 @@
+package=blst
+$(package)_version=0.3.17
+$(package)_download_path=https://github.com/supranational/blst/archive/refs/tags
+$(package)_download_file=v$($(package)_version).tar.gz
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=c3fef37b566b67419703b2bbb648e15176276af9a880c22aa8f5f2e8cecc2e4d
+
+# build.sh takes CC/AR/RANLIB/CFLAGS from the environment. __BLST_PORTABLE__
+# selects runtime CPU dispatch instead of letting build.sh probe the builder's
+# /proc/cpuinfo for ADX, which keeps the build reproducible; build.sh itself
+# adds -D__BLST_NO_ASM__ on hosts other than x86_64/aarch64.
+define $(package)_set_vars
+  $(package)_build_env=CC="$($(package)_cc)" AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fno-builtin -fPIC -D__BLST_PORTABLE__"
+endef
+
+define $(package)_build_cmds
+  ./build.sh
+endef
+
+define $(package)_stage_cmds
+  mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib && \
+  install -m 644 bindings/blst.h bindings/blst_aux.h $($(package)_staging_prefix_dir)/include && \
+  install -m 644 libblst.a $($(package)_staging_prefix_dir)/lib
+endef
diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk
deleted file mode 100644
index 03ec302caede..000000000000
--- a/depends/packages/gmp.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-package=gmp
-$(package)_version=6.3.0
-$(package)_download_path=https://ftp.gnu.org/gnu/gmp
-$(package)_file_name=gmp-$($(package)_version).tar.gz
-$(package)_sha256_hash=e56fd59d76810932a0555aa15a14b61c16bed66110d3c75cc2ac49ddaa9ab24c
-$(package)_patches=include_ldflags_in_configure.patch
-
-define $(package)_set_vars
-$(package)_config_opts += --disable-shared --enable-cxx --enable-fat
-$(package)_cflags_aarch64 += -march=armv8-a
-$(package)_cflags_armv7l += -march=armv7-a
-$(package)_cflags_x86_64 += -march=x86-64
-endef
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/include_ldflags_in_configure.patch
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm lib/*.la
-endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 7e0bb2633219..ec5fcbab8f78 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,4 +1,4 @@
-packages:=gmp backtrace
+packages:=backtrace blst
 
 boost_packages = boost
 
diff --git a/depends/patches/gmp/include_ldflags_in_configure.patch b/depends/patches/gmp/include_ldflags_in_configure.patch
deleted file mode 100644
index 8ddc304da0ec..000000000000
--- a/depends/patches/gmp/include_ldflags_in_configure.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-Use LDFLAGS when configure is compiling test programs.
-
-Needed for macOS cross-compilation support using lld (ld64.lld) as
-a linker, done by including '-fuse-ld=lld' in LDFLAGS. Defining it
-in CC or CXX will result in unused argument warnings if the compiler
-isn't expected to link files.
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 9cf9483..99edd43 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1752,7 +1752,7 @@ AC_CACHE_CHECK([if globals are prefixed by underscore],
- cat >conftest.c <<EOF
- int gurkmacka;
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >&AC_FD_CC"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -c conftest.c >&AC_FD_CC"
- if AC_TRY_EVAL(gmp_compile); then
-   $NM conftest.$OBJEXT >conftest.out
-   if grep "[[ 	]]_gurkmacka" conftest.out >/dev/null; then
-@@ -1984,7 +1984,7 @@ const int foo[[]] = {1,2,3};
- EOF
- echo "Test program:" >&AC_FD_CC
- cat conftest.c >&AC_FD_CC
--gmp_compile="$CC $CFLAGS $CPPFLAGS -S conftest.c >&AC_FD_CC"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -S conftest.c >&AC_FD_CC"
- if AC_TRY_EVAL(gmp_compile); then
-   echo "Compiler output:" >&AC_FD_CC
-   cat conftest.s >&AC_FD_CC
-@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do
- ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix
- 	addl	$ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx
- EOF
--  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
-+  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $LDFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $LDFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
-   if AC_TRY_EVAL(gmp_compile); then
-     if test "$tmp_underscore" = "_"; then
-       gmp_cv_asm_x86_got_underscore=yes
-@@ -3019,7 +3019,7 @@ int *bar() { return &foo; }
- EOF
- echo "Test program:" >&AC_FD_CC
- cat conftest.c >&AC_FD_CC
--gmp_compile="$CC $CFLAGS $CPPFLAGS -S conftest.c >&AC_FD_CC"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -S conftest.c >&AC_FD_CC"
- if AC_TRY_EVAL(gmp_compile); then
-   echo "Compiler output:" >&AC_FD_CC
-   cat conftest.s >&AC_FD_CC
-@@ -3164,7 +3164,7 @@ AC_DEFUN([GMP_C_ATTRIBUTE_MALLOC],
- [cat >conftest.c <<EOF
- void *foo (int x) __attribute__ ((malloc));
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >conftest.out 2>&1"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -c conftest.c >conftest.out 2>&1"
- if AC_TRY_EVAL(gmp_compile); then
-   if grep "attribute directive ignored" conftest.out >/dev/null; then
-     gmp_cv_c_attribute_malloc=no
-@@ -3279,7 +3279,7 @@ int main(){
-   return 0;
- }]
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS conftest.c -o conftest$EXEEXT >&AC_FD_CC 2>&1"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest$EXEEXT >&AC_FD_CC 2>&1"
- if AC_TRY_EVAL(gmp_compile); then
- cat >conftest.awk <<\EOF
- [
-diff --git a/configure b/configure
-index 7910aa0..15121e2 100755
---- a/configure
-+++ b/configure
-@@ -5885,7 +5885,7 @@ for abi in $abilist; do
-   choke me
- #endif
- EOF
--gmp_compile="$cc -c conftest.c >&5"
-+gmp_compile="$cc $LDFLAGS -c conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -5978,7 +5978,7 @@ if test "$gmp_prog_cc_works" = yes; then
- int main () { return 0; }
- EOF
-   echo "Test compile: " >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6032,7 +6032,7 @@ void *f() { return g(); }
- int main () { return 0; }
- EOF
-   echo "Test compile: function pointer return" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6088,7 +6088,7 @@ int cmov () { return (n >= 0 ? n : 0); }
- int main () { return 0; }
- EOF
-   echo "Test compile: cmov instruction" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6145,7 +6145,7 @@ unsigned long gcc303 () { return (unsigned long) d; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double -> ulong conversion" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6200,7 +6200,7 @@ unsigned long fneg () { return -fneg_data; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double negation" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6256,7 +6256,7 @@ float ftod () { return (float) ftod_data; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double -> float conversion" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6341,7 +6341,7 @@ param_init ()
- int main () { return 0; }
- EOF
-   echo "Test compile: gnupro alpha ev6 char spilling" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6392,7 +6392,7 @@ if test "$gmp_prog_cc_works" = yes; then
- int k; int foo () { __builtin_alloca (k); }
- EOF
-   echo "Test compile: __builtin_alloca availability" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6438,7 +6438,7 @@ int foo ()
- int main () { return 0; }
- EOF
-   echo "Test compile: alloca array" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6516,7 +6516,7 @@ int f ()
- int main () { return 0; }
- EOF
-   echo "Test compile: abs int -> double conversion" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6581,7 +6581,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: long long reliability test 1" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6642,7 +6642,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: long long reliability test 2" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6703,7 +6703,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: freebsd hacked gcc" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6802,7 +6802,7 @@ main ()
-
- EOF
-   echo "Test compile: mpn_lshift_com optimization" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6911,7 +6911,7 @@ main ()
-
- EOF
-   echo "Test compile: mpn_lshift_com optimization 2" >&5
--  gmp_compile="$cc $cflags $cppflags conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -6970,7 +6970,7 @@ int foo;
- int bar () { return foo; }
- EOF
- tmp_got_emitted=no
--gmp_compile="$cc $cflags $cppflags -fPIC -S conftest.c >&5 2>&1"
-+gmp_compile="$cc $cflags $cppflags $LDFLAGS -fPIC -S conftest.c >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7044,7 +7044,7 @@ cat >conftest.s <<\EOF
- 	.byte	254, 220, 186, 152, 118, 84, 50, 16
- EOF
- tmp_got_good=yes
--gmp_compile="$cc $cflags $cppflags -fPIC -o conftest.o -c conftest.s >&5 2>&1"
-+gmp_compile="$cc $cflags $cppflags $LDFLAGS -fPIC -o conftest.o -c conftest.s >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7094,7 +7094,7 @@ long long  bar () { return foo; }
- int main () { return 0; }
- EOF
- gmp_prog_cc_works=no
--gmp_compile="$cc $cflags $cppflags -c conftest.c >&5"
-+gmp_compile="$cc $cflags $cppflags $LDFLAGS -c conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7221,7 +7221,7 @@ result=no
- cat >conftest.s <<EOF
- 	.level 2.0
- EOF
--gmp_compile="$cc $cflags -c conftest.s >&5 2>&1"
-+gmp_compile="$cc $cflags $LDFLAGS -c conftest.s >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7256,7 +7256,7 @@ main ()
- }
- EOF
- gmp_c_testlist_sizeof=no
--gmp_compile="$cc $cflags -c conftest.c >&5"
-+gmp_compile="$cc $cflags $LDFLAGS -c conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7424,7 +7424,7 @@ _main:
- 	xorl	%eax, %eax
- 	ret
- EOF
--  gmp_compile="$cc $cflags $cppflags conftest.s -o conftest >&5"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS conftest.s -o conftest >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7489,7 +7489,7 @@ $as_echo_n "checking compiler $cc $cflags -no-cpp-precomp... " >&6; }
-   cat >conftest.c <<EOF
- int main () { return 0; }
- EOF
--  gmp_compile="$cc $cflags -no-cpp-precomp conftest.c >conftest.out 2>&1"
-+  gmp_compile="$cc $cflags $LDFLAGS -no-cpp-precomp conftest.c >conftest.out 2>&1"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7522,7 +7522,7 @@ result=no
- cat >conftest.c <<EOF
- int main () {}
- EOF
--gmp_compile="$cc $cflags $flag -c conftest.c >conftest.out 2>&1"
-+gmp_compile="$cc $cflags $flag $LDFLAGS -c conftest.c >conftest.out 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7553,7 +7553,7 @@ result=no
- cat >conftest.c <<EOF
- EOF
- echo "with empty conftest.c" >&5
--gmp_compile="$cc $cflags $cppflags -c conftest.c >&5 2>&1"
-+gmp_compile="$cc $cflags $cppflags $LDFLAGS -c conftest.c >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7561,7 +7561,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   test $ac_status = 0; }; then : ;
- else
-   # empty fails
--  gmp_compile="$cc $cflags $cppflags -Wa,-oldas -c conftest.c >&5 2>&1"
-+  gmp_compile="$cc $cflags $cppflags $LDFLAGS -Wa,-oldas -c conftest.c >&5 2>&1"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7597,7 +7597,7 @@ if test "$gmp_prog_cc_works" = yes; then
- int main () { return 0; }
- EOF
-   echo "Test compile: " >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7651,7 +7651,7 @@ void *f() { return g(); }
- int main () { return 0; }
- EOF
-   echo "Test compile: function pointer return" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7707,7 +7707,7 @@ int cmov () { return (n >= 0 ? n : 0); }
- int main () { return 0; }
- EOF
-   echo "Test compile: cmov instruction" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7764,7 +7764,7 @@ unsigned long gcc303 () { return (unsigned long) d; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double -> ulong conversion" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7819,7 +7819,7 @@ unsigned long fneg () { return -fneg_data; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double negation" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7875,7 +7875,7 @@ float ftod () { return (float) ftod_data; }
- int main () { return 0; }
- EOF
-   echo "Test compile: double -> float conversion" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -7960,7 +7960,7 @@ param_init ()
- int main () { return 0; }
- EOF
-   echo "Test compile: gnupro alpha ev6 char spilling" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8011,7 +8011,7 @@ if test "$gmp_prog_cc_works" = yes; then
- int k; int foo () { __builtin_alloca (k); }
- EOF
-   echo "Test compile: __builtin_alloca availability" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8057,7 +8057,7 @@ int foo ()
- int main () { return 0; }
- EOF
-   echo "Test compile: alloca array" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8135,7 +8135,7 @@ int f ()
- int main () { return 0; }
- EOF
-   echo "Test compile: abs int -> double conversion" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8200,7 +8200,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: long long reliability test 1" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8261,7 +8261,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: long long reliability test 2" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8322,7 +8322,7 @@ int dummy;
- int main () { return 0; }
- EOF
-   echo "Test compile: freebsd hacked gcc" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8421,7 +8421,7 @@ main ()
-
- EOF
-   echo "Test compile: mpn_lshift_com optimization" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8530,7 +8530,7 @@ main ()
-
- EOF
-   echo "Test compile: mpn_lshift_com optimization 2" >&5
--  gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
-+  gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS conftest.c >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8589,7 +8589,7 @@ int foo;
- int bar () { return foo; }
- EOF
- tmp_got_emitted=no
--gmp_compile="$cc $cflags $cppflags $flag -fPIC -S conftest.c >&5 2>&1"
-+gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS -fPIC -S conftest.c >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -8663,7 +8663,7 @@ cat >conftest.s <<\EOF
- 	.byte	254, 220, 186, 152, 118, 84, 50, 16
- EOF
- tmp_got_good=yes
--gmp_compile="$cc $cflags $cppflags $flag -fPIC -o conftest.o -c conftest.s >&5 2>&1"
-+gmp_compile="$cc $cflags $cppflags $flag $LDFLAGS -fPIC -o conftest.o -c conftest.s >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -9974,7 +9974,7 @@ main ()
-   return 0;
- }
- EOF
--gmp_compile="$HOST_CC conftest.c"
-+gmp_compile="$HOST_CC $LDFLAGS conftest.c"
- cc_for_build_works=no
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-@@ -10027,7 +10027,7 @@ else
- fi
-
- else
--  for i in "$CC" "$CC $CFLAGS $CPPFLAGS" cc gcc c89 c99; do
-+  for i in "$CC" "$CC $CFLAGS $CPPFLAGS $LDFLAGS" cc gcc c89 c99; do
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system compiler $i" >&5
- $as_echo_n "checking build system compiler $i... " >&6; }
- # remove anything that might look like compiler output to our "||" expression
-@@ -10080,7 +10080,7 @@ else
- #define FOO BAR
- EOF
-   echo "Test compile: " >&5
--  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS conftest.cc >&5"
-+  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS $LDFLAGS conftest.cc >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5
-   (eval $gmp_cxxcompile) 2>&5
-   ac_status=$?
-@@ -10570,7 +10570,7 @@ using namespace foo;
- int main (void) { return 0; }
- EOF
-   echo "Test compile: namespace" >&5
--  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS conftest.cc >&5"
-+  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS $LDFLAGS conftest.cc >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5
-   (eval $gmp_cxxcompile) 2>&5
-   ac_status=$?
-@@ -10616,7 +10616,7 @@ void someoutput (void) { std::cout << 123; }
- int main (void) { return 0; }
- EOF
-   echo "Test compile: std iostream" >&5
--  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS conftest.cc >&5"
-+  gmp_cxxcompile="$CXX $CPPFLAGS $CXXFLAGS $LDFLAGS conftest.cc >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5
-   (eval $gmp_cxxcompile) 2>&5
-   ac_status=$?
-@@ -23651,7 +23651,7 @@ else
-   cat >conftest.c <<EOF
- void *foo (int x) __attribute__ ((malloc));
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >conftest.out 2>&1"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -c conftest.c >conftest.out 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -24421,7 +24421,7 @@ int main(){
-   return 0;
- }
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS conftest.c -o conftest$EXEEXT >&5 2>&1"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest$EXEEXT >&5 2>&1"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -25833,7 +25833,7 @@ else
- cat >conftest.c <<EOF
- int gurkmacka;
- EOF
--gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >&5"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -c conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -25914,7 +25914,7 @@ const int foo[] = {1,2,3};
- EOF
- echo "Test program:" >&5
- cat conftest.c >&5
--gmp_compile="$CC $CFLAGS $CPPFLAGS -S conftest.c >&5"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -S conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -26580,7 +26580,7 @@ int *bar() { return &foo; }
- EOF
- echo "Test program:" >&5
- cat conftest.c >&5
--gmp_compile="$CC $CFLAGS $CPPFLAGS -S conftest.c >&5"
-+gmp_compile="$CC $CFLAGS $CPPFLAGS $LDFLAGS -S conftest.c >&5"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-@@ -27031,7 +27031,7 @@ for tmp_underscore in "" "_"; do
- ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix
- 	addl	$ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx
- EOF
--  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&5 && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&5"
-+  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $LDFLAGS $lt_prog_compiler_pic conftest.s >&5 && $CC $CFLAGS $CPPFLAGS $LDFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&5"
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5
-   (eval $gmp_compile) 2>&5
-   ac_status=$?
-diff --git a/configure.ac b/configure.ac
-index 082077b..f43e1c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2272,14 +2272,14 @@ for abi in $abilist; do
-           instrument) cflags="$cflags -finstrument-functions" ;;
-         esac
-
--        GMP_PROG_CC_WORKS($cc $cflags $cppflags,,continue)
-+        GMP_PROG_CC_WORKS($cc $cflags $cppflags $LDFLAGS,,continue)
-
-         # If we're supposed to be using a "long long" for a limb, check that
-         # it works.
-                                   eval limb_chosen=\"\$limb$abi1\"
-         test -n "$limb_chosen" || eval limb_chosen=\"\$limb$abi2\"
-         if test "$limb_chosen" = longlong; then
--          GMP_PROG_CC_WORKS_LONGLONG($cc $cflags $cppflags,,continue)
-+          GMP_PROG_CC_WORKS_LONGLONG($cc $cflags $cppflags $LDFLAGS,,continue)
-         fi
-
-         # The tests to perform on this $cc, if any
-@@ -2294,8 +2294,8 @@ for abi in $abilist; do
-           hpc-hppa-2-0)   GMP_HPC_HPPA_2_0($cc,,testlist_pass=no) ;;
-           gcc-arm-umodsi) GMP_GCC_ARM_UMODSI($cc,,testlist_pass=no) ;;
-           gcc-mips-o32)   GMP_GCC_MIPS_O32($cc,,testlist_pass=no) ;;
--          hppa-level-2.0) GMP_HPPA_LEVEL_20($cc $cflags,,testlist_pass=no) ;;
--          sizeof*)       GMP_C_TEST_SIZEOF($cc $cflags,$tst,,testlist_pass=no) ;;
-+          hppa-level-2.0) GMP_HPPA_LEVEL_20($cc $cflags $LDFLAGS,,testlist_pass=no) ;;
-+          sizeof*)       GMP_C_TEST_SIZEOF($cc $cflags $LDFLAGS,$tst,,testlist_pass=no) ;;
-           esac
-           if test $testlist_pass = no; then break; fi
-         done
-@@ -2415,8 +2415,8 @@ if test $found_compiler = yes; then
-             # pentium4 case.
-             #
-             if test "$abi" = 32; then
--              GMP_GCC_PENTIUM4_SSE2($cc $cflags $cppflags,, continue)
--              GMP_OS_X86_XMM($cc $cflags $cppflags,, continue)
-+              GMP_GCC_PENTIUM4_SSE2($cc $cflags $cppflags $LDFLAGS,, continue)
-+              GMP_OS_X86_XMM($cc $cflags $cppflags $LDFLAGS,, continue)
-             fi
-             ;;
-           -no-cpp-precomp)
-@@ -2429,19 +2429,19 @@ if test $found_compiler = yes; then
-           -Wa,-m*)
-             case $host in
-               alpha*-*-*)
--                GMP_GCC_WA_MCPU($cc $cflags, $flag, , [continue])
-+                GMP_GCC_WA_MCPU($cc $cflags $LDFLAGS, $flag, , [continue])
-               ;;
-             esac
-             ;;
-           -Wa,-oldas)
--            GMP_GCC_WA_OLDAS($cc $cflags $cppflags,
-+            GMP_GCC_WA_OLDAS($cc $cflags $cppflags $LDFLAGS,
-                              [cflags="$cflags $flag"
-                              break],
-                              [continue])
-             ;;
-         esac
-
--        GMP_PROG_CC_WORKS($cc $cflags $cppflags $flag,
-+        GMP_PROG_CC_WORKS($cc $cflags $cppflags $flag $LDFLAGS,
-           [cflags="$cflags $flag"
-           break])
-       done
diff --git a/doc/build-freebsd.md b/doc/build-freebsd.md
index d33629b551c8..ebe27d8d2ecb 100644
--- a/doc/build-freebsd.md
+++ b/doc/build-freebsd.md
@@ -24,12 +24,6 @@ git clone https://github.com/dashpay/dash.git
 
 ### 3. Install Optional Dependencies
 
-###### GMP
-
-```bash
-pkg install gmp
-```
-
 It is not necessary to build wallet functionality to run either `dashd` or `dash-qt`.
 
 ###### Descriptor Wallet Support
diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md
index 86f72e1096e4..780a048e2f1a 100644
--- a/doc/build-netbsd.md
+++ b/doc/build-netbsd.md
@@ -14,7 +14,7 @@ Install the required dependencies the usual way you [install software on NetBSD]
 The example commands below use `pkgin`.
 
 ```bash
-pkgin install autoconf automake libtool pkg-config git gmake boost libevent gmp
+pkgin install autoconf automake libtool pkg-config git gmake boost libevent
 
 ```
 
diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 8b0ee196eb46..f6a371b9cc7e 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -10,7 +10,7 @@ This guide describes how to build dashd, command-line utilities, and GUI on Open
 Run the following as root to install the base dependencies for building.
 
 ```bash
-pkg_add bash git gmake gmp libevent libtool boost
+pkg_add bash git gmake libevent libtool boost
 # Select the newest version of the following packages:
 pkg_add autoconf automake python
 
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 87914d09affc..e5e955f683c0 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -47,7 +47,7 @@ To install, run the following from your terminal:
 See [dependencies.md](dependencies.md) for a complete overview.
 
 ``` bash
-brew install automake libtool boost gmp pkg-config libevent
+brew install automake libtool boost pkg-config libevent
 ```
 
 ### 4. Clone Dash repository
diff --git a/doc/build-unix.md b/doc/build-unix.md
index 419df8488ab1..01f1ef64bc7b 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -76,12 +76,6 @@ ZMQ dependencies (provides ZMQ API):
 sudo apt-get install libzmq3-dev
 ```
 
-GMP dependencies (provides platform-optimized routines):
-
-```sh
-sudo apt-get install libgmp-dev
-```
-
 User-Space, Statically Defined Tracing (USDT) dependencies:
 
 ```sh
@@ -165,12 +159,6 @@ ZMQ dependencies (provides ZMQ API):
 sudo dnf install zeromq-devel
 ```
 
-GMP dependencies (provides platform-optimized routines):
-
-```sh
-sudo dnf install gmp-devel
-```
-
 User-Space, Statically Defined Tracing (USDT) dependencies:
 
 ```sh
diff --git a/doc/dependencies.md b/doc/dependencies.md
index a9be6395aaa0..40e06fe819ae 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -19,15 +19,12 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | --- | --- | --- | --- | --- |
 | [Boost](../depends/packages/boost.mk) | [link](https://www.boost.org/users/download/) | 1.81.0 | [1.73.0](https://github.com/bitcoin/bitcoin/pull/29066) | No |
 | [libevent](../depends/packages/libevent.mk) | [link](https://github.com/libevent/libevent/releases) | [2.1.12-stable](https://github.com/bitcoin/bitcoin/pull/21991) | [2.1.8](https://github.com/bitcoin/bitcoin/pull/24681) | No |
+| [blst](../depends/packages/blst.mk) | [link](https://github.com/supranational/blst/releases) | 0.3.17 | | No |
 | glibc | [link](https://www.gnu.org/software/libc/) | N/A | [2.31](https://github.com/bitcoin/bitcoin/pull/29987) | Yes |
 | Linux Kernel | [link](https://www.kernel.org/) | N/A | [3.17.0](https://github.com/bitcoin/bitcoin/pull/27699) | Yes |
 
 ## Optional
 
-| Dependency | Releases | Version used | Minimum required | Runtime |
-| --- | --- | --- | --- | --- |
-| libgmp | [link](https://gmplib.org/download/gmp/)<sup>[ \* ](#note1)</sup> | 6.3.0 | [6.2.0](https://github.com/dashpay/bls-signatures/pull/92) | No |
-
 ### GUI
 | Dependency | Releases | Version used | Minimum required | Runtime |
 | --- | --- | --- | --- | --- |
@@ -52,5 +49,3 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | --- | --- | --- | --- | --- |
 | [Berkeley DB](../depends/packages/bdb.mk) (legacy wallet) | [link](https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.30 | 4.8.x | No |
 | [SQLite](../depends/packages/sqlite.mk) | [link](https://sqlite.org) | 3.38.5 | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | No |
-
-<a name="note1">Note \*</a> : The minimum supported version on macOS is 6.3.0
diff --git a/src/.bear-tidy-config b/src/.bear-tidy-config
index 3512e59a781b..cd791effd273 100644
--- a/src/.bear-tidy-config
+++ b/src/.bear-tidy-config
@@ -6,7 +6,7 @@
       "paths_to_exclude": [
         "src/crc32",
         "src/crypto/x11",
-        "src/dashbls",
+        "src/mimalloc",
         "src/gsl",
         "src/immer",
         "src/leveldb",
diff --git a/src/Makefile.am b/src/Makefile.am
index c5b08a2e17f7..51f5e8421401 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,7 @@ endif # ENABLE_CRASH_HOOKS
 endif # ENABLE_STACKTRACES
 
 BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
-BITCOIN_INCLUDES+=-isystem$(srcdir)/dashbls/include -isystem$(srcdir)/dashbls/depends/relic/include -isystem$(srcdir)/dashbls/depends/minialloc/include
+BITCOIN_INCLUDES+=$(MIMALLOC_CPPFLAGS)
 BITCOIN_INCLUDES+=-isystem$(srcdir)/immer
 
 LIBBITCOIN_NODE=libbitcoin_node.a
@@ -56,7 +56,6 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
 LIBBITCOIN_UTIL=libbitcoin_util.a
 LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la
 LIBBITCOINQT=qt/libbitcoinqt.a
-LIBDASHBLS=dashbls/libdashbls.la
 LIBSECP256K1=secp256k1/libsecp256k1.la
 
 if ENABLE_ZMQ
@@ -110,9 +109,6 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
 endif
 noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO)
 
-$(LIBDASHBLS):
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D)
-
 $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 
@@ -925,6 +921,8 @@ libbitcoin_consensus_a_SOURCES = \
   arith_uint256.h \
   bls/bls.cpp \
   bls/bls.h \
+  bls/bls_legacy.cpp \
+  bls/bls_legacy.h \
   consensus/amount.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
@@ -1098,12 +1096,12 @@ bitcoin_bin_ldadd = \
   $(LIBBITCOIN_ZMQ) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
-  $(LIBDASHBLS) \
+  $(BLS_LIBS) \
   $(LIBLEVELDB) \
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 
-bitcoin_bin_ldadd += $(BACKTRACE_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(GMP_LIBS)
+bitcoin_bin_ldadd += $(BACKTRACE_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
 
 dashd_SOURCES = $(bitcoin_daemon_sources) init/bitcoind.cpp
 dashd_CPPFLAGS = $(bitcoin_bin_cppflags)
@@ -1133,7 +1131,7 @@ dash_cli_LDADD = \
   $(LIBBITCOIN_COMMON) \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CRYPTO)
-dash_cli_LDADD += $(BACKTRACE_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
+dash_cli_LDADD += $(BACKTRACE_LIBS) $(EVENT_LIBS)
 #
 
 # dash-tx binary #
@@ -1152,10 +1150,10 @@ dash_tx_LDADD = \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
-  $(LIBDASHBLS) \
+  $(BLS_LIBS) \
   $(LIBSECP256K1)
 
-dash_tx_LDADD += $(BACKTRACE_LIBS) $(GMP_LIBS)
+dash_tx_LDADD += $(BACKTRACE_LIBS)
 #
 
 # dash-wallet binary #
@@ -1172,13 +1170,12 @@ dash_wallet_LDADD = \
   $(LIBUNIVALUE) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
-  $(LIBDASHBLS) \
+  $(BLS_LIBS) \
   $(LIBSECP256K1) \
   $(BACKTRACE_LIBS) \
   $(BOOST_LIBS) \
   $(BDB_LIBS) \
-  $(SQLITE_LIBS) \
-  $(GMP_LIBS)
+  $(SQLITE_LIBS)
 
 if TARGET_WINDOWS
 dash_wallet_SOURCES += dash-wallet-res.rc
@@ -1223,8 +1220,8 @@ if BUILD_BITCOIN_KERNEL_LIB
 lib_LTLIBRARIES += $(LIBBITCOINKERNEL)
 
 libdashkernel_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(PTHREAD_FLAGS)
-libdashkernel_la_LIBADD = $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(LIBDASHBLS) $(GMP_LIBS)
-libdashkernel_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -isystem$(srcdir)/dashbls/include -isystem$(srcdir)/dashbls/depends/relic/include -isystem$(srcdir)/dashbls/depends/minialloc/include -isystem$(srcdir)/immer $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)
+libdashkernel_la_LIBADD = $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(BLS_LIBS)
+libdashkernel_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL $(MIMALLOC_CPPFLAGS) -isystem$(srcdir)/immer $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)
 
 # libdashkernel requires default symbol visibility, explicitly specify that
 # here so that things still work even when user configures with
@@ -1255,6 +1252,7 @@ libdashkernel_la_SOURCES = \
   bech32.cpp \
   blockfilter.cpp \
   bls/bls.cpp \
+  bls/bls_legacy.cpp \
   bls/bls_worker.cpp \
   chain.cpp \
   chainlock/chainlock.cpp \
@@ -1408,9 +1406,9 @@ include_HEADERS = script/bitcoinconsensus.h
 libdashconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_la_SOURCES) $(crypto_libbitcoin_crypto_sph_la_SOURCES) $(libbitcoin_consensus_a_SOURCES)
 
 libdashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
-libdashconsensus_la_LIBADD = $(LIBDASHBLS) $(LIBSECP256K1) $(GMP_LIBS)
+libdashconsensus_la_LIBADD = $(BLS_LIBS) $(LIBSECP256K1)
 libdashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -DDISABLE_OPTIMIZED_SHA256
-libdashconsensus_la_CPPFLAGS += -isystem$(srcdir)/dashbls/include -isystem$(srcdir)/dashbls/depends/relic/include -isystem$(srcdir)/dashbls/depends/minialloc/include
+libdashconsensus_la_CPPFLAGS += $(MIMALLOC_CPPFLAGS)
 libdashconsensus_la_CPPFLAGS += -isystem$(srcdir)/immer
 libdashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
@@ -1443,15 +1441,14 @@ CLEANFILES += util/*.gcda util/*.gcno
 CLEANFILES += wallet/*.gcda wallet/*.gcno
 CLEANFILES += wallet/test/*.gcda wallet/test/*.gcno
 CLEANFILES += zmq/*.gcda zmq/*.gcno
+CLEANFILES += mimalloc/src/*.gcda mimalloc/src/*.gcno mimalloc/src/prim/*.gcda mimalloc/src/prim/*.gcno
 CLEANFILES += obj/build.h
 
 IMMER_DIST = immer/immer
-LIBDASHBLS_DIST = dashbls
 
 EXTRA_DIST = \
   $(CTAES_DIST)   \
-  $(IMMER_DIST)   \
-  $(LIBDASHBLS_DIST)
+  $(IMMER_DIST)
 
 config/bitcoin-config.h: config/stamp-h1
 	@$(MAKE) -C $(top_builddir) $(subdir)/$(@)
@@ -1462,7 +1459,6 @@ $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in:  $(am__configure_deps)
 
 
 clean-local:
-	-$(MAKE) -C dashbls clean
 	-$(MAKE) -C secp256k1 clean
 	-rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno
 	-rm -f config.h
@@ -1539,6 +1535,7 @@ include Makefile.minisketch.include
 
 include Makefile.crc32c.include
 include Makefile.leveldb.include
+include Makefile.mimalloc.include
 
 include Makefile.test_util.include
 include Makefile.test_fuzz.include
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index ff20b71822bc..138444b4bcd0 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -74,7 +74,7 @@ bench_bench_dash_LDADD = \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
-  $(LIBDASHBLS) \
+  $(BLS_LIBS) \
   $(LIBLEVELDB) \
   $(LIBMEMENV) \
   $(LIBSECP256K1) \
@@ -83,7 +83,6 @@ bench_bench_dash_LDADD = \
   $(EVENT_LIBS) \
   $(MINIUPNPC_LIBS) \
   $(NATPMP_LIBS) \
-  $(GMP_LIBS) \
   $(BACKTRACE_LIBS)
 
 if ENABLE_ZMQ
diff --git a/src/Makefile.mimalloc.include b/src/Makefile.mimalloc.include
new file mode 100644
index 000000000000..6e455dc529f4
--- /dev/null
+++ b/src/Makefile.mimalloc.include
@@ -0,0 +1,53 @@
+# Copyright (c) 2026 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+LIBMIMALLOC_INT = mimalloc/libmimalloc-secure.la
+
+noinst_LTLIBRARIES += $(LIBMIMALLOC_INT)
+
+# What the users of bls/ link, dependents first: mimalloc -> blst (from depends)
+BLS_LIBS = $(LIBMIMALLOC_INT) $(BLST_LIBS)
+
+# Flags for consumers of the library (bls/bls.cpp)
+MIMALLOC_CPPFLAGS = -isystem$(srcdir)/mimalloc/include
+
+# Flags used only when building the library itself: secure mode (guard pages,
+# encrypted free lists, zeroing on free) for the BLS secret keys it holds.
+MIMALLOC_CPPFLAGS_INT =
+MIMALLOC_CPPFLAGS_INT += -I$(srcdir)/mimalloc/include
+MIMALLOC_CPPFLAGS_INT += -I$(srcdir)/mimalloc/src
+MIMALLOC_CPPFLAGS_INT += -DMI_SECURE=4
+MIMALLOC_CPPFLAGS_INT += -DNDEBUG
+
+MIMALLOC_H = \
+  mimalloc/include/mimalloc-new-delete.h \
+  mimalloc/include/mimalloc-override.h \
+  mimalloc/include/mimalloc-stats.h \
+  mimalloc/include/mimalloc.h \
+  mimalloc/src/bitmap.h
+
+mimalloc_libmimalloc_secure_la_SOURCES = \
+  $(MIMALLOC_H) \
+  mimalloc/src/alloc-aligned.c \
+  mimalloc/src/alloc-posix.c \
+  mimalloc/src/alloc.c \
+  mimalloc/src/arena-meta.c \
+  mimalloc/src/arena.c \
+  mimalloc/src/bitmap.c \
+  mimalloc/src/heap.c \
+  mimalloc/src/init.c \
+  mimalloc/src/libc.c \
+  mimalloc/src/options.c \
+  mimalloc/src/os.c \
+  mimalloc/src/page-map.c \
+  mimalloc/src/page.c \
+  mimalloc/src/random.c \
+  mimalloc/src/stats.c \
+  mimalloc/src/prim/prim.c
+
+mimalloc_libmimalloc_secure_la_CPPFLAGS = $(AM_CPPFLAGS) $(MIMALLOC_CPPFLAGS_INT)
+# Specify -static in both CFLAGS and LDFLAGS so libtool will only build a
+# static version of this library (same as crc32c and leveldb).
+mimalloc_libmimalloc_secure_la_CFLAGS = $(AM_CFLAGS) $(PIE_FLAGS) -static
+mimalloc_libmimalloc_secure_la_LDFLAGS = $(AM_LDFLAGS) -static
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 56ddd8a12156..e907e8ba629e 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -473,9 +473,9 @@ endif
 if ENABLE_ZMQ
 bitcoin_qt_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
-bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(BLS_LIBS) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
+  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 bitcoin_qt_ldflags = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 bitcoin_qt_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX
 
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 00401c6340d7..fea4cdd08208 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -67,10 +67,10 @@ endif
 if ENABLE_ZMQ
 qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
-qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) \
+qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(BLS_LIBS) $(LIBUNIVALUE) $(LIBLEVELDB) \
   $(LIBMEMENV) $(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
   $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
+  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 qt_test_test_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 qt_test_test_dash_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 63635c7daa66..96fb2cbb38d9 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -17,6 +17,7 @@ FUZZ_BINARY=test/fuzz/fuzz$(EXEEXT)
 
 JSON_TEST_FILES = \
   test/data/blockfilters.json \
+  test/data/bls_reference_vectors.json \
   test/data/base58_encode_decode.json \
   test/data/bip39_vectors.json \
   test/data/key_io_valid.json \
@@ -49,7 +50,7 @@ FUZZ_SUITE_LD_COMMON = \
  $(LIBBITCOIN_CONSENSUS) \
  $(LIBBITCOIN_CRYPTO) \
  $(LIBBITCOIN_CLI) \
- $(LIBDASHBLS) \
+ $(BLS_LIBS) \
  $(BDB_LIBS) \
  $(SQLITE_LIBS) \
  $(LIBUNIVALUE) \
@@ -59,7 +60,6 @@ FUZZ_SUITE_LD_COMMON = \
  $(MINISKETCH_LIBS) \
  $(EVENT_LIBS) \
  $(EVENT_PTHREADS_LIBS) \
- $(GMP_LIBS) \
  $(BACKTRACE_LIBS)
 
 if USE_UPNP
@@ -93,6 +93,7 @@ BITCOIN_TESTS =\
   test/blockmanager_tests.cpp \
   test/bloom_tests.cpp \
   test/bls_tests.cpp \
+  test/bls_reference_vectors_tests.cpp \
   test/bswap_tests.cpp \
   test/checkdatasig_tests.cpp \
   test/checkqueue_tests.cpp \
@@ -273,10 +274,10 @@ test_test_dash_LDADD += $(LIBBITCOIN_WALLET)
 test_test_dash_CPPFLAGS += $(BDB_CPPFLAGS)
 endif
 test_test_dash_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
-  $(LIBDASHBLS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIBS) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
+  $(BLS_LIBS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIBS) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
 test_test_dash_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
-test_test_dash_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(SQLITE_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
+test_test_dash_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(SQLITE_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 test_test_dash_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) -static
 
 if ENABLE_ZMQ
diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 8d5b1b83703c..2ce87eef5911 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -1,42 +1,438 @@
-// Copyright (c) 2018-2025 The Dash Core developers
+// Copyright (c) 2018-2026 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bls/bls.h>
 
+#include <bls/bls_legacy.h>
+#include <crypto/sha256.h>
 #include <random.h>
+#include <support/cleanse.h>
 
 #ifndef BUILD_BITCOIN_INTERNAL
 #include <support/allocators/mt_pooled_secure.h>
-#include <support/cleanse.h>
 #endif
 
+#include <mimalloc.h>
+
+#include <algorithm>
 #include <cassert>
 #include <cstring>
+#include <mutex>
+#include <new>
+#include <set>
 
 namespace bls {
     std::atomic<bool> bls_legacy_scheme = std::atomic<bool>(true);
 }
 
-static const std::unique_ptr<bls::CoreMPL> pSchemeLegacy{std::make_unique<bls::LegacySchemeMPL>()};
-static const std::unique_ptr<bls::CoreMPL> pScheme(std::make_unique<bls::BasicSchemeMPL>());
+namespace {
+
+// --- secure memory for secret scalars ---------------------------------------
+//
+// Secret scalars live in memory that is wiped when released. Until BLSInit()
+// runs, and always in the consensus and kernel libraries, that memory comes
+// from mimalloc in secure mode; BLSInit() switches to the locked pool shared
+// with the rest of the node. The choice is latched at the first allocation
+// so that no block is ever released through the wrong allocator.
+
+enum class SecureBackend : uint8_t { UNSET, MIMALLOC, LOCKED_POOL };
+std::atomic<SecureBackend> g_secureBackend{SecureBackend::UNSET};
+
+#ifndef BUILD_BITCOIN_INTERNAL
+std::once_flag g_poolInitFlag;
+mt_pooled_secure_allocator<uint8_t>* g_poolInstance{nullptr};
+
+void CreateLockedPool()
+{
+    // make sure LockedPoolManager is initialized first (ensures destruction order)
+    LockedPoolManager::Instance();
+
+    // static variable in function scope ensures it's initialized when first accessed
+    // and destroyed before LockedPoolManager
+    static mt_pooled_secure_allocator<uint8_t> pool(sizeof(blst_scalar));
+    g_poolInstance = &pool;
+}
+
+mt_pooled_secure_allocator<uint8_t>& LockedPool()
+{
+    std::call_once(g_poolInitFlag, CreateLockedPool);
+    return *g_poolInstance;
+}
+#endif
+
+SecureBackend ActiveSecureBackend()
+{
+    SecureBackend backend = g_secureBackend.load();
+    if (backend == SecureBackend::UNSET) {
+        g_secureBackend.compare_exchange_strong(backend, SecureBackend::MIMALLOC);
+        backend = g_secureBackend.load();
+    }
+    return backend;
+}
+
+void* SecureAlloc(size_t n)
+{
+#ifndef BUILD_BITCOIN_INTERNAL
+    if (ActiveSecureBackend() == SecureBackend::LOCKED_POOL) {
+        return LockedPool().allocate(n);
+    }
+#endif
+    ActiveSecureBackend();
+    return mi_malloc(n);
+}
+
+void SecureFree(void* p, size_t n)
+{
+    memory_cleanse(p, n);
+#ifndef BUILD_BITCOIN_INTERNAL
+    if (ActiveSecureBackend() == SecureBackend::LOCKED_POOL) {
+        LockedPool().deallocate(static_cast<uint8_t*>(p), n);
+        return;
+    }
+#endif
+    mi_free(p);
+}
+
+// --- constants ---------------------------------------------------------------
+
+// BLS12-381 group order r, big-endian
+const uint8_t ORDER_BE[32] = {
+    0x73, 0xed, 0xa7, 0x53, 0x29, 0x9d, 0x7d, 0x48, 0x33, 0x39, 0xd8, 0x08,
+    0x09, 0xa1, 0xd8, 0x05, 0x53, 0xbd, 0xa4, 0x02, 0xff, 0xfe, 0x5b, 0xfe,
+    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01};
+
+// Ciphersuite of the basic scheme
+const char BASIC_SCHEME_DST[] = "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_";
+
+// --- scalars -----------------------------------------------------------------
+
+//! Stack storage that is wiped on scope exit
+template <typename T>
+struct Wiped {
+    T v{};
+    ~Wiped() { memory_cleanse(&v, sizeof(v)); }
+};
+
+bool ScalarIsZero(const blst_scalar& s)
+{
+    static const blst_scalar zero{};
+    return memcmp(&s, &zero, sizeof(s)) == 0;
+}
+
+//! A threshold id as a scalar, reduced modulo the group order
+void ScalarFromId(blst_scalar& out, const uint256& id)
+{
+    blst_scalar_from_be_bytes(&out, id.begin(), id.size());
+}
+
+void P1Mult(blst_p1& out, const blst_p1& p, const blst_scalar& k)
+{
+    Wiped<std::array<uint8_t, 32>> le;
+    blst_lendian_from_scalar(le.v.data(), &k);
+    blst_p1_mult(&out, &p, le.v.data(), 256);
+}
+
+void P2Mult(blst_p2& out, const blst_p2& p, const blst_scalar& k)
+{
+    Wiped<std::array<uint8_t, 32>> le;
+    blst_lendian_from_scalar(le.v.data(), &k);
+    blst_p2_mult(&out, &p, le.v.data(), 256);
+}
+
+// --- points ------------------------------------------------------------------
+
+//! Validity in the basic scheme: a subgroup element or the point at infinity
+bool InG1OrInf(const blst_p1& p) { return blst_p1_is_inf(&p) || blst_p1_in_g1(&p); }
+bool InG2OrInf(const blst_p2& p) { return blst_p2_is_inf(&p) || blst_p2_in_g2(&p); }
+
+void HashToG2(blst_p2& out, const uint256& hash, bool legacy)
+{
+    if (legacy) {
+        bls_legacy::HashToG2(out, hash);
+    } else {
+        blst_hash_to_g2(&out, hash.begin(), hash.size(),
+                        reinterpret_cast<const uint8_t*>(BASIC_SCHEME_DST), sizeof(BASIC_SCHEME_DST) - 1,
+                        nullptr, 0);
+    }
+}
+
+// Decoding of the basic (IETF) compressed encodings. Only the canonical
+// infinity encoding is accepted; a non-infinity encoding must have the
+// compression bit set, may not encode a zero x coordinate, and must decode
+// to a subgroup element.
+bool DecodeBasicG1(blst_p1& out, Span<const uint8_t> in)
+{
+    const bool tailZero = std::all_of(in.begin() + 1, in.end(), [](uint8_t c) { return c == 0; });
+    if ((in[0] & 0xc0) == 0xc0) {
+        if (in[0] != 0xc0 || !tailZero) return false;
+        memset(&out, 0, sizeof(out));
+        return true;
+    }
+    if ((in[0] & 0xc0) != 0x80 || tailZero) return false;
+    blst_p1_affine a;
+    if (blst_p1_uncompress(&a, in.data()) != BLST_SUCCESS) return false;
+    blst_p1_from_affine(&out, &a);
+    return InG1OrInf(out);
+}
+
+bool DecodeBasicG2(blst_p2& out, Span<const uint8_t> in)
+{
+    if ((in[48] & 0xe0) != 0) return false;
+    const bool zerosOnly = (in[0] & 0x1f) == 0 && std::all_of(in.begin() + 1, in.end(), [](uint8_t c) { return c == 0; });
+    if ((in[0] & 0xc0) == 0xc0) {
+        if (in[0] != 0xc0 || !zerosOnly) return false;
+        memset(&out, 0, sizeof(out));
+        return true;
+    }
+    if ((in[0] & 0xc0) != 0x80 || zerosOnly) return false;
+    blst_p2_affine a;
+    if (blst_p2_uncompress(&a, in.data()) != BLST_SUCCESS) return false;
+    blst_p2_from_affine(&out, &a);
+    return InG2OrInf(out);
+}
+
+// --- pairing product ---------------------------------------------------------
+
+// Checks e(-G, sig) * prod e(pk_i, h_i) == 1. A pair with the point at
+// infinity on either side contributes the identity (relic's semantics, which
+// is why blst_core_verify is not used).
+bool VerifyPairing(const blst_p2& sig, const std::vector<const blst_p1*>& pks, const std::vector<blst_p2>& hashes)
+{
+    assert(pks.size() == hashes.size());
+    std::vector<blst_p1_affine> g1(pks.size() + 1);
+    std::vector<blst_p2_affine> g2(pks.size() + 1);
+
+    blst_p1 negGenerator = *blst_p1_generator();
+    blst_p1_cneg(&negGenerator, true);
+    blst_p1_to_affine(&g1[0], &negGenerator);
+    blst_p2_to_affine(&g2[0], &sig);
+    for (size_t i = 0; i < pks.size(); i++) {
+        blst_p1_to_affine(&g1[i + 1], pks[i]);
+        blst_p2_to_affine(&g2[i + 1], &hashes[i]);
+    }
+
+    blst_fp12 acc = *blst_fp12_one();
+    for (size_t i = 0; i < g1.size(); i++) {
+        if (blst_p1_affine_is_inf(&g1[i]) || blst_p2_affine_is_inf(&g2[i])) {
+            continue;
+        }
+        blst_fp12 term;
+        blst_miller_loop(&term, &g2[i], &g1[i]);
+        blst_fp12_mul(&acc, &acc, &term);
+    }
+    blst_final_exp(&acc, &acc);
+    return blst_fp12_is_one(&acc);
+}
+
+// --- secure aggregation ------------------------------------------------------
+
+// Coefficients of the secure aggregation: the public keys are ordered by
+// their encoding under the given scheme, and coefficient i is
+// SHA256(i || SHA256(encodings)) reduced modulo the group order.
+struct SecureAggregationOrder {
+    std::vector<size_t> index;        // input index of each sorted position
+    std::vector<blst_scalar> coeffs;  // coefficient of each sorted position
+};
+
+SecureAggregationOrder SecureAggregationCoefficients(const std::vector<std::array<uint8_t, BLS_CURVE_PUBKEY_SIZE>>& encodings)
+{
+    const size_t n = encodings.size();
+    SecureAggregationOrder ret;
+    ret.index.resize(n);
+    for (size_t i = 0; i < n; i++) ret.index[i] = i;
+    std::sort(ret.index.begin(), ret.index.end(), [&](size_t a, size_t b) {
+        return memcmp(encodings[a].data(), encodings[b].data(), BLS_CURVE_PUBKEY_SIZE) < 0;
+    });
+
+    CSHA256 all;
+    for (size_t i : ret.index) {
+        all.Write(encodings[i].data(), BLS_CURVE_PUBKEY_SIZE);
+    }
+    uint8_t pkHash[CSHA256::OUTPUT_SIZE];
+    all.Finalize(pkHash);
+
+    ret.coeffs.resize(n);
+    for (uint32_t i = 0; i < n; i++) {
+        const uint8_t prefix[4] = {uint8_t(i >> 24), uint8_t(i >> 16), uint8_t(i >> 8), uint8_t(i)};
+        uint8_t digest[CSHA256::OUTPUT_SIZE];
+        CSHA256().Write(prefix, sizeof(prefix)).Write(pkHash, sizeof(pkHash)).Finalize(digest);
+        blst_scalar_from_be_bytes(&ret.coeffs[i], digest, sizeof(digest));
+    }
+    return ret;
+}
+
+// --- polynomials over the scalar field ---------------------------------------
+
+template <typename T>
+struct PolyOps;
+
+template <>
+struct PolyOps<blst_scalar> {
+    static void Mul(blst_scalar& out, const blst_scalar& a, const blst_scalar& x) { blst_sk_mul_n_check(&out, &a, &x); }
+    static void Add(blst_scalar& out, const blst_scalar& a, const blst_scalar& b) { blst_sk_add_n_check(&out, &a, &b); }
+};
+
+template <>
+struct PolyOps<blst_p1> {
+    static void Mul(blst_p1& out, const blst_p1& a, const blst_scalar& x) { P1Mult(out, a, x); }
+    static void Add(blst_p1& out, const blst_p1& a, const blst_p1& b) { blst_p1_add_or_double(&out, &a, &b); }
+};
+
+template <>
+struct PolyOps<blst_p2> {
+    static void Mul(blst_p2& out, const blst_p2& a, const blst_scalar& x) { P2Mult(out, a, x); }
+    static void Add(blst_p2& out, const blst_p2& a, const blst_p2& b) { blst_p2_add_or_double(&out, &a, &b); }
+};
+
+//! Horner evaluation of the polynomial with the given coefficients at the
+//! point id. Requires at least two coefficients.
+template <typename T, typename GetCoefficient>
+bool PolyEvaluate(T& out, size_t n, GetCoefficient coefficient, const uint256& id)
+{
+    if (n < 2) return false;
+    Wiped<blst_scalar> x;
+    ScalarFromId(x.v, id);
+    Wiped<T> y, term;
+    y.v = coefficient(n - 1);
+    for (size_t i = n - 1; i-- > 0;) {
+        PolyOps<T>::Mul(term.v, y.v, x.v);
+        PolyOps<T>::Add(y.v, term.v, coefficient(i));
+    }
+    out = y.v;
+    return true;
+}
+
+//! Lagrange interpolation at zero of the polynomial through the given shares.
+//! Fails for fewer than two shares, a zero id or duplicate ids.
+template <typename T, typename GetShare>
+bool LagrangeInterpolate(T& out, size_t k, GetShare share, const std::vector<uint256>& ids)
+{
+    if (k < 2 || ids.size() != k) return false;
+    std::vector<blst_scalar> x(k);
+    for (size_t i = 0; i < k; i++) {
+        ScalarFromId(x[i], ids[i]);
+    }
+
+    // delta_i = prod_j x_j / (x_i * prod_{j != i} (x_j - x_i))
+    blst_scalar numerator = x[0];
+    for (size_t i = 1; i < k; i++) {
+        blst_sk_mul_n_check(&numerator, &numerator, &x[i]);
+    }
+    if (ScalarIsZero(numerator)) return false;
+
+    T acc{};
+    for (size_t i = 0; i < k; i++) {
+        blst_scalar denominator = x[i];
+        for (size_t j = 0; j < k; j++) {
+            if (j == i) continue;
+            blst_scalar diff;
+            blst_sk_sub_n_check(&diff, &x[j], &x[i]);
+            if (ScalarIsZero(diff)) return false;
+            blst_sk_mul_n_check(&denominator, &denominator, &diff);
+        }
+        blst_scalar delta;
+        blst_sk_inverse(&delta, &denominator);
+        blst_sk_mul_n_check(&delta, &numerator, &delta);
+        T term;
+        PolyOps<T>::Mul(term, share(i), delta);
+        PolyOps<T>::Add(acc, acc, term);
+    }
+    out = acc;
+    return true;
+}
+
+} // namespace
+
+// --- CBLSSecretScalar --------------------------------------------------------
+
+CBLSSecretScalar::CBLSSecretScalar(const CBLSSecretScalar& o)
+{
+    if (o.m_data != nullptr) {
+        Mutable() = *o.m_data;
+    }
+}
+
+CBLSSecretScalar& CBLSSecretScalar::operator=(const CBLSSecretScalar& o)
+{
+    if (this != &o) {
+        if (o.m_data != nullptr) {
+            Mutable() = *o.m_data;
+        } else if (m_data != nullptr) {
+            SecureFree(m_data, sizeof(blst_scalar));
+            m_data = nullptr;
+        }
+    }
+    return *this;
+}
+
+CBLSSecretScalar::~CBLSSecretScalar()
+{
+    if (m_data != nullptr) {
+        SecureFree(m_data, sizeof(blst_scalar));
+    }
+}
+
+const blst_scalar& CBLSSecretScalar::Get() const
+{
+    static const blst_scalar zero{};
+    return m_data != nullptr ? *m_data : zero;
+}
+
+blst_scalar& CBLSSecretScalar::Mutable()
+{
+    if (m_data == nullptr) {
+        m_data = static_cast<blst_scalar*>(SecureAlloc(sizeof(blst_scalar)));
+        if (m_data == nullptr) throw std::bad_alloc();
+        memset(m_data, 0, sizeof(blst_scalar));
+    }
+    return *m_data;
+}
+
+bool CBLSSecretScalar::IsZero() const
+{
+    return m_data == nullptr || ScalarIsZero(*m_data);
+}
 
-static const std::unique_ptr<bls::CoreMPL>& Scheme(const bool fLegacy)
+bool CBLSSecretScalar::operator==(const CBLSSecretScalar& o) const
 {
-    return fLegacy ? pSchemeLegacy : pScheme;
+    return memcmp(&Get(), &o.Get(), sizeof(blst_scalar)) == 0;
 }
 
-CBLSId::CBLSId(const uint256& nHash) : CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>()
+// --- CBLSId ------------------------------------------------------------------
+
+CBLSId::CBLSId(const uint256& nHash) : CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>()
 {
     impl = nHash;
     fValid = true;
     cachedHash.SetNull();
 }
 
+// --- CBLSSecretKey -----------------------------------------------------------
+
+bool CBLSSecretKey::DecodeImpl(Span<const uint8_t> in, bool modOrder, CBLSSecretScalar& out)
+{
+    if (modOrder) {
+        blst_scalar_from_be_bytes(&out.Mutable(), in.data(), in.size());
+        return true;
+    }
+    // values above the group order are rejected, the order itself is not
+    if (memcmp(in.data(), ORDER_BE, sizeof(ORDER_BE)) > 0) {
+        return false;
+    }
+    blst_scalar_from_bendian(&out.Mutable(), in.data());
+    return true;
+}
+
+void CBLSSecretKey::EncodeImpl(const CBLSSecretScalar& in, bool /*specificLegacyScheme*/, uint8_t* out)
+{
+    blst_bendian_from_scalar(out, &in.Get());
+}
+
 void CBLSSecretKey::AggregateInsecure(const CBLSSecretKey& o)
 {
     assert(IsValid() && o.IsValid());
-    impl = bls::PrivateKey::Aggregate({impl, o.impl});
+    blst_sk_add_n_check(&impl.Mutable(), &impl.Get(), &o.impl.Get());
     cachedHash.SetNull();
 }
 
@@ -46,14 +442,11 @@ CBLSSecretKey CBLSSecretKey::AggregateInsecure(Span<CBLSSecretKey> sks)
         return {};
     }
 
-    std::vector<bls::PrivateKey> v;
-    v.reserve(sks.size());
+    CBLSSecretKey ret;
+    blst_scalar& sum = ret.impl.Mutable();
     for (const auto& sk : sks) {
-        v.emplace_back(sk.impl);
+        blst_sk_add_n_check(&sum, &sum, &sk.impl.Get());
     }
-
-    CBLSSecretKey ret;
-    ret.impl = bls::PrivateKey::Aggregate(v);
     ret.fValid = true;
     ret.cachedHash.SetNull();
     return ret;
@@ -63,20 +456,11 @@ CBLSSecretKey CBLSSecretKey::AggregateInsecure(Span<CBLSSecretKey> sks)
 void CBLSSecretKey::MakeNewKey()
 {
     unsigned char buf[SerSize];
-    while (true) {
+    do {
         GetStrongRandBytes({buf, sizeof(buf)});
-        try {
-            impl = bls::PrivateKey::FromBytes(bls::Bytes(reinterpret_cast<const uint8_t*>(buf), SerSize));
-            if (impl == bls::PrivateKey()) {
-                continue;
-            }
-            break;
-        } catch (...) {
-        }
-    }
+        SetBytes(buf, false);
+    } while (!IsValid());
     memory_cleanse(buf, sizeof(buf));
-    fValid = true;
-    cachedHash.SetNull();
 }
 #endif
 
@@ -88,22 +472,17 @@ bool CBLSSecretKey::SecretKeyShare(Span<CBLSSecretKey> msk, const CBLSId& _id)
     if (!_id.IsValid()) {
         return false;
     }
-
-    std::vector<bls::PrivateKey> mskVec;
-    mskVec.reserve(msk.size());
     for (const CBLSSecretKey& sk : msk) {
         if (!sk.IsValid()) {
             return false;
         }
-        mskVec.emplace_back(sk.impl);
     }
 
-    try {
-        impl = bls::Threshold::PrivateKeyShare(mskVec, bls::Bytes(_id.impl.begin(), _id.impl.size()));
-    } catch (...) {
+    Wiped<blst_scalar> share;
+    if (!PolyEvaluate<blst_scalar>(share.v, msk.size(), [&](size_t i) -> const blst_scalar& { return msk[i].impl.Get(); }, _id.impl)) {
         return false;
     }
-
+    impl.Mutable() = share.v;
     fValid = true;
     cachedHash.SetNull();
     return true;
@@ -116,7 +495,7 @@ CBLSPublicKey CBLSSecretKey::GetPublicKey() const
     }
 
     CBLSPublicKey pubKey;
-    pubKey.impl = impl.GetG1Element();
+    blst_sk_to_pk_in_g1(&pubKey.impl, &impl.Get());
     pubKey.fValid = true;
     pubKey.cachedHash.SetNull();
     return pubKey;
@@ -129,26 +508,34 @@ CBLSSignature CBLSSecretKey::Sign(const uint256& hash, const bool specificLegacy
     }
 
     CBLSSignature sigRet;
-    try {
-        sigRet.impl = Scheme(specificLegacyScheme)->Sign(impl, bls::Bytes(hash.begin(), hash.size()));
-        sigRet.fValid = true;
-    } catch (...) {
-        sigRet.fValid = false;
-    }
-
+    blst_p2 hashPoint;
+    HashToG2(hashPoint, hash, specificLegacyScheme);
+    blst_sign_pk_in_g1(&sigRet.impl, &hashPoint, &impl.Get());
+    sigRet.fValid = true;
     sigRet.cachedHash.SetNull();
-
     return sigRet;
 }
 
+// --- CBLSPublicKey -----------------------------------------------------------
+
+bool CBLSPublicKey::DecodeImpl(Span<const uint8_t> in, bool specificLegacyScheme, blst_p1& out)
+{
+    return specificLegacyScheme ? bls_legacy::DecodeG1(out, in) : DecodeBasicG1(out, in);
+}
+
+void CBLSPublicKey::EncodeImpl(const blst_p1& in, bool specificLegacyScheme, uint8_t* out)
+{
+    if (specificLegacyScheme) {
+        bls_legacy::EncodeG1({out, BLS_CURVE_PUBKEY_SIZE}, in);
+    } else {
+        blst_p1_compress(out, &in);
+    }
+}
+
 void CBLSPublicKey::AggregateInsecure(const CBLSPublicKey& o)
 {
     assert(IsValid() && o.IsValid());
-    try {
-        impl = Scheme(bls::bls_legacy_scheme.load())->Aggregate({impl, o.impl});
-    } catch (...) {
-        fValid = false;
-    }
+    blst_p1_add_or_double(&impl, &impl, &o.impl);
     cachedHash.SetNull();
 }
 
@@ -158,20 +545,11 @@ CBLSPublicKey CBLSPublicKey::AggregateInsecure(Span<CBLSPublicKey> pks)
         return {};
     }
 
-    std::vector<bls::G1Element> vecPublicKeys;
-    vecPublicKeys.reserve(pks.size());
-    for (const auto& pk : pks) {
-        vecPublicKeys.emplace_back(pk.impl);
-    }
-
     CBLSPublicKey ret;
-    try {
-        ret.impl = Scheme(bls::bls_legacy_scheme.load())->Aggregate(vecPublicKeys);
-        ret.fValid = true;
-    } catch (...) {
-        ret.fValid = false;
+    for (const auto& pk : pks) {
+        blst_p1_add_or_double(&ret.impl, &ret.impl, &pk.impl);
     }
-
+    ret.fValid = true;
     ret.cachedHash.SetNull();
     return ret;
 }
@@ -184,22 +562,15 @@ bool CBLSPublicKey::PublicKeyShare(Span<CBLSPublicKey> mpk, const CBLSId& _id)
     if (!_id.IsValid()) {
         return false;
     }
-
-    std::vector<bls::G1Element> mpkVec;
-    mpkVec.reserve(mpk.size());
     for (const CBLSPublicKey& pk : mpk) {
         if (!pk.IsValid()) {
             return false;
         }
-        mpkVec.emplace_back(pk.impl);
     }
 
-    try {
-        impl = bls::Threshold::PublicKeyShare(mpkVec, bls::Bytes(_id.impl.begin(), _id.impl.size()));
-    } catch (...) {
+    if (!PolyEvaluate<blst_p1>(impl, mpk.size(), [&](size_t i) -> const blst_p1& { return mpk[i].impl; }, _id.impl)) {
         return false;
     }
-
     fValid = true;
     cachedHash.SetNull();
     return true;
@@ -213,20 +584,32 @@ bool CBLSPublicKey::DHKeyExchange(const CBLSSecretKey& sk, const CBLSPublicKey&
     if (!sk.IsValid() || !pk.IsValid()) {
         return false;
     }
-    impl = sk.impl * pk.impl;
+    P1Mult(impl, pk.impl, sk.impl.Get());
     fValid = true;
     cachedHash.SetNull();
     return true;
 }
 
+// --- CBLSSignature -----------------------------------------------------------
+
+bool CBLSSignature::DecodeImpl(Span<const uint8_t> in, bool specificLegacyScheme, blst_p2& out)
+{
+    return specificLegacyScheme ? bls_legacy::DecodeG2(out, in) : DecodeBasicG2(out, in);
+}
+
+void CBLSSignature::EncodeImpl(const blst_p2& in, bool specificLegacyScheme, uint8_t* out)
+{
+    if (specificLegacyScheme) {
+        bls_legacy::EncodeG2({out, BLS_CURVE_SIG_SIZE}, in);
+    } else {
+        blst_p2_compress(out, &in);
+    }
+}
+
 void CBLSSignature::AggregateInsecure(const CBLSSignature& o)
 {
     assert(IsValid() && o.IsValid());
-    try {
-        impl = Scheme(bls::bls_legacy_scheme.load())->Aggregate({impl, o.impl});
-    } catch (...) {
-        fValid = false;
-    }
+    blst_p2_add_or_double(&impl, &impl, &o.impl);
     cachedHash.SetNull();
 }
 
@@ -236,20 +619,11 @@ CBLSSignature CBLSSignature::AggregateInsecure(Span<CBLSSignature> sigs)
         return {};
     }
 
-    std::vector<bls::G2Element> v;
-    v.reserve(sigs.size());
-    for (const auto& pk : sigs) {
-        v.emplace_back(pk.impl);
-    }
-
     CBLSSignature ret;
-    try {
-        ret.impl = Scheme(bls::bls_legacy_scheme.load())->Aggregate(v);
-        ret.fValid = true;
-    } catch (...) {
-        ret.fValid = false;
+    for (const auto& sig : sigs) {
+        blst_p2_add_or_double(&ret.impl, &ret.impl, &sig.impl);
     }
-
+    ret.fValid = true;
     ret.cachedHash.SetNull();
     return ret;
 }
@@ -261,27 +635,21 @@ CBLSSignature CBLSSignature::AggregateSecure(Span<CBLSSignature> sigs,
     if (sigs.size() != pks.size() || sigs.empty()) {
         return {};
     }
+    const bool legacy = bls::bls_legacy_scheme.load();
 
-    std::vector<bls::G1Element> vecPublicKeys;
-    vecPublicKeys.reserve(pks.size());
-    for (const auto& pk : pks) {
-        vecPublicKeys.push_back(pk.impl);
-    }
-
-    std::vector<bls::G2Element> vecSignatures;
-    vecSignatures.reserve(pks.size());
-    for (const auto& sig : sigs) {
-        vecSignatures.push_back(sig.impl);
+    std::vector<std::array<uint8_t, BLS_CURVE_PUBKEY_SIZE>> encodings(pks.size());
+    for (size_t i = 0; i < pks.size(); i++) {
+        CBLSPublicKey::EncodeImpl(pks[i].impl, legacy, encodings[i].data());
     }
+    const SecureAggregationOrder order = SecureAggregationCoefficients(encodings);
 
     CBLSSignature ret;
-    try {
-        ret.impl = Scheme(bls::bls_legacy_scheme.load())->AggregateSecure(vecPublicKeys, vecSignatures, bls::Bytes(hash.begin(), hash.size()));
-        ret.fValid = true;
-    } catch (...) {
-        ret.fValid = false;
+    for (size_t i = 0; i < order.index.size(); i++) {
+        blst_p2 term;
+        P2Mult(term, sigs[order.index[i]].impl, order.coeffs[i]);
+        blst_p2_add_or_double(&ret.impl, &ret.impl, &term);
     }
-
+    ret.fValid = true;
     ret.cachedHash.SetNull();
     return ret;
 }
@@ -289,7 +657,9 @@ CBLSSignature CBLSSignature::AggregateSecure(Span<CBLSSignature> sigs,
 void CBLSSignature::SubInsecure(const CBLSSignature& o)
 {
     assert(IsValid() && o.IsValid());
-    impl = impl + o.impl.Negate();
+    blst_p2 neg = o.impl;
+    blst_p2_cneg(&neg, true);
+    blst_p2_add_or_double(&impl, &impl, &neg);
     cachedHash.SetNull();
 }
 
@@ -298,12 +668,14 @@ bool CBLSSignature::VerifyInsecure(const CBLSPublicKey& pubKey, const uint256& h
     if (!IsValid() || !pubKey.IsValid()) {
         return false;
     }
-
-    try {
-        return Scheme(specificLegacyScheme)->Verify(pubKey.impl, bls::Bytes(hash.begin(), hash.size()), impl);
-    } catch (...) {
+    // The basic scheme requires subgroup elements; the legacy scheme verifies
+    // whatever was decoded.
+    if (!specificLegacyScheme && (!InG1OrInf(pubKey.impl) || !InG2OrInf(impl))) {
         return false;
     }
+    std::vector<blst_p2> hashes(1);
+    HashToG2(hashes[0], hash, specificLegacyScheme);
+    return VerifyPairing(impl, {&pubKey.impl}, hashes);
 }
 
 bool CBLSSignature::VerifyInsecure(const CBLSPublicKey& pubKey, const uint256& hash) const
@@ -317,25 +689,38 @@ bool CBLSSignature::VerifyInsecureAggregated(Span<CBLSPublicKey> pubKeys, Span<u
         return false;
     }
     assert(!pubKeys.empty() && !hashes.empty() && pubKeys.size() == hashes.size());
+    const bool legacy = bls::bls_legacy_scheme.load();
 
-    std::vector<bls::G1Element> pubKeyVec;
-    std::vector<bls::Bytes> hashes2;
-    hashes2.reserve(hashes.size());
-    pubKeyVec.reserve(pubKeys.size());
-    for (size_t i = 0; i < pubKeys.size(); i++) {
-        const auto& p = pubKeys[i];
-        if (!p.IsValid()) {
+    std::vector<const blst_p1*> pks;
+    pks.reserve(pubKeys.size());
+    for (const auto& pk : pubKeys) {
+        if (!pk.IsValid()) {
             return false;
         }
-        pubKeyVec.push_back(p.impl);
-        hashes2.emplace_back(hashes[i].begin(), hashes[i].size());
+        pks.push_back(&pk.impl);
     }
 
-    try {
-        return Scheme(bls::bls_legacy_scheme.load())->AggregateVerify(pubKeyVec, hashes2, impl);
-    } catch (...) {
-        return false;
+    if (!legacy) {
+        // the basic scheme needs distinct messages and subgroup elements
+        const std::set<uint256> distinct(hashes.begin(), hashes.end());
+        if (distinct.size() != hashes.size()) {
+            return false;
+        }
+        if (!InG2OrInf(impl)) {
+            return false;
+        }
+        for (const blst_p1* pk : pks) {
+            if (!InG1OrInf(*pk)) {
+                return false;
+            }
+        }
+    }
+
+    std::vector<blst_p2> hashPoints(hashes.size());
+    for (size_t i = 0; i < hashes.size(); i++) {
+        HashToG2(hashPoints[i], hashes[i], legacy);
     }
+    return VerifyPairing(impl, pks, hashPoints);
 }
 
 bool CBLSSignature::VerifySecureAggregated(Span<CBLSPublicKey> pks, const uint256& hash) const
@@ -343,18 +728,32 @@ bool CBLSSignature::VerifySecureAggregated(Span<CBLSPublicKey> pks, const uint25
     if (pks.empty()) {
         return false;
     }
+    const bool legacy = bls::bls_legacy_scheme.load();
 
-    std::vector<bls::G1Element> vecPublicKeys;
-    vecPublicKeys.reserve(pks.size());
-    for (const auto& pk : pks) {
-        vecPublicKeys.push_back(pk.impl);
+    std::vector<std::array<uint8_t, BLS_CURVE_PUBKEY_SIZE>> encodings(pks.size());
+    for (size_t i = 0; i < pks.size(); i++) {
+        CBLSPublicKey::EncodeImpl(pks[i].impl, legacy, encodings[i].data());
     }
+    const SecureAggregationOrder order = SecureAggregationCoefficients(encodings);
 
-    try {
-        return Scheme(bls::bls_legacy_scheme.load())->VerifySecure(vecPublicKeys, impl, bls::Bytes(hash.begin(), hash.size()));
-    } catch (...) {
+    blst_p1 aggregate{};
+    for (size_t i = 0; i < order.index.size(); i++) {
+        const blst_p1& pk = pks[order.index[i]].impl;
+        // the basic scheme only accepts subgroup elements
+        if (!legacy && !InG1OrInf(pk)) {
+            return false;
+        }
+        blst_p1 term;
+        P1Mult(term, pk, order.coeffs[i]);
+        blst_p1_add_or_double(&aggregate, &aggregate, &term);
+    }
+    if (!legacy && !InG2OrInf(impl)) {
         return false;
     }
+
+    std::vector<blst_p2> hashes(1);
+    HashToG2(hashes[0], hash, legacy);
+    return VerifyPairing(impl, {&aggregate}, hashes);
 }
 
 bool CBLSSignature::Recover(Span<CBLSSignature> sigs, Span<CBLSId> ids)
@@ -366,74 +765,30 @@ bool CBLSSignature::Recover(Span<CBLSSignature> sigs, Span<CBLSId> ids)
         return false;
     }
 
-    std::vector<bls::G2Element> sigsVec;
-    std::vector<bls::Bytes> idsVec;
-    sigsVec.reserve(sigs.size());
-    idsVec.reserve(sigs.size());
-
+    std::vector<uint256> idValues;
+    idValues.reserve(ids.size());
     for (size_t i = 0; i < sigs.size(); i++) {
         if (!sigs[i].IsValid() || !ids[i].IsValid()) {
             return false;
         }
-        sigsVec.emplace_back(sigs[i].impl);
-        idsVec.emplace_back(ids[i].impl.begin(), ids[i].impl.size());
+        idValues.push_back(ids[i].impl);
     }
 
-    try {
-        impl = bls::Threshold::SignatureRecover(sigsVec, idsVec);
-    } catch (...) {
+    if (!LagrangeInterpolate<blst_p2>(impl, sigs.size(), [&](size_t i) -> const blst_p2& { return sigs[i].impl; }, idValues)) {
         return false;
     }
-
     fValid = true;
     cachedHash.SetNull();
     return true;
 }
 
-#ifndef BUILD_BITCOIN_INTERNAL
-
-static std::once_flag init_flag;
-static mt_pooled_secure_allocator<uint8_t>* secure_allocator_instance;
-static void create_secure_allocator()
-{
-    // make sure LockedPoolManager is initialized first (ensures destruction order)
-    LockedPoolManager::Instance();
-
-    // static variable in function scope ensures it's initialized when first accessed
-    // and destroyed before LockedPoolManager
-    static mt_pooled_secure_allocator<uint8_t> a(sizeof(bn_t) + sizeof(size_t));
-    secure_allocator_instance = &a;
-}
-
-static mt_pooled_secure_allocator<uint8_t>& get_secure_allocator()
-{
-    std::call_once(init_flag, create_secure_allocator);
-    return *secure_allocator_instance;
-}
-
-static void* secure_allocate(size_t n)
-{
-    uint8_t* ptr = get_secure_allocator().allocate(n + sizeof(size_t));
-    *reinterpret_cast<size_t*>(ptr) = n;
-    return ptr + sizeof(size_t);
-}
-
-static void secure_free(void* p)
-{
-    if (p == nullptr) {
-        return;
-    }
-
-    uint8_t* ptr = reinterpret_cast<uint8_t*>(p) - sizeof(size_t);
-    size_t n = *reinterpret_cast<size_t*>(ptr);
-    return get_secure_allocator().deallocate(ptr, n);
-}
-#endif
+// --- initialization ----------------------------------------------------------
 
 bool BLSInit()
 {
 #ifndef BUILD_BITCOIN_INTERNAL
-    bls::BLS::SetSecureAllocator(secure_allocate, secure_free);
+    SecureBackend expected = SecureBackend::UNSET;
+    g_secureBackend.compare_exchange_strong(expected, SecureBackend::LOCKED_POOL);
 #endif
     return true;
 }
diff --git a/src/bls/bls.h b/src/bls/bls.h
index ae2124cd38e1..3ba73c212c5b 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2025 The Dash Core developers
+// Copyright (c) 2018-2026 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -7,26 +7,25 @@
 
 #include <hash.h>
 #include <serialize.h>
+#include <span.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 
-// bls-dash uses relic, which may define DEBUG and ERROR, which leads to many warnings in some build setups
-#undef ERROR
-#undef DEBUG
-#include <dashbls/bls.hpp>
-#include <dashbls/privatekey.hpp>
-#include <dashbls/elements.hpp>
-#include <dashbls/schemes.hpp>
-#include <dashbls/threshold.hpp>
-#undef DOUBLE
-#undef SEED
+#include <blst.h>
 
 #include <array>
 #include <atomic>
+#include <memory>
 #include <mutex>
 #include <ranges>
+#include <utility>
+#include <vector>
 
 namespace bls {
+    //! Selects the scheme used wherever no explicit flag is given (the
+    //! flag-less Serialize/Unserialize/GetHash overloads, aggregation and
+    //! aggregated verification): the legacy scheme from before the v19 hard
+    //! fork, or the basic (IETF) scheme after it.
     extern std::atomic<bool> bls_legacy_scheme;
 }
 
@@ -36,9 +35,47 @@ constexpr int BLS_CURVE_SECKEY_SIZE{32};
 constexpr int BLS_CURVE_PUBKEY_SIZE{48};
 constexpr int BLS_CURVE_SIG_SIZE{96};
 
+class CBLSSecretKey;
 class CBLSSignature;
 class CBLSPublicKey;
 
+/**
+ * A secret scalar kept in secure memory (see BLSInit). A default constructed
+ * holder stands for the zero scalar and owns no memory.
+ */
+class CBLSSecretScalar
+{
+private:
+    blst_scalar* m_data{nullptr};
+
+public:
+    CBLSSecretScalar() = default;
+    CBLSSecretScalar(const CBLSSecretScalar& o);
+    CBLSSecretScalar& operator=(const CBLSSecretScalar& o);
+    CBLSSecretScalar(CBLSSecretScalar&& o) noexcept : m_data(std::exchange(o.m_data, nullptr)) {}
+    CBLSSecretScalar& operator=(CBLSSecretScalar&& o) noexcept
+    {
+        std::swap(m_data, o.m_data);
+        return *this;
+    }
+    ~CBLSSecretScalar();
+
+    //! The scalar, or zero when nothing has been stored
+    const blst_scalar& Get() const;
+    //! Writable storage, allocated on first use
+    blst_scalar& Mutable();
+    bool IsZero() const;
+    bool operator==(const CBLSSecretScalar& o) const;
+};
+
+/**
+ * Common part of the BLS objects. The derived class C provides the codec
+ * through four static hooks:
+ *   bool DecodeImpl(Span<const uint8_t> in, bool specificLegacyScheme, ImplType& out)
+ *   void EncodeImpl(const ImplType& in, bool specificLegacyScheme, uint8_t* out)
+ *   bool IsIdentity(const ImplType& v)
+ *   bool EqualImpl(const ImplType& a, const ImplType& b)
+ */
 template <typename ImplType, size_t _SerSize, typename C>
 class CBLSWrapper
 {
@@ -47,7 +84,7 @@ class CBLSWrapper
     friend class CBLSSignature;
 
 protected:
-    ImplType impl;
+    ImplType impl{};
     bool fValid{false};
     mutable uint256 cachedHash;
 
@@ -72,11 +109,9 @@ class CBLSWrapper
         return *this;
     }
 
-    virtual ~CBLSWrapper() = default;
-
     bool operator==(const C& r) const
     {
-        return fValid == r.fValid && impl == r.impl;
+        return fValid == r.fValid && C::EqualImpl(impl, r.impl);
     }
     bool operator!=(const C& r) const
     {
@@ -106,36 +141,31 @@ class CBLSWrapper
 
         if (std::ranges::all_of(vecBytes, [](uint8_t c) { return c == 0; })) {
             Reset();
+        } else if (!C::DecodeImpl(vecBytes, specificLegacyScheme, impl) || C::IsIdentity(impl)) {
+            // neither undecodable input nor the identity element make a valid object
+            Reset();
         } else {
-            try {
-                impl = ImplType::FromBytes(bls::Bytes(vecBytes.data(), vecBytes.size()), specificLegacyScheme);
-                if (impl == ImplType()) {
-                    Reset();
-                    cachedHash.SetNull();
-                    return;
-                }
-                fValid = true;
-            } catch (...) {
-                Reset();
-            }
+            fValid = true;
         }
         cachedHash.SetNull();
     }
 
     std::vector<uint8_t> ToByteVector(const bool specificLegacyScheme) const
     {
-        if (!fValid) {
-            return std::vector<uint8_t>(SerSize, 0);
+        std::vector<uint8_t> ret(SerSize, 0);
+        if (fValid) {
+            C::EncodeImpl(impl, specificLegacyScheme, ret.data());
         }
-        return impl.Serialize(specificLegacyScheme);
+        return ret;
     }
 
     std::array<uint8_t, SerSize> ToBytes(const bool specificLegacyScheme) const
     {
-        if (!fValid) {
-            return std::array<uint8_t, SerSize>{};
+        std::array<uint8_t, SerSize> ret{};
+        if (fValid) {
+            C::EncodeImpl(impl, specificLegacyScheme, ret.data());
         }
-        return impl.SerializeToArray(specificLegacyScheme);
+        return ret;
     }
 
     const uint256& GetHash() const
@@ -232,29 +262,23 @@ class CBLSWrapper
     }
 };
 
-struct CBLSIdImplicit : public uint256
+
+class CBLSId : public CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>
 {
-    CBLSIdImplicit() = default;
-    // cppcheck-suppress noExplicitConstructor
-    CBLSIdImplicit(const uint256& id)
-    {
-        memcpy(begin(), id.begin(), sizeof(uint256));
-    }
-    static CBLSIdImplicit FromBytes(const uint8_t* buffer, const bool fLegacy)
+    friend class CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>;
+
+    static bool DecodeImpl(Span<const uint8_t> in, bool /*specificLegacyScheme*/, uint256& out)
     {
-        CBLSIdImplicit instance;
-        memcpy(instance.begin(), buffer, sizeof(CBLSIdImplicit));
-        return instance;
+        memcpy(out.begin(), in.data(), BLS_CURVE_ID_SIZE);
+        return true;
     }
-    [[nodiscard]] std::vector<uint8_t> Serialize(const bool fLegacy) const
+    static void EncodeImpl(const uint256& in, bool /*specificLegacyScheme*/, uint8_t* out)
     {
-        return {begin(), end()};
+        memcpy(out, in.begin(), BLS_CURVE_ID_SIZE);
     }
-    [[nodiscard]] std::array<uint8_t, 32> SerializeToArray(const bool fLegacy) const { return m_data; }
-};
+    static bool IsIdentity(const uint256& v) { return v.IsNull(); }
+    static bool EqualImpl(const uint256& a, const uint256& b) { return a == b; }
 
-class CBLSId : public CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>
-{
 public:
     using CBLSWrapper::operator=;
     using CBLSWrapper::operator==;
@@ -266,8 +290,20 @@ class CBLSId : public CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>
 };
 
 //! CBLSSecretKey is invariant to BLS scheme for Creation / Serialization / Deserialization
-class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
+class CBLSSecretKey : public CBLSWrapper<CBLSSecretScalar, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
 {
+    friend class CBLSWrapper<CBLSSecretScalar, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>;
+    friend class CBLSPublicKey;
+    friend class CBLSSignature;
+
+    //! The flag does not select a scheme here: with it set the bytes are
+    //! reduced modulo the group order, without it values above the order
+    //! are rejected.
+    static bool DecodeImpl(Span<const uint8_t> in, bool modOrder, CBLSSecretScalar& out);
+    static void EncodeImpl(const CBLSSecretScalar& in, bool /*specificLegacyScheme*/, uint8_t* out);
+    static bool IsIdentity(const CBLSSecretScalar& s) { return s.IsZero(); }
+    static bool EqualImpl(const CBLSSecretScalar& a, const CBLSSecretScalar& b) { return a == b; }
+
 public:
     using CBLSWrapper::operator=;
     using CBLSWrapper::operator==;
@@ -298,11 +334,17 @@ class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE,
     [[nodiscard]] CBLSSignature Sign(const uint256& hash, const bool specificLegacyScheme) const;
 };
 
-class CBLSPublicKey : public CBLSWrapper<bls::G1Element, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>
+class CBLSPublicKey : public CBLSWrapper<blst_p1, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>
 {
+    friend class CBLSWrapper<blst_p1, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>;
     friend class CBLSSecretKey;
     friend class CBLSSignature;
 
+    static bool DecodeImpl(Span<const uint8_t> in, bool specificLegacyScheme, blst_p1& out);
+    static void EncodeImpl(const blst_p1& in, bool specificLegacyScheme, uint8_t* out);
+    static bool IsIdentity(const blst_p1& p) { return blst_p1_is_inf(&p); }
+    static bool EqualImpl(const blst_p1& a, const blst_p1& b) { return blst_p1_is_equal(&a, &b); }
+
 public:
     using CBLSWrapper::operator=;
     using CBLSWrapper::operator==;
@@ -338,10 +380,16 @@ class CBLSPublicKeyVersionWrapper {
     }
 };
 
-class CBLSSignature : public CBLSWrapper<bls::G2Element, BLS_CURVE_SIG_SIZE, CBLSSignature>
+class CBLSSignature : public CBLSWrapper<blst_p2, BLS_CURVE_SIG_SIZE, CBLSSignature>
 {
+    friend class CBLSWrapper<blst_p2, BLS_CURVE_SIG_SIZE, CBLSSignature>;
     friend class CBLSSecretKey;
 
+    static bool DecodeImpl(Span<const uint8_t> in, bool specificLegacyScheme, blst_p2& out);
+    static void EncodeImpl(const blst_p2& in, bool specificLegacyScheme, uint8_t* out);
+    static bool IsIdentity(const blst_p2& p) { return blst_p2_is_inf(&p); }
+    static bool EqualImpl(const blst_p2& a, const blst_p2& b) { return blst_p2_is_equal(&a, &b); }
+
 public:
     using CBLSWrapper::operator==;
     using CBLSWrapper::operator!=;
@@ -414,7 +462,6 @@ class CBLSLazyWrapper
     {
         *this = r;
     }
-    virtual ~CBLSLazyWrapper() = default;
 
     CBLSLazyWrapper& operator=(const CBLSLazyWrapper& r)
     {
diff --git a/src/bls/bls_legacy.cpp b/src/bls/bls_legacy.cpp
new file mode 100644
index 000000000000..4fb55e28ec29
--- /dev/null
+++ b/src/bls/bls_legacy.cpp
@@ -0,0 +1,416 @@
+// Copyright (c) 2021-2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <bls/bls_legacy.h>
+
+#include <crypto/sha256.h>
+
+#include <cassert>
+#include <cstring>
+
+namespace bls_legacy {
+namespace {
+
+// BLS12-381 base field prime p, big-endian.
+const uint8_t P_BE[48] = {
+    0x1a, 0x01, 0x11, 0xea, 0x39, 0x7f, 0xe6, 0x9a, 0x4b, 0x1b, 0xa7, 0xb6,
+    0x43, 0x4b, 0xac, 0xd7, 0x64, 0x77, 0x4b, 0x84, 0xf3, 0x85, 0x12, 0xbf,
+    0x67, 0x30, 0xd2, 0xa0, 0xf6, 0xb0, 0xf6, 0x24, 0x1e, 0xab, 0xff, 0xfe,
+    0xb1, 0x53, 0xff, 0xff, 0xb9, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xaa, 0xab};
+
+// (p - 1) / 2, big-endian. The legacy sign convention picks the "larger"
+// root: a coordinate is flagged when it is greater than this value.
+const uint8_t HALF_P_BE[48] = {
+    0x0d, 0x00, 0x88, 0xf5, 0x1c, 0xbf, 0xf3, 0x4d, 0x25, 0x8d, 0xd3, 0xdb,
+    0x21, 0xa5, 0xd6, 0x6b, 0xb2, 0x3b, 0xa5, 0xc2, 0x79, 0xc2, 0x89, 0x5f,
+    0xb3, 0x98, 0x69, 0x50, 0x7b, 0x58, 0x7b, 0x12, 0x0f, 0x55, 0xff, 0xff,
+    0x58, 0xa9, 0xff, 0xff, 0xdc, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xd5, 0x55};
+
+// (2^384)^-1 mod p, big-endian. When relic failed to find a square root
+// while decompressing a point whose sign bit was set, it left the raw limb
+// value 1 in y, which reads back from Montgomery form as this number.
+const uint8_t SQRT_FAILURE_MARKER_BE[48] = {
+    0x14, 0xfe, 0xc7, 0x01, 0xe8, 0xfb, 0x0c, 0xe9, 0xed, 0x5e, 0x64, 0x27,
+    0x3c, 0x4f, 0x53, 0x8b, 0x17, 0x97, 0xab, 0x14, 0x58, 0xa8, 0x8d, 0xe9,
+    0x34, 0x3e, 0xa9, 0x79, 0x14, 0x95, 0x6d, 0xc8, 0x7f, 0xe1, 0x12, 0x74,
+    0xd8, 0x98, 0xfa, 0xfb, 0xf4, 0xd3, 0x82, 0x59, 0x38, 0x0b, 0x48, 0x20};
+
+// sqrt(-3) mod p, big-endian.
+const uint8_t SQRT_M3_BE[48] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0x32, 0xce, 0x5f,
+    0xbe, 0xed, 0x9c, 0xa3, 0x74, 0xd3, 0x8c, 0x0e, 0xd4, 0x1e, 0xef, 0xd5,
+    0xbb, 0x67, 0x52, 0x77, 0xcd, 0xf1, 0x2d, 0x11, 0xbc, 0x2f, 0xb0, 0x26,
+    0xc4, 0x14, 0x00, 0x04, 0x5c, 0x03, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfd};
+
+// (sqrt(-3) - 1) / 2 mod p, big-endian.
+const uint8_t SQRT_M3_MINUS_1_HALF_BE[48] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x19, 0x67, 0x2f,
+    0xdf, 0x76, 0xce, 0x51, 0xba, 0x69, 0xc6, 0x07, 0x6a, 0x0f, 0x77, 0xea,
+    0xdd, 0xb3, 0xa9, 0x3b, 0xe6, 0xf8, 0x96, 0x88, 0xde, 0x17, 0xd8, 0x13,
+    0x62, 0x0a, 0x00, 0x02, 0x2e, 0x01, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe};
+
+// Effective cofactor h_eff of BLS12-381 G2 (RFC 9380 section 8.8.2),
+// big-endian, 636 bits. Multiplying by it is equivalent to the
+// endomorphism-based cofactor clearing relic performed.
+const uint8_t H_EFF_BE[80] = {
+    0x0b, 0xc6, 0x9f, 0x08, 0xf2, 0xee, 0x75, 0xb3, 0x58, 0x4c, 0x6a, 0x0e,
+    0xa9, 0x1b, 0x35, 0x28, 0x88, 0xe2, 0xa8, 0xe9, 0x14, 0x5a, 0xd7, 0x68,
+    0x99, 0x86, 0xff, 0x03, 0x15, 0x08, 0xff, 0xe1, 0x32, 0x9c, 0x2f, 0x17,
+    0x87, 0x31, 0xdb, 0x95, 0x6d, 0x82, 0xbf, 0x01, 0x5d, 0x12, 0x12, 0xb0,
+    0x2e, 0xc0, 0xec, 0x69, 0xd7, 0x47, 0x7c, 0x1a, 0xe9, 0x54, 0xcb, 0xc0,
+    0x66, 0x89, 0xf6, 0xa3, 0x59, 0x89, 0x4c, 0x0a, 0xde, 0xbb, 0xf6, 0xb4,
+    0xe8, 0x02, 0x00, 0x05, 0xaa, 0xa9, 0x55, 0x51};
+constexpr size_t H_EFF_BITS{636};
+
+void FpFromSmall(blst_fp& out, uint8_t value)
+{
+    uint8_t be[48]{};
+    be[47] = value;
+    blst_fp_from_bendian(&out, be);
+}
+
+void FpZero(blst_fp& out)
+{
+    memset(&out, 0, sizeof(out));
+}
+
+bool FpIsZero(const blst_fp& a)
+{
+    uint8_t be[48];
+    blst_bendian_from_fp(be, &a);
+    for (uint8_t b : be) {
+        if (b != 0) return false;
+    }
+    return true;
+}
+
+// The legacy sign test: canonical representation greater than (p-1)/2.
+bool FpIsLargeRoot(const blst_fp& a)
+{
+    uint8_t be[48];
+    blst_bendian_from_fp(be, &a);
+    return memcmp(be, HALF_P_BE, sizeof(be)) > 0;
+}
+
+// The decompression-side sign test of relic's ep2_upk: c1 > (p-1)/2, with c0
+// deciding when c1 is zero. (The serialization side uses c1 alone.)
+bool Fp2IsLargeRootForDecode(const blst_fp2& y)
+{
+    return FpIsZero(y.fp[1]) ? FpIsLargeRoot(y.fp[0]) : FpIsLargeRoot(y.fp[1]);
+}
+
+// Reads a big-endian coordinate; a value of p or more reads as zero, which is
+// what relic's fp_read_bin left behind when its range check failed.
+void ReadCoordinate(blst_fp& out, const uint8_t* be)
+{
+    if (memcmp(be, P_BE, 48) >= 0) {
+        FpZero(out);
+    } else {
+        blst_fp_from_bendian(&out, be);
+    }
+}
+
+// x^3 + 4
+void CurveRhsG1(blst_fp& rhs, const blst_fp& x)
+{
+    blst_fp four;
+    FpFromSmall(four, 4);
+    blst_fp_sqr(&rhs, &x);
+    blst_fp_mul(&rhs, &rhs, &x);
+    blst_fp_add(&rhs, &rhs, &four);
+}
+
+// x^3 + (4 + 4i)
+void CurveRhsG2(blst_fp2& rhs, const blst_fp2& x)
+{
+    blst_fp2 b;
+    FpFromSmall(b.fp[0], 4);
+    FpFromSmall(b.fp[1], 4);
+    blst_fp2_sqr(&rhs, &x);
+    blst_fp2_mul(&rhs, &rhs, &x);
+    blst_fp2_add(&rhs, &rhs, &b);
+}
+
+// Shallue-van de Woestijne encoding of a field element into a G2 point
+// (section 3 of Fouque-Tibouchi, "Indifferentiable Hashing to
+// Barreto-Naehrig Curves"). Returns false when t is zero, which maps to the
+// point at infinity.
+bool SwEncodeG2(blst_p2_affine& out, const blst_fp2& t)
+{
+    if (FpIsZero(t.fp[0]) && FpIsZero(t.fp[1])) {
+        return false;
+    }
+
+    // The "parity" of t decides the sign of y: whether t.c1 is the larger of
+    // the two roots {t.c1, -t.c1}.
+    blst_fp2 negT;
+    blst_fp2_cneg(&negT, &t, true);
+    uint8_t be1[48], be2[48];
+    blst_bendian_from_fp(be1, &t.fp[1]);
+    blst_bendian_from_fp(be2, &negT.fp[1]);
+    const bool parity = memcmp(be1, be2, sizeof(be1)) > 0;
+
+    blst_fp one;
+    FpFromSmall(one, 1);
+    blst_fp2 b;
+    FpFromSmall(b.fp[0], 4);
+    FpFromSmall(b.fp[1], 4);
+
+    // w = t^2 + b + 1
+    blst_fp2 w;
+    blst_fp2_sqr(&w, &t);
+    blst_fp2_add(&w, &w, &b);
+    blst_fp_add(&w.fp[0], &w.fp[0], &one);
+
+    if (FpIsZero(w.fp[0]) && FpIsZero(w.fp[1])) {
+        out = *blst_p2_affine_generator();
+        if (parity) {
+            blst_fp2_cneg(&out.y, &out.y, true);
+        }
+        return true;
+    }
+
+    blst_fp2 sqrtM3, sqrtM3Minus1Half;
+    blst_fp_from_bendian(&sqrtM3.fp[0], SQRT_M3_BE);
+    FpZero(sqrtM3.fp[1]);
+    blst_fp_from_bendian(&sqrtM3Minus1Half.fp[0], SQRT_M3_MINUS_1_HALF_BE);
+    FpZero(sqrtM3Minus1Half.fp[1]);
+
+    // w = sqrt(-3) * t / (t^2 + b + 1)
+    blst_fp2_inverse(&w, &w);
+    blst_fp2_mul(&w, &w, &sqrtM3);
+    blst_fp2_mul(&w, &w, &t);
+
+    // x1 = (sqrt(-3) - 1) / 2 - t * w
+    blst_fp2 x1;
+    blst_fp2_cneg(&x1, &w, true);
+    blst_fp2_mul(&x1, &x1, &t);
+    blst_fp2_add(&x1, &x1, &sqrtM3Minus1Half);
+
+    // x2 = -1 - x1
+    blst_fp2 x2;
+    blst_fp2_cneg(&x2, &x1, true);
+    blst_fp_sub(&x2.fp[0], &x2.fp[0], &one);
+
+    // x3 = 1 + 1 / w^2
+    blst_fp2 x3;
+    blst_fp2_sqr(&x3, &w);
+    blst_fp2_inverse(&x3, &x3);
+    blst_fp_add(&x3.fp[0], &x3.fp[0], &one);
+
+    // Pick the first candidate that lies on the curve, branch-free as in the paper.
+    blst_fp2 rhs, y;
+    CurveRhsG2(rhs, x1);
+    const int chi1 = blst_fp2_sqrt(&y, &rhs) ? 1 : -1;
+    CurveRhsG2(rhs, x2);
+    const int chi2 = blst_fp2_sqrt(&y, &rhs) ? 1 : -1;
+    const int index = ((((chi1 - 1) * chi2) % 3) + 3) % 3;
+
+    out.x = index == 0 ? x1 : index == 1 ? x2 : x3;
+    CurveRhsG2(rhs, out.x);
+    const bool onCurve = blst_fp2_sqrt(&out.y, &rhs);
+    assert(onCurve); // guaranteed by the construction
+    (void)onCurve;
+
+    // Align the sign of y with the parity of t.
+    blst_fp2 negY;
+    blst_fp2_cneg(&negY, &out.y, true);
+    blst_bendian_from_fp(be1, &out.y.fp[1]);
+    blst_bendian_from_fp(be2, &negY.fp[1]);
+    if ((memcmp(be1, be2, sizeof(be1)) > 0) != parity) {
+        out.y = negY;
+    }
+    return true;
+}
+
+// Reduces a 64-byte big-endian number modulo p as hi * 2^256 + lo, where both
+// halves are below 2^256 < p (the way relic converted a 512-bit draw).
+void FpFromWideBigEndian(blst_fp& out, const uint8_t* be64)
+{
+    uint8_t padded[48]{};
+    blst_fp hi, lo, shift;
+
+    memcpy(padded + 16, be64, 32);
+    blst_fp_from_bendian(&hi, padded);
+    memcpy(padded + 16, be64 + 32, 32);
+    blst_fp_from_bendian(&lo, padded);
+
+    memset(padded, 0, sizeof(padded));
+    padded[15] = 0x01; // 2^256
+    blst_fp_from_bendian(&shift, padded);
+
+    blst_fp_mul(&out, &hi, &shift);
+    blst_fp_add(&out, &out, &lo);
+}
+
+// Two SHA-256 draws of "hash || 'G2_<i>_c<j>' || counter" for counter 0 and 1,
+// concatenated into a 64-byte value.
+void DrawFieldElement(blst_fp& out, const uint256& hash, char i, char j)
+{
+    uint8_t input[32 + 8];
+    memcpy(input, hash.begin(), 32);
+    input[32] = 'G';
+    input[33] = '2';
+    input[34] = '_';
+    input[35] = static_cast<uint8_t>(i);
+    input[36] = '_';
+    input[37] = 'c';
+    input[38] = static_cast<uint8_t>(j);
+
+    uint8_t draw[64];
+    input[39] = 0;
+    CSHA256().Write(input, sizeof(input)).Finalize(draw);
+    input[39] = 1;
+    CSHA256().Write(input, sizeof(input)).Finalize(draw + 32);
+
+    FpFromWideBigEndian(out, draw);
+}
+
+} // namespace
+
+bool DecodeG1(blst_p1& out, Span<const uint8_t> in)
+{
+    assert(in.size() == 48);
+    const uint8_t prefix = in[0];
+    if ((prefix & 0xc0) == 0xc0) {
+        // only the canonical infinity encoding is accepted
+        if (prefix != 0xc0) return false;
+        for (size_t i = 1; i < in.size(); i++) {
+            if (in[i] != 0) return false;
+        }
+        memset(&out, 0, sizeof(out));
+        return true;
+    }
+    const bool signBit = (prefix & 0x80) != 0;
+
+    uint8_t xbytes[48];
+    memcpy(xbytes, in.data(), sizeof(xbytes));
+    // The G1 codec cleared all three flag bits before reading x (the G2 codec
+    // only clears the sign bit, and only when it is set).
+    xbytes[0] &= 0x1f;
+
+    blst_p1_affine a;
+    ReadCoordinate(a.x, xbytes);
+
+    blst_fp rhs;
+    CurveRhsG1(rhs, a.x);
+    if (blst_fp_sqrt(&a.y, &rhs)) {
+        if (FpIsLargeRoot(a.y) != signBit) {
+            blst_fp_cneg(&a.y, &a.y, true);
+        }
+    } else if (signBit) {
+        blst_fp_from_bendian(&a.y, SQRT_FAILURE_MARKER_BE);
+    } else {
+        FpZero(a.y);
+    }
+
+    // Set z = 1 by hand: blst_p1_from_affine maps an all-zero pair to
+    // infinity, whereas relic kept such degenerate decodes as ordinary points.
+    out.x = a.x;
+    out.y = a.y;
+    FpFromSmall(out.z, 1);
+    return true;
+}
+
+bool DecodeG2(blst_p2& out, Span<const uint8_t> in)
+{
+    assert(in.size() == 96);
+    if ((in[0] & 0xc0) == 0xc0) {
+        return false;
+    }
+    const bool signBit = (in[0] & 0x80) != 0;
+
+    uint8_t c0[48], c1[48];
+    memcpy(c0, in.data(), sizeof(c0));
+    memcpy(c1, in.data() + 48, sizeof(c1));
+    if (signBit) {
+        c0[0] &= 0x7f;
+    }
+
+    blst_p2_affine a;
+    ReadCoordinate(a.x.fp[0], c0);
+    ReadCoordinate(a.x.fp[1], c1);
+
+    blst_fp2 rhs;
+    CurveRhsG2(rhs, a.x);
+    if (blst_fp2_sqrt(&a.y, &rhs)) {
+        if (Fp2IsLargeRootForDecode(a.y) != signBit) {
+            blst_fp2_cneg(&a.y, &a.y, true);
+        }
+    } else {
+        if (signBit) {
+            blst_fp_from_bendian(&a.y.fp[0], SQRT_FAILURE_MARKER_BE);
+        } else {
+            FpZero(a.y.fp[0]);
+        }
+        FpZero(a.y.fp[1]);
+    }
+
+    out.x = a.x;
+    out.y = a.y;
+    FpFromSmall(out.z.fp[0], 1);
+    FpZero(out.z.fp[1]);
+    return true;
+}
+
+void EncodeG1(Span<uint8_t> out, const blst_p1& p)
+{
+    assert(out.size() == 48);
+    if (blst_p1_is_inf(&p)) {
+        memset(out.data(), 0, out.size());
+        out[0] = 0xc0;
+        return;
+    }
+    blst_p1_affine a;
+    blst_p1_to_affine(&a, &p);
+    blst_bendian_from_fp(out.data(), &a.x);
+    if (FpIsLargeRoot(a.y)) {
+        out[0] |= 0x80;
+    }
+}
+
+void EncodeG2(Span<uint8_t> out, const blst_p2& p)
+{
+    assert(out.size() == 96);
+    if (blst_p2_is_inf(&p)) {
+        memset(out.data(), 0, out.size());
+        out[0] = 0xc0;
+        return;
+    }
+    blst_p2_affine a;
+    blst_p2_to_affine(&a, &p);
+    blst_bendian_from_fp(out.data(), &a.x.fp[0]);
+    blst_bendian_from_fp(out.data() + 48, &a.x.fp[1]);
+    // sign taken from c1 alone, no fallback to c0
+    if (FpIsLargeRoot(a.y.fp[1])) {
+        out[0] |= 0x80;
+    }
+}
+
+void HashToG2(blst_p2& out, const uint256& hash)
+{
+    blst_fp2 t0, t1;
+    DrawFieldElement(t0.fp[0], hash, '0', '0');
+    DrawFieldElement(t0.fp[1], hash, '0', '1');
+    DrawFieldElement(t1.fp[0], hash, '1', '0');
+    DrawFieldElement(t1.fp[1], hash, '1', '1');
+
+    blst_p2 sum;
+    memset(&sum, 0, sizeof(sum)); // infinity
+    blst_p2_affine enc;
+    if (SwEncodeG2(enc, t0)) {
+        blst_p2_from_affine(&sum, &enc);
+    }
+    if (SwEncodeG2(enc, t1)) {
+        blst_p2_add_or_double_affine(&sum, &sum, &enc);
+    }
+
+    uint8_t hEffLittleEndian[sizeof(H_EFF_BE)];
+    for (size_t i = 0; i < sizeof(H_EFF_BE); i++) {
+        hEffLittleEndian[i] = H_EFF_BE[sizeof(H_EFF_BE) - 1 - i];
+    }
+    blst_p2_mult(&out, &sum, hEffLittleEndian, H_EFF_BITS);
+}
+
+} // namespace bls_legacy
diff --git a/src/bls/bls_legacy.h b/src/bls/bls_legacy.h
new file mode 100644
index 000000000000..037ff4959cb0
--- /dev/null
+++ b/src/bls/bls_legacy.h
@@ -0,0 +1,58 @@
+// Copyright (c) 2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_BLS_BLS_LEGACY_H
+#define BITCOIN_BLS_BLS_LEGACY_H
+
+#include <span.h>
+#include <uint256.h>
+
+#include <blst.h>
+
+#include <cstdint>
+
+/**
+ * Point codec and hash-to-curve of the legacy (pre-v19) BLS scheme.
+ *
+ * Both reproduce, bit for bit, what the relic-based implementation did before
+ * the v19 hard fork, including its treatment of malformed input: relic was
+ * built without its CHECK option, so decoding never failed but left degenerate
+ * coordinates behind (an out-of-range coordinate reads as zero, a missing
+ * square root leaves y at zero or at a raw marker value). Every such point is
+ * consensus-visible through re-serialization of on-chain data, so all of it
+ * is kept.
+ */
+namespace bls_legacy {
+
+/**
+ * Deserializes a G1 point from its 48-byte legacy encoding. Returns false only
+ * for a non-canonical infinity encoding (top two bits set with anything but
+ * 0xc0 00..00). Any other input yields a point, possibly off the curve and
+ * outside the subgroup; the caller decides whether that is acceptable.
+ */
+bool DecodeG1(blst_p1& out, Span<const uint8_t> in);
+
+/**
+ * Deserializes a G2 point from its 96-byte legacy encoding (x.c0 || x.c1).
+ * Returns false for any input with the top two bits set: the legacy G2 codec
+ * rejected the infinity encoding along with everything else in that range.
+ */
+bool DecodeG2(blst_p2& out, Span<const uint8_t> in);
+
+/** Serializes a G1 point: 0xc0 00..00 for infinity, else x with bit 0x80 set iff y > (p-1)/2. */
+void EncodeG1(Span<uint8_t> out, const blst_p1& p);
+
+/** Serializes a G2 point: 0xc0 00..00 for infinity, else x.c0 || x.c1 with bit 0x80 set iff y.c1 > (p-1)/2. */
+void EncodeG2(Span<uint8_t> out, const blst_p2& p);
+
+/**
+ * Legacy hash-to-G2 of a 32-byte message hash: two Fouque-Tibouchi
+ * (Shallue-van de Woestijne) encodings of SHA-256 derived field elements,
+ * added and multiplied by the effective cofactor.
+ */
+void HashToG2(blst_p2& out, const uint256& hash);
+
+} // namespace bls_legacy
+
+#endif // BITCOIN_BLS_BLS_LEGACY_H
diff --git a/src/dashbls/.clang-format b/src/dashbls/.clang-format
deleted file mode 100644
index b2a45d802046..000000000000
--- a/src/dashbls/.clang-format
+++ /dev/null
@@ -1,17 +0,0 @@
-BasedOnStyle: Google
-UseTab: Never
-ColumnLimit: 80
-IndentWidth: 4
-TabWidth: 4
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: false
-AccessModifierOffset: -4
-BinPackArguments: false
-BinPackParameters: false
-AlignAfterOpenBracket: AlwaysBreak
-IndentCaseLabels: true
-AllowAllParametersOfDeclarationOnNextLine: false
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterFunction: true
-PenaltyReturnTypeOnItsOwnLine: 1000
diff --git a/src/dashbls/.flake8 b/src/dashbls/.flake8
deleted file mode 100644
index ccb153056291..000000000000
--- a/src/dashbls/.flake8
+++ /dev/null
@@ -1,4 +0,0 @@
-[flake8]
-max-line-length = 120
-exclude = ./typings/**/* python-impl/fields.py
-ignore = E203,W503,E501
diff --git a/src/dashbls/.github/workflows/build-binds.yml b/src/dashbls/.github/workflows/build-binds.yml
deleted file mode 100644
index 43dc8b212590..000000000000
--- a/src/dashbls/.github/workflows/build-binds.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-name: Build and test binds
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main') && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: ${{ matrix.os }}, Python ${{ matrix.python }}, Go ${{ matrix.golang }}, Rust ${{ matrix.rust }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-        golang: [ '1.24' ]
-        python: ['3.10', '3.11', '3.12', '3.13']
-        rust: [ '1.91.0' ]
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - uses: chia-network/actions/setup-python@main
-      with:
-        python-version: ${{ matrix.python }}
-
-    - name: Test Python implementation
-      run: |
-        python python-impl/impl-test.py
-
-    - name: Install Emscripten SDK
-      uses: mymindstorm/setup-emsdk@v11
-
-    - name: Build JavaScript bindings
-      run: |
-        emcc -v
-        sh emsdk_build.sh
-
-    - name: Test JavaScript bindings
-      run: |
-        sh js_test.sh
-
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^${{ matrix.golang }}
-
-    - name: Prepare build system for Ubuntu
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get update
-        sudo apt-get install -qq --yes valgrind libgmp-dev cmake
-        hash -r
-        cmake --version
-
-    - name: Prepare build system for macOS
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        ls -l
-        export MACOSX_DEPLOYMENT_TARGET=10.14
-        brew install gmp
-
-    - name: Build library using CMake
-      run: |
-        mkdir -p build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Debug
-        cmake --build . -- -j 6
-
-    - name: Build Go bindings
-      run: |
-        cd go-bindings
-        make config
-        make
-
-    - name: Install Rust
-      run: |
-        rustup toolchain install ${{ matrix.rust }}
-        rustup default ${{ matrix.rust }}
-        rustc --version
-        cargo --version
-
-    - name: Build and test Rust bindings
-      run: |
-        cd rust-bindings/bls-dash-sys
-        cargo test
diff --git a/src/dashbls/.github/workflows/build-test.yaml b/src/dashbls/.github/workflows/build-test.yaml
deleted file mode 100644
index 90a550a5e4d2..000000000000
--- a/src/dashbls/.github/workflows/build-test.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: Build and test library
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main') && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: ${{ matrix.os }}, ${{ matrix.builder }}, ${{ matrix.compiler.cc }}, ${{ matrix.backend }} backend
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ macos-latest, ubuntu-latest ]
-        builder: [ cmake, autotools ]
-        compiler:
-          - cc: gcc
-            cxx: g++
-          - cc: clang
-            cxx: clang++
-        backend: [ easy, gmp ]
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Prepare build system for Ubuntu
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get update
-        sudo apt-get install -qq --yes valgrind libgmp-dev cmake
-        hash -r
-        cmake --version
-
-    - name: Prepare build system for macOS
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        ls -l
-        export MACOSX_DEPLOYMENT_TARGET=10.14
-        brew install autoconf automake gmp libtool pkg-config
-
-    - name: Build library using CMake
-      if: startsWith(matrix.builder, 'cmake')
-      run: |
-        mkdir -p build && cd build
-        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} cmake .. -DARITH=${{ matrix.backend }} -DBUILD_BLS_PYTHON_BINDINGS=0 -DCMAKE_BUILD_TYPE=Debug
-        cmake --build . -- -j 6
-        mv src/runtest ..
-
-    - name: Build library using GNU Autotools
-      if: startsWith(matrix.builder, 'autotools')
-      run: |
-        ./autogen.sh
-        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} ./configure --with-backend=${{ matrix.backend }}
-        make -j8
-
-    - name: Run tests
-      run: ./runtest
-
-    - name: Run valgrind on Ubuntu
-      if: startsWith(matrix.os, 'ubuntu')
-      run: valgrind --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all ./runtest
diff --git a/src/dashbls/.github/workflows/build-wheels.yml b/src/dashbls/.github/workflows/build-wheels.yml
deleted file mode 100644
index 6953beebc5f8..000000000000
--- a/src/dashbls/.github/workflows/build-wheels.yml
+++ /dev/null
@@ -1,357 +0,0 @@
-name: build - check - upload
-
-on:
-  push:
-    branches:
-    - main
-    tags:
-    - '**'
-  pull_request:
-    branches:
-    - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build-wheels:
-    name: Wheel - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
-    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - name: macOS
-            matrix: macos
-            runs-on:
-              arm: [macOS, ARM64]
-              intel: [macos-latest]
-            cibw-archs-macos:
-              arm: arm64
-              intel: x86_64
-          - name: Ubuntu
-            matrix: ubuntu
-            runs-on:
-              arm: [Linux, ARM64]
-              intel: [ubuntu-latest]
-          - name: Windows
-            matrix: windows
-            runs-on:
-              intel: [windows-latest]
-        python:
-          - major-dot-minor: '3.7'
-            cibw-build: 'cp37-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
-            matrix: '3.7'
-          - major-dot-minor: '3.8'
-            cibw-build: 'cp38-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
-            matrix: '3.8'
-          - major-dot-minor: '3.9'
-            cibw-build: 'cp39-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
-            matrix: '3.9'
-          - major-dot-minor: '3.10'
-            cibw-build: 'cp310-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2010
-            matrix: '3.10'
-          - major-dot-minor: '3.11'
-            cibw-build: 'cp311-*'
-            manylinux:
-              arch: manylinux2014
-              intel: manylinux2014
-            matrix: '3.11'
-        arch:
-          - name: ARM
-            matrix: arm
-          - name: Intel
-            matrix: intel
-        exclude:
-          # Only partial entries are required here by GitHub Actions so generally I
-          # only specify the `matrix:` entry.  The super linter complains so for now
-          # all entries are included to avoid that.  Reported at
-          # https://github.com/github/super-linter/issues/3016
-          - os:
-              name: Windows
-              matrix: windows
-              runs-on:
-                intel: [windows-latest]
-            arch:
-              name: ARM
-              matrix: arm
-          - os:
-              name: macOS
-              matrix: macos
-              runs-on:
-                arm: [macOS, ARM64]
-                intel: [macos-latest]
-            python:
-              major-dot-minor: '3.7'
-              cibw-build: 'cp37-*'
-              matrix: '3.7'
-            arch:
-              name: ARM
-              matrix: arm
-          - os:
-              name: macOS
-              matrix: macos
-              runs-on:
-                arm: [macOS, ARM64]
-                intel: [macos-latest]
-            python:
-              major-dot-minor: '3.8'
-              cibw-build: 'cp38-*'
-              matrix: '3.8'
-            arch:
-              name: ARM
-              matrix: arm
-
-    steps:
-    - name: Clean workspace
-      uses: Chia-Network/actions/clean-workspace@main
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - uses: chia-network/actions/setup-python@main
-      with:
-        python-version: ${{ matrix.python.major-dot-minor }}
-
-    - name: Install pipx
-      run: |
-        pip install pipx
-
-    - name: Build and test
-      env:
-        CIBW_PRERELEASE_PYTHONS: True
-        CIBW_BUILD_VERBOSITY_MACOS: 0
-        CIBW_BUILD_VERBOSITY_LINUX: 0
-        CIBW_BUILD_VERBOSITY_WINDOWS: 0
-        CIBW_BUILD: ${{ matrix.python.cibw-build }}
-        CIBW_SKIP: '*-manylinux_i686 *-win32 *-musllinux_*'
-        CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.python.manylinux['arm'] }}
-        CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.python.manylinux['intel'] }}
-        CIBW_ENVIRONMENT_LINUX: "PATH=/project/cmake-3.14.3-Linux-`uname -m`/bin:$PATH"
-        CIBW_BEFORE_ALL_LINUX: >
-          yum -y install epel-release
-          && echo "epel-release installed"
-          && yum -y install lzip
-          && echo "lzip installed"
-          && curl -L https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Linux-`uname -m`.sh > cmake.sh
-          && yes | sh cmake.sh | cat
-          && rm -f /usr/bin/cmake
-          && curl -L https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz | tar x --lzip
-          && cp contrib/gmp-patch-6.2.1/longlong.h gmp-6.2.1/
-          && cp contrib/gmp-patch-6.2.1/compat.c gmp-6.2.1/
-          && cd gmp-6.2.1 && ./configure --enable-fat
-          && make && make install && cd .. && rm -rf gmp-6.2.1
-          && cmake --version
-          && uname -a
-        CIBW_BEFORE_BUILD_LINUX: >
-          python -m pip install --upgrade pip
-        CIBW_ARCHS_MACOS: ${{ matrix.os.cibw-archs-macos[matrix.arch.matrix] }}
-        CIBW_BEFORE_ALL_MACOS: >
-          brew install gmp boost cmake
-        CIBW_BEFORE_BUILD_MACOS: >
-          python -m pip install --upgrade pip
-        CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.14"
-        CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-          pip uninstall -y delocate && pip install git+https://github.com/Chia-Network/delocate.git
-          && delocate-listdeps {wheel} && delocate-wheel -v {wheel}
-          && cp {wheel} {dest_dir}
-        CIBW_BEFORE_ALL_WINDOWS: >
-          curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip > libsodium-1.0.18-stable-msvc.zip
-          && 7z x libsodium-1.0.18-stable-msvc.zip
-          && git clone https://github.com/Chia-Network/relic_ietf_64.git
-          && ls -l relic_ietf_64
-          && git clone https://github.com/Chia-Network/mpir_gc_x64.git
-          && ls -l mpir_gc_x64
-        CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
-          ls -l mpir_gc_x64 && pip uninstall -y delocate
-          && pip install git+https://github.com/Chia-Network/delocate.git
-          && delocate-wheel -v -i mpir_gc_x64/mpir.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_gc.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_broadwell.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_broadwell_avx.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_bulldozer.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_haswell.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_piledriver.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_sandybridge.dll {wheel}
-          && delocate-wheel -v -i mpir_gc_x64/mpir_skylake_avx.dll {wheel}
-          && cp {wheel} {dest_dir}
-        CIBW_TEST_REQUIRES: pytest
-        CIBW_TEST_COMMAND: py.test -v {project}/python-bindings/test.py
-      run:
-        pipx run --spec='cibuildwheel==2.9.0' cibuildwheel --output-dir dist 2>&1
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: packages
-        path: ./dist
-
-  build-sdist:
-    name: sdist - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
-    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - name: Ubuntu
-            matrix: ubuntu
-            runs-on:
-              arm: [Linux, ARM64]
-              intel: [ubuntu-latest]
-        python:
-          - major-dot-minor: '3.9'
-            matrix: '3.9'
-        arch:
-          - name: Intel
-            matrix: intel
-
-    steps:
-    - name: Clean workspace
-      uses: Chia-Network/actions/clean-workspace@main
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - uses: Chia-Network/actions/setup-python@main
-      with:
-        python-version: ${{ matrix.python.major-dot-minor }}
-
-    - name: Build source distribution
-      run: |
-        pip install build
-        python -m build --sdist --outdir dist .
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: packages
-        path: ./dist
-
-  check:
-    name: Check - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
-    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - name: Ubuntu
-            matrix: ubuntu
-            runs-on:
-              arm: [Linux, ARM64]
-              intel: [ubuntu-latest]
-        python:
-          - major-dot-minor: '3.9'
-            matrix: '3.9'
-        arch:
-          - name: Intel
-            matrix: intel
-
-    steps:
-    - name: Clean workspace
-      uses: Chia-Network/actions/clean-workspace@main
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - uses: Chia-Network/actions/setup-python@main
-      with:
-        python-version: ${{ matrix.python.major-dot-minor }}
-
-    - name: flake8
-      run: |
-        pip install flake8
-        flake8 src setup.py python-bindings python-impl
-    - name: mypy
-      run: |
-        pip install mypy
-        mypy --config-file mypi.ini python-bindings python-impl
-  upload:
-    name: Upload to PyPI - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
-    runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
-    needs:
-      - build-wheels
-      - build-sdist
-      - check
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - name: Ubuntu
-            matrix: ubuntu
-            runs-on:
-              arm: [Linux, ARM64]
-              intel: [ubuntu-latest]
-        python:
-          - major-dot-minor: '3.9'
-            matrix: '3.9'
-        arch:
-          - name: Intel
-            matrix: intel
-
-    steps:
-    - name: Clean workspace
-      uses: Chia-Network/actions/clean-workspace@main
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - uses: Chia-Network/actions/setup-python@main
-      with:
-        python-version: ${{ matrix.python.major-dot-minor }}
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: packages
-        path: ./dist
-
-    - name: Test for secrets access
-      id: check_secrets
-      shell: bash
-      run: |
-        unset HAS_SECRET
-        if [ -n "$SECRET" ]; then HAS_SECRET='true' ; fi
-        echo ::set-output name=HAS_SECRET::${HAS_SECRET}
-      env:
-        SECRET: "${{ secrets.test_pypi_password }}"
-
-    - name: Install twine
-      run: pip install twine
-
-    - name: Publish distribution to PyPI
-      if: startsWith(github.event.ref, 'refs/tags') && steps.check_secrets.outputs.HAS_SECRET
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_NON_INTERACTIVE: 1
-        TWINE_PASSWORD: ${{ secrets.pypi_password }}
-      run: twine upload --non-interactive --skip-existing --verbose 'dist/*'
-
-    - name: Publish distribution to Test PyPI
-      if: steps.check_secrets.outputs.HAS_SECRET
-      env:
-        TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/
-        TWINE_USERNAME: __token__
-        TWINE_NON_INTERACTIVE: 1
-        TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
-      run: twine upload --non-interactive --skip-existing --verbose 'dist/*'
diff --git a/src/dashbls/.github/workflows/js-bindings.yml b/src/dashbls/.github/workflows/js-bindings.yml
deleted file mode 100644
index 887c8df3d628..000000000000
--- a/src/dashbls/.github/workflows/js-bindings.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Build & Publish JS Bindings
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main') && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  js_bindings:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install emsdk
-        uses: mymindstorm/setup-emsdk@v11
-
-      - name: Get the version
-        id: version_info
-        run: echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
-      - name: Update version in package.json
-        if: startsWith(github.ref, 'refs/tags/')
-        working-directory: ${{ github.workspace }}/js-bindings
-        env:
-          SOURCE_TAG: ${{ steps.version_info.outputs.SOURCE_TAG }}
-        run: |
-          jq --arg VER "$SOURCE_TAG" '.version=$VER' package.json > temp.json && mv temp.json package.json
-
-      - name: Build JS
-        run: ./js_build.sh
-
-      - name: Publish
-        if: startsWith(github.ref, 'refs/tags/')
-        working-directory: ${{ github.workspace }}/js_build/js-bindings
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-          npm publish --access public
-
-      - name: Cleanup
-        if: always()
-        run:
-          rm ${{ github.workspace }}/js_build/js-bindings/.npmrc || true
diff --git a/src/dashbls/.github/workflows/relic-nightly.yml b/src/dashbls/.github/workflows/relic-nightly.yml
deleted file mode 100644
index 2a9ef67153cc..000000000000
--- a/src/dashbls/.github/workflows/relic-nightly.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name:  Build and Test with Relic Nightly
-
-on:
-  schedule:
-    - cron: "0 11 * * *"
-  workflow_dispatch:
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main') && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build_wheels:
-    name: Build and Test with Relic Nightly
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Ubuntu build C++ and test Relic at origin/main
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        echo "Relic origin/main commit:"
-        curl -H "application/vnd.github.v3.sha" \
-        https://api.github.com/repos/relic-toolkit/relic/commits/main | \
-        head -10
-        sudo apt-get update
-        sudo apt-get install snap -y
-        sudo apt-get remove --purge cmake -y
-        sudo snap install cmake --classic
-        hash -r
-        cmake --version
-        export RELIC_MAIN=1
-        mkdir -p build
-        cd build
-        cmake ../
-        cmake --build . -- -j 6
-        echo "Running ./src/runtest"
-        ./src/runtest
-
-    - name: Mac OS build C++ and test
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        ls -l
-        export MACOSX_DEPLOYMENT_TARGET=10.14
-        export RELIC_MAIN=1
-        mkdir -p build
-        ls -l build
-        cd build
-        cmake ../
-        cmake --build . -- -j 6
-        echo "Running ./src/runtest"
-        ./src/runtest
-
-    - uses: actions/setup-python@v2
-      name: Install Python
-      with:
-        python-version: '3.8'
-
-    - name: Test pure python implementation
-      run: |
-        python python-impl/impl-test.py
-
-    - name: Install emsdk
-      uses: mymindstorm/setup-emsdk@v11
-
-    - name: Test javascript bindings
-      run: |
-        emcc -v
-        export RELIC_MAIN=1
-        sh emsdk_build.sh
-        sh js_test.sh
diff --git a/src/dashbls/.github/workflows/stale-issue.yml b/src/dashbls/.github/workflows/stale-issue.yml
deleted file mode 100755
index e3668dba6984..000000000000
--- a/src/dashbls/.github/workflows/stale-issue.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: 'Close stale issues'
-on:
-  schedule:
-    - cron: '0 11 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: chia-network/stale@main
-        with:
-          operations-per-run: 10000
-          ascending: true
-          days-before-issue-stale: 14
-          days-before-issue-close: 7
-          days-before-pr-stale: 60
-          days-before-pr-close: -1
-          exempt-all-pr-milestones: true
-          exempt-all-issue-milestones: true
-          exempt-all-assignees: true
-          stale-issue-label: stale-issue
-          stale-pr-label: stale-pr
-          remove-stale-when-updated: true
-          stale-issue-message: >
-              'This issue has been flagged as stale as there has been no
-              activity on it in 14 days. If this issue is still affecting you
-              and in need of review, please update it to keep it open.'
-          close-issue-message: >
-              'This issue was automatically closed because it has been flagged
-              as stale and subsequently passed 7 days with no further activity.'
-          stale-pr-message: >
-              'This PR has been flagged as stale due to no activity for over 60
-               days. It will not be automatically closed, but it has been given
-               a stale-pr label and should be manually reviewed.'
diff --git a/src/dashbls/.gitignore b/src/dashbls/.gitignore
deleted file mode 100644
index bec3896a5c07..000000000000
--- a/src/dashbls/.gitignore
+++ /dev/null
@@ -1,117 +0,0 @@
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
-Makefile
-src/bench
-src/test
-src/MakefilE
-src/cmake_install.cmake
-src/CMakeFile
-build/*
-blspy.egg-info
-dist
-python-impl/__pycache__/
-blspy.*.so
-.mypy_cache/
-.pytest_chache/
-.eggs/
-cmake-build-debug/
-
-js_build
-node_modules
-
-main
-.o
-obj/
-src/*.o
-depends/relic/CTestTestfile.cmake
-depends/relic/bench/CTestTestfile.cmake
-depends/relic/bin
-depends/relic/include/relic_conf.h
-depends/relic/include/relic_conf.h.in
-depends/relic/include/relic_conf.h.old
-depends/relic/include/stamp-h1
-depends/relic/test/CTestTestfile.cmake
-contrib/gmp-6.1.2/
-
-.idea
-.vscode
-runtest
-runtest.*
-runbench
-runbench.*
-
-.dirstamp
-.libs
-.*.swp
-*.*~*
-*.bak
-*.rej
-*.orig
-*.pyc
-*.o
-*.o-*
-*.patch
-*.a
-*.pb.cc
-*.pb.h
-*.lo
-*.la
-
-**/.DS_Store
-
-*.whl
-venv
-env/
-yarn-error.log
-
-.vs/
-out/
-
-target
-
-Makefile.in
-/ar-lib
-/mdate-sh
-/py-compile
-/test-driver
-/ylwrap
-.deps/
-.dirstamp
-aclocal.m4
-autom4te.cache/
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/ltmain.sh
-build-aux/m4/libtool.m4
-build-aux/m4/lt~obsolete.m4
-build-aux/m4/ltoptions.m4
-build-aux/m4/ltsugar.m4
-build-aux/m4/ltversion.m4
-build-aux/missing
-build-aux/compile
-build-aux/test-driver
-configure
-libtool
-
-autom4te.cache
-/autoscan.log
-/autoscan-*.log
-/aclocal.m4
-/compile
-/config.cache
-/config.guess
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/configure
-/configure.scan
-/depcomp
-/install-sh
-/missing
-/stamp-h1
-/ltmain.sh
-/texinfo.tex
diff --git a/src/dashbls/CMakeLists.txt b/src/dashbls/CMakeLists.txt
deleted file mode 100644
index f413f97cc7a9..000000000000
--- a/src/dashbls/CMakeLists.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.14.0 FATAL_ERROR)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_STANDARD 99)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release"
-    CACHE STRING "Possible values are empty, Debug, Release, RelWithDebInfo, MinSizeRel, ..."
-    FORCE
-  )
-endif()
-
-project(BLS)
-
-set(BUILD_BLS_JS_BINDINGS "1" CACHE STRING "")
-set(BUILD_BLS_PYTHON_BINDINGS "1" CACHE STRING "")
-set(BUILD_BLS_TESTS "1" CACHE STRING "")
-set(BUILD_BLS_BENCHMARKS "1" CACHE STRING "")
-
-message(STATUS "Build python bindings: ${BUILD_BLS_PYTHON_BINDINGS}")
-message(STATUS "Build tests: ${BUILD_BLS_TESTS}")
-message(STATUS "Build benchmarks: ${BUILD_BLS_BENCHMARKS}")
-
-# Add path for custom modules
-set(CMAKE_MODULE_PATH
-  ${CMAKE_MODULE_PATH}
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
-)
-
-# Relic related options
-
-set(STBIN "off" CACHE STRING "Relic - Build static binaries")
-
-find_package(gmp)
-if (GMP_FOUND)
-  message(STATUS "Found libgmp")
-  set(ARITH "gmp" CACHE STRING "")
-else()
-  set(ARITH "easy" CACHE STRING "")
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(WSIZE "32" CACHE STRING "Relic - Processor word size")
-else()
-  set(WSIZE "64" CACHE STRING "Relic - Processor word size")
-endif()
-
-if(EMSCRIPTEN)
-  # emscripten needs arch set to be none since it can't compile assembly
-  set(ARCH "" CACHE STRING "")
-  # emscripten is a 32 bit compiler
-  set(WSIZE "32" CACHE STRING "Relic - Processor word size")
-endif()
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(TIMER "ANSI" CACHE STRING "")
-  set(MULTI "OPENMP" CACHE STRING "")
-else()
-  set(TIMER "CYCLE" CACHE STRING "")
-  set(MULTI "PTHREAD" CACHE STRING "")
-endif()
-
-set(CHECK "off" CACHE STRING "")
-set(VERBS "off" CACHE STRING "")
-set(ALLOC "AUTO" CACHE STRING "")
-set(SHLIB "off" CACHE STRING "")
-set(DOCUM "off" CACHE STRING "")
-set(FP_PRIME "381" CACHE STRING "Relic - Prime modulus size")
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(SEED "UDEV" CACHE STRING "")
-  set(FP_QNRES "off" CACHE STRING "")
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(SEED "WCGR" CACHE STRING "")
-  set(FP_QNRES "on" CACHE STRING "")
-else()
-  set(SEED "UDEV" CACHE STRING "")
-  set(FP_QNRES "on" CACHE STRING "")
-endif()
-
-set(FP_METHD "INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" CACHE STRING "")
-
-if(MSVC)
-  set(COMP_FLAGS "" CACHE STRING "")
-else()
-  set(COMP_FLAGS "-O3 -funroll-loops -fomit-frame-pointer" CACHE STRING "")
-endif()
-
-set(FP_PMERS "off" CACHE STRING "")
-set(FPX_METHD "INTEG;INTEG;LAZYR" CACHE STRING "")
-set(EP_PLAIN "off" CACHE STRING "")
-set(EP_SUPER "off" CACHE STRING "")
-# Disable relic tests and benchmarks
-set(TESTS "0" CACHE STRING "Relic - Number of times each test is ran")
-set(BENCH "0" CACHE STRING "Relic - Number of times each benchmark is ran")
-
-set(QUIET "on" CACHE STRING "Relic - Build with printing disabled")
-
-set(PP_EXT "LAZYR" CACHE STRING "")
-set(PP_METHD "LAZYR;OATEP" CACHE STRING "")
-
-# Disable mimalloc shared libraries and tests, enable secure mode
-set(MI_SECURE       "on" CACHE STRING "")
-
-set(MI_BUILD_SHARED "off" CACHE STRING "")
-set(MI_BUILD_TESTS  "off" CACHE STRING "")
-set(MI_OVERRIDE     "off" CACHE STRING "")
-
-add_subdirectory(depends/relic)
-add_subdirectory(depends/mimalloc)
-
-#message(STATUS "Patching Relic to make setjmp.h inclusion conditional")
-#
-#execute_process(
-#  COMMAND bash -c "git apply ${CMAKE_SOURCE_DIR}/setjmp_patch.diff"
-#  WORKING_DIRECTORY ${RELIC_SRC}
-#)
-
-add_subdirectory(src)
-
-
-# Write include paths for rust binding
-if(EMSCRIPTEN)
-  file(APPEND "${CMAKE_CURRENT_LIST_DIR}/build/include_paths.txt" "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}/c++/v1/;")
-endif()
-
-file(APPEND "${CMAKE_CURRENT_LIST_DIR}/build/include_paths.txt" "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES};")
-
-if(GMP_INCLUDES)
-  file(APPEND "${CMAKE_CURRENT_LIST_DIR}/build/include_paths.txt" "${GMP_INCLUDES};")
-endif()
-
-# Write gmp library path for rust binding
-if(GMP_LIBRARIES)
-  file(APPEND "${CMAKE_CURRENT_LIST_DIR}/build/gmp_libraries.txt" "${GMP_LIBRARIES}")
-endif()
-
-if(EMSCRIPTEN)
-  if(BUILD_BLS_JS_BINDINGS)
-    add_subdirectory(js-bindings)
-  endif()
-else()
-  # emscripten can't build python bindings, it produces only javascript
-  # add_subdirectory(contrib/pybind11)
-  if(BUILD_BLS_PYTHON_BINDINGS)
-    add_subdirectory(python-bindings)
-  endif()
-endif()
diff --git a/src/dashbls/LICENSE b/src/dashbls/LICENSE
deleted file mode 100644
index f433b1a53f5b..000000000000
--- a/src/dashbls/LICENSE
+++ /dev/null
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/src/dashbls/MANIFEST.in b/src/dashbls/MANIFEST.in
deleted file mode 100644
index 3063e7883b3c..000000000000
--- a/src/dashbls/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include README.md LICENSE
-global-include CMakeLists.txt *.cmake
-recursive-include cmake_modules *
-recursive-include src *
-recursive-include python-bindings *
-recursive-include contrib *
\ No newline at end of file
diff --git a/src/dashbls/Makefile.am b/src/dashbls/Makefile.am
deleted file mode 100644
index 1c1e5d19d594..000000000000
--- a/src/dashbls/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2022 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-print-%: FORCE
-	@echo '$*'='$($*)'
-
-ACLOCAL_AMFLAGS = -I build-aux/m4
-.PHONY: deploy FORCE
-
-AM_LDFLAGS    = $(HARDENED_LDFLAGS) $(CORE_LDFLAGS) $(GMP_LDFLAGS)
-AM_CFLAGS     = $(DEBUG_FLAGS) $(HARDENED_FLAGS) $(CORE_FLAGS) $(WARN_FLAGS) $(NOWARN_FLAGS)
-AM_CPPFLAGS   = $(CORE_CPPFLAGS) $(GMP_CPPFLAGS)
-AM_CXXFLAGS   = $(DEBUG_FLAGS) $(HARDENED_FLAGS) $(CORE_FLAGS) $(WARN_FLAGS) $(NOWARN_FLAGS)
-PTHREAD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-
-EXTRA_LIBRARIES =
-
-lib_LTLIBRARIES =
-noinst_LTLIBRARIES =
-
-bin_PROGRAMS =
-noinst_PROGRAMS =
-EXTRA_DIST =
-
-CLEANFILES =
-
-include Makefile.bls.include
-
-CLEANFILES += $(LIBRELIC) $(LIBDASHBLS) $(LIBMIMALLOC)
-
-if USE_TESTS
-CLEANFILES += $(DASHBLS_RUNTEST)
-endif
-
-if USE_BENCH
-CLEANFILES += $(DASHBLS_RUNBENCH)
-endif
diff --git a/src/dashbls/Makefile.bench.include b/src/dashbls/Makefile.bench.include
deleted file mode 100644
index f584102a3294..000000000000
--- a/src/dashbls/Makefile.bench.include
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2021 The PIVX developers
-# Copyright (c) 2022 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-DASHBLS_RUNBENCH = runbench
-
-runbench_SOURCES = \
-	src/test-bench.cpp \
-	src/test-utils.hpp
-
-runbench_SOURCES += \
-	$(RELIC_H) \
-	$(DASHBLS_H)
-
-runbench_CPPFLAGS = $(AM_CPPFLAGS) $(DASHBLS_INCLUDES) $(RELIC_INCLUDES)
-runbench_CXXFLAGS = $(AM_CXXFLAGS)
-runbench_LDFLAGS  = -static $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
-
-runbench_LDADD = $(LIBDASHBLS)
-
-noinst_PROGRAMS += $(DASHBLS_RUNBENCH)
diff --git a/src/dashbls/Makefile.bls.include b/src/dashbls/Makefile.bls.include
deleted file mode 100644
index 7c35b3ced764..000000000000
--- a/src/dashbls/Makefile.bls.include
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2021 The PIVX developers
-# Copyright (c) 2022 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-LIBDASHBLS = libdashbls.la
-
-DASHBLS_CPPFLAGS = -DBLSALLOC_MIMALLOC=1
-
-DASHBLS_INCLUDES = \
-	-I$(builddir) \
-	-I$(builddir)/obj \
-	-I$(top_srcdir)/include/dashbls
-
-DASHBLS_H = \
-	src/bls.hpp \
-	src/chaincode.hpp \
-	src/elements.hpp \
-	src/extendedprivatekey.hpp \
-	src/extendedpublickey.hpp \
-	src/hdkeys.hpp \
-	src/hkdf.hpp \
-	src/legacy.hpp \
-	src/privatekey.hpp \
-	src/schemes.hpp \
-	src/test-utils.hpp \
-	src/threshold.hpp \
-	src/util.hpp
-
-libdashbls_la_SOURCES = \
-	src/bls.cpp \
-	src/chaincode.cpp \
-	src/elements.cpp \
-	src/extendedprivatekey.cpp \
-	src/extendedpublickey.cpp \
-	src/legacy.cpp \
-	src/privatekey.cpp \
-	src/schemes.cpp \
-	src/threshold.cpp
-
-libdashbls_la_SOURCES += \
-	$(DASHBLS_H) \
-	$(MIMALLOC_H) \
-	$(RELIC_H)
-
-libdashbls_la_LIBADD = \
-	$(LIBMIMALLOC) \
-	$(LIBRELIC) \
-	$(GMP_LIBS)
-
-libdashbls_la_CPPFLAGS = $(AM_CPPFLAGS) $(RELIC_INCLUDES) $(MIMALLOC_INCLUDES) $(DASHBLS_INCLUDES) $(DASHBLS_CPPFLAGS)
-libdashbls_la_CXXFLAGS = $(AM_CXXFLAGS)
-libdashbls_la_LDFLAGS  = $(AM_LDFLAGS)
-
-include Makefile.mimalloc.include
-include Makefile.relic.include
-
-if USE_TESTS
-include Makefile.test.include
-endif
-
-if USE_BENCH
-include Makefile.bench.include
-endif
-
-lib_LTLIBRARIES += $(LIBDASHBLS)
diff --git a/src/dashbls/Makefile.mimalloc.include b/src/dashbls/Makefile.mimalloc.include
deleted file mode 100644
index fada5fe32819..000000000000
--- a/src/dashbls/Makefile.mimalloc.include
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2022-2025 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-LIBMIMALLOC = libmimalloc-secure.la
-
-MIMALLOC_CPPFLAGS = \
-	-DMI_SECURE=4 \
-    -DNDEBUG
-
-MIMALLOC_INCLUDES = \
-	-I$(top_srcdir)/depends/mimalloc/include \
-	-I$(top_srcdir)/depends/mimalloc/src
-
-MIMALLOC_H = \
-    depends/mimalloc/include/mimalloc-new-delete.h \
-    depends/mimalloc/include/mimalloc-override.h \
-    depends/mimalloc/include/mimalloc-stats.h \
-    depends/mimalloc/include/mimalloc.h \
-	depends/mimalloc/src/bitmap.h
-
-libmimalloc_secure_la_SOURCES = \
-	$(MIMALLOC_H) \
-    depends/mimalloc/src/alloc-aligned.c \
-    depends/mimalloc/src/alloc-posix.c \
-    depends/mimalloc/src/alloc.c \
-    depends/mimalloc/src/arena-meta.c \
-    depends/mimalloc/src/arena.c \
-    depends/mimalloc/src/bitmap.c \
-    depends/mimalloc/src/heap.c \
-    depends/mimalloc/src/init.c \
-    depends/mimalloc/src/libc.c \
-    depends/mimalloc/src/options.c \
-    depends/mimalloc/src/os.c \
-    depends/mimalloc/src/page-map.c \
-    depends/mimalloc/src/page.c \
-    depends/mimalloc/src/random.c \
-    depends/mimalloc/src/stats.c \
-    depends/mimalloc/src/prim/prim.c
-
-libmimalloc_secure_la_CPPFLAGS = $(AM_CPPFLAGS) $(MIMALLOC_CPPFLAGS) $(MIMALLOC_INCLUDES)
-libmimalloc_secure_la_CXXFLAGS = $(AM_CXXFLAGS)
-libmimalloc_secure_la_CFLAGS   = $(AM_CFLAGS)
-libmimalloc_secure_la_LDFLAGS  = $(AM_LDFLAGS)
-
-noinst_LTLIBRARIES += $(LIBMIMALLOC)
diff --git a/src/dashbls/Makefile.relic.include b/src/dashbls/Makefile.relic.include
deleted file mode 100644
index 92bd7c7e8f5b..000000000000
--- a/src/dashbls/Makefile.relic.include
+++ /dev/null
@@ -1,470 +0,0 @@
-# Copyright (c) 2021 The PIVX developers
-# Copyright (c) 2022 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-LIBRELIC = librelic.la
-
-RELIC_INCLUDES = \
-	-I$(top_srcdir)/depends/relic/include \
-	-I$(top_srcdir)/depends/relic/include/low \
-	-I$(top_srcdir)/depends/relic/src/tmpl
-
-RELIC_H = \
-	depends/relic/include/relic.h \
-	depends/relic/include/relic_alloc.h \
-	depends/relic/include/relic_arch.h \
-	depends/relic/include/relic_bc.h \
-	depends/relic/include/relic_bench.h \
-	depends/relic/include/relic_bn.h \
-	depends/relic/include/relic_conf.h \
-	depends/relic/include/relic_core.h \
-	depends/relic/include/relic_cp.h \
-	depends/relic/include/relic_dv.h \
-	depends/relic/include/relic_eb.h \
-	depends/relic/include/relic_ec.h \
-	depends/relic/include/relic_ed.h \
-	depends/relic/include/relic_ep.h \
-	depends/relic/include/relic_epx.h \
-	depends/relic/include/relic_err.h \
-	depends/relic/include/relic_fb.h \
-	depends/relic/include/relic_fbx.h \
-	depends/relic/include/relic_fp.h \
-	depends/relic/include/relic_fpx.h \
-	depends/relic/include/relic_label.h \
-	depends/relic/include/relic_md.h \
-	depends/relic/include/relic_mpc.h \
-	depends/relic/include/relic_multi.h \
-	depends/relic/include/relic_pc.h \
-	depends/relic/include/relic_pp.h \
-	depends/relic/include/relic_rand.h \
-	depends/relic/include/relic_test.h \
-	depends/relic/include/relic_types.h \
-	depends/relic/include/relic_util.h \
-	depends/relic/include/low/relic_bn_low.h \
-	depends/relic/include/low/relic_dv_low.h \
-	depends/relic/include/low/relic_fb_low.h \
-	depends/relic/include/low/relic_fp_low.h \
-	depends/relic/include/low/relic_fpx_low.h \
-	depends/relic/src/arch/lzcnt.inc \
-	depends/relic/src/tmpl/relic_tmpl_map.h
-
-RELIC_SOURCES = \
-	depends/relic/src/relic_err.c \
-	depends/relic/src/relic_core.c \
-	depends/relic/src/relic_conf.c \
-	depends/relic/src/relic_util.c
-
-BN_SOURCES = \
-	depends/relic/src/bn/relic_bn_add.c \
-	depends/relic/src/bn/relic_bn_cmp.c \
-	depends/relic/src/bn/relic_bn_div.c \
-	depends/relic/src/bn/relic_bn_factor.c \
-	depends/relic/src/bn/relic_bn_gcd.c \
-	depends/relic/src/bn/relic_bn_inv.c \
-	depends/relic/src/bn/relic_bn_lcm.c \
-	depends/relic/src/bn/relic_bn_mem.c \
-	depends/relic/src/bn/relic_bn_mod.c \
-	depends/relic/src/bn/relic_bn_mul.c \
-	depends/relic/src/bn/relic_bn_mxp.c \
-	depends/relic/src/bn/relic_bn_prime.c \
-	depends/relic/src/bn/relic_bn_rec.c \
-	depends/relic/src/bn/relic_bn_shift.c \
-	depends/relic/src/bn/relic_bn_smb.c \
-	depends/relic/src/bn/relic_bn_sqr.c \
-	depends/relic/src/bn/relic_bn_srt.c \
-	depends/relic/src/bn/relic_bn_util.c
-
-FP_SOURCES = \
-	depends/relic/src/fp/relic_fp_add.c \
-	depends/relic/src/fp/relic_fp_cmp.c \
-	depends/relic/src/fp/relic_fp_exp.c \
-	depends/relic/src/fp/relic_fp_inv.c \
-	depends/relic/src/fp/relic_fp_mul.c \
-	depends/relic/src/fp/relic_fp_param.c \
-	depends/relic/src/fp/relic_fp_prime.c \
-	depends/relic/src/fp/relic_fp_rdc.c \
-	depends/relic/src/fp/relic_fp_shift.c \
-	depends/relic/src/fp/relic_fp_sqr.c \
-	depends/relic/src/fp/relic_fp_srt.c \
-	depends/relic/src/fp/relic_fp_util.c
-
-FPX_SOURCES = \
-	depends/relic/src/fpx/relic_fp2_mul.c \
-	depends/relic/src/fpx/relic_fp2_sqr.c \
-	depends/relic/src/fpx/relic_fp3_mul.c \
-	depends/relic/src/fpx/relic_fp3_sqr.c \
-	depends/relic/src/fpx/relic_fp4_mul.c \
-	depends/relic/src/fpx/relic_fp4_sqr.c \
-	depends/relic/src/fpx/relic_fp6_mul.c \
-	depends/relic/src/fpx/relic_fp6_sqr.c \
-	depends/relic/src/fpx/relic_fp8_mul.c \
-	depends/relic/src/fpx/relic_fp8_sqr.c \
-	depends/relic/src/fpx/relic_fp9_mul.c \
-	depends/relic/src/fpx/relic_fp9_sqr.c \
-	depends/relic/src/fpx/relic_fp12_mul.c \
-	depends/relic/src/fpx/relic_fp12_sqr.c \
-	depends/relic/src/fpx/relic_fp18_mul.c \
-	depends/relic/src/fpx/relic_fp18_sqr.c \
-	depends/relic/src/fpx/relic_fp24_mul.c \
-	depends/relic/src/fpx/relic_fp24_sqr.c \
-	depends/relic/src/fpx/relic_fp48_mul.c \
-	depends/relic/src/fpx/relic_fp48_sqr.c \
-	depends/relic/src/fpx/relic_fp54_mul.c \
-	depends/relic/src/fpx/relic_fp54_sqr.c \
-	depends/relic/src/fpx/relic_fpx_add.c \
-	depends/relic/src/fpx/relic_fpx_cmp.c \
-	depends/relic/src/fpx/relic_fpx_cyc.c \
-	depends/relic/src/fpx/relic_fpx_exp.c \
-	depends/relic/src/fpx/relic_fpx_field.c \
-	depends/relic/src/fpx/relic_fpx_frb.c \
-	depends/relic/src/fpx/relic_fpx_inv.c \
-	depends/relic/src/fpx/relic_fpx_pck.c \
-	depends/relic/src/fpx/relic_fpx_rdc.c \
-	depends/relic/src/fpx/relic_fpx_srt.c \
-	depends/relic/src/fpx/relic_fpx_util.c
-
-FB_SOURCES = \
-	depends/relic/src/fb/relic_fb_add.c \
-	depends/relic/src/fb/relic_fb_cmp.c \
-	depends/relic/src/fb/relic_fb_exp.c \
-	depends/relic/src/fb/relic_fb_inv.c \
-	depends/relic/src/fb/relic_fb_itr.c \
-	depends/relic/src/fb/relic_fb_mul.c \
-	depends/relic/src/fb/relic_fb_param.c \
-	depends/relic/src/fb/relic_fb_poly.c \
-	depends/relic/src/fb/relic_fb_rdc.c \
-	depends/relic/src/fb/relic_fb_shift.c \
-	depends/relic/src/fb/relic_fb_slv.c \
-	depends/relic/src/fb/relic_fb_sqr.c \
-	depends/relic/src/fb/relic_fb_srt.c \
-	depends/relic/src/fb/relic_fb_trc.c \
-	depends/relic/src/fb/relic_fb_util.c
-
-EP_SOURCES = \
-	depends/relic/src/ep/relic_ep_add.c \
-	depends/relic/src/ep/relic_ep_cmp.c \
-	depends/relic/src/ep/relic_ep_curve.c \
-	depends/relic/src/ep/relic_ep_dbl.c \
-	depends/relic/src/ep/relic_ep_map.c \
-	depends/relic/src/ep/relic_ep_mul.c \
-	depends/relic/src/ep/relic_ep_mul_fix.c \
-	depends/relic/src/ep/relic_ep_mul_sim.c \
-	depends/relic/src/ep/relic_ep_neg.c \
-	depends/relic/src/ep/relic_ep_norm.c \
-	depends/relic/src/ep/relic_ep_param.c \
-	depends/relic/src/ep/relic_ep_pck.c \
-	depends/relic/src/ep/relic_ep_psi.c \
-	depends/relic/src/ep/relic_ep_util.c
-
-EPX_SOURCES = \
-	depends/relic/src/epx/relic_ep2_add.c \
-	depends/relic/src/epx/relic_ep2_cmp.c \
-	depends/relic/src/epx/relic_ep2_curve.c \
-	depends/relic/src/epx/relic_ep2_dbl.c \
-	depends/relic/src/epx/relic_ep2_frb.c \
-	depends/relic/src/epx/relic_ep2_map.c \
-	depends/relic/src/epx/relic_ep2_mul.c \
-	depends/relic/src/epx/relic_ep2_mul_cof.c \
-	depends/relic/src/epx/relic_ep2_mul_fix.c \
-	depends/relic/src/epx/relic_ep2_mul_sim.c \
-	depends/relic/src/epx/relic_ep2_neg.c \
-	depends/relic/src/epx/relic_ep2_norm.c \
-	depends/relic/src/epx/relic_ep2_pck.c \
-	depends/relic/src/epx/relic_ep2_util.c \
-	depends/relic/src/epx/relic_ep4_add.c \
-	depends/relic/src/epx/relic_ep4_cmp.c \
-	depends/relic/src/epx/relic_ep4_curve.c \
-	depends/relic/src/epx/relic_ep4_dbl.c \
-	depends/relic/src/epx/relic_ep4_frb.c \
-	depends/relic/src/epx/relic_ep4_map.c \
-	depends/relic/src/epx/relic_ep4_mul.c \
-	depends/relic/src/epx/relic_ep4_mul_cof.c \
-	depends/relic/src/epx/relic_ep4_mul_fix.c \
-	depends/relic/src/epx/relic_ep4_mul_sim.c \
-	depends/relic/src/epx/relic_ep4_neg.c \
-	depends/relic/src/epx/relic_ep4_norm.c \
-	depends/relic/src/epx/relic_ep4_util.c
-
-EB_SOURCES = \
-	depends/relic/src/eb/relic_eb_add.c \
-	depends/relic/src/eb/relic_eb_cmp.c \
-	depends/relic/src/eb/relic_eb_curve.c \
-	depends/relic/src/eb/relic_eb_dbl.c \
-	depends/relic/src/eb/relic_eb_frb.c \
-	depends/relic/src/eb/relic_eb_hlv.c \
-	depends/relic/src/eb/relic_eb_map.c \
-	depends/relic/src/eb/relic_eb_mul.c \
-	depends/relic/src/eb/relic_eb_mul_fix.c \
-	depends/relic/src/eb/relic_eb_mul_sim.c \
-	depends/relic/src/eb/relic_eb_neg.c \
-	depends/relic/src/eb/relic_eb_norm.c \
-	depends/relic/src/eb/relic_eb_param.c \
-	depends/relic/src/eb/relic_eb_pck.c \
-	depends/relic/src/eb/relic_eb_util.c
-
-ED_SOURCES = \
-	depends/relic/src/ed/relic_ed_add.c \
-	depends/relic/src/ed/relic_ed_cmp.c \
-	depends/relic/src/ed/relic_ed_curve.c \
-	depends/relic/src/ed/relic_ed_dbl.c \
-	depends/relic/src/ed/relic_ed_map.c \
-	depends/relic/src/ed/relic_ed_mul.c \
-	depends/relic/src/ed/relic_ed_mul_fix.c \
-	depends/relic/src/ed/relic_ed_mul_sim.c \
-	depends/relic/src/ed/relic_ed_neg.c \
-	depends/relic/src/ed/relic_ed_norm.c \
-	depends/relic/src/ed/relic_ed_param.c \
-	depends/relic/src/ed/relic_ed_pck.c \
-	depends/relic/src/ed/relic_ed_util.c
-
-PP_SOURCES = \
-	depends/relic/src/pp/relic_pp_add_k2.c \
-	depends/relic/src/pp/relic_pp_add_k8.c \
-	depends/relic/src/pp/relic_pp_add_k12.c \
-	depends/relic/src/pp/relic_pp_add_k24.c \
-	depends/relic/src/pp/relic_pp_add_k48.c \
-	depends/relic/src/pp/relic_pp_add_k54.c \
-	depends/relic/src/pp/relic_pp_dbl_k2.c \
-	depends/relic/src/pp/relic_pp_dbl_k8.c \
-	depends/relic/src/pp/relic_pp_dbl_k12.c \
-	depends/relic/src/pp/relic_pp_dbl_k24.c \
-	depends/relic/src/pp/relic_pp_dbl_k48.c \
-	depends/relic/src/pp/relic_pp_dbl_k54.c \
-	depends/relic/src/pp/relic_pp_exp_k2.c \
-	depends/relic/src/pp/relic_pp_exp_k8.c \
-	depends/relic/src/pp/relic_pp_exp_k12.c \
-	depends/relic/src/pp/relic_pp_exp_k24.c \
-	depends/relic/src/pp/relic_pp_exp_k48.c \
-	depends/relic/src/pp/relic_pp_exp_k54.c \
-	depends/relic/src/pp/relic_pp_map.c \
-	depends/relic/src/pp/relic_pp_map_k2.c \
-	depends/relic/src/pp/relic_pp_map_k8.c \
-	depends/relic/src/pp/relic_pp_map_k12.c \
-	depends/relic/src/pp/relic_pp_map_k24.c \
-	depends/relic/src/pp/relic_pp_map_k48.c \
-	depends/relic/src/pp/relic_pp_map_k54.c \
-	depends/relic/src/pp/relic_pp_norm.c
-
-PC_SOURCES = \
-	depends/relic/src/pc/relic_pc_core.c \
-	depends/relic/src/pc/relic_pc_exp.c \
-	depends/relic/src/pc/relic_pc_util.c
-
-MD_SOURCES = \
-	depends/relic/src/md/blake2.h \
-	depends/relic/src/md/blake2-impl.h \
-	depends/relic/src/md/blake2s-ref.c \
-	depends/relic/src/md/relic_md_blake2s.c \
-	depends/relic/src/md/relic_md_hmac.c \
-	depends/relic/src/md/relic_md_kdf.c \
-	depends/relic/src/md/relic_md_mgf.c \
-	depends/relic/src/md/relic_md_sha224.c \
-	depends/relic/src/md/relic_md_sha256.c \
-	depends/relic/src/md/relic_md_sha384.c \
-	depends/relic/src/md/relic_md_sha512.c \
-	depends/relic/src/md/relic_md_xmd.c \
-	depends/relic/src/md/sha.h \
-	depends/relic/src/md/sha224-256.c \
-	depends/relic/src/md/sha384-512.c \
-	depends/relic/src/md/sha_private.h
-
-EXTRA_DIST += \
-	depends/relic/src/arch/relic_arch_arm.c \
-	depends/relic/src/arch/relic_arch_none.c \
-	depends/relic/src/arch/relic_arch_x64.c \
-	depends/relic/src/arch/relic_arch_x86.c
-
-RELIC_SOURCES += \
-	depends/relic/src/arch/relic_arch_@CPU_ARCH@.c \
-	depends/relic/src/rand/relic_rand_call.c \
-	depends/relic/src/rand/relic_rand_core.c \
-	depends/relic/src/rand/relic_rand_hashd.c \
-	depends/relic/src/rand/relic_rand_udev.c
-
-if WITH_DV
-RELIC_SOURCES += \
-	depends/relic/src/dv/relic_dv_mem.c \
-	depends/relic/src/dv/relic_dv_util.c
-endif
-
-if ARITH_EASY
-if WITH_BN
-RELIC_SOURCES += $(BN_SOURCES) \
-	depends/relic/src/low/easy/relic_bn_add_low.c \
-	depends/relic/src/low/easy/relic_bn_div_low.c \
-	depends/relic/src/low/easy/relic_bn_mod_low.c \
-	depends/relic/src/low/easy/relic_bn_mul_low.c \
-	depends/relic/src/low/easy/relic_bn_shift_low.c \
-	depends/relic/src/low/easy/relic_bn_sqr_low.c
-endif
-
-if WITH_FP
-RELIC_SOURCES += $(FP_SOURCES) \
-	depends/relic/src/low/easy/relic_fp_add_low.c   \
-	depends/relic/src/low/easy/relic_fp_inv_low.c   \
-	depends/relic/src/low/easy/relic_fp_mul_low.c   \
-	depends/relic/src/low/easy/relic_fp_rdc_low.c   \
-	depends/relic/src/low/easy/relic_fp_shift_low.c \
-	depends/relic/src/low/easy/relic_fp_sqr_low.c
-endif
-
-if WITH_FPX
-RELIC_SOURCES += $(FPX_SOURCES) \
-	depends/relic/src/low/easy/relic_fpx_add_low.c \
-	depends/relic/src/low/easy/relic_fpx_mul_low.c \
-	depends/relic/src/low/easy/relic_fpx_rdc_low.c \
-	depends/relic/src/low/easy/relic_fpx_sqr_low.c
-endif
-
-if WITH_FB
-RELIC_SOURCES += $(FB_SOURCES) \
-	depends/relic/src/low/easy/relic_fb_add_low.c \
-	depends/relic/src/low/easy/relic_fb_inv_low.c \
-	depends/relic/src/low/easy/relic_fb_itr_low.c \
-	depends/relic/src/low/easy/relic_fb_mul_low.c \
-	depends/relic/src/low/easy/relic_fb_rdc_low.c \
-	depends/relic/src/low/easy/relic_fb_shift_low.c \
-	depends/relic/src/low/easy/relic_fb_slv_low.c \
-	depends/relic/src/low/easy/relic_fb_sqr_low.c \
-	depends/relic/src/low/easy/relic_fb_srt_low.c \
-	depends/relic/src/low/easy/relic_fb_trc_low.c
-endif
-endif
-
-if ARITH_GMP
-if WITH_BN
-RELIC_SOURCES += $(BN_SOURCES) \
-	depends/relic/src/low/gmp/relic_bn_add_low.c   \
-	depends/relic/src/low/gmp/relic_bn_div_low.c   \
-	depends/relic/src/low/gmp/relic_bn_mod_low.c   \
-	depends/relic/src/low/gmp/relic_bn_mul_low.c   \
-	depends/relic/src/low/gmp/relic_bn_shift_low.c \
-	depends/relic/src/low/gmp/relic_bn_sqr_low.c
-endif
-
-if WITH_FP
-RELIC_SOURCES += $(FP_SOURCES) \
-	depends/relic/src/low/gmp/relic_fp_add_low.c   \
-	depends/relic/src/low/gmp/relic_fp_inv_low.c   \
-	depends/relic/src/low/gmp/relic_fp_mul_low.c   \
-	depends/relic/src/low/gmp/relic_fp_rdc_low.c   \
-	depends/relic/src/low/gmp/relic_fp_shift_low.c \
-	depends/relic/src/low/gmp/relic_fp_sqr_low.c
-endif
-
-if WITH_FPX
-RELIC_SOURCES += $(FPX_SOURCES) \
-	depends/relic/src/low/easy/relic_fpx_add_low.c \
-	depends/relic/src/low/easy/relic_fpx_mul_low.c \
-	depends/relic/src/low/easy/relic_fpx_rdc_low.c \
-	depends/relic/src/low/easy/relic_fpx_sqr_low.c
-endif
-
-if WITH_FB
-RELIC_SOURCES += $(FB_SOURCES) \
-	depends/relic/src/low/gmp/relic_fb_add_low.c   \
-	depends/relic/src/low/easy/relic_fb_inv_low.c  \
-	depends/relic/src/low/easy/relic_fb_itr_low.c  \
-	depends/relic/src/low/easy/relic_fb_mul_low.c  \
-	depends/relic/src/low/easy/relic_fb_rdc_low.c  \
-	depends/relic/src/low/gmp/relic_fb_shift_low.c \
-	depends/relic/src/low/easy/relic_fb_slv_low.c  \
-	depends/relic/src/low/easy/relic_fb_sqr_low.c  \
-	depends/relic/src/low/easy/relic_fb_srt_low.c  \
-	depends/relic/src/low/easy/relic_fb_trc_low.c
-endif
-endif
-
-if WITH_FBX
-RELIC_SOURCES += \
-	depends/relic/src/fbx/relic_fb2_inv.c \
-	depends/relic/src/fbx/relic_fb2_mul.c \
-	depends/relic/src/fbx/relic_fb2_slv.c \
-	depends/relic/src/fbx/relic_fb2_sqr.c
-endif
-
-if WITH_EP
-RELIC_SOURCES += $(EP_SOURCES)
-endif
-
-if WITH_EPX
-RELIC_SOURCES += $(EPX_SOURCES)
-endif
-
-if WITH_EB
-RELIC_SOURCES += $(EB_SOURCES)
-endif
-
-if WITH_ED
-RELIC_SOURCES += $(ED_SOURCES)
-endif
-
-if WITH_PP
-RELIC_SOURCES += $(PP_SOURCES)
-endif
-
-if WITH_PC
-RELIC_SOURCES += $(PC_SOURCES)
-endif
-
-if WITH_CP
-RELIC_SOURCES += \
-	depends/relic/src/cp/relic_cp_bbs.c \
-	depends/relic/src/cp/relic_cp_bdpe.c \
-	depends/relic/src/cp/relic_cp_bgn.c \
-	depends/relic/src/cp/relic_cp_bls.c \
-	depends/relic/src/cp/relic_cp_cls.c \
-	depends/relic/src/cp/relic_cp_cmlhs.c \
-	depends/relic/src/cp/relic_cp_ecdh.c \
-	depends/relic/src/cp/relic_cp_ecdsa.c \
-	depends/relic/src/cp/relic_cp_ecies.c \
-	depends/relic/src/cp/relic_cp_ecmqv.c \
-	depends/relic/src/cp/relic_cp_ecss.c \
-	depends/relic/src/cp/relic_cp_ers.c \
-	depends/relic/src/cp/relic_cp_etrs.c \
-	depends/relic/src/cp/relic_cp_ghpe.c \
-	depends/relic/src/cp/relic_cp_ibe.c \
-	depends/relic/src/cp/relic_cp_mklhs.c \
-	depends/relic/src/cp/relic_cp_mpss.c \
-	depends/relic/src/cp/relic_cp_pcdel.c \
-	depends/relic/src/cp/relic_cp_phpe.c \
-	depends/relic/src/cp/relic_cp_pok.c \
-	depends/relic/src/cp/relic_cp_pss.c \
-	depends/relic/src/cp/relic_cp_rabin.c \
-	depends/relic/src/cp/relic_cp_rsa.c \
-	depends/relic/src/cp/relic_cp_sok.c \
-	depends/relic/src/cp/relic_cp_sokaka.c \
-	depends/relic/src/cp/relic_cp_vbnn.c \
-	depends/relic/src/cp/relic_cp_zss.c
-endif
-
-if WITH_BC
-RELIC_SOURCES += \
-	depends/relic/src/bc/relic_bc_aes.c \
-	depends/relic/src/bc/rijndael-alg-fst.c \
-	depends/relic/src/bc/rijndael-alg-fst.h \
-	depends/relic/src/bc/rijndael-api-fst.c \
-	depends/relic/src/bc/rijndael-api-fst.h
-endif
-
-if WITH_MD
-RELIC_SOURCES += $(MD_SOURCES)
-endif
-
-if WITH_MPC
-RELIC_SOURCES += \
-	depends/relic/src/mpc/relic_mt_mpc.c \
-	depends/relic/src/mpc/relic_pc_mpc.c
-endif
-
-librelic_la_SOURCES = \
-	$(RELIC_SOURCES) \
-	$(RELIC_H)
-
-librelic_la_CPPFLAGS = $(AM_CPPFLAGS) $(RELIC_CPPFLAGS) $(RELIC_INCLUDES)
-librelic_la_CXXFLAGS = $(AM_CXXFLAGS)
-librelic_la_CFLAGS   = $(AM_CFLAGS)
-librelic_la_LDFLAGS  = $(AM_LDFLAGS)
-
-noinst_LTLIBRARIES += $(LIBRELIC)
diff --git a/src/dashbls/Makefile.test.include b/src/dashbls/Makefile.test.include
deleted file mode 100644
index a8ec86cb59d1..000000000000
--- a/src/dashbls/Makefile.test.include
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2021 The PIVX developers
-# Copyright (c) 2022 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
-
-DASHBLS_RUNTEST = runtest
-
-RUNTEST_INCLUDES = \
-	-I$(top_srcdir)/depends/catch2/include
-
-RUNTEST_H = \
-	depends/catch2/include/catch2/catch.hpp
-
-runtest_SOURCES = \
-	$(DASHBLS_H) \
-	$(RELIC_H) \
-	$(RUNTEST_H) \
-	src/test.cpp \
-	src/test-utils.hpp
-
-runtest_CPPFLAGS = $(AM_CPPFLAGS) $(DASHBLS_INCLUDES) $(RELIC_INCLUDES) $(RUNTEST_INCLUDES)
-runtest_CXXFLAGS = $(AM_CXXFLAGS)
-runtest_LDFLAGS  = -static $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
-
-runtest_LDADD = $(LIBDASHBLS)
-
-noinst_PROGRAMS += $(DASHBLS_RUNTEST)
diff --git a/src/dashbls/README.md b/src/dashbls/README.md
deleted file mode 100644
index 8460ac818ea7..000000000000
--- a/src/dashbls/README.md
+++ /dev/null
@@ -1,299 +0,0 @@
-# BLS Signatures implementation
-
-[![Build and Test C++, Javascript, and Python](https://github.com/Chia-Network/bls-signatures/actions/workflows/build-test.yaml/badge.svg)](https://github.com/Chia-Network/bls-signatures/actions/workflows/build-test.yaml)
-![PyPI](https://img.shields.io/pypi/v/blspy?logo=pypi)
-![PyPI - Format](https://img.shields.io/pypi/format/blspy?logo=pypi)
-![GitHub](https://img.shields.io/github/license/Chia-Network/bls-signatures?logo=Github)
-
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/Chia-Network/bls-signatures.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Chia-Network/bls-signatures/alerts/)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/Chia-Network/bls-signatures.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Chia-Network/bls-signatures/context:javascript)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Chia-Network/bls-signatures.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Chia-Network/bls-signatures/context:python)
-[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/Chia-Network/bls-signatures.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Chia-Network/bls-signatures/context:cpp)
-
-NOTE: THIS LIBRARY IS NOT YET FORMALLY REVIEWED FOR SECURITY
-
-NOTE: THIS LIBRARY WAS SHIFTED TO THE IETF BLS SPECIFICATION ON 7/16/20
-
-Implements BLS signatures with aggregation using [relic toolkit](https://github.com/relic-toolkit/relic)
-for cryptographic primitives (pairings, EC, hashing) according to the
-[IETF BLS RFC](https://datatracker.ietf.org/doc/draft-irtf-cfrg-bls-signature/)
-with [these curve parameters](https://datatracker.ietf.org/doc/draft-irtf-cfrg-pairing-friendly-curves/)
-for BLS12-381.
-
-Features:
-
-* Non-interactive signature aggregation following IETF specification
-* Works on Windows, Mac, Linux, BSD
-* Efficient verification using Proof of Posssesion (only one pairing per distinct message)
-* Aggregate public keys and private keys
-* [EIP-2333](https://eips.ethereum.org/EIPS/eip-2333) key derivation (including unhardened BIP-32-like keys)
-* Key and signature serialization
-* Batch verification
-* [Python bindings](https://github.com/Chia-Network/bls-signatures/tree/main/python-bindings)
-* [Pure python bls12-381 and signatures](https://github.com/Chia-Network/bls-signatures/tree/main/python-impl)
-* [JavaScript bindings](https://github.com/Chia-Network/bls-signatures/tree/main/js-bindings)
-
-## Before you start
-
-This library uses minimum public key sizes (MPL). A G2Element is a signature (96 bytes), and a G1Element is a public key (48 bytes). A private key is a 32 byte integer. There are three schemes: Basic, Augmented, and ProofOfPossession. Augmented should be enough for most use cases, and ProofOfPossession can be used where verification must be fast.
-
-## Import the library
-
-```c++
-#include "bls.hpp"
-using namespace bls;
-```
-
-## Creating keys and signatures
-
-```c++
-// Example seed, used to generate private key. Always use
-// a secure RNG with sufficient entropy to generate a seed (at least 32 bytes).
-vector<uint8_t> seed = {0,  50, 6,  244, 24,  199, 1,  25,  52,  88,  192,
-                        19, 18, 12, 89,  6,   220, 18, 102, 58,  209, 82,
-                        12, 62, 89, 110, 182, 9,   44, 20,  254, 22};
-
-PrivateKey sk = AugSchemeMPL().KeyGen(seed);
-G1Element pk = sk.GetG1Element();
-
-vector<uint8_t> message = {1, 2, 3, 4, 5};  // Message is passed in as a byte vector
-G2Element signature = AugSchemeMPL().Sign(sk, message);
-
-// Verify the signature
-bool ok = AugSchemeMPL().Verify(pk, message, signature);
-```
-
-## Serializing keys and signatures to bytes
-
-```c++
-vector<uint8_t> skBytes = sk.Serialize();
-vector<uint8_t> pkBytes = pk.Serialize();
-vector<uint8_t> signatureBytes = signature.Serialize();
-
-cout << Util::HexStr(skBytes) << endl;    // 32 bytes printed in hex
-cout << Util::HexStr(pkBytes) << endl;    // 48 bytes printed in hex
-cout << Util::HexStr(signatureBytes) << endl;  // 96 bytes printed in hex
-```
-
-## Loading keys and signatures from bytes
-
-```c++
-// Takes vector of 32 bytes
-PrivateKey skc = PrivateKey::FromByteVector(skBytes);
-
-// Takes vector of 48 bytes
-pk = G1Element::FromByteVector(pkBytes);
-
-// Takes vector of 96 bytes
-signature = G2Element::FromByteVector(signatureBytes);
-```
-
-## Create aggregate signatures
-
-```c++
-// Generate some more private keys
-seed[0] = 1;
-PrivateKey sk1 = AugSchemeMPL().KeyGen(seed);
-seed[0] = 2;
-PrivateKey sk2 = AugSchemeMPL().KeyGen(seed);
-vector<uint8_t> message2 = {1, 2, 3, 4, 5, 6, 7};
-
-// Generate first sig
-G1Element pk1 = sk1.GetG1Element();
-G2Element sig1 = AugSchemeMPL().Sign(sk1, message);
-
-// Generate second sig
-G1Element pk2 = sk2.GetG1Element();
-G2Element sig2 = AugSchemeMPL().Sign(sk2, message2);
-
-// Signatures can be non-interactively combined by anyone
-G2Element aggSig = AugSchemeMPL().Aggregate({sig1, sig2});
-
-ok = AugSchemeMPL().AggregateVerify({pk1, pk2}, {message, message2}, aggSig);
-```
-
-## Arbitrary trees of aggregates
-
-```c++
-seed[0] = 3;
-PrivateKey sk3 = AugSchemeMPL().KeyGen(seed);
-G1Element pk3 = sk3.GetG1Element();
-vector<uint8_t> message3 = {100, 2, 254, 88, 90, 45, 23};
-G2Element sig3 = AugSchemeMPL().Sign(sk3, message3);
-
-
-G2Element aggSigFinal = AugSchemeMPL().Aggregate({aggSig, sig3});
-ok = AugSchemeMPL().AggregateVerify({pk1, pk2, pk3}, {message, message2, message3}, aggSigFinal);
-
-```
-
-## Very fast verification with Proof of Possession scheme
-
-```c++
-// If the same message is signed, you can use Proof of Posession (PopScheme) for efficiency
-// A proof of possession MUST be passed around with the PK to ensure security.
-
-G2Element popSig1 = PopSchemeMPL().Sign(sk1, message);
-G2Element popSig2 = PopSchemeMPL().Sign(sk2, message);
-G2Element popSig3 = PopSchemeMPL().Sign(sk3, message);
-G2Element pop1 = PopSchemeMPL().PopProve(sk1);
-G2Element pop2 = PopSchemeMPL().PopProve(sk2);
-G2Element pop3 = PopSchemeMPL().PopProve(sk3);
-
-ok = PopSchemeMPL().PopVerify(pk1, pop1);
-ok = PopSchemeMPL().PopVerify(pk2, pop2);
-ok = PopSchemeMPL().PopVerify(pk3, pop3);
-G2Element popSigAgg = PopSchemeMPL().Aggregate({popSig1, popSig2, popSig3});
-
-ok = PopSchemeMPL().FastAggregateVerify({pk1, pk2, pk3}, message, popSigAgg);
-
-// Aggregate public key, indistinguishable from a single public key
-G1Element popAggPk = pk1 + pk2 + pk3;
-ok = PopSchemeMPL().Verify(popAggPk, message, popSigAgg);
-
-// Aggregate private keys
-PrivateKey aggSk = PrivateKey::Aggregate({sk1, sk2, sk3});
-ok = (PopSchemeMPL().Sign(aggSk, message) == popSigAgg);
-```
-
-## HD keys using [EIP-2333](https://github.com/ethereum/EIPs/pull/2333)
-
-```c++
-// You can derive 'child' keys from any key, to create arbitrary trees. 4 byte indeces are used.
-// Hardened (more secure, but no parent pk -> child pk)
-PrivateKey masterSk = AugSchemeMPL().KeyGen(seed);
-PrivateKey child = AugSchemeMPL().DeriveChildSk(masterSk, 152);
-PrivateKey grandChild = AugSchemeMPL().DeriveChildSk(child, 952)
-
-// Unhardened (less secure, but can go from parent pk -> child pk), BIP32 style
-G1Element masterPk = masterSk.GetG1Element();
-PrivateKey childU = AugSchemeMPL().DeriveChildSkUnhardened(masterSk, 22);
-PrivateKey grandchildU = AugSchemeMPL().DeriveChildSkUnhardened(childU, 0);
-
-G1Element childUPk = AugSchemeMPL().DeriveChildPkUnhardened(masterPk, 22);
-G1Element grandchildUPk = AugSchemeMPL().DeriveChildPkUnhardened(childUPk, 0);
-
-ok = (grandchildUPk == grandchildU.GetG1Element();
-```
-
-## Build
-
-Cmake 3.14+, a c++ compiler, and python3 (for bindings) are required for building.
-
-```bash
-mkdir build
-cd build
-cmake ../
-cmake --build . -- -j 6
-```
-
-### Run tests
-
-```bash
-./build/src/runtest
-```
-
-### Run benchmarks
-
-```bash
-./build/src/runbench
-```
-
-On a 3.5 GHz i7 Mac, verification takes about 1.1ms per signature, and signing takes 1.3ms.
-
-### Link the library to use it
-
-```bash
-g++ -Wl,-no_pie -std=c++11  -Ibls-signatures/depends/relic/include -Ibls-signatures/build/depends/relic/include -Ibls-signatures/src -L./bls-signatures/build/ -l bls yourapp.cpp
-```
-
-## Notes on dependencies
-
-We use Libsodium and have GMP as an optional dependency: libsodium gives secure memory
-allocation, and GMP speeds up the library by ~ 3x. MPIR is used on Windows via
-GitHub Actions instead. To install them, either download them from github and
-follow the instructions for each repo, or use a package manager like APT or
-brew. You can follow the recipe used to build python wheels for multiple
-platforms in `.github/workflows/`.
-
-## Discussion
-
-Discussion about this library and other Chia related development is in the #dev
-channel of Chia's [public Keybase channels](https://keybase.io/team/chia_network.public).
-
-## Code style
-
-* Always use vector<uint8_t> for bytes
-* Use size_t for size variables
-* Uppercase method names
-* Prefer static constructors
-* Avoid using templates
-* Objects allocate and free their own memory
-* Use cpplint with default rules
-* Use SecAlloc and SecFree when handling secrets
-
-## ci Building
-
-The primary build process for this repository is to use GitHub Actions to
-build binary wheels for MacOS, Linux (x64 and aarch64), and Windows and publish
-them with a source wheel on PyPi. MacOS ARM64 is supported but not automated
-due to a lack of M1 CI runners. See `.github/workflows/build.yml`. CMake uses
-[FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html)
-to download [pybind11](https://github.com/pybind/pybind11) for the Python
-bindings and relic from a chia relic forked repository for Windows. Building
-is then managed by [cibuildwheel](https://github.com/joerick/cibuildwheel).
-Further installation is then available via `pip install blspy` e.g. The ci
-builds include GMP and a statically linked libsodium.
-
-## Contributing and workflow
-
-Contributions are welcome and more details are available in chia-blockchain's
-[CONTRIBUTING.md](https://github.com/Chia-Network/chia-blockchain/blob/main/CONTRIBUTING.md).
-
-The main branch is usually the currently released latest version on PyPI.
-Note that at times bls-signatures/blspy will be ahead of the release version
-that chia-blockchain requires in it's main/release version in preparation
-for a new chia-blockchain release. Please branch or fork main and then create
-a pull request to the main branch. Linear merging is enforced on main and
-merging requires a completed review. PRs will kick off a GitHub actions ci
-build and analysis of bls-signatures at
-[lgtm.com](https://lgtm.com/projects/g/Chia-Network/bls-signatures/?mode=list).
-Please make sure your build is passing and that it does not increase alerts
-at lgtm.
-
-## Specification and test vectors
-
-The [IETF bls draft](https://datatracker.ietf.org/doc/draft-irtf-cfrg-hash-to-curve/)
-is followed. Test vectors can also be seen in the python and cpp test files.
-
-## Libsodium license
-
-The libsodium static library is licensed under the ISC license which requires
-the following copyright notice.
-
->ISC License
->
->Copyright (c) 2013-2020
->Frank Denis \<j at pureftpd dot org\>
->
->Permission to use, copy, modify, and/or distribute this software for any
->purpose with or without fee is hereby granted, provided that the above
->copyright notice and this permission notice appear in all copies.
->
->THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
->WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
->MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
->ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
->WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
->ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
->OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-## GMP license
-
-GMP is distributed under the
-[GNU LGPL v3 license](https://www.gnu.org/licenses/lgpl-3.0.html)
-
-## Relic license
-
-Relic is used with the
-[Apache 2.0 license](https://github.com/relic-toolkit/relic/blob/master/LICENSE.Apache-2.0)
diff --git a/src/dashbls/apple.rust.deps.sh b/src/dashbls/apple.rust.deps.sh
deleted file mode 100755
index b2ebc41a4ff2..000000000000
--- a/src/dashbls/apple.rust.deps.sh
+++ /dev/null
@@ -1,374 +0,0 @@
-#!/bin/sh
-set -x
-set -e
-# "x86_64-apple-ios"
-# "aarch64-apple-ios"
-# "aarch64-apple-ios-sim"
-# "x86_64-apple-darwin"
-# "aarch64-apple-darwin"
-# TODO: it's probably needs to be optimized in order to increase better build velocity
-# TODO: so we need to combine multiple targets
-TARGET=$1
-git submodule update --init
-MIN_IOS="13.0"
-MIN_WATCHOS="5.0"
-MIN_TVOS=$MIN_IOS
-MIN_MACOS="10.15"
-
-IPHONEOS=iphoneos
-IPHONESIMULATOR=iphonesimulator
-WATCHOS=watchos
-WATCHSIMULATOR=watchsimulator
-TVOS=appletvos
-TVSIMULATOR=appletvsimulator
-MACOS=macosx
-
-LOGICALCPU_MAX=$(sysctl -n hw.logicalcpu_max)
-BUILD=build
-
-version_min_flag() {
-    PLATFORM=$1
-    FLAG=""
-    # shellcheck disable=SC2039
-    # shellcheck disable=SC2053
-    if [[ $PLATFORM = $IPHONEOS ]]; then
-        FLAG="-miphoneos-version-min=${MIN_IOS}"
-    elif [[ $PLATFORM = $IPHONESIMULATOR ]]; then
-        FLAG="-mios-simulator-version-min=${MIN_IOS}"
-    elif [[ $PLATFORM = $WATCHOS ]]; then
-        FLAG="-mwatchos-version-min=${MIN_WATCHOS}"
-    elif [[ $PLATFORM = $WATCHSIMULATOR ]]; then
-        FLAG="-mwatchos-simulator-version-min=${MIN_WATCHOS}"
-    elif [[ $PLATFORM = $TVOS ]]; then
-        FLAG="-mtvos-version-min=${MIN_TVOS}"
-    elif [[ $PLATFORM = $TVSIMULATOR ]]; then
-        FLAG="-mtvos-simulator-version-min=${MIN_TVOS}"
-    elif [[ $PLATFORM = $MACOS ]]; then
-        FLAG="-mmacosx-version-min=${MIN_MACOS}"
-    fi
-    echo $FLAG
-}
-
-
-prepare() {
-    download_gmp() {
-        GMP_VERSION="6.3.0"
-        CURRENT_DIR=$(pwd)
-        echo "$CURRENT_DIR"
-        # shellcheck disable=SC2039,SC2164
-        pushd ${BUILD}
-        mkdir -p "contrib"
-        if [ ! -s "contrib/gmp-${GMP_VERSION}.tar.bz2" ]; then
-            curl -L -o "contrib/gmp-${GMP_VERSION}.tar.bz2" https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.bz2
-        fi
-        rm -rf "contrib/gmp"
-        # shellcheck disable=SC2039,SC2164
-        pushd contrib
-        tar xfj "gmp-${GMP_VERSION}.tar.bz2"
-        mv gmp-${GMP_VERSION} gmp
-        # shellcheck disable=SC2039,SC2164
-        popd #contrib
-        # shellcheck disable=SC2039,SC2164
-        popd #build
-    }
-
-    download_cmake_toolchain() {
-        if [ ! -s "${BUILD}/ios.toolchain.cmake" ]; then
-            SHA256_HASH="d02857ff6bd64f1d7109ca59c3e4f3b2f89d0663c412146e6977c679801b3243"
-            curl -o "${BUILD}/ios.toolchain.cmake" https://raw.githubusercontent.com/leetal/ios-cmake/c55677a4445b138c9ef2650d3c21f22cc78c2357/ios.toolchain.cmake
-            DOWNLOADED_HASH=$(shasum -a 256 ${BUILD}/ios.toolchain.cmake | cut -f 1 -d " ")
-            if [ $SHA256_HASH != "$DOWNLOADED_HASH" ]; then
-              echo "Error: sha256 checksum of ios.toolchain.cmake mismatch" >&2
-              exit 1
-            fi
-        fi
-    }
-
-    download_relic() {
-        CURRENT_DIR=$(pwd)
-        echo "$CURRENT_DIR"
-        mkdir -p "${CURRENT_DIR}/${BUILD}/depends"
-        if [ ! -s "${CURRENT_DIR}/${BUILD}/depends/relic" ]; then
-            # shellcheck disable=SC2039,SC2164
-            pushd "${CURRENT_DIR}/${BUILD}/depends"
-            git clone --depth 1 --branch "feat/ios-support" https://github.com/pankcuf/relic
-            # shellcheck disable=SC2039,SC2164
-            pushd relic
-            git fetch --depth 1 origin 19fb6d79a77ade4ae8cd70d2b0ef7aab8720d1ae
-            git checkout 19fb6d79a77ade4ae8cd70d2b0ef7aab8720d1ae
-            # shellcheck disable=SC2039,SC2164
-            popd #relic
-            # shellcheck disable=SC2039,SC2164
-            popd #depends
-        fi
-    }
-    rm -rf ${BUILD}
-    mkdir -p ${BUILD}
-    download_relic
-    download_gmp
-    download_cmake_toolchain
-}
-
-build_gmp_arch() {
-    PLATFORM=$1
-    ARCH=$2
-    PFX=${PLATFORM}-${ARCH}
-    # why this works with this host only?
-    HOST=aarch64-apple-darwin
-    # shellcheck disable=SC2039,SC2164
-    pushd ${BUILD}
-    SDK=$(xcrun --sdk "$PLATFORM" --show-sdk-path)
-    PLATFORM_PATH=$(xcrun --sdk "$PLATFORM" --show-sdk-platform-path)
-    CLANG=$(xcrun --sdk "$PLATFORM" --find clang)
-    DEVELOPER=$(xcode-select --print-path)
-    CURRENT_DIR=$(pwd)
-    export PATH="${PLATFORM_PATH}/Developer/usr/bin:${DEVELOPER}/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin"
-    mkdir gmplib-"${PLATFORM}"-"${ARCH}"
-    CFLAGS="-Wno-unused-value -fembed-bitcode -arch ${ARCH} --sysroot=${SDK} $(version_min_flag "$PLATFORM")"
-    CONFIGURESCRIPT="gmp_configure_script.sh"
-    # shellcheck disable=SC2039,SC2164
-    pushd contrib
-    # shellcheck disable=SC2039,SC2164
-    pushd gmp
-    make clean || true
-    make distclean || true
-    echo "HOST: $HOST"
-    echo "PREFIX: ${CURRENT_DIR}/gmplib-${PFX}"
-
-    cat >"$CONFIGURESCRIPT" << EOF
-#!/bin/sh
-./configure \
-CC="$CLANG" CFLAGS="$CFLAGS" CPPFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" \
---host=${HOST} --prefix="${CURRENT_DIR}/gmplib-${PFX}" \
---disable-shared --enable-static --disable-assembly -v
-EOF
-    
-    chmod a+x "$CONFIGURESCRIPT"
-    sh "$CONFIGURESCRIPT"
-    rm "$CONFIGURESCRIPT"
-
-    # shellcheck disable=SC2039
-    mkdir -p "${CURRENT_DIR}/log"
-    # shellcheck disable=SC2039
-    make -j "$LOGICALCPU_MAX" &> "${CURRENT_DIR}"/log/gmplib-"${PFX}"-build.log
-    # shellcheck disable=SC2039
-    make install &> "${CURRENT_DIR}"/log/gmplib-"${PFX}"-install.log
-    #make check
-    #exit 1
-    # shellcheck disable=SC2039,SC2164
-    popd # gmp
-    # shellcheck disable=SC2039,SC2164
-    popd # contrib
-    # shellcheck disable=SC2039,SC2164
-    popd # build
-}
-
-build_relic_arch() {
-    PLATFORM=$1
-    ARCH=$2
-    PFX=${PLATFORM}-${ARCH}
-
-    # shellcheck disable=SC2039,SC2164
-    pushd ${BUILD}
-
-    SDK=$(xcrun --sdk "$PLATFORM" --show-sdk-path)
-
-    BUILDDIR=relic-"${PFX}"
-    TOOLCHAIN=$(pwd)/ios.toolchain.cmake
-    GMP_PFX=$(pwd)/gmplib-${PFX}
-    rm -rf "$BUILDDIR"
-    mkdir "$BUILDDIR"
-    # shellcheck disable=SC2039,SC2164
-    pushd "$BUILDDIR"
-
-    unset CC
-    # shellcheck disable=SC2155
-    export CC=$(xcrun --sdk "${PLATFORM}" --find clang)
-
-    WSIZE=0
-    IOS_PLATFORM=""
-    OPTIMIZATIONFLAGS=""
-    DEPLOYMENT_TARGET=""
-
-    # shellcheck disable=SC2039
-    # shellcheck disable=SC2053
-    if [[ $PLATFORM = $IPHONEOS ]]; then
-        if [[ $ARCH = "arm64" ]] || [[ $ARCH = "arm64e" ]]; then
-            IOS_PLATFORM=OS64
-            DEPLOYMENT_TARGET=$MIN_IOS
-            WSIZE=64
-            OPTIMIZATIONFLAGS=-fomit-frame-pointer
-        else
-            IOS_PLATFORM=OS
-            WSIZE=32
-        fi
-    elif [[ $PLATFORM = $IPHONESIMULATOR ]]; then
-        if [[ $ARCH = "x86_64" ]]; then
-            IOS_PLATFORM=SIMULATOR64
-            DEPLOYMENT_TARGET=$MIN_IOS
-            WSIZE=64
-            OPTIMIZATIONFLAGS=-fomit-frame-pointer
-        elif [[ $ARCH = "arm64" ]]; then
-            IOS_PLATFORM=SIMULATORARM64
-            DEPLOYMENT_TARGET=$MIN_IOS
-            WSIZE=64
-        else
-            IOS_PLATFORM=SIMULATOR
-            WSIZE=32
-        fi
-    elif [[ $PLATFORM = $WATCHOS ]]; then
-        IOS_PLATFORM=WATCHOS
-        DEPLOYMENT_TARGET=$MIN_WATCHOS
-        WSIZE=32
-    elif [[ $PLATFORM = $WATCHSIMULATOR ]]; then
-        IOS_PLATFORM=SIMULATOR_WATCHOS
-        DEPLOYMENT_TARGET=$MIN_WATCHOS
-        WSIZE=32
-    elif [[ $PLATFORM = $TVOS ]]; then
-        IOS_PLATFORM=TVOS
-        DEPLOYMENT_TARGET=$MIN_TVOS
-        WSIZE=64
-        OPTIMIZATIONFLAGS=-fomit-frame-pointer
-    elif [[ $PLATFORM = $TVSIMULATOR ]]; then
-        IOS_PLATFORM=SIMULATOR_TVOS
-        #TODO
-        if [[ $ARCH = "arm64" ]]
-        then
-            IOS_PLATFORM=OS64
-        fi
-        DEPLOYMENT_TARGET=$MIN_TVOS
-        WSIZE=64
-        OPTIMIZATIONFLAGS=-fomit-frame-pointer
-    elif [[ $PLATFORM = $MACOS ]]; then
-        WSIZE=64
-        IOS_PLATFORM=MAC
-        if [[ $ARCH = "arm64" ]]
-        then
-            IOS_PLATFORM=MAC_ARM64
-        fi
-        DEPLOYMENT_TARGET=$MIN_MACOS
-        OPTIMIZATIONFLAGS=-fomit-frame-pointer
-    fi
-
-    COMPILER_ARGS="$(version_min_flag "$PLATFORM") -Wno-unused-functions"
-
-    EXTRA_ARGS="-DOPSYS=NONE -DPLATFORM=$IOS_PLATFORM -DDEPLOYMENT_TARGET=$DEPLOYMENT_TARGET -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN"
-
-    # shellcheck disable=SC2039
-    if [[ $ARCH = "i386" ]]; then
-        EXTRA_ARGS+=" -DARCH=X86"
-    elif [[ $ARCH = "x86_64" ]]; then
-        EXTRA_ARGS+=" -DARCH=X64"
-    elif [[ $ARCH = "arm64" ]]; then
-       # Relic doesn't support aarch64 yet, "ARCH=ARM" is for ARM 32-bit architecture only
-       EXTRA_ARGS+=" -DIOS_ARCH=arm64 -DARCH="
-    elif [[ $ARCH = "armv7s" ]]; then
-        EXTRA_ARGS+=" -DIOS_ARCH=armv7s -DARCH=ARM"
-    elif [[ $ARCH = "armv7k" ]]; then
-        EXTRA_ARGS+=" -DIOS_ARCH=armv7k -DARCH=ARM"
-    elif [[ $ARCH = "arm64_32" ]]; then
-        EXTRA_ARGS+=" -DIOS_ARCH=arm64_32 -DARCH=ARM"
-    fi
-
-    CURRENT_DIR=$(pwd)
-    cmake -DCMAKE_PREFIX_PATH:PATH="${GMP_PFX}" -DTESTS=0 -DBENCH=0 -DBUILD_BLS_JS_BINDINGS=0 -DBUILD_BLS_PYTHON_BINDINGS=0 \
-    -DBUILD_BLS_BENCHMARKS=0 -DBUILD_BLS_TESTS=0 -DCHECK=off -DARITH=gmp -DTIMER=HPROC -DFP_PRIME=381 -DMULTI=PTHREAD \
-    -DFP_QNRES=on -DFP_METHD="INTEG;INTEG;INTEG;MONTY;EXGCD;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" \
-    -DCOMP_FLAGS="-pipe -std=c99 -O3 -funroll-loops $OPTIMIZATIONFLAGS -isysroot $SDK -arch $ARCH -fembed-bitcode ${COMPILER_ARGS}" \
-    -DWSIZE=$WSIZE -DVERBS=off -DSHLIB=off -DALLOC="AUTO" -DEP_PLAIN=off -DEP_SUPER=off -DPP_EXT="LAZYR" \
-    -DWITH="DV;BN;MD;FP;EP;FPX;EPX;PP;PC;CP" -DBN_METHD="COMBA;COMBA;MONTY;SLIDE;STEIN;BASIC" ${EXTRA_ARGS} ../../
-
-    make -j "$LOGICALCPU_MAX"
-    # shellcheck disable=SC2039,SC2164
-    popd # "$BUILDDIR"
-    # shellcheck disable=SC2039,SC2164
-    popd # depends/relic
-}
-
-build_bls_arch() {
-    # shellcheck disable=SC2039
-    BLS_FILES=( "bls" "chaincode" "elements" "extendedprivatekey" "extendedpublickey" "legacy" "privatekey" "schemes" "threshold" )
-    # shellcheck disable=SC2039
-    ALL_BLS_OBJ_FILES=$(printf "%s.o " "${BLS_FILES[@]}")
-
-    PLATFORM=$1
-    ARCH=$2
-    PFX=${PLATFORM}-${ARCH}
-    SDK=$(xcrun --sdk "$PLATFORM" --show-sdk-path)
-
-    BUILDDIR=${BUILD}/bls-"${PFX}"
-    rm -rf "$BUILDDIR"
-    mkdir "$BUILDDIR"
-    # shellcheck disable=SC2039,SC2164
-    pushd "$BUILDDIR"
-
-    EXTRA_ARGS="$(version_min_flag "$PLATFORM")"
-
-    CURRENT_DIR=$(pwd)
-
-    # shellcheck disable=SC2039
-    for F in "${BLS_FILES[@]}"
-    do
-        clang -I"../contrib/relic/include" \
-          -I"../../depends/relic/include" \
-          -I"../../include/dashbls" \
-          -I"../relic-${PFX}/depends/relic/include" \
-          -I"../../src/" \
-          -I"../gmplib-${PFX}/include" \
-          -x c++ -std=c++14 -stdlib=libc++ -fembed-bitcode -arch "${ARCH}" -isysroot "${SDK}" "${EXTRA_ARGS}" \
-          -c "../../src/${F}.cpp" -o "${F}.o"
-    done
-
-    # shellcheck disable=SC2086
-    xcrun -sdk "$PLATFORM" ar -cvq libbls.a $ALL_BLS_OBJ_FILES
-
-    # shellcheck disable=SC2039,SC2164
-    popd # "$BUILDDIR"
-}
-
-build_all_arch() {
-    PLATFORM=$1
-    ARCH=$2
-    build_gmp_arch "$PLATFORM" "$ARCH"
-    build_relic_arch "$PLATFORM" "$ARCH"
-    build_bls_arch "$PLATFORM" "$ARCH"
-}
-
-build_target() {
-    BUILD_IN=$1
-    echo "Build target: $BUILD_IN"
-    ARCH=""
-    PLATFORM=""
-    # shellcheck disable=SC2039
-    if [[ $BUILD_IN = "x86_64-apple-ios" ]]; then
-      ARCH=x86_64
-      PLATFORM=$IPHONESIMULATOR
-    elif [[ $BUILD_IN = "aarch64-apple-ios" ]]; then
-      ARCH=arm64
-      PLATFORM=$IPHONEOS
-    elif [[ $BUILD_IN = "aarch64-apple-ios-sim" ]]; then
-      ARCH=arm64
-      PLATFORM=$IPHONESIMULATOR
-    elif [[ $BUILD_IN = "x86_64-apple-darwin" ]]; then
-      ARCH=x86_64
-      PLATFORM=$MACOS
-    elif [[ $BUILD_IN = "aarch64-apple-darwin" ]]; then
-      ARCH=arm64
-      PLATFORM=$MACOS
-    fi
-    build_all_arch "$PLATFORM" "$ARCH"
-    PFX="${PLATFORM}"-"${ARCH}"
-    rm -rf "build/artefacts/${BUILD_IN}"
-    mkdir -p "build/artefacts/${BUILD_IN}"
-    cp "build/gmplib-${PFX}/lib/libgmp.a" "build/artefacts/${BUILD_IN}"
-    cp "build/relic-${PFX}/depends/relic/lib/librelic_s.a" "build/artefacts/${BUILD_IN}"
-#    cp "build/relic-${PFX}/depends/sodium/libsodium.a" "build/artefacts/${BUILD_IN}"
-    cp "build/bls-${PFX}/libbls.a" "build/artefacts/${BUILD_IN}"
-#    cp -rf build/bls-"${PFX}"/*.o build/artefacts/"${BUILD_IN}"/include
-#    cp -rf src/*.hpp build/artefacts/"${BUILD_IN}"/include
-#    cp -rf build/gmplib-"${PFX}"/include/gmp.h build/artefacts/"${BUILD_IN}"/include
-#    cp -rf build/relic-"${PFX}"/_deps/relic-build/include/*.h build/artefacts/"${BUILD_IN}"/include
-}
-
-prepare
-build_target "$TARGET"
diff --git a/src/dashbls/autogen.sh b/src/dashbls/autogen.sh
deleted file mode 100755
index de4600499e09..000000000000
--- a/src/dashbls/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-export LC_ALL=C
-set -e
-srcdir="$(dirname "$0")"
-cd "$srcdir"
-if [ -z "${LIBTOOLIZE}" ] && GLIBTOOLIZE="$(command -v glibtoolize)"; then
-  LIBTOOLIZE="${GLIBTOOLIZE}"
-  export LIBTOOLIZE
-fi
-command -v autoreconf >/dev/null || \
-  (echo "configuration failed, please install autoconf first" && exit 1)
-autoreconf --install --force --warnings=all
diff --git a/src/dashbls/build-aux/m4/ax_check_compile_flag.m4 b/src/dashbls/build-aux/m4/ax_check_compile_flag.m4
deleted file mode 100644
index bd753b34d7dc..000000000000
--- a/src/dashbls/build-aux/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/src/dashbls/build-aux/m4/ax_check_link_flag.m4 b/src/dashbls/build-aux/m4/ax_check_link_flag.m4
deleted file mode 100644
index 03a30ce4c739..000000000000
--- a/src/dashbls/build-aux/m4/ax_check_link_flag.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the linker or gives an error.
-#   (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_LINK_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
-AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  LDFLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_LINK_FLAGS
diff --git a/src/dashbls/build-aux/m4/ax_cxx_compile_stdcxx.m4 b/src/dashbls/build-aux/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644
index 51a35054d08c..000000000000
--- a/src/dashbls/build-aux/m4/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,1005 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11', '14', '17', or '20' for
-#   the respective C++ standard version.
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for no added switch, and then for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
-#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
-#   Copyright (c) 2021 Jörn Heusipp <osmanx@problemloesungsmaschine.de>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 14
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [$1], [20], [ax_cxx_compile_alternatives="20"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-
-  m4_if([$2], [], [dnl
-    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-		   ax_cv_cxx_compile_cxx$1,
-      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-        [ax_cv_cxx_compile_cxx$1=yes],
-        [ax_cv_cxx_compile_cxx$1=no])])
-    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-      ac_success=yes
-    fi])
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-dnl  Test body for checking C++17 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Test body for checking C++20 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
-)
-
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual ~Base() {}
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual ~Derived() override {}
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201703L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-  namespace test_constexpr_lambdas
-  {
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-  namespace test_structured_bindings
-  {
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-
-  namespace test_exception_spec_type_system
-  {
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus < 201703L
-
-]])
-
-
-dnl  Tests for new features in C++20
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 202002L
-
-#error "This is not a C++20 compiler"
-
-#else
-
-#include <version>
-
-namespace cxx20
-{
-
-// As C++20 supports feature test macros in the standard, there is no
-// immediate need to actually test for feature availability on the
-// Autoconf side.
-
-}  // namespace cxx20
-
-#endif  // __cplusplus < 202002L
-
-]])
diff --git a/src/dashbls/build-aux/m4/ax_pthread.m4 b/src/dashbls/build-aux/m4/ax_pthread.m4
deleted file mode 100644
index 9f35d139149f..000000000000
--- a/src/dashbls/build-aux/m4/ax_pthread.m4
+++ /dev/null
@@ -1,522 +0,0 @@
-# ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is
-#   needed for multi-threaded programs (defaults to the value of CC
-#   respectively CXX otherwise). (This is necessary on e.g. AIX to use the
-#   special cc_r/CC_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#   $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threaded programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#     CXX="$PTHREAD_CXX"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 31
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"])
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try. Items with a "," contain both
-# C compiler flags (before ",") and linker flags (after ","). Other items
-# starting with a "-" are C compiler flags, and remaining items are
-# library names, except for "none" which indicates that we try without
-# any flags at all, and "pthread-config" which is a program returning
-# the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-# Note that for GCC and Clang -pthread generally implies -lpthread,
-# except when -nostdlib is passed.
-# This is problematic using libtool to build C++ shared libraries with pthread:
-# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-# To solve this, first try -pthread together with -lpthread for GCC
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-
-# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-
-AS_IF([test "x$ax_pthread_clang" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread"])
-
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                *,*)
-                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void *some_global = NULL;
-                        static void routine(void *a)
-                          {
-                             /* To avoid any unused-parameter or
-                                unused-but-set-parameter warning.  */
-                             some_global = a;
-                          }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
-
-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;
-                                               return i;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [
-			   AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
-			   AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
-			 ],
-                         [
-			   AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
-			   AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
-			 ]
-                     )
-                    ])
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-AC_SUBST([PTHREAD_CXX])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
diff --git a/src/dashbls/cmake_modules/BrewHelper.cmake b/src/dashbls/cmake_modules/BrewHelper.cmake
deleted file mode 100644
index 6a1738fa1c17..000000000000
--- a/src/dashbls/cmake_modules/BrewHelper.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2018 The Bitcoin developers
-
-find_program(BREW brew)
-
-function(find_brew_prefix VAR NAME)
-    if(NOT BREW)
-        return()
-    endif()
-
-    if(DEFINED ${VAR})
-        return()
-    endif()
-
-    execute_process(
-        COMMAND ${BREW} --prefix ${NAME}
-        OUTPUT_VARIABLE PREFIX
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    set(${VAR} ${PREFIX} PARENT_SCOPE)
-endfunction()
diff --git a/src/dashbls/cmake_modules/Findgmp.cmake b/src/dashbls/cmake_modules/Findgmp.cmake
deleted file mode 100644
index 3e59ede0a4f3..000000000000
--- a/src/dashbls/cmake_modules/Findgmp.cmake
+++ /dev/null
@@ -1,103 +0,0 @@
-# Try to find the GMP library
-# https://gmplib.org/
-#
-# This module supports requiring a minimum version, e.g. you can do
-#   find_package(GMP 6.0.0)
-# to require version 6.0.0 to newer of GMP.
-#
-# Once done this will define
-#
-#  GMP_FOUND - system has GMP lib with correct version
-#  GMP_INCLUDES - the GMP include directory
-#  GMP_LIBRARIES - the GMP library
-#  GMP_VERSION - GMP version
-#
-# Copyright (c) 2016 Jack Poulson, <jack.poulson@gmail.com>
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-include(BrewHelper)
-find_brew_prefix(_GMP_BREW_HINT gmp)
-
-find_path(GMP_INCLUDES
-  NAMES
-    gmp.h
-  PATHS
-    $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR}
-  PATH_SUFFIXES
-    include
-  HINTS
-    ${_GMP_BREW_HINT}
-)
-
-# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified
-if(NOT GMP_FIND_VERSION)
-  if(NOT GMP_FIND_VERSION_MAJOR)
-    set(GMP_FIND_VERSION_MAJOR 5)
-  endif()
-  if(NOT GMP_FIND_VERSION_MINOR)
-    set(GMP_FIND_VERSION_MINOR 1)
-  endif()
-  if(NOT GMP_FIND_VERSION_PATCH)
-    set(GMP_FIND_VERSION_PATCH 0)
-  endif()
-  set(GMP_FIND_VERSION
-    "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}")
-endif()
-
-message("GMP_INCLUDES=${GMP_INCLUDES}")
-if(GMP_INCLUDES)
-  # Since the GMP version macros may be in a file included by gmp.h of the form
-  # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them.
-  file(GLOB GMP_HEADERS "${GMP_INCLUDES}/gmp.h" "${GMP_INCLUDES}/gmp-*.h")
-  foreach(gmp_header_filename ${GMP_HEADERS})
-    file(READ "${gmp_header_filename}" _gmp_version_header)
-    string(REGEX MATCH
-      "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match
-      "${_gmp_version_header}")
-    if(_gmp_major_version_match)
-      set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}")
-      string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)"
-        _gmp_minor_version_match "${_gmp_version_header}")
-      set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}")
-      string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)"
-        _gmp_patchlevel_version_match "${_gmp_version_header}")
-      set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}")
-      set(GMP_VERSION
-        ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION})
-    endif()
-  endforeach()
-
-  # Check whether found version exists and exceeds the minimum requirement
-  if(NOT GMP_VERSION)
-    set(GMP_VERSION_OK FALSE)
-    message(STATUS "GMP version was not detected")
-  elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION})
-    set(GMP_VERSION_OK FALSE)
-    message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDES}, "
-                   "but at least version ${GMP_FIND_VERSION} is required")
-  else()
-    set(GMP_VERSION_OK TRUE)
-  endif()
-endif()
-
-if(STBIN)
-  set(_gmp_lib_name libgmp.a)
-else()
-  set(_gmp_lib_name libgmp.so)
-endif()
-
-find_library(GMP_LIBRARIES
-  NAMES
-    ${_gmp_lib_name} gmp.lib libgmp-10 libgmp gmp
-  HINTS
-    ${_GMP_BREW_HINT}
-  INCLUDE_DIRS
-    ${GMP_INCLUDES}
-  PATHS
-    $ENV{GMPDIR} ${LIB_INSTALL_DIR}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gmp DEFAULT_MSG
-                                  GMP_INCLUDES GMP_LIBRARIES GMP_VERSION_OK)
-mark_as_advanced(GMP_INCLUDES GMP_LIBRARIES)
diff --git a/src/dashbls/cmake_modules/Findsodium.cmake b/src/dashbls/cmake_modules/Findsodium.cmake
deleted file mode 100644
index 0350b67fce9b..000000000000
--- a/src/dashbls/cmake_modules/Findsodium.cmake
+++ /dev/null
@@ -1,294 +0,0 @@
-# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
-#
-# To the extent possible under law, the author(s) have dedicated all
-# copyright and related and neighboring rights to this software to the
-# public domain worldwide. This software is distributed without any warranty.
-#
-# You should have received a copy of the CC0 Public Domain Dedication
-# along with this software. If not, see
-#
-#     http://creativecommons.org/publicdomain/zero/1.0/
-#
-########################################################################
-# Tries to find the local libsodium installation.
-#
-# On Windows the sodium_DIR environment variable is used as a default
-# hint which can be overridden by setting the corresponding cmake variable.
-#
-# Once done the following variables will be defined:
-#
-#   sodium_FOUND
-#   sodium_INCLUDE_DIR
-#   sodium_LIBRARY_DEBUG
-#   sodium_LIBRARY_RELEASE
-#
-#
-# Furthermore an imported "sodium" target is created.
-#
-
-if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
-    OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    set(_GCC_COMPATIBLE 1)
-endif()
-
-# static library option
-if (NOT DEFINED sodium_USE_STATIC_LIBS)
-    option(sodium_USE_STATIC_LIBS "enable to statically link against sodium" OFF)
-endif()
-if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
-    unset(sodium_LIBRARY CACHE)
-    unset(sodium_LIBRARY_DEBUG CACHE)
-    unset(sodium_LIBRARY_RELEASE CACHE)
-    unset(sodium_DLL_DEBUG CACHE)
-    unset(sodium_DLL_RELEASE CACHE)
-    set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
-endif()
-
-
-########################################################################
-# UNIX
-if (UNIX)
-    # import pkg-config
-    find_package(PkgConfig QUIET)
-    if (PKG_CONFIG_FOUND)
-        pkg_check_modules(sodium_PKG QUIET libsodium)
-    endif()
-
-    if(sodium_USE_STATIC_LIBS)
-        foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
-            if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
-                list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
-            endif()
-        endforeach()
-        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
-
-        # if pkgconfig for libsodium doesn't provide
-        # static lib info, then override PKG_STATIC here..
-        if (NOT sodium_PKG_STATIC_FOUND)
-            set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
-        endif()
-
-        set(XPREFIX sodium_PKG_STATIC)
-    else()
-        if (NOT sodium_PKG_FOUND)
-            set(sodium_PKG_LIBRARIES sodium)
-        endif()
-
-        set(XPREFIX sodium_PKG)
-    endif()
-
-    find_path(sodium_INCLUDE_DIR sodium.h
-        HINTS ${${XPREFIX}_INCLUDE_DIRS}
-    )
-    find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES}
-        HINTS ${${XPREFIX}_LIBRARY_DIRS}
-    )
-    find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES}
-        HINTS ${${XPREFIX}_LIBRARY_DIRS}
-    )
-
-
-########################################################################
-# Windows
-elseif (WIN32)
-    set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
-    mark_as_advanced(sodium_DIR)
-
-    find_path(sodium_INCLUDE_DIR sodium.h
-        HINTS ${sodium_DIR}
-        PATH_SUFFIXES include
-    )
-
-    if (MSVC)
-        # detect target architecture
-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
-            #if defined _M_IX86
-            #error ARCH_VALUE x86_32
-            #elif defined _M_X64
-            #error ARCH_VALUE x86_64
-            #endif
-            #error ARCH_VALUE unknown
-        ]=])
-        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
-            OUTPUT_VARIABLE _COMPILATION_LOG
-        )
-        string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
-
-        # construct library path
-        if (_TARGET_ARCH STREQUAL "x86_32")
-            string(APPEND _PLATFORM_PATH "Win32")
-        elseif(_TARGET_ARCH STREQUAL "x86_64")
-            string(APPEND _PLATFORM_PATH "x64")
-        else()
-            message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.")
-        endif()
-        string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
-
-        if (MSVC_VERSION LESS 1900)
-            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
-        else()
-            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
-        endif()
-        string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
-
-        if (sodium_USE_STATIC_LIBS)
-            string(APPEND _PLATFORM_PATH "/static")
-        else()
-            string(APPEND _PLATFORM_PATH "/dynamic")
-        endif()
-
-        string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}")
-        string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}")
-
-        find_library(sodium_LIBRARY_DEBUG libsodium.lib
-            HINTS ${sodium_DIR}
-            PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
-        )
-        find_library(sodium_LIBRARY_RELEASE libsodium.lib
-            HINTS ${sodium_DIR}
-            PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
-        )
-        if (NOT sodium_USE_STATIC_LIBS)
-            set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES})
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
-            find_library(sodium_DLL_DEBUG libsodium
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
-            )
-            find_library(sodium_DLL_RELEASE libsodium
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
-            )
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
-        endif()
-
-    elseif(_GCC_COMPATIBLE)
-        if (sodium_USE_STATIC_LIBS)
-            find_library(sodium_LIBRARY_DEBUG libsodium.a
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES lib
-            )
-            find_library(sodium_LIBRARY_RELEASE libsodium.a
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES lib
-            )
-        else()
-            find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES lib
-            )
-            find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES lib
-            )
-
-            file(GLOB _DLL
-                LIST_DIRECTORIES false
-                RELATIVE "${sodium_DIR}/bin"
-                "${sodium_DIR}/bin/libsodium*.dll"
-            )
-            find_library(sodium_DLL_DEBUG ${_DLL} libsodium
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES bin
-            )
-            find_library(sodium_DLL_RELEASE ${_DLL} libsodium
-                HINTS ${sodium_DIR}
-                PATH_SUFFIXES bin
-            )
-        endif()
-    else()
-        message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
-    endif()
-
-
-########################################################################
-# unsupported
-else()
-    message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
-endif()
-
-
-########################################################################
-# common stuff
-
-# extract sodium version
-if (sodium_INCLUDE_DIR)
-    set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
-    if (EXISTS _VERSION_HEADER)
-        file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
-        string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
-            sodium_VERSION "${_VERSION_HEADER_CONTENT}")
-        set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
-    endif()
-endif()
-
-# communicate results
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-    sodium # The name must be either uppercase or match the filename case.
-    REQUIRED_VARS
-        sodium_LIBRARY_RELEASE
-        sodium_LIBRARY_DEBUG
-        sodium_INCLUDE_DIR
-    VERSION_VAR
-        sodium_VERSION
-)
-
-if(Sodium_FOUND)
-    set(sodium_LIBRARIES
-        optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
-endif()
-
-# mark file paths as advanced
-mark_as_advanced(sodium_INCLUDE_DIR)
-mark_as_advanced(sodium_LIBRARY_DEBUG)
-mark_as_advanced(sodium_LIBRARY_RELEASE)
-if (WIN32)
-    mark_as_advanced(sodium_DLL_DEBUG)
-    mark_as_advanced(sodium_DLL_RELEASE)
-endif()
-
-# create imported target
-if(sodium_USE_STATIC_LIBS)
-    set(_LIB_TYPE STATIC)
-else()
-    set(_LIB_TYPE SHARED)
-endif()
-add_library(sodium ${_LIB_TYPE} IMPORTED)
-
-set_target_properties(sodium PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-)
-
-if (sodium_USE_STATIC_LIBS)
-    set_target_properties(sodium PROPERTIES
-        INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC"
-        IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
-        IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
-    )
-else()
-    if (UNIX)
-        set_target_properties(sodium PROPERTIES
-            IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
-            IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
-        )
-    elseif (WIN32)
-        set_target_properties(sodium PROPERTIES
-            IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}"
-            IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}"
-        )
-        if (NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
-            set_target_properties(sodium PROPERTIES
-                IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}"
-            )
-        endif()
-        if (NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
-            set_target_properties(sodium PROPERTIES
-                IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}"
-                IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}"
-                IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}"
-            )
-        endif()
-    endif()
-endif()
diff --git a/src/dashbls/configure.ac b/src/dashbls/configure.ac
deleted file mode 100644
index 56b8a78339e0..000000000000
--- a/src/dashbls/configure.ac
+++ /dev/null
@@ -1,913 +0,0 @@
-AC_PREREQ([2.60])
-AC_INIT([libdashbls],[2.0])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([build-aux/m4])
-
-dnl Unless the user specified ARFLAGS, force it to be cr
-AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
-if test "x${ARFLAGS+set}" != "xset"; then
-  ARFLAGS="qc"
-fi
-
-AC_CANONICAL_HOST
-
-AH_TOP([#ifndef RLC_CONF_H])
-AH_TOP([#define RLC_CONF_H])
-AH_BOTTOM([#endif /*RLC_CONF_H*/])
-AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
-
-dnl faketime messes with timestamps and causes configure to be re-run.
-dnl --disable-maintainer-mode can be used to bypass this.
-AM_MAINTAINER_MODE([enable])
-
-dnl make the compilation flags quiet unless V=1 is used
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl Compiler checks (here before libtool).
-if test "x${CFLAGS+set}" = "xset"; then
-  CFLAGS_overridden=yes
-else
-  CFLAGS_overridden=no
-fi
-if test "x${CXXFLAGS+set}" = "xset"; then
-  CXXFLAGS_overridden=yes
-else
-  CXXFLAGS_overridden=no
-fi
-
-AC_PROG_CC
-
-AC_PROG_CXX
-
-dnl By default, libtool for mingw refuses to link static libs into a dll for
-dnl fear of mixing pic/non-pic objects, and import/export complications. Since
-dnl we have those under control, re-enable that functionality.
-case $host in
-  *mingw*)
-     lt_cv_deplibs_check_method="pass_all"
-  ;;
-esac
-dnl Require C++14 compiler (no GNU extensions)
-AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory], [nodefault])
-
-dnl Libtool init checks.
-LT_INIT([pic-only])
-
-AC_PATH_TOOL(AR, ar)
-AC_PATH_TOOL(RANLIB, ranlib)
-AC_PATH_TOOL(STRIP, strip)
-
-AM_PROG_AS
-
-AC_ARG_ENABLE([tests],
-  [AS_HELP_STRING([--enable-tests],
-  [Compile with tests [default=yes]])],
-  [use_tests=$enableval],
-  [use_tests=yes])
-
-AC_ARG_ENABLE([bench],
-  [AS_HELP_STRING([--enable-bench],
-  [Compile with benchmarks [default=yes]])],
-  [use_bench=$enableval],
-  [use_bench=yes])
-
-AC_ARG_ENABLE([hardening],
-  [AS_HELP_STRING([--enable-hardening],
-  [Enable hardening flags and arguments [default=auto]])],
-  [use_hardening=$enableval],
-  [use_hardening=auto])
-
-AC_ARG_ENABLE([optimizations],
-  [AS_HELP_STRING([--enable-optimizations],
-  [Enable compiler and library optimizations [default=yes]])],
-  [use_optimizations=$enableval],
-  [use_optimizations=yes])
-
-AC_ARG_ENABLE([debug],
-  [AS_HELP_STRING([--enable-debug],
-  [Build with debugging support [default=no]])],
-  [use_debug=$enableval],
-  [use_debug=no])
-
-AC_LANG_PUSH([C])
-
-dnl Check for a flag to turn compiler warnings into errors. This is helpful for checks which may
-dnl appear to succeed because by default they merely emit warnings when they fail.
-dnl
-dnl Note that this is not necessarily a check to see if -Werror is supported, but rather to see if
-dnl a compile with -Werror can succeed. This is important because the compiler may already be
-dnl warning about something unrelated, for example about some path issue. If that is the case,
-dnl -Werror cannot be used because all of those warnings would be turned into errors.
-AX_CHECK_COMPILE_FLAG([-Werror], [FLAG_WERROR="-Werror"], [FLAG_WERROR=""])
-
-if test x"$use_debug" = x"yes" -o x"$use_optimizations" = x"no"; then
-  dnl Clear default -g -O2 flags
-  if test x"$CFLAGS_overridden" = x"no"; then
-    CFLAGS=""
-  fi
-  if test x"$CXXFLAGS_overridden" = x"no"; then
-    CXXFLAGS=""
-  fi
-
-  dnl Disable optimizations
-  AX_CHECK_COMPILE_FLAG([-O0], [[DEBUG_FLAGS="$DEBUG_FLAGS -O0"]], [], [[$FLAG_WERROR]])
-
-  if test x"$use_debug" = x"yes"; then
-    dnl Prefer -g3, fall back to -g if that is unavailable.
-    AX_CHECK_COMPILE_FLAG(
-      [-g3],
-      [[DEBUG_FLAGS="$DEBUG_FLAGS -g3"]],
-      [AX_CHECK_COMPILE_FLAG([-g],[[DEBUG_FLAGS="$DEBUG_FLAGS -g"]])], [[$FLAG_WERROR]])
-
-    AX_CHECK_COMPILE_FLAG([-ftrapv],[DEBUG_FLAGS="$DEBUG_FLAGS -ftrapv"], [], [[$FLAG_WERROR]])
-  else
-    dnl Reintroduce -g flag deleted during C(XX)FLAGS reset
-    AX_CHECK_COMPILE_FLAG([-g],[[DEBUG_FLAGS="$DEBUG_FLAGS -g"]], [], [[$FLAG_WERROR]])
-
-    dnl -ftrapv and -fwrapv conflict, so we only set this if use_debug=no
-    AX_CHECK_COMPILE_FLAG([-fwrapv],[DEBUG_FLAGS="$DEBUG_FLAGS -fwrapv"], [], [[$FLAG_WERROR]])
-  fi
-fi
-
-dnl Define enum mappings for relic config
-AC_DEFINE([RLC_VERSION], ["0.5.0"], [Relic Version])
-
-dnl dashbls: Library processor architecture
-AC_DEFINE([AVR],     [1], [Atmel AVR ATMega128 8-bit architecture.])
-AC_DEFINE([MSP],     [2], [MSP430 16-bit architecture.])
-AC_DEFINE([ARM],     [3], [ARM 32-bit architecture.])
-AC_DEFINE([X86],     [4], [Intel x86-compatible 32-bit architecture.])
-AC_DEFINE([X64],     [5], [AMD64-compatible 64-bit architecture.])
-
-dnl Relic: Generic options
-AC_DEFINE([RELIC_NONE],    [0], [Unknown or unrecognized parameter.])
-
-dnl Relic: Arithmetic backends
-AC_DEFINE([EASY],    [1], [Easy C-only backend.])
-AC_DEFINE([GMP],     [2], [Backend based on GNU Multiple Precision library.])
-AC_DEFINE([GMP_SEC], [3], [Backend based on GNU Multiple Precision library, but using constant-time code.])
-
-AC_DEFUN([GMP_CHECK],[
-  AC_REQUIRE([AC_PROG_CC])
-
-  CPPFLAGS_TEMP="$CPPFLAGS"
-  CPPFLAGS="$GMP_CPPFLAGS $CPPFLAGS"
-  LIBS_TEMP="$LIBS"
-  LIBS="$GMP_LDFLAGS $LIBS"
-
-  AC_CHECK_HEADER(
-    gmp.h,
-    [AC_CHECK_LIB(gmp, __gmpz_init, [], [gmp_fail_reason="libgmp not found or unusable"; has_gmp=no;])],
-    [gmp_fail_reason="gmp header not found"; has_gmp=no;]
-  )
-
-  if test x"$has_gmp" != x"no"; then
-    # Proper support for macOS aarch64 was introduced in 6.3.0, but LTS distros
-    # like Ubuntu 20.04 (focal) use 6.2.0, so, the minimum supported version is
-    # determined by platform and architecture.
-    case $host in
-      *darwin*)
-        case $host_cpu in
-          aarch*)
-            gmp_major_version=6
-            gmp_minor_version=3
-            ;;
-        esac
-        ;;
-      *)
-        gmp_major_version=6
-        gmp_minor_version=2
-        ;;
-    esac
-    AC_MSG_CHECKING([gmp version >= $gmp_major_version.$gmp_minor_version])
-    AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-        [[@%:@include <gmp.h>]],
-        [[
-          @%:@if __GNU_MP_VERSION < $gmp_major_version || __GNU_MP_VERSION_MINOR < $gmp_minor_version
-            @%:@error Unsupported GMP version
-          @%:@endif]])],
-      [AC_MSG_RESULT([yes]); GMP_LIBS="-lgmp"; has_gmp=yes;],
-      [AC_MSG_RESULT([no]); gmp_fail_reason="unsupported gmp version"; has_gmp=no;]
-    )
-  fi
-
-  if test x"$want_backend" = x"gmp" && test x"$has_gmp" = x"no"; then
-    AC_MSG_ERROR([$gmp_fail_reason])
-  fi
-
-  CPPFLAGS="$CPPFLAGS_TEMP"
-  LIBS="$LIBS_TEMP"
-])
-
-AC_ARG_WITH([backend],
-  [AS_HELP_STRING([--with-backend=auto|easy|gmp],
-  [backend implementation to use [default=auto]])],
-  [want_backend=$withval],
-  [want_backend=auto]
-)
-
-case $host in
-  *darwin*)
-    AC_PATH_PROG([BREW],brew,)
-    if test x$BREW != x; then
-      # These Homebrew packages may be keg-only, meaning that they won't be found
-      # in expected paths because they may conflict with system files. Ask
-      # Homebrew where each one is located, then adjust paths accordingly.
-      gmp_prefix=`$BREW --prefix gmp 2>/dev/null`
-      if test x$gmp_prefix != x; then
-        GMP_CPPFLAGS="-I$gmp_prefix/include"
-        GMP_LDFLAGS="-L$gmp_prefix/lib"
-      fi
-    fi
-    ;;
-  *freebsd*)
-    GMP_CPPFLAGS="-I/usr/local/include"
-    GMP_LDFLAGS="-L/usr/local/lib"
-    ;;
-esac
-
-if test x"$want_backend" = x"auto"; then
-  if test x"$use_optimizations" = x"no"; then
-    want_backend=easy
-  else
-    GMP_CHECK
-    if test x"$has_gmp" = x"yes"; then
-      want_backend=gmp
-    else
-      want_backend=easy
-    fi
-  fi
-else
-  case $want_backend in
-  gmp)
-    dnl GMP_CHECK will report the reason if and why the backend cannot be used.
-    GMP_CHECK
-    ;;
-  easy)
-    ;;
-  *)
-    AC_MSG_ERROR([invalid backend explicitly requested])
-    ;;
-  esac
-fi
-
-case $want_backend in
-gmp)
-  AC_DEFINE(ARITH, GMP, [Define if GNU MP backend is requested])
-  ;;
-easy)
-  AC_DEFINE(ARITH, EASY, [Define if C-only backend is requested].)
-  ;;
-*)
-  AC_MSG_ERROR([invalid backend explicitly requested])
-  ;;
-esac
-
-dnl Relic: Multithreading APIs
-AC_DEFINE([OPENMP],  [1], [OpenMP multithreading support.])
-AC_DEFINE([PTHREAD], [2], [POSIX multithreading support.])
-
-dnl Relic: Supported operating systems
-AC_DEFINE([LINUX],   [1], [GNU/Linux operating system.])
-AC_DEFINE([FREEBSD], [2], [FreeBSD operating system.])
-AC_DEFINE([MACOSX],  [3], [MacOS operating system.])
-AC_DEFINE([WINDOWS], [4], [Windows operating system.])
-AC_DEFINE([DROID],   [5], [Android operating system.])
-AC_DEFINE([DUINO],   [6], [Arduino platform.])
-dnl AC_DEFINE([OPENBSD], [7], [OpenBSD operating system.])
-
-dnl Relic: Supported timers
-AC_DEFINE([HREAL],   [1], [Per-process high-resolution timer.])
-AC_DEFINE([HPROC],   [2], [Per-process high-resolution timer.])
-AC_DEFINE([HTHRD],   [3], [Per-thread high-resolution timer.])
-AC_DEFINE([ANSI],    [5], [ANSI-compatible timer.])
-AC_DEFINE([POSIX],   [4], [POSIX-compatible timer.])
-AC_DEFINE([CYCLE],   [6], [Cycle-counting timer.])
-AC_DEFINE([PERF],    [7], [Performance monitoring framework.])
-
-dnl Relic: Memory-allocation policies
-AC_DEFINE([AUTO],    [1], [Automatic memory allocation.])
-AC_DEFINE([DYNAMIC], [2], [Dynamic memory allocation.])
-
-dnl Relic (CP): Support for faster CRT-based exponentiation in factoring-based cryptosystems
-AC_DEFINE([PKCS1],   [2], [RSA PKCS#1 v1.5 padding.])
-AC_DEFINE([PKCS2],   [3], [RSA PKCS#1 v2.1 padding.])
-
-dnl Relic (MD): Available hash functions
-AC_DEFINE([SH224],   [2], [SHA-224 hash function.])
-AC_DEFINE([SH256],   [3], [SHA-256 hash function.])
-AC_DEFINE([SH384],   [4], [SHA-384 hash function.])
-AC_DEFINE([SH512],   [5], [SHA-512 hash function.])
-AC_DEFINE([B2S160],  [6], [BLAKE2s-160 hash function.])
-AC_DEFINE([B2S256],  [7], [BLAKE2s-256 hash function.])
-
-dnl Relic (RAND): Available pseudo-random number generators
-AC_DEFINE([HASHD],   [1], [NIST HASH-DRBG generator.])
-AC_DEFINE([RDRND],   [2], [Intel RdRand instruction.])
-AC_DEFINE([UDEV],    [3], [Operating system underlying generator.])
-AC_DEFINE([CALL],    [4], [Override library generator with the callback.])
-
-dnl Relic (RAND): Available random number generator seeders
-AC_DEFINE([LIBC],    [1], [Standard C library generator.])
-dnl AC_DEFINE([RDRND],   [2], [Intel RdRand instruction.])
-dnl AC_DEFINE([UDEV],    [3], [Operating system underlying generator.])
-AC_DEFINE([WCGR],    [4], [Use Windows' CryptGenRandom.])
-
-dnl Relic (BN): Options for the multiple precision
-AC_DEFINE([SINGLE],  [1], [A multiple precision integer can store w words.])
-AC_DEFINE([CARRY],   [2], [A multiple precision integer can store the result of an addition.])
-AC_DEFINE([DOUBLE],  [3], [A multiple precision integer can store the result of a multiplication.])
-
-AC_DEFINE([BASIC],   [1], [Basic method.])
-AC_DEFINE([PRIME],   [1], [Prime curves.])
-AC_DEFINE([TATEP],   [1], [Tate pairing.])
-AC_DEFINE([COMBA],   [2], [Comba method.])
-AC_DEFINE([LEHME],   [2], [Lehmer's fast GCD Algorithm.])
-AC_DEFINE([SAFEP],   [2], [Safe prime generation.])
-AC_DEFINE([QUICK],   [2], [Fast reduction modulo special form prime.])
-AC_DEFINE([BINAR],   [2], [Binary inversion.])
-AC_DEFINE([LAZYR],   [2], [Lazy-reduced extension field arithmetic.])
-AC_DEFINE([LODAH],   [2], [Lopez-Dahab multiplication.])
-AC_DEFINE([SLIDE],   [2], [Sliding window modular exponentiation.])
-AC_DEFINE([PROJC],   [2], [Projective coordinates.])
-AC_DEFINE([COMBS],   [2], [Single-table comb method.])
-AC_DEFINE([TRICK],   [2], [Shamir's trick.])
-AC_DEFINE([CHAR2],   [2], [Binary curves.])
-AC_DEFINE([WEILP],   [2], [Weil pairing.])
-AC_DEFINE([MONTY],   [3], [Montgomery method.])
-AC_DEFINE([STEIN],   [3], [Stein's binary GCD Algorithm.])
-AC_DEFINE([STRON],   [3], [Strong prime generation.])
-AC_DEFINE([INTEG],   [3], [Integrated modular addtion.])
-AC_DEFINE([INTER],   [3], [Interleaving of w-(T)NAFs.])
-AC_DEFINE([ALMOS],   [3], [Almost inverse algorithm.])
-AC_DEFINE([JACOB],   [3], [Jacobian coordinates.])
-AC_DEFINE([COMBD],   [3], [Double-table comb method.])
-AC_DEFINE([HALVE],   [3], [Halving.])
-AC_DEFINE([EDDIE],   [3], [Edwards curves.])
-AC_DEFINE([EXTND],   [3], [Extended projective twisted Edwards coordinates.])
-AC_DEFINE([OATEP],   [3], [Optimal ate pairing.])
-AC_DEFINE([PMERS],   [4], [Pseudo-Mersenne method.])
-AC_DEFINE([MULTP],   [4], [Reuse multiplication for squaring.])
-AC_DEFINE([EXGCD],   [4], [Extended Euclidean algorithm.])
-AC_DEFINE([LWNAF],   [4], [Left-to-right Width-w NAF.])
-AC_DEFINE([JOINT],   [4], [Joint sparse form.])
-AC_DEFINE([DIVST],   [5], [Constant-time inversion by Bernstein-Yang division steps.])
-AC_DEFINE([ITOHT],   [5], [Itoh-Tsuji inversion.])
-AC_DEFINE([LWREG],   [5], [Left-to-right Width-w NAF.])
-AC_DEFINE([BRUCH],   [6], [Hardware-friendly inversion by Brunner-Curiger-Hofstetter.])
-AC_DEFINE([CTAIA],   [7], [Constant-time version of almost inverse.])
-AC_DEFINE([LOWER],   [8], [Use implementation provided by the lower layer.])
-
-if test x"$use_debug" = x"yes"; then
-  AC_DEFINE([DEBUG],   [1], [Define this symbol if debugging support is enabled])
-fi
-
-dnl Define relic switches
-AC_ARG_ENABLE([profiling],
-  [AS_HELP_STRING([--enable-profiling],
-  [Build with profiling support [default=no]])],
-  [use_profiling=$enableval],
-  [use_profiling=no])
-
-if test x$use_profiling = xyes; then
-  AC_DEFINE([PROFL],   [1], [Define this symbol if profiling support is enabled])
-fi
-
-AC_ARG_ENABLE([check],
-  [AS_HELP_STRING([--enable-check],
-  [Build with error-checking support [default=no]])],
-  [use_check=$enableval],
-  [use_check=no])
-
-if test x$use_check = xyes; then
-  AC_DEFINE([CHECK],   [1], [Define this symbol if error-checking support is enabled])
-fi
-
-AC_ARG_ENABLE([verbs],
-  [AS_HELP_STRING([--enable-verbs],
-  [Build with detailed error messages [default=no]])],
-  [use_verbs=$enableval],
-  [use_verbs=no])
-
-if test x$use_verbs = xyes; then
-  AC_DEFINE([VERBS],   [1], [Define this symbol if detailed error messages are enabled])
-fi
-
-AC_ARG_ENABLE([overhead],
-  [AS_HELP_STRING([--enable-overhead],
-  [Build with overhead estimation [default=no]])],
-  [use_overhead=$enableval],
-  [use_overhead=no])
-
-if test x$use_overhead = xyes; then
-  AC_DEFINE([OVERH],   [1], [Define this symbol if overhead estimation is enabled])
-fi
-
-AC_ARG_ENABLE([quiet],
-  [AS_HELP_STRING([--enable-quiet],
-  [Build with printing disabled [default=yes]])],
-  [use_quiet=$enableval],
-  [use_quiet=yes])
-
-if test x$use_quiet = xyes; then
-  AC_DEFINE([QUIET],   [1], [Define this symbol if printing is disabled])
-fi
-
-AC_ARG_ENABLE([color],
-  [AS_HELP_STRING([--enable-color],
-  [Build with colored output support [default=yes]])],
-  [use_color=$enableval],
-  [use_color=yes])
-
-if test x$use_color = xyes; then
-  AC_DEFINE([COLOR],   [1], [Define this symbol if colored output is enabled])
-fi
-
-AC_ARG_ENABLE([big_endian],
-  [AS_HELP_STRING([--enable-big-endian],
-  [Build with big-endian support [default=no]])],
-  [use_big_endian=$enableval],
-  [use_big_endian=no])
-
-if test x$use_big_endian = xyes; then
-  AC_DEFINE([BIGED],   [1], [Define this symbol if big-endian support is enabled])
-fi
-
-use_pkgconfig=yes
-
-if test x"$use_optimizations" = x"yes"; then
-  case $host_cpu in
-    amd64 | x86_64)
-      dnl Support for AMD64 (also known as x86_64 on some platforms) processors
-      CPU_ARCH="x64"
-      AC_DEFINE([ARCH], [X64], [Architecture.])
-      AC_DEFINE([WSIZE], [64], [Size of word in this architecture.])
-      ;;
-    aarch*)
-      dnl Support for 64-bit ARM processors
-      dnl Relic does not support aarch64 yet, set CPU_ARCH to none and ARCH to RELIC_NONE.
-      CPU_ARCH="none"
-      AC_DEFINE([ARCH], [RELIC_NONE], [Architecture.])
-      AC_DEFINE([WSIZE], [64], [Size of word in this architecture.])
-      ;;
-    i?86)
-      dnl Support for Intel x86 processors
-      CPU_ARCH="x86"
-      AC_DEFINE([ARCH], [X86], [Architecture.])
-      AC_DEFINE([WSIZE], [32], [Size of word in this architecture.])
-      ;;
-    arm*)
-      dnl Support for 32-bit native ARM processors
-      CPU_ARCH="arm"
-      AC_DEFINE([ARCH], [ARM], [Architecture.])
-      AC_DEFINE([WSIZE], [32], [Size of word in this architecture.])
-      ;;
-    *64*)
-      dnl Support for an undefined 64-bit architecture
-      CPU_ARCH="none"
-      AC_DEFINE([ARCH], [RELIC_NONE], [Architecture.])
-      AC_DEFINE([WSIZE], [64], [Size of word in this architecture.])
-      ;;
-    *32*)
-      dnl Support for an undefined 32-bit architecture
-      CPU_ARCH="none"
-      AC_DEFINE([ARCH], [RELIC_NONE], [Architecture.])
-      AC_DEFINE([WSIZE], [32], [Size of word in this architecture.])
-      ;;
-    *)
-      AC_MSG_ERROR([Unable to determine host architecture, may not be supported!])
-      ;;
-  esac
-else
-  case $host_cpu in
-    *64*)
-      dnl Support for an undefined 64-bit architecture
-      CPU_ARCH="none"
-      AC_DEFINE([ARCH], [RELIC_NONE], [Architecture.])
-      AC_DEFINE([WSIZE], [64], [Size of word in this architecture.])
-      ;;
-    *32* | arm* | i?86)
-      dnl Support for an undefined 32-bit architecture
-      CPU_ARCH="none"
-      AC_DEFINE([ARCH], [RELIC_NONE], [Architecture.])
-      AC_DEFINE([WSIZE], [32], [Size of word in this architecture.])
-      ;;
-    *)
-      AC_MSG_ERROR([Unable to determine host architecture, may not be supported!])
-      ;;
-  esac
-fi
-
-case $host in
-  *darwin*)
-     AC_DEFINE([OPSYS], [MACOSX], [Detected operation system.])
-     TARGET_OS=darwin
-
-     AC_PATH_PROG([BREW],brew,)
-     if test x$BREW = x; then
-       AC_PATH_PROG([PORT],port,)
-       # If homebrew isn't installed and macports is, add the macports default paths
-       # as a last resort.
-       if test x$PORT != x; then
-         CPPFLAGS="$CPPFLAGS -isystem /opt/local/include"
-         LDFLAGS="$LDFLAGS -L/opt/local/lib"
-       fi
-     fi
-     ;;
-  *mingw*)
-     AC_DEFINE([OPSYS], [WINDOWS], [Detected operation system.])
-     TARGET_OS=windows
-
-     use_pkgconfig=no
-     LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"
-
-     dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
-     dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
-     dnl its command here, with the predeps/postdeps removed, and -static inserted. Postdeps are
-     dnl also overridden to prevent their insertion later.
-     dnl This should only affect dll's.
-     archive_cmds_CXX="\$CC -shared \$libobjs \$deplibs \$compiler_flags -static -o \$output_objdir/\$soname \${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker \$lib"
-     postdeps_CXX=
-     ;;
-  *linux*)
-    AC_DEFINE([OPSYS], [LINUX], [Detected operation system.])
-    TARGET_OS=linux
-
-    RELIC_CPPFLAGS="-D_GNU_SOURCE"
-    ;;
-  *android*)
-    AC_DEFINE([OPSYS], [DROID], [Detected operation system.])
-    TARGET_OS=android
-    ;;
-  *freebsd*)
-    AC_DEFINE([OPSYS], [FREEBSD], [Detected operation system.])
-    TARGET_OS=freebsd
-    ;;
-  *netbsd*)
-    AC_DEFINE([OPSYS], [NETBSD], [Detected operation system.])
-    TARGET_OS=netbsd
-    ;;
-  *)
-    AC_DEFINE([OPSYS], [RELIC_NONE], [Detected operation system.])
-    ;;
-esac
-
-case $host in
-  *darwin*)
-    dnl Relic: Don't define FP_QNRES on Darwin
-    AC_DEFINE([SEED], [UDEV], [Chosen random generator seeder.])
-    ;;
-  *mingw*)
-    AC_DEFINE([FP_QNRES], [], [Use -1 as quadratic non-residue.])
-    AC_DEFINE([SEED], [WCGR], [Chosen random generator seeder.])
-    ;;
-  *)
-    AC_DEFINE([FP_QNRES], [], [Use -1 as quadratic non-residue.])
-    AC_DEFINE([SEED], [UDEV], [Chosen random generator seeder.])
-    ;;
-esac
-
-if test x$use_pkgconfig = xyes; then
-  m4_ifndef([PKG_PROG_PKG_CONFIG], [AC_MSG_ERROR(PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh.)])
-  m4_ifdef([PKG_PROG_PKG_CONFIG], [
-  PKG_PROG_PKG_CONFIG
-  if test x"$PKG_CONFIG" = "x"; then
-    AC_MSG_ERROR(pkg-config not found.)
-  fi
-  ])
-fi
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -pipe"
-AC_MSG_CHECKING([if ${CC} supports -pipe])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[char foo;]])],
-    [ AC_MSG_RESULT([yes]) ],
-    [ AC_MSG_RESULT([no])
-      CFLAGS="$saved_CFLAGS"
-    ])
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fomit-frame-pointer"
-AC_MSG_CHECKING([if ${CC} supports -fomit-frame-pointer])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[char foo;]])],
-    [ AC_MSG_RESULT([yes]) ],
-    [ AC_MSG_RESULT([no])
-      CFLAGS="$saved_CFLAGS"
-    ])
-
-if test x"$CFLAGS_overridden" = x"no" -a x"$CXXFLAGS_overridden" = x"no"; then
-  dnl Enable warnings
-  AX_CHECK_COMPILE_FLAG([-Wall],[WARN_FLAGS="$WARN_FLAGS -Wall"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wcast-align],[WARN_FLAGS="$WARN_FLAGS -Wcast-align"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wextra],[WARN_FLAGS="$WARN_FLAGS -Wextra"], [], [[$FLAG_WERROR]])
-
-  dnl Exclude known warnings
-  AX_CHECK_COMPILE_FLAG([-Wlong-long],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-long-long"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wshadow],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-shadow"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wsign-compare],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-sign-compare"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-strict-prototypes"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wunused-function],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-unused-function"], [], [[$FLAG_WERROR]])
-  AX_CHECK_COMPILE_FLAG([-Wunused-parameter],[NOWARN_FLAGS="$NOWARN_FLAGS -Wno-unused-parameter"], [], [[$FLAG_WERROR]])
-fi
-
-dnl set default settings for relic
-AC_DEFINE([ALIGN], [1], [Byte boundary to align digit vectors.])
-
-AC_DEFINE(WITH_BN,, Build multiple precision integer module.)
-AC_DEFINE(WITH_DV,, Temporary double-precision digit vectors.)
-AC_DEFINE(WITH_FP,, Build prime field module.)
-AC_DEFINE(WITH_FPX,, Build prime field extension module.)
-AC_DEFINE(WITH_FB,, Build binary field module.)
-AC_DEFINE(WITH_FBX,, Build binary field extension module.)
-AC_DEFINE(WITH_EP,, Build prime elliptic curve module.)
-AC_DEFINE(WITH_EPX,, Build prime field extension elliptic curve module.)
-AC_DEFINE(WITH_EB,, Build binary elliptic curve module.)
-AC_DEFINE(WITH_ED,, Build elliptic Edwards curve module.)
-AC_DEFINE(WITH_EC,, Build elliptic curve cryptography module.)
-AC_DEFINE(WITH_PP,, Build pairings over prime curves module.)
-AC_DEFINE(WITH_PC,, Build pairing-based cryptography module.)
-AC_DEFINE(WITH_BC,, Build block ciphers.)
-AC_DEFINE(WITH_MD,, Build hash functions.)
-AC_DEFINE(WITH_CP,, Build cryptographic protocols.)
-AC_DEFINE(WITH_MPC,, Build Multi-party computation primitives.)
-
-AC_DEFINE(BN_PRECI, 1024, Required precision in bits.)
-AC_DEFINE(BN_KARAT, 0, Number of Karatsuba steps.)
-AC_DEFINE(BN_MAGNI, [DOUBLE], Effective size of a multiple precision integer.)
-
-AC_DEFINE(BN_METHD, "COMBA;COMBA;MONTY;SLIDE;BASIC;BASIC", Multiple precision arithmetic method.)
-AC_DEFINE(BN_MUL, COMBA, Chosen multiple precision multiplication method.)
-AC_DEFINE(BN_SQR, COMBA, Chosen multiple precision multiplication method.)
-AC_DEFINE(BN_MOD, MONTY, Chosen multiple precision modular reduction method.)
-AC_DEFINE(BN_MXP, SLIDE, Chosen multiple precision modular exponentiation method.)
-AC_DEFINE(BN_GCD, BASIC, Chosen multiple precision greatest common divisor method.)
-AC_DEFINE(BN_GEN, BASIC, Chosen prime generation algorithm.)
-
-AC_DEFINE(FP_PRIME, 381, Prime field size in bits.)
-AC_DEFINE(FP_METHD, "INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE", Prime field arithmetic method.)
-AC_DEFINE(FP_KARAT, 0, Number of Karatsuba steps.)
-AC_DEFINE(FP_WIDTH, 4, Width of window processing for exponentiation methods.)
-AC_DEFINE(FP_ADD, INTEG, Chosen prime field multiplication method.)
-AC_DEFINE(FP_MUL, INTEG, Chosen prime field multiplication method.)
-AC_DEFINE(FP_SQR, INTEG, Chosen prime field multiplication method.)
-AC_DEFINE(FP_RDC, MONTY, Chosen prime field reduction method.)
-AC_DEFINE(FP_INV, LOWER, Chosen prime field inversion method.)
-AC_DEFINE(FP_EXP, SLIDE, Chosen multiple precision modular exponentiation method.)
-
-AC_DEFINE(FPX_METHD, "INTEG;INTEG;LAZYR", Prime extension field arithmetic method.)
-AC_DEFINE(FPX_QDR, INTEG, Chosen extension field arithmetic method.)
-AC_DEFINE(FPX_CBC, INTEG, Chosen extension field arithmetic method.)
-AC_DEFINE(FPX_RDC, LAZYR, Chosen extension field arithmetic method.)
-
-AC_DEFINE(FB_METHD, "LODAH;QUICK;QUICK;QUICK;QUICK;QUICK;EXGCD;SLIDE;QUICK", Binary field arithmetic method)
-AC_DEFINE(FB_POLYN, 283, Irreducible polynomial size in bits.)
-AC_DEFINE(FB_KARAT, 0, Number of Karatsuba levels.)
-AC_DEFINE(FB_TRINO,, Prefer trinomials over pentanomials.)
-AC_DEFINE(FB_PRECO,, Precompute multiplication table for sqrt(z).)
-AC_DEFINE(FB_WIDTH, 4, Width of window processing for exponentiation methods.)
-AC_DEFINE(FB_MUL, LODAH, Chosen binary field multiplication method.)
-AC_DEFINE(FB_SQR, QUICK, Chosen binary field squaring method.)
-AC_DEFINE(FB_RDC, QUICK, Chosen binary field modular reduction method.)
-AC_DEFINE(FB_SRT, QUICK, Chosen binary field modular reduction method.)
-AC_DEFINE(FB_TRC, QUICK, Chosen trace computation method.)
-AC_DEFINE(FB_SLV, QUICK, Chosen method to solve a quadratic equation.)
-AC_DEFINE(FB_INV, EXGCD, Chosen binary field inversion method.)
-AC_DEFINE(FB_EXP, SLIDE, Chosen multiple precision modular exponentiation method.)
-AC_DEFINE(FB_ITR, QUICK, Chosen method to solve a quadratic equation.)
-
-AC_DEFINE(EP_METHD, "PROJC;LWNAF;COMBS;INTER", Prime elliptic curve arithmetic method.)
-AC_DEFINE(EP_ENDOM,, Support for prime curves with efficient endormorphisms.)
-AC_DEFINE(EP_MIXED,, Use mixed coordinates.)
-AC_DEFINE(EP_PRECO,, Build precomputation table for generator.)
-AC_DEFINE(EP_CTMAP,, Enable isogeny map for SSWU map-to-curve.)
-AC_DEFINE(EP_DEPTH, 4, Width of precomputation table for fixed point methods.)
-AC_DEFINE(EP_WIDTH, 4, Width of window processing for unknown point methods.)
-AC_DEFINE(EP_ADD, PROJC, Chosen prime elliptic curve coordinate method.)
-AC_DEFINE(EP_MUL, LWNAF, Chosen prime elliptic curve point multiplication method.)
-AC_DEFINE(EP_FIX, COMBS, Chosen prime elliptic curve point multiplication method.)
-AC_DEFINE(EP_SIM, INTER, Chosen prime elliptic curve simulteanous point multiplication method.)
-
-AC_DEFINE(EB_METHD, "PROJC;LWNAF;COMBS;INTER", Binary elliptic curve arithmetic method.)
-AC_DEFINE(EB_PLAIN,, Support for ordinary curves without endormorphisms.)
-AC_DEFINE(EB_KBLTZ,, Support for Koblitz anomalous binary curves.)
-AC_DEFINE(EB_MIXED,, Use mixed coordinates.)
-AC_DEFINE(EB_PRECO,, Build precomputation table for generator.)
-AC_DEFINE(EB_DEPTH, 4, Width of precomputation table for fixed point methods.)
-AC_DEFINE(EB_WIDTH, 4, Width of window processing for unknown point methods.)
-AC_DEFINE(EB_ADD, PROJC, Chosen binary elliptic curve coordinate method.)
-AC_DEFINE(EB_MUL, LWNAF, Chosen binary elliptic curve point multiplication method.)
-AC_DEFINE(EB_FIX, COMBS, Chosen binary elliptic curve point multiplication method.)
-AC_DEFINE(EB_SIM, INTER, Chosen binary elliptic curve simulteanous point multiplication method.)
-
-AC_DEFINE(ED_METHD, "PROJC;LWNAF;COMBS;INTER", Edwards elliptic curve arithmetic method.)
-AC_DEFINE(ED_PRECO,, Build precomputation table for generator.)
-AC_DEFINE(ED_DEPTH, 4, Width of precomputation table for fixed point methods.)
-AC_DEFINE(ED_WIDTH, 4, Width of window processing for unknown point methods.)
-AC_DEFINE(ED_ADD, PROJC, Chosen binary elliptic curve coordinate method.)
-AC_DEFINE(ED_MUL, LWNAF, Chosen prime elliptic twisted Edwards curve point multiplication method.)
-AC_DEFINE(ED_FIX, COMBS, Chosen prime elliptic twisted Edwards curve point multiplication method.)
-AC_DEFINE(ED_SIM, INTER, Chosen prime elliptic curve simulteanous point multiplication method.)
-
-AC_DEFINE(EC_METHD, "PRIME", Chosen elliptic curve cryptography method.)
-AC_DEFINE(EC_CUR, PRIME, Chosen elliptic curve type.)
-
-AC_DEFINE(PP_METHD, "LAZYR;OATEP", Bilinear pairing method.)
-AC_DEFINE(PP_EXT, LAZYR, Chosen extension field arithmetic method.)
-AC_DEFINE(PP_MAP, OATEP, Chosen pairing method over prime elliptic curves.)
-
-AC_DEFINE(MD_METHD, "SH256", Choice of hash function.)
-AC_DEFINE(MD_MAP, SH256, Chosen hash function.)
-
-AC_DEFINE(CP_CRT,, Support for faster CRT-based exponentiation in factoring-based cryptosystems.)
-AC_DEFINE(CP_RSAPD, PKCS2, Chosen RSA padding method.)
-
-AC_DEFINE(ALLOC, AUTO, Chosen memory allocation policy.)
-AC_DEFINE(RAND, HASHD, Chosen random generator.)
-AC_DEFINE(MULTI, PTHREAD, Chosen multithreading API.)
-AC_DEFINE(TIMER, CYCLE, Chosen timer.)
-
-dnl Check for pthread compile/link requirements
-AX_PTHREAD
-
-AC_SEARCH_LIBS([clock_gettime],[rt])
-
-if test "$TARGET_OS" != "windows"; then
-  dnl All windows code is PIC, forcing it on just adds useless compile warnings
-  AX_CHECK_COMPILE_FLAG([-fPIC], [HARDENED_FLAGS="$HARDENED_FLAGS -fPIC"], [], [[$FLAG_WERROR]])
-fi
-
-dnl All versions of gcc that we commonly use for building are subject to bug
-dnl https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90348. To work around that, set
-dnl -fstack-reuse=none for all gcc builds. (Only gcc understands this flag)
-AX_CHECK_COMPILE_FLAG([-fstack-reuse=none], [HARDENED_FLAGS="$HARDENED_FLAGS -fstack-reuse=none"], [], [[$FLAG_WERROR]])
-if test "$use_hardening" != "no"; then
-  use_hardening=yes
-  AX_CHECK_COMPILE_FLAG([-Wstack-protector], [HARDENED_FLAGS="$HARDENED_FLAGS -Wstack-protector"])
-  AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [HARDENED_FLAGS="$HARDENED_FLAGS -fstack-protector-all"], [], [[$FLAG_WERROR]])
-
-  AX_CHECK_COMPILE_FLAG([-fcf-protection=full], [HARDENED_FLAGS="$HARDENED_FLAGS -fcf-protection=full"], [], [[$FLAG_WERROR]])
-
-  case $host in
-    *mingw*)
-      dnl stack-clash-protection doesn't currently work, and likely should just be skipped for Windows.
-      dnl See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458 for more details.
-      ;;
-    *)
-      AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [HARDENED_FLAGS="$HARDENED_FLAGS -fstack-clash-protection"], [], [[$FLAG_WERROR]])
-      ;;
-  esac
-
-  case $host in
-    *aarch64*)
-      AX_CHECK_COMPILE_FLAG([-mbranch-protection=bti], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -mbranch-protection=bti"], [], [[$CXXFLAG_WERROR]])
-    ;;
-  esac
-
-  AX_CHECK_LINK_FLAG([-Wl,--enable-reloc-section], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--enable-reloc-section"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,--high-entropy-va], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--high-entropy-va"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,-z,relro], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [])
-  AX_CHECK_LINK_FLAG([-fPIE -pie], [HARDENED_FLAGS="$HARDENED_FLAGS -fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [])
-fi
-
-CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO"
-
-case $host in
-  *mingw*)
-     AC_CHECK_LIB([user32],   [main],                    [], [AC_MSG_ERROR([libuser32 missing])])
-     AC_CHECK_LIB([shell32],  [SHGetSpecialFolderPathW], [], [AC_MSG_ERROR([libshell32 missing])])
-     AC_CHECK_LIB([advapi32], [CryptAcquireContextW],    [], [AC_MSG_ERROR([libadvapi32 missing])])
-     AC_CHECK_LIB([psapi],    [GetProcessMemoryInfo],    [], [AC_MSG_ERROR([libpsapi missing])])
-     AC_CHECK_LIB([bcrypt],   [main],                    [], [AC_MSG_ERROR([libbcrypt missing])])
-
-     dnl -static is interpreted by libtool, where it has a different meaning.
-     dnl In libtool-speak, it's -all-static.
-     AX_CHECK_LINK_FLAG([-static], [LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"])
-
-     CORE_CPPFLAGS="$CORE_CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
-     dnl Prevent the definition of min/max macros.
-     dnl We always want to use the standard library.
-     CORE_CPPFLAGS="$CORE_CPPFLAGS -DNOMINMAX"
-
-     dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
-     dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
-     dnl its command here, with the predeps/postdeps removed, and -static inserted. Postdeps are
-     dnl also overridden to prevent their insertion later.
-     dnl This should only affect dll's.
-     archive_cmds_CXX="\$CC -shared \$libobjs \$deplibs \$compiler_flags -static -o \$output_objdir/\$soname \${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker \$lib"
-     postdeps_CXX=
-
-     dnl We require Windows 7 (NT 6.1) or later
-     AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"], [], [])
-     ;;
-  *darwin*)
-     AX_CHECK_LINK_FLAG([-Wl,-headerpad_max_install_names], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-headerpad_max_install_names"], [], [])
-     CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
-     OBJCXXFLAGS="$CXXFLAGS"
-     ;;
-esac
-
-dnl These flags are specific to ld64, and may cause issues with other linkers.
-dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
-dnl "ad_strip" as the symbol for the entry point.
-if test "$TARGET_OS" = "darwin"; then
-  AX_CHECK_LINK_FLAG([-Wl,-dead_strip], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,-dead_strip_dylibs], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip_dylibs"], [], [])
-  AX_CHECK_LINK_FLAG([-Wl,-bind_at_load], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-bind_at_load"], [], [])
-fi
-
-dnl Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
-AX_CHECK_COMPILE_FLAG([-fno-extended-identifiers], [CORE_FLAGS="$CORE_FLAGS -fno-extended-identifiers"], [], [[$FLAG_WERROR]])
-
-AC_LANG_POP([C])
-
-AC_MSG_CHECKING([whether to build runtest])
-if test x$use_tests = xyes; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([whether to build runbench])
-if test x$use_bench = xyes; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
-AM_CONDITIONAL([TARGET_DARWIN], [test "$TARGET_OS" = "darwin"])
-AM_CONDITIONAL([TARGET_LINUX], [test "$TARGET_OS" = "linux"])
-AM_CONDITIONAL([TARGET_WINDOWS], [test "$TARGET_OS" = "windows"])
-
-AM_CONDITIONAL(WITH_BN, test 1 -eq 1)
-AM_CONDITIONAL(WITH_FP, test 1 -eq 1)
-AM_CONDITIONAL(WITH_FPX, test 1 -eq 1)
-AM_CONDITIONAL(WITH_FB, test 1 -eq 1)
-AM_CONDITIONAL(WITH_EP, test 1 -eq 1)
-AM_CONDITIONAL(WITH_EPX, test 1 -eq 1)
-AM_CONDITIONAL(WITH_EB, test 1 -eq 1)
-AM_CONDITIONAL(WITH_ED, test 1 -eq 1)
-AM_CONDITIONAL(WITH_EC, test 1 -eq 1)
-AM_CONDITIONAL(WITH_PP, test 1 -eq 1)
-AM_CONDITIONAL(WITH_PC, test 1 -eq 1)
-AM_CONDITIONAL(WITH_BC, test 1 -eq 1)
-AM_CONDITIONAL(WITH_MD, test 1 -eq 1)
-AM_CONDITIONAL(WITH_CP, test 1 -eq 1)
-AM_CONDITIONAL(WITH_MPC, test 1 -eq 1)
-AM_CONDITIONAL(WITH_DV, test 1 -eq 1)
-AM_CONDITIONAL(WITH_FBX, test 1 -eq 1)
-
-AM_CONDITIONAL([USE_TESTS], [test x"$use_tests" = x"yes"])
-AM_CONDITIONAL([USE_BENCH], [test x"$use_bench" = x"yes"])
-AM_CONDITIONAL([HARDEN], [test "$use_hardening" = "yes"])
-AM_CONDITIONAL([OPTIMIZE], [test "$use_optimizations" = "yes"])
-
-AM_CONDITIONAL([ARITH_EASY], [test "$want_backend" = "easy"])
-AM_CONDITIONAL([ARITH_GMP], [test "$want_backend" = "gmp"])
-
-AC_SUBST(CPU_ARCH)
-AC_SUBST(DEBUG_FLAGS)
-AC_SUBST(RAND_PATH, hashd)
-AC_SUBST(RELIC_CPPFLAGS)
-AC_SUBST(WARN_FLAGS)
-AC_SUBST(NOWARN_FLAGS)
-AC_SUBST(LIBTOOL_APP_LDFLAGS)
-AC_SUBST(HARDENED_FLAGS)
-AC_SUBST(HARDENED_LDFLAGS)
-AC_SUBST(CORE_LDFLAGS)
-AC_SUBST(CORE_CPPFLAGS)
-AC_SUBST(CORE_FLAGS)
-
-AC_SUBST(GMP_LDFLAGS)
-AC_SUBST(GMP_CPPFLAGS)
-AC_SUBST(GMP_LIBS)
-
-AC_CONFIG_HEADERS([depends/relic/include/relic_conf.h])
-AC_CONFIG_FILES([Makefile])
-
-AC_OUTPUT
-
-dnl Peplace conflict-prone PACKAGE-prefixed macros with DASHBLS
-sed -i.old 's/PACKAGE/DASHBLS/g' depends/relic/include/relic_conf.h
-sed -i.old 's/PACKAGE/DASHBLS/g' config.status
-
-echo
-echo "Options used to compile and link:"
-echo "  target os           = $TARGET_OS"
-echo "  backend             = $want_backend"
-echo "  build bench         = $use_tests"
-echo "  build test          = $use_bench"
-echo "  use debug           = $use_debug"
-echo "  use hardening       = $use_hardening"
-echo "  use optimizations   = $use_optimizations"
-echo
-echo "  LDFLAGS             = $HARDENED_LDFLAGS $CORE_LDFLAGS $GMP_LDFLAGS"
-echo "  CFLAGS              = $DEBUG_FLAGS $HARDENED_FLAGS $CORE_FLAGS $WARN_FLAGS $NOWARN_FLAGS"
-echo "  CPPFLAGS            = $CORE_CPPFLAGS $GMP_CPPFLAGS"
-echo "  CXXFLAGS            = $DEBUG_FLAGS $HARDENED_FLAGS $CORE_FLAGS $WARN_FLAGS $NOWARN_FLAGS"
-echo "  PTHREAD_FLAGS       = $PTHREAD_CFLAGS $PTHREAD_LIBS"
-echo
diff --git a/src/dashbls/depends/catch2/CMakeLists.txt b/src/dashbls/depends/catch2/CMakeLists.txt
deleted file mode 100644
index 8c26a03af581..000000000000
--- a/src/dashbls/depends/catch2/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.14.0 FATAL_ERROR)
-
-set(PROJECT_NAME "catch2")
-
-project(
-    ${PROJECT_NAME}
-    VERSION 2.13
-    LANGUAGES CXX
-)
-
-set(
-    ${PROJECT_NAME}_HEADERS
-    catch2/catch.hpp
-)
-
-list(
-    TRANSFORM ${PROJECT_NAME}_HEADERS
-    PREPEND "${CMAKE_CURRENT_LIST_DIR}/include/"
-)
-
-add_library(
-    ${PROJECT_NAME}
-    INTERFACE
-)
-
-target_sources(
-    ${PROJECT_NAME}
-    INTERFACE
-    "${${PROJECT_NAME}_HEADERS}"
-)
-
-target_include_directories(
-    ${PROJECT_NAME}
-    INTERFACE
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
diff --git a/src/dashbls/depends/catch2/include/catch2/catch.hpp b/src/dashbls/depends/catch2/include/catch2/catch.hpp
deleted file mode 100644
index 9b309bddc6bc..000000000000
--- a/src/dashbls/depends/catch2/include/catch2/catch.hpp
+++ /dev/null
@@ -1,17976 +0,0 @@
-/*
- *  Catch v2.13.10
- *  Generated: 2022-10-16 11:01:23.452308
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// start catch.hpp
-
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 10
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// start catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-     // Because REQUIREs trigger GCC's -Wparentheses, and because still
-     // supported version of g++ have only buggy support for _Pragmas,
-     // Wparentheses have to be suppressed globally.
-#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
-
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-// end catch_suppress_warnings.h
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#  define CATCH_CONFIG_ALL_PARTS
-#endif
-
-// In the impl file, we want to have access to all parts of the headers
-// Can also be used to sanely support PCHs
-#if defined(CATCH_CONFIG_ALL_PARTS)
-#  define CATCH_CONFIG_EXTERNAL_INTERFACES
-#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#    undef CATCH_CONFIG_DISABLE_MATCHERS
-#  endif
-#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  endif
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-// start catch_platform.h
-
-// See e.g.:
-// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
-#ifdef __APPLE__
-#  include <TargetConditionals.h>
-#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
-      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
-#    define CATCH_PLATFORM_MAC
-#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
-#    define CATCH_PLATFORM_IPHONE
-#  endif
-
-#elif defined(linux) || defined(__linux) || defined(__linux__)
-#  define CATCH_PLATFORM_LINUX
-
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
-#  define CATCH_PLATFORM_WINDOWS
-#endif
-
-// end catch_platform.h
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// start catch_user_interfaces.h
-
-namespace Catch {
-    unsigned int rngSeed();
-}
-
-// end catch_user_interfaces.h
-// start catch_tag_alias_autoregistrar.h
-
-// start catch_common.h
-
-// start catch_compiler_capabilities.h
-
-// Detect a number of compiler features - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
-// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
-// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-#ifdef __cplusplus
-
-#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
-#    define CATCH_CPP14_OR_GREATER
-#  endif
-
-#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#    define CATCH_CPP17_OR_GREATER
-#  endif
-
-#endif
-
-// Only GCC compiler should be used in this block, so other compilers trying to
-// mask themselves as GCC should be ignored.
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
-
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
-
-#endif
-
-#if defined(__clang__)
-
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
-
-// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
-// which results in calls to destructors being emitted for each temporary,
-// without a matching initialization. In practice, this can result in something
-// like `std::string::~string` being called on an uninitialized value.
-//
-// For example, this code will likely segfault under IBM XL:
-// ```
-// REQUIRE(std::string("12") + "34" == "1234")
-// ```
-//
-// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
-#  if !defined(__ibmxl__) && !defined(__CUDACC__)
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
-#  endif
-
-#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-
-#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Assume that non-Windows platforms support posix signals by default
-#if !defined(CATCH_PLATFORM_WINDOWS)
-    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// We know some environments not to support full POSIX signals
-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
-    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#endif
-
-#ifdef __OS400__
-#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#       define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Android somehow still does not support std::to_string
-#if defined(__ANDROID__)
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Not all Windows environments support SEH properly
-#if defined(__MINGW32__)
-#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// PS4
-#if defined(__ORBIS__)
-#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
-
-// Required for some versions of Cygwin to declare gettimeofday
-// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
-#   define _BSD_SOURCE
-// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
-# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
-
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-
-# endif
-#endif // __CYGWIN__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#if defined(_MSC_VER)
-
-// Universal Windows platform does not support SEH
-// Or console colours (or console at all...)
-#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#    define CATCH_CONFIG_COLOUR_NONE
-#  else
-#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
-#  endif
-
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
-
-// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
-// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
-// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
-#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#    endif // MSVC_TRADITIONAL
-
-// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-#  endif // __clang__
-
-#endif // _MSC_VER
-
-#if defined(_REENTRANT) || defined(_MSC_VER)
-// Enable async processing, as -pthread is specified or no additional linking is required
-# define CATCH_INTERNAL_CONFIG_USE_ASYNC
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// Check if we are compiled with -fno-exceptions or equivalent
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// DJGPP
-#ifdef __DJGPP__
-#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
-#endif // __DJGPP__
-
-////////////////////////////////////////////////////////////////////////////////
-// Embarcadero C++Build
-#if defined(__BORLANDC__)
-    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use of __COUNTER__ is suppressed during code analysis in
-// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
-// handled by it.
-// Otherwise all supported compilers support COUNTER macro,
-// but user still might want to turn it off
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// RTX is a special version of Windows that is real time.
-// This means that it is detected as Windows, but does not provide
-// the same set of capabilities as real Windows does.
-#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
-    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
-    #define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
-#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Various stdlib support checks that require __has_include
-#if defined(__has_include)
-  // Check if string_view is available and usable
-  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    include <cstddef>
-  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
-  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #    endif
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-  #    if defined(__clang__) && (__clang_major__ < 8)
-         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
-         // fix should be in clang 8, workaround in libstdc++ 8.2
-  #      include <ciso646>
-  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #        define CATCH_CONFIG_NO_CPP17_VARIANT
-  #      else
-  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #    else
-  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #    endif // defined(__clang__) && (__clang_major__ < 8)
-  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-#endif // defined(__has_include)
-
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
-#   define CATCH_CONFIG_WINDOWS_SEH
-#endif
-// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
-#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
-#   define CATCH_CONFIG_POSIX_SIGNALS
-#endif
-// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
-#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
-#   define CATCH_CONFIG_WCHAR
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
-#    define CATCH_CONFIG_CPP11_TO_STRING
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#  define CATCH_CONFIG_CPP17_OPTIONAL
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
-#  define CATCH_CONFIG_CPP17_STRING_VIEW
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
-#  define CATCH_CONFIG_CPP17_VARIANT
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
-#  define CATCH_CONFIG_CPP17_BYTE
-#endif
-
-#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
-#  define CATCH_CONFIG_NEW_CAPTURE
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-#  define CATCH_CONFIG_POLYFILL_ISNAN
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
-#  define CATCH_CONFIG_USE_ASYNC
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#  define CATCH_CONFIG_ANDROID_LOGWRITE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Even if we do not think the compiler has that warning, we still have
-// to provide a macro that can be used by the code.
-#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
-#endif
-
-// The goal of this macro is to avoid evaluation of the arguments, but
-// still have the compiler warn on problems inside...
-#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
-#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
-#endif
-
-#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#elif defined(__clang__) && (__clang_major__ < 5)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#define CATCH_TRY if ((true))
-#define CATCH_CATCH_ALL if ((false))
-#define CATCH_CATCH_ANON(type) if ((false))
-#else
-#define CATCH_TRY try
-#define CATCH_CATCH_ALL catch (...)
-#define CATCH_CATCH_ANON(type) catch (type)
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
-#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#endif
-
-// end catch_compiler_capabilities.h
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <cstdint>
-
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
-namespace Catch {
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-
-    protected:
-        NonCopyable();
-        virtual ~NonCopyable();
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
-            line( _line )
-        {}
-
-        SourceLineInfo( SourceLineInfo const& other )            = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
-        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
-        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
-
-        bool empty() const noexcept { return file[0] == '\0'; }
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
-
-        char const* file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // Bring in operator<< from global namespace into Catch namespace
-    // This is necessary because the overload of operator<< above makes
-    // lookup stop at namespace Catch
-    using ::operator<<;
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() const;
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-
-// end catch_common.h
-namespace Catch {
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_tag_alias_autoregistrar.h
-// start catch_test_registry.h
-
-// start catch_interfaces_testcase.h
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != (StringRef const& other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns the current start pointer. If the StringRef is not
-        // null-terminated, throws std::domain_exception
-        auto c_str() const -> char const*;
-
-    public: // substrings and searches
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, size()).
-        // If start > size(), then the substring is empty.
-        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
-
-        // Returns the current start pointer. May not be null-terminated.
-        auto data() const noexcept -> char const*;
-
-        constexpr auto isNullTerminated() const noexcept -> bool {
-            return m_start[m_size] == '\0';
-        }
-
-    public: // iterators
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-    };
-
-    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
-    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
-
-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-// end catch_stringref.h
-// start catch_preprocessor.hpp
-
-
-#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
-#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
-
-#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
-// MSVC needs more evaluations
-#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
-#else
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
-#endif
-
-#define CATCH_REC_END(...)
-#define CATCH_REC_OUT
-
-#define CATCH_EMPTY()
-#define CATCH_DEFER(id) id CATCH_EMPTY()
-
-#define CATCH_REC_GET_END2() 0, CATCH_REC_END
-#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
-#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
-#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
-#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
-#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
-
-#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-
-#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-
-// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
-// and passes userdata as the first parameter to each invocation,
-// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
-#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
-#else
-// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
-#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
-#endif
-
-#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
-#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
-
-#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
-#else
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
-#endif
-
-#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
-    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
-
-#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
-#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
-#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
-#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
-#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
-#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
-#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
-#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
-#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
-#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
-#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
-
-#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-
-#define INTERNAL_CATCH_TYPE_GEN\
-    template<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here.
-    template <typename Func, typename... U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
-#else
-    // Keep ::type here because we still support C++11
-    template <typename Func, typename... U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator, typename Sentinel = InputIterator>
-        std::string rangeToString(InputIterator first, Sentinel last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    // Import begin/ end from std here
-    using std::begin;
-    using std::end;
-
-    namespace detail {
-        template <typename...>
-        struct void_type {
-            using type = void;
-        };
-
-        template <typename T, typename = void>
-        struct is_range_impl : std::false_type {
-        };
-
-        template <typename T>
-        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
-        };
-    } // namespace detail
-
-    template <typename T>
-    struct is_range : detail::is_range_impl<T> {
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analysers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) const {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true iff the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = nextImpl();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            return nextImpl();
-        }
-
-    private:
-        bool nextImpl() {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual double minDuration() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        double minDuration = -1;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        double minDuration() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-
-#include <iterator>
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    //! Should the reporter show
-    bool shouldShowDuration( IConfig const& config, double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection( std::string const& className,
-                           std::string const& rootName,
-                           SectionNode const& sectionNode,
-                           bool testOkToFail );
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                Catch::throw_exception(optimized_away_error{});
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = (std::max)(cumn(a1), 0);
-                auto hi = (std::min)(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = (std::min)(
-                    resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                struct { alignas(T) unsigned char data[sizeof(T)]; }  data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
-            return lhs.name == rhs.name
-                && lhs.location == rhs.location;
-        }
-    };
-
-    class ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    class  ITracker {
-        NameAndLocation m_nameAndLocation;
-
-    public:
-        ITracker(NameAndLocation const& nameAndLoc) :
-            m_nameAndLocation(nameAndLoc)
-        {}
-
-        // static queries
-        NameAndLocation const& nameAndLocation() const {
-            return m_nameAndLocation;
-        }
-
-        virtual ~ITracker();
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-        virtual bool hasStarted() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-        bool hasStarted() const override {
-            return m_runState != NotStarted;
-        }
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-        //! Returns filters active in this tracker
-        std::vector<std::string> const& getFilters() const;
-        //! Returns whitespace-trimmed name of the tracked section
-        std::string const& trimmedName() const;
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd43e0000")
-    #endif
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-#include <cassert>
-
-namespace Catch {
-
-    // Wrapper for platform-specific fatal error (signals/SEH) handlers
-    //
-    // Tries to be cooperative with other handlers, and not step over
-    // other handlers. This means that unknown structured exceptions
-    // are passed on, previous signal handlers are called, and so on.
-    //
-    // Can only be instantiated once, and assumes that once a signal
-    // is caught, the binary will end up terminating. Thus, there
-    class FatalConditionHandler {
-        bool m_started = false;
-
-        // Install/disengage implementation for specific platform.
-        // Should be if-defed to work on current platform, can assume
-        // engage-disengage 1:1 pairing.
-        void engage_platform();
-        void disengage_platform();
-    public:
-        // Should also have platform-specific implementations as needed
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-
-        void engage() {
-            assert(!m_started && "Handler cannot be installed twice.");
-            m_started = true;
-            engage_platform();
-        }
-
-        void disengage() {
-            assert(m_started && "Handler cannot be uninstalled without being installed first");
-            m_started = false;
-            disengage_platform();
-        }
-    };
-
-    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
-    class FatalConditionHandlerGuard {
-        FatalConditionHandler* m_handler;
-    public:
-        FatalConditionHandlerGuard(FatalConditionHandler* handler):
-            m_handler(handler) {
-            m_handler->engage();
-        }
-        ~FatalConditionHandlerGuard() {
-            m_handler->disengage();
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        FatalConditionHandler m_fatalConditionhandler;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( config.minDuration, "seconds" )
-                ["-D"]["--min-duration"]
-                ( "show test durations for tests taking at least the given number of seconds" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    double Config::minDuration() const                 { return m_data.minDuration; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurrence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#include <algorithm>
-
-#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    // If neither SEH nor signal handling is required, the handler impls
-    // do not have to do anything, and can be empty.
-    void FatalConditionHandler::engage_platform() {}
-    void FatalConditionHandler::disengage_platform() {}
-    FatalConditionHandler::FatalConditionHandler() = default;
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-} // end namespace Catch
-
-#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
-#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
-#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    //! Signals fatal error message to the run context
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-
-    //! Minimal size Catch2 needs for its own fatal error handling.
-    //! Picked anecdotally, so it might not be sufficient on all
-    //! platforms, and for all configurations.
-    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
-} // end unnamed namespace
-
-#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    // Since we do not support multiple instantiations, we put these
-    // into global variables and rely on cleaning them up in outlined
-    // constructors/destructors
-    static PVOID exceptionHandlerHandle = nullptr;
-
-    // For MSVC, we reserve part of the stack memory for handling
-    // memory overflow structured exception.
-    FatalConditionHandler::FatalConditionHandler() {
-        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
-        if (!SetThreadStackGuarantee(&guaranteeSize)) {
-            // We do not want to fully error out, because needing
-            // the stack reserve should be rare enough anyway.
-            Catch::cerr()
-                << "Failed to reserve piece of stack."
-                << " Stack overflows will not be reported successfully.";
-        }
-    }
-
-    // We do not attempt to unset the stack guarantee, because
-    // Windows does not support lowering the stack size guarantee.
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-    void FatalConditionHandler::engage_platform() {
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        if (!exceptionHandlerHandle) {
-            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
-        }
-    }
-
-    void FatalConditionHandler::disengage_platform() {
-        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
-            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
-        }
-        exceptionHandlerHandle = nullptr;
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_WINDOWS_SEH
-
-#if defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
-// which is zero initialization, but not explicit. We want to avoid
-// that.
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-    static char* altStackMem = nullptr;
-    static std::size_t altStackSize = 0;
-    static stack_t oldSigStack{};
-    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
-
-    static void restorePreviousSignalHandlers() {
-        // We set signal handlers back to the previous ones. Hopefully
-        // nobody overwrote them in the meantime, and doesn't expect
-        // their signal handlers to live past ours given that they
-        // installed them after ours..
-        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-        }
-        // Return the old stack
-        sigaltstack(&oldSigStack, nullptr);
-    }
-
-    static void handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        // We need to restore previous signal handlers and let them do
-        // their thing, so that the users can have the debugger break
-        // when a signal is raised, and so on.
-        restorePreviousSignalHandlers();
-        reportFatal( name );
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
-        if (altStackSize == 0) {
-            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
-        }
-        altStackMem = new char[altStackSize]();
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        delete[] altStackMem;
-        // We signal that another instance can be constructed by zeroing
-        // out the pointer.
-        altStackMem = nullptr;
-    }
-
-    void FatalConditionHandler::engage_platform() {
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = altStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-
-    void FatalConditionHandler::disengage_platform() {
-        restorePreviousSignalHandlers();
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_POSIX_SIGNALS
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        // static cast as a workaround for IBM XLC
-        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w+")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-#endif
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if (currentTracker.nameAndLocation() == nameAndLocation) {
-                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
-                    assert(thisTracker);
-                    assert(thisTracker->isGeneratorTracker());
-                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
-                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                } else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
-
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    auto* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = &( parent->parent() );
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
-
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find( filters.begin(),
-                                        filters.end(),
-                                        static_cast<SectionTracker&>( *child )
-                                            .trimmedName() ) !=
-                                 filters.end() ) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->next() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
-                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-        m_reporter->benchmarkPreparing(name);
-    }
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-    void RunContext::benchmarkFailed(std::string const & error) {
-        m_reporter->benchmarkFailed(error);
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
-        m_activeTestCase->invoke();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-                else
-                {
-                    filename.insert(0, "#");
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return (std::min) (MaxExitCode, static_cast<int>(*listed));
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-#endif
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            using hash_t = uint64_t;
-
-            explicit TestHasher( hash_t hashSuffix ):
-                m_hashSuffix{ hashSuffix } {}
-
-            uint32_t operator()( TestCase const& t ) const {
-                // FNV-1a hash with multiplication fold.
-                const hash_t prime = 1099511628211u;
-                hash_t hash = 14695981039346656037u;
-                for ( const char c : t.name ) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                hash ^= m_hashSuffix;
-                hash *= prime;
-                const uint32_t low{ static_cast<uint32_t>( hash ) };
-                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
-                return low * high;
-            }
-
-        private:
-            hash_t m_hashSuffix;
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h{ config.rngSeed() };
-
-                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
-        ITracker(nameAndLocation),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if (m_filters.empty()
-            || m_filters[0] == ""
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-    std::vector<std::string> const& SectionTracker::getFilters() const {
-        return m_filters;
-    }
-
-    std::string const& SectionTracker::trimmedName() const {
-        return m_trimmed_name;
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-// start catch_config_uncaught_exceptions.hpp
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE_1_0.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-
-#if defined(_MSC_VER)
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-#endif
-
-#include <exception>
-
-#if defined(__cpp_lib_uncaught_exceptions) \
-    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif // __cpp_lib_uncaught_exceptions
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-// end catch_config_uncaught_exceptions.hpp
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        return false;
-#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 13, 10, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    bool shouldShowDuration( IConfig const& config, double duration ) {
-        if ( config.showDurations() == ShowDurations::Always ) {
-            return true;
-        }
-        if ( config.showDurations() == ShowDurations::Never ) {
-            return false;
-        }
-        const double min = config.minDuration();
-        return min >= 0 && duration >= min;
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            double dur = _sectionStats.durationInSeconds;
-            if ( shouldShowDuration( *m_config, dur ) ) {
-                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    double dur = _sectionStats.durationInSeconds;
-    if (shouldShowDuration(*m_config, dur)) {
-        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp, timeStampSize-1);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-
-        // Formats the duration in seconds to 3 decimal places.
-        // This is done because some genius defined Maven Surefire schema
-        // in a way that only accepts 3 decimal places, and tools like
-        // Jenkins use that schema for validation JUnit reporter output.
-        std::string formatDuration( double seconds ) {
-            ReusableStringStream rss;
-            rss << std::fixed << std::setprecision( 3 ) << seconds;
-            return rss.str();
-        }
-
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", formatDuration( suiteTime ) );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
-    }
-
-    void JunitReporter::writeSection( std::string const& className,
-                                      std::string const& rootName,
-                                      SectionNode const& sectionNode,
-                                      bool testOkToFail) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
-            // This is not ideal, but it should be enough to mimic gtest's
-            // junit output.
-            // Ideally the JUnit reporter would also handle `skipTest`
-            // events and write those out appropriately.
-            xml.writeAttribute( "status", "run" );
-
-            if (sectionNode.stats.assertions.failedButOk) {
-                xml.scopedElement("skipped")
-                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
-            }
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode, testOkToFail );
-            else
-                writeSection( className, name, *childNode, testOkToFail );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
-            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
-            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#ifndef CATCH_INTERNAL_CDECL
-#ifdef _MSC_VER
-#define CATCH_INTERNAL_CDECL __cdecl
-#else
-#define CATCH_INTERNAL_CDECL
-#endif
-#endif
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( ... ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/src/dashbls/depends/relic/.editorconfig b/src/dashbls/depends/relic/.editorconfig
deleted file mode 100644
index bdc049fe5f28..000000000000
--- a/src/dashbls/depends/relic/.editorconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# top-most EditorConfig file
-root = true
-
-# 4 space indentation
-[*.{cmake,c,h}]
-indent_style = tab
-indent_size = 4
diff --git a/src/dashbls/depends/relic/.github/workflows/16bit.yml b/src/dashbls/depends/relic/.github/workflows/16bit.yml
deleted file mode 100644
index 8633cd322672..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/16bit.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Basic configuration (16 bits)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DWSIZE=16 -DSEED= -DBENCH=0 -DTESTS=10 ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/32bit.yml b/src/dashbls/depends/relic/.github/workflows/32bit.yml
deleted file mode 100644
index bb225ab8083c..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/32bit.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: Basic configuration (32 bits)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows Latest - MSVC",
-            artifact: "windows-msvc.tar.xz",
-            os: windows-latest,
-            cc: "cl",
-          }
-          - {
-            name: "Windows Latest - MinGW",
-            artifact: "windows-mingw.tar.xz",
-            os: windows-latest,
-            cc: "gcc"
-          }
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-          - {
-            name: "MacOS Latest",
-            os: macos-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Windows enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'cl') }}
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Set MinGW enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            git
-            base-devel
-            gcc
-            cmake
-          update: true
-
-      - name: Run CMake (Win)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'cl') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DWSIZE=32 -DSEED= -DBENCH=0 -G "NMake Makefiles" ..
-
-      - name: Run CMake (MingW)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DWSIZE=32 -DSEED= -DBENCH=0 -G "MinGW Makefiles" ..
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DWSIZE=32 -DSEED= -DBENCH=0 ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/8bit.yml b/src/dashbls/depends/relic/.github/workflows/8bit.yml
deleted file mode 100644
index 0765607ec9c7..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/8bit.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Basic configuration (8 bits)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DWSIZE=8 -DSEED= -DBENCH=0 -DTESTS=10 ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/bls12-381.yml b/src/dashbls/depends/relic/.github/workflows/bls12-381.yml
deleted file mode 100644
index dc518a02b94d..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/bls12-381.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: BLS12-381 configuration (ASM)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          #- {
-            #name: "Windows Latest - MinGW",
-            #artifact: "windows-mingw.tar.xz",
-            #os: windows-latest,
-            #cc: "gcc"
-          #}
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-          - {
-            name: "MacOS Latest",
-            os: macos-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Linux Dependencies
-        if: runner.os == 'Linux'
-        run: sudo apt install libgmp-dev
-
-      - name: Install MacOS Dependencies
-        if: runner.os == 'MacOS'
-        run: brew install gmp
-
-      - name: Set MinGW enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            git
-            base-devel
-            gcc
-            cmake
-            gmp
-          update: true
-
-      - name: Run CMake (MingW)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -G "MinGW Makefiles" ..
-          ../preset/x64-pbc-bls12-381.sh .
-          cmake  -DSEED= -DBENCH=0 -DSTBIN=off -DRAND=HASHD .
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          ../preset/x64-pbc-bls12-381.sh ../
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSEED= -DBENCH=0 .
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/easy.yml b/src/dashbls/depends/relic/.github/workflows/easy.yml
deleted file mode 100644
index 761f07f33ca5..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/easy.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: Basic configuration
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows Latest - MSVC",
-            artifact: "windows-msvc.tar.xz",
-            os: windows-latest,
-            cc: "cl",
-          }
-          - {
-            name: "Windows Latest - MinGW",
-            artifact: "windows-mingw.tar.xz",
-            os: windows-latest,
-            cc: "gcc"
-          }
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-          - {
-            name: "MacOS Latest",
-            os: macos-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Windows enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'cl') }}
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Set MinGW enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            git
-            base-devel
-            gcc
-            cmake
-          update: true
-
-      - name: Run CMake (Win)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'cl') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DSEED= -DBENCH=0 -G "NMake Makefiles" ..
-
-      - name: Run CMake (MingW)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DSEED= -DBENCH=0 -G "MinGW Makefiles" ..
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSEED= -DBENCH=0 ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/gmp-sec.yml b/src/dashbls/depends/relic/.github/workflows/gmp-sec.yml
deleted file mode 100644
index 2cd342099ab3..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/gmp-sec.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Faster configuration (constant-time GMP)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows Latest - MinGW",
-            artifact: "windows-mingw.tar.xz",
-            os: windows-latest,
-            cc: "gcc"
-          }
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-          - {
-            name: "MacOS Latest",
-            os: macos-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Linux Dependencies
-        if: runner.os == 'Linux'
-        run: sudo apt install libgmp-dev
-
-      - name: Install MacOS Dependencies
-        if: runner.os == 'MacOS'
-        run: brew install gmp
-
-      - name: Set MinGW enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            git
-            base-devel
-            gcc
-            cmake
-            gmp
-          update: true
-
-      - name: Run CMake (MingW)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DSEED= -DBENCH=0 -DARITH=gmp-sec -G "MinGW Makefiles" ..
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSEED= -DBENCH=0 -DARITH=gmp-sec ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.github/workflows/gmp.yml b/src/dashbls/depends/relic/.github/workflows/gmp.yml
deleted file mode 100644
index 618e05da3078..000000000000
--- a/src/dashbls/depends/relic/.github/workflows/gmp.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Faster configuration (GMP)
-
-on:
-  push:
-    branches:
-      - '**'         # all branches
-  pull_request:
-    branches:
-      - '**'         # all branches
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows Latest - MinGW",
-            artifact: "windows-mingw.tar.xz",
-            os: windows-latest,
-            cc: "gcc"
-          }
-          - {
-            name: "Ubuntu Latest - GCC",
-            artifact: "linux-gcc.tar.xz",
-            os: ubuntu-latest,
-            cc: "gcc",
-          }
-          - {
-            name: "Ubuntu Latest - Clang",
-            artifact: "linux-clang.tar.xz",
-            os: ubuntu-latest,
-            cc: "clang",
-          }
-          - {
-            name: "MacOS Latest",
-            os: macos-latest,
-            cc: "clang",
-          }
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Linux Dependencies
-        if: runner.os == 'Linux'
-        run: sudo apt install libgmp-dev
-
-      - name: Install MacOS Dependencies
-        if: runner.os == 'MacOS'
-        run: brew install gmp
-
-      - name: Set MinGW enviroment
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: >-
-            git
-            base-devel
-            gcc
-            cmake
-            gmp
-          update: true
-
-      - name: Run CMake (MingW)
-        if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'gcc') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DSEED= -DBENCH=0 -DARITH=gmp -G "MinGW Makefiles" ..
-
-      - name: Run CMake (standard)
-        if: ${{ !(runner.os == 'Windows') }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSEED= -DBENCH=0 -DARITH=gmp ..
-
-      - name: CMake Build
-        run: cmake --build build
-
-      - name: CMake Test
-        run: |
-          cd build
-          ctest --verbose .
diff --git a/src/dashbls/depends/relic/.gitignore b/src/dashbls/depends/relic/.gitignore
deleted file mode 100644
index d73f86704276..000000000000
--- a/src/dashbls/depends/relic/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-relic-all.c
-target*
-*.o
-
-*/x64/
-*.vcxproj*
-.vs/
-*.sln
-*.dir/
-x64/
-
-*/win32/
-win32/
-
-*/CMakeCache.txt
-CMakeCache.txt
-
-*/Makefile
-Makefile
-*/CMakeFiles
-CMakeFiles
-
-lib/
-bin/
-
-CMakeSettings.json
-Testing/
-include/relic_conf.h
-install_manifest.txt
-
-src/low/fiat/*.c
diff --git a/src/dashbls/depends/relic/.indent.pro b/src/dashbls/depends/relic/.indent.pro
deleted file mode 100644
index 3fa50ae4f126..000000000000
--- a/src/dashbls/depends/relic/.indent.pro
+++ /dev/null
@@ -1,64 +0,0 @@
--nbap	--no-blank-lines-after-procedures
--brf	--braces-on-func-def-line
--br	--braces-on-if-line
--brs	--braces-on-struct-decl-line
--cd1	--declaration-comment-column1
--ncdb	--no-comment-delimiters-on-blank-lines
--ce	--cuddle-else
--ci8	--continuation-indentation8
--cli4	--case-indentation4
--cp1	--else-endif-column1
--di1	--declaration-indentation1
--fc1	--format-first-column-comments
--hnl	--honour-newlines
--i4	--indent-level4
--ip0	--parameter-indentation0
--l80	--line-length80
--lc80	--comment-line-length80
--lps	--leave-preprocessor-space
--nbbo	--break-after-boolean-operator
--nbad	--no-blank-lines-after-declarations
--nbbo 	--break-after-boolean-operator
--ncs	--no-space-after-casts
--npcs 	--no-space-after-function-call-names
--nprs	--no-space-after-parentheses
--npsl	--dont-break-procedure-type
--nlp	--dont-line-up-parentheses
--pmt	--preserve-mtime
--saf	--space-after-for
--sai	--space-after-if
--saw	--space-after-while
--sc	--start-left-side-of-comments
--ss	--space-special-semicolon
--ut	--use-tabs
--ts4	--tab-size4
--T int8_t
--T uint8_t
--T FILE
--T bn_t
--T dv_t
--T dv2_t
--T dv3_t
--T dv6_t
--T ft_t
--T fb_t
--T fb2_t
--T fb4_t
--T fp_t
--T fp2_t
--T fp3_t
--T fp6_t
--T fp12_t
--T fp18_t
--T eb_t
--T ep_t
--T ep2_t
--T ep3_t
--T err_t
--T ctx_t
--T state_t
--T dig_t
--T dbl_t
--T dis_t
--T rsa_pub_t
--T rsa_prv_t
diff --git a/src/dashbls/depends/relic/.travis.yml b/src/dashbls/depends/relic/.travis.yml
deleted file mode 100644
index 330d9929917d..000000000000
--- a/src/dashbls/depends/relic/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: cpp
-
-addons:
-  apt:
-    packages:
-      - cmake
-      - cmake-data
-
-compiler:
-  - clang
-  - gcc
-
-env:
-  # Automatic allocation
-  - CONFIG="-DSEED= -DBENCH=0" TEST=""
-  # Dynamic allocation
-  - CONFIG="-DALLOC=DYNAMIC -DSEED= -DBENCH=0" TEST=""
-  # Jacobian coordinates
-  - CONFIG="-DSEED= -DBENCH=0 -DEP_METHD='JACOB;LWNAF;COMBS;INTER'" TEST=""
-  # Build for Edwards curves
-  - CONFIG="-DSEED= -DBENCH=0 -DFP_PRIME=255 -FP_QNRES=off -DEC_METHD=EDDIE -DED_METHD='PROJC;LWNAF;LWNAF;BASIC' -DWITH='BN;DV;MD;FP;ED,EC;CP'" TEST="-E test_fpx"
-  # Build Supersingular curves
-  - CONFIG="-DSEED= -DBENCH=0 -DBN_PRECI=1536 -DFP_PRIME=1536 -DFP_QNRES=on" TEST="-E test_fpx"
-  # Build BLS12-381
-  - CONFIG="-DWSIZE=64 -DARITH=x64-asm-6l -DFP_PRIME=381 -DFP_PMERS=off -DFP_QNRES=on"
-
-  # Build with Address Sanityzer
-  - CONFIG="-DAUSAN=on -DSEED= -DBENCH=0" TEST=""
-
-script:
-  - mkdir build && cd build
-  - cmake $CONFIG  .. && make -j && ctest -V $TEST
-  - cd .. && rm -rf build
diff --git a/src/dashbls/depends/relic/CMakeLists.txt b/src/dashbls/depends/relic/CMakeLists.txt
deleted file mode 100644
index db36c9bb7d46..000000000000
--- a/src/dashbls/depends/relic/CMakeLists.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-cmake_minimum_required(VERSION 3.18)
-cmake_policy(SET CMP0054 NEW)
-
-project(RELIC C CXX)
-set(PROJECT_VERSION_MAJOR "0")
-set(PROJECT_VERSION_MINOR "5")
-set(PROJECT_VERSION_PATCH "0")
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-set(VERSION ${PROJECT_VERSION})
-
-set(INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/low ${CMAKE_CURRENT_SOURCE_DIR}/src/tmpl)
-include_directories(${INCLUDE})
-
-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
-set(WFLAGS "-Wall")
-
-message("\n-- Configuring ${PROJECT_NAME} ${PROJECT_VERSION}...\n")
-
-message(STATUS "Available switches (default = CHECK, VERBS, DOCUM):\n")
-
-message("   DEBUG=[off|on] Build with debugging support.")
-message("   PROFL=[off|on] Build with profiling support.")
-message("   CHECK=[off|on] Build with error-checking support.")
-message("   VERBS=[off|on] Build with detailed error messages.")
-message("   OVERH=[off|on] Build with overhead estimation.")
-message("   DOCUM=[off|on] Build documentation.")
-message("   STRIP=[off|on] Build only selected algorithms.")
-message("   QUIET=[off|on] Build with printing disabled.")
-message("   COLOR=[off|on] Build with colored output.")
-message("   BIGED=[off|on] Build with big-endian support.")
-message("   SHLIB=[off|on] Build shared library.")
-message("   STLIB=[off|on] Build static library.")
-message("   STBIN=[off|on] Build static binaries.")
-message("   AMALG=[off|on] Build amalgamation for better performance.")
-message("   AUSAN=[off|on] Build with ASan and UBSan (gcc/clang only).\n")
-
-option(DEBUG "Build with debugging support" off)
-option(PROFL "Build with profiling support" off)
-option(CHECK "Build with error-checking support" on)
-option(VERBS "Build with detailed error messages" on)
-option(OVERH "Build with overhead estimation" off)
-option(DOCUM "Build documentation" on)
-option(STRIP "Build only the selected algorithms" off)
-option(QUIET "Build with printing disabled" off)
-option(COLOR "Build with colored output" on)
-option(BIGED "Build with big-endian support" off)
-option(SHLIB "Build shared library" on)
-option(STLIB "Build static library" on)
-option(STBIN "Build static binaries" off)
-option(AMALG "Build amalgamation" off)
-option(AUSAN "Build with ASan and UBSan (gcc/clang only)" off)
-
-message(STATUS "Number of times each test or benchmark is ran (default = 50, 1000):\n")
-
-message("   TESTS=n        If n > 0, build automated tests and run them n times.")
-message("   BENCH=n        If n > 0, build automated benchmarks and run them n * n times.\n")
-
-message(STATUS "Number of available processor cores (default = 1):\n")
-
-message("   CORES=n        If n > 1, enable multithreading support.\n")
-
-message(STATUS "Available modules (default = ALL)\n")
-
-message("   WITH=BN       Multiple precision arithmetic.")
-message("   WITH=DV       Temporary double-precision digit vectors.")
-message("   WITH=FP       Prime field arithmetic.")
-message("   WITH=FPX      Prime extension field arithmetic.")
-message("   WITH=FB       Binary field arithmetic.")
-message("   WITH=EP       Elliptic curves over prime fields.")
-message("   WITH=EPX      Elliptic curves over quadratic extensions of prime fields.")
-message("   WITH=EB       Elliptic curves over binary fields.")
-message("   WITH=ED       Elliptic Edwards curves over prime fields.")
-message("   WTTH=EC       Elliptic curve cryptography.")
-message("   WITH=PB       Pairings over binary elliptic curves.")
-message("   WITH=PP       Pairings over prime elliptic curves.")
-message("   WTTH=PC       Pairing-based cryptography.")
-message("   WITH=BC       Block ciphers (symmetric encryption).")
-message("   WITH=MD       Message digests (hash functions).")
-message("   WITH=CP       Cryptographic protocols.")
-message("   WITH=MPC      Multi-party computation primitives.")
-message("   WITH=ALL      All of the above.")
-message("   Note: the programmer is responsible for not using unselected modules.\n")
-
-message(STATUS "Available arithmetic backends (default = easy):\n")
-
-message("   ARITH=easy     Easy-to-understand and portable, but slow backend.")
-message("   ARITH=fiat     Backend based on code generated from Fiat-Crypto.")
-message("   ARITH=gmp      Backend based on GNU Multiple Precision library.\n")
-message("   ARITH=gmp-sec  Same as above, but using constant-time code.\n")
-
-message(STATUS "Available memory-allocation policies (default = AUTO):\n")
-
-message("   ALLOC=AUTO     All memory is automatically allocated.")
-message("   ALLOC=DYNAMIC  All memory is allocated dynamically on demand.\n")
-
-message(STATUS "Supported operating systems (default = LINUX):\n")
-
-message("   OPSYS=         Undefined/No specific operating system.")
-message("   OPSYS=LINUX    GNU/Linux operating system.")
-message("   OPSYS=FREEBSD  FreeBSD operating system.")
-message("   OPSYS=NETBSD   NetBSD operating system.")
-message("   OPSYS=MACOSX   Mac OS X operating system.")
-message("   OPSYS=WINDOWS  Windows operating system.")
-message("   OPSYS=DROID    Android operating system.")
-message("   OPSYS=DUINO    Arduino platform.\n")
-
-message(STATUS "Supported multithreading APIs (default = UNDEF):\n")
-
-message("   MULTI=         No multithreading support.")
-message("   MULTI=OPENMP   Open Multi-Processing.")
-message("   MULTI=PTHREAD  POSIX threads.\n")
-
-message(STATUS "Supported timers (default = HREAL):\n")
-
-message("   TIMER=         No timer.")
-message("   TIMER=HREAL    GNU/Linux realtime high-resolution timer.")
-message("   TIMER=HPROC    GNU/Linux per-process high-resolution timer.")
-message("   TIMER=HTHRD    GNU/Linux per-thread high-resolution timer.")
-message("   TIMER=ANSI     ANSI-compatible timer.")
-message("   TIMER=POSIX    POSIX-compatible timer.")
-message("   TIMER=CYCLE    Cycle-counting timer. (architecture-dependant)")
-message("   TIMER=PERF     GNU/Linux performance monitoring framework.\n")
-
-message(STATUS "Prefix to identify this build of the library (default = \"\"):\n")
-
-message("   LABEL=relic\n")
-
-include(cmake/arch.cmake)
-include(cmake/err.cmake)
-include(cmake/bn.cmake)
-include(cmake/fp.cmake)
-include(cmake/fpx.cmake)
-include(cmake/fb.cmake)
-include(cmake/ep.cmake)
-include(cmake/eb.cmake)
-include(cmake/ed.cmake)
-include(cmake/ec.cmake)
-include(cmake/pp.cmake)
-include(cmake/md.cmake)
-include(cmake/cp.cmake)
-include(cmake/rand.cmake)
-include(cmake/with.cmake)
-
-# Number of tests and benchmarks
-set(BENCH "100" CACHE STRING "Number of times each benchmark is ran.")
-set(TESTS "100" CACHE STRING "Number of times each test is ran.")
-
-# Number of cores.
-set(CORES "1" CACHE STRING "Number of available processor cores.")
-
-# Choose the arithmetic backend.
-set(ARITH "easy" CACHE STRING "Arithmetic backend")
-
-# Choose the memory-allocation policy.
-set(ALLOC "AUTO" CACHE STRING "Allocation policy")
-
-# Simulator of the target platform.
-set(SIMUL "$ENV{SIMUL}" CACHE STRING "Path to call a simulator of the target platform.")
-set(SIMAR "$ENV{SIMAR}" CACHE STRING "Arguments to call a simulator of the target platform.")
-string(REPLACE " " ";" SIMAR "${SIMAR}")
-
-# Linker flags.
-string(TOLOWER ${ARITH} LFLAGS)
-set(LFLAGS "-L${CMAKE_CURRENT_SOURCE_DIR}/src/low/${LFLAGS}/")
-set(LFLAGS "${LFLAGS} $ENV{LDFLAGS}")
-
-if(STBIN)
-	set(LFLAGS "${LFLAGS} -static")
-	set(CMAKE_LINK_SEARCH_START_STATIC ON)
-	set(CMAKE_LINK_SEARCH_END_STATIC ON)
-endif()
-
-# Discover the operating system.
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-	set(OPSYS "LINUX" CACHE STRING "Operating system")
-else()
-	if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-		set(OPSYS "FREEBSD" CACHE STRING "Operating system")
-	else()
-		if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-			set(OPSYS "MACOSX" CACHE STRING "Operating system")
-		else()
-			if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-				set(OPSYS "NETBSD" CACHE STRING "Operating system")
-			else()
-				if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-					set(OPSYS "WINDOWS" CACHE STRING "Operating system")
-				endif()
-			endif()
-		endif()
-	endif()
-endif()
-if(OPSYS STREQUAL LINUX)
-	add_definitions(-D_GNU_SOURCE)
-endif()
-message(STATUS "Configured operating system: ${OPSYS}")
-
-if(OPSYS STREQUAL LINUX)
-	set(TIMER "HREAL" CACHE STRING "Timer")
-else()
-	set(TIMER "ANSI" CACHE STRING "Timer")
-endif()
-
-if(MSVC)
-	#defaults to the DLL runtime library.
-	set(RUNTIME "MD" CACHE STRING "MSVC runtime libraries")
-	message(STATUS "Supported MSVC runtime libraries (default = MD):\n")
-	message("   RUNTIME=MD     DLL runtime library (/MD,/MDd).")
-	message("   RUNTIME=MT     Static runtime library (/MT,/MTd).\n")
-
-	#loop over the compile flags to swap /MD and /MT.
-	set(CompilerFlags
-		CMAKE_C_FLAGS_DEBUG
-		CMAKE_C_FLAGS_RELEASE
-		CMAKE_C_FLAGS_RELWITHDEBINFO
-		CMAKE_C_FLAGS_MINSIZEREL)
-	foreach(CompilerFlag ${CompilerFlags})
-		if(RUNTIME STREQUAL MT)
-			string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-		else()
-			string(REPLACE "/MT" "/MD" ${CompilerFlag} "${${CompilerFlag}}")
-		endif()
-	endforeach()
-endif()
-
-if("$ENV{CFLAGS}" STREQUAL "")
-	# If the user did not specify compile flags, we use sane defaults.
-	if(DEBUG)
-		if (MSVC)
-			set(CFLAGS "/Od" CACHE STRING "Default compiler flags.")
-		else()
-			# Turn off all optimizations.
-			set(CFLAGS "-pipe -std=c99 -O0 -fno-omit-frame-pointer" CACHE STRING "Default compiler flags.")
-			set(DFLAGS "-ggdb")
-		endif()
-	else()
-		if (MSVC)
-			set(CFLAGS "/O2" CACHE STRING "Default compiler flags.")
-		else()
-			set(CFLAGS "-pipe -std=c99 -O2 -funroll-loops -fomit-frame-pointer" CACHE STRING "Default compiler flags.")
-		endif()
-	endif()
-else()
-	# Turn on debugging symbols with custom flags.
-	if(DEBUG)
-		if (MSVC)
-			set(DFLAGS "/Z7")
-		else ()
-			set(DFLAGS "-ggdb")
-		endif()
-	endif()
-	set(CFLAGS "$ENV{CFLAGS}" CACHE STRING "User-chosen compiler flags.")
-endif()
-
-if(AUSAN)
-	set(DFLAGS "${DFLAGS} -ggdb -fsanitize=address -fsanitize=undefined")
-endif()
-
-if(MULTI STREQUAL OPENMP)
-	if (MSVC)
-		set(CFLAGS "${CFLAGS} /openmp")
-	else ()
-		find_package(OpenMP REQUIRED)
-		set(CFLAGS "${CFLAGS} -fopenmp")
-	endif ()
-	set(MULTI "OPENMP" CACHE STRING "Multithreading interface")
-else()
-	if(MULTI STREQUAL PTHREAD)
-		find_package(Threads REQUIRED)
-		set(CFLAGS "${CFLAGS} -pthread")
-		set(MULTI "PTHREAD" CACHE STRING "Multithreading interface")
-	endif()
-endif()
-
-if(PROFL)
-	set(PFLAGS "-pg -fno-omit-frame-pointer")
-else()
-	set(PFLAGS "")
-endif()
-
-if(ARITH STREQUAL "gmp" OR ARITH STREQUAL "gmp-sec")
-	include(cmake/gmp.cmake)
-	if(GMP_FOUND)
-		include_directories(${GMP_INCLUDE_DIR})
-		set(ARITH_LIBS ${GMP_LIBRARIES})
-	endif()
-endif()
-
-if(ARITH STREQUAL "fiat")
-	message(STATUS "Configured Fiat-Crypto: After build completes, set FIAT_CRYPTO to root folder and run: make fiat; cmake; make.")
-endif()
-
-set(CMAKE_C_FLAGS "${AFLAGS} ${WFLAGS} ${DFLAGS} ${PFLAGS} ${CFLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${LFLAGS}")
-
-message(STATUS "Compiler flags: ${CMAKE_C_FLAGS}")
-message(STATUS "Linker flags: ${CMAKE_EXE_LINKER_FLAGS}")
-
-string(TOUPPER ${ARITH} ARITH)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/relic_conf.h.in
-	${CMAKE_CURRENT_BINARY_DIR}/include/relic_conf.h @ONLY)
-message(STATUS "Configured ${CMAKE_CURRENT_SOURCE_DIR}/include/relic_conf.h.in")
-string(TOLOWER ${ARITH} ARITH)
-
-if (LABEL)
-	set(RELIC "relic_${LABEL}")
-	set(RELIC_S "relic_s_${LABEL}")
-else()
-	set(RELIC "relic")
-	set(RELIC_S "relic_s")
-endif()
-
-# Choose the arithmetic backend.
-set(LABEL "" CACHE STRING "Build label")
-
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-file(GLOB includes "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
-install(FILES ${includes} DESTINATION include/${RELIC})
-file(GLOB includes "${CMAKE_CURRENT_SOURCE_DIR}/include/low/*.h")
-install(FILES ${includes} DESTINATION include/${RELIC}/low)
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/" DESTINATION include/${RELIC})
-
-install(FILES cmake/relic-config.cmake DESTINATION cmake/)
-
-if(DOCUM)
-	include(cmake/doxygen.cmake)
-endif()
-
-if(TESTS GREATER 0)
-	enable_testing()
-	add_subdirectory(test)
-endif(TESTS GREATER 0)
-
-if(BENCH GREATER 0)
-	add_subdirectory(bench)
-endif(BENCH GREATER 0)
diff --git a/src/dashbls/depends/relic/COPYRIGHT b/src/dashbls/depends/relic/COPYRIGHT
deleted file mode 100644
index bf950c2b0ad3..000000000000
--- a/src/dashbls/depends/relic/COPYRIGHT
+++ /dev/null
@@ -1,11 +0,0 @@
-RELIC Authors:
-
-Diego de Freitas Aranha 		dfaranha at gmail com
-Conrado Porto Lopes Gouvêa		conradoplg at gmail com
-Tobias Markmann					tmarkmann at gmail com
-Riad S. Wahby                   rsw at cs stanford edu
-Kevin Liao                      kevliao at mit edu
-
-RELIC logo:
-
-Fernanda Alcântara Andaló		fernanda@andalo.net.br
diff --git a/src/dashbls/depends/relic/LICENSE b/src/dashbls/depends/relic/LICENSE
deleted file mode 100644
index d5e3877071e9..000000000000
--- a/src/dashbls/depends/relic/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-Apache-2.0 OR LGPL-2.1
diff --git a/src/dashbls/depends/relic/LICENSE.Apache-2.0 b/src/dashbls/depends/relic/LICENSE.Apache-2.0
deleted file mode 100644
index d64569567334..000000000000
--- a/src/dashbls/depends/relic/LICENSE.Apache-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/src/dashbls/depends/relic/LICENSE.LGPL-2.1 b/src/dashbls/depends/relic/LICENSE.LGPL-2.1
deleted file mode 100644
index e8555423924e..000000000000
--- a/src/dashbls/depends/relic/LICENSE.LGPL-2.1
+++ /dev/null
@@ -1,520 +0,0 @@
-RELIC is licensed under the GNU Lesser General Public License (LGPL), with
-the following exceptions/clarifications:
-
-   1. Making modifications to RELIC configuration files, build scripts and
-      configuration headers such as "relic_conf.h" in order to create a
-      customized build setup of RELIC with the otherwise unmodified source code,
-      does not constitute a derived work.
-   2. Statically linking the RELIC library into a user application does not
-      make the user application a derived work, and therefore does not require
-      the user to distribute the source code or object code of their own
-      application. The RELIC source code with all modifications must still be
-      passed on in the same way as using RELIC as a shared library.
-   3. Using source code obfuscation on the RELIC source code when distributing
-      it is not permitted.
-
-These exceptions/clarifications shall be deemed to amend the base LGPL text,
-as reproduced below.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/src/dashbls/depends/relic/README.md b/src/dashbls/depends/relic/README.md
deleted file mode 100644
index 9fa6d01b2756..000000000000
--- a/src/dashbls/depends/relic/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-![](https://github.com/relic-toolkit/relic/blob/master/art/rlc_logo.png)
-=====
-
-[![Project stats](https://www.openhub.net/p/relic-toolkit/widgets/project_thin_badge.gif)](https://www.openhub.net/p/relic-toolkit)
-[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/relic-toolkit/relic.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/relic-toolkit/relic/context:cpp)
-[![Total Alerts](https://img.shields.io/lgtm/alerts/g/relic-toolkit/relic.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/relic-toolkit/relic/alerts)
-
-[![Travis Status](https://travis-ci.org/relic-toolkit/relic.svg?branch=main)](https://travis-ci.org/relic-toolkit/relic)
-[![GHA Status](https://github.com/relic-toolkit/relic/actions/workflows/easy.yml/badge.svg)](https://github.com/relic-toolkit/relic/actions/workflows/easy.yml)
-[![GHA Status](https://github.com/relic-toolkit/relic/actions/workflows/gmp.yml/badge.svg)](https://github.com/relic-toolkit/relic/actions/workflows/gmp.yml)
-[![GHA Status](https://github.com/relic-toolkit/relic/actions/workflows/bls12-381.yml/badge.svg)](https://github.com/relic-toolkit/relic/actions/workflows/bls12-381.yml)
-
-
-RELIC is a modern research-oriented cryptographic meta-toolkit with emphasis on efficiency and flexibility. RELIC can be used to build efficient and usable cryptographic toolkits tailored for specific security levels and algorithmic choices.
-
-### Goals
-
-RELIC is an ongoing project and features will be added on demand. The focus is to provide:
-
- * Ease of portability and inclusion of architecture-dependent code
- * Simple experimentation with alternative implementations
- * Tests and benchmarks for every implemented function
- * Flexible configuration
- * Maximum efficiency
-
-### Algorithms
-
-RELIC implements to date:
-
- * Multiple-precision integer arithmetic
- * Prime and Binary field arithmetic
- * Elliptic curves over prime and binary fields (NIST curves and pairing-friendly curves)
- * Bilinear maps and related extension fields
- * Cryptographic protocols (RSA, Rabin, ECDSA, ECMQV, ECSS (Schnorr), ECIES, Sakai-Ohgishi-Kasahara ID-based authenticated key agreement, Boneh-Lynn-Schacham and Boneh-Boyen short signatures, Paillier and Benaloh homomorphic encryption systems)
-
-### Citing
-
-If you use RELIC, please cite using the template below:
-
-    @misc{relic-toolkit,
-        author = {D. F. Aranha and C. P. L. Gouvêa and T. Markmann and R. S. Wahby and K. Liao},        
-        title = {{RELIC is an Efficient LIbrary for Cryptography}},
-        howpublished = {\url{https://github.com/relic-toolkit/relic}},
-    }
-
-### Build instructions
-
-Instructions for building the library can be found in the [Wiki](https://github.com/relic-toolkit/relic/wiki/Building).
-
-### Support
-
-You can probably get some help over the official mailing list at `relic-discuss@googlegroups.com`
-
-If you like the library, please consider supporting development through [Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=R7D6ZE3BLMTF2&lc=BR&item_name=RELIC%20Development&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted).
-
-### Licensing
-
-This work is dual-licensed under Apache 2.0 and LGPL 2.1-or-above to encourage collaboration with other research groups and contributions from the industry. You can choose between one of them if you use this work.
-
-`SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1`
-
-Starting from version 0.3.3, static linking and changes in the configuration or build system are explicitly exempted from representing derived works. Please refer to the LICENSE files for additional details.
-
-### Disclaimer
-
-RELIC is at most alpha-quality software. Implementations may not be correct or secure and may include patented algorithms. There are *many* configuration options which make the library horribly insecure. Backward API compatibility with early versions may not necessarily be maintained. Use at your own risk.
diff --git a/src/dashbls/depends/relic/art/rlc_logo.png b/src/dashbls/depends/relic/art/rlc_logo.png
deleted file mode 100755
index 4f481be964f9..000000000000
Binary files a/src/dashbls/depends/relic/art/rlc_logo.png and /dev/null differ
diff --git a/src/dashbls/depends/relic/art/rlc_logo.svg b/src/dashbls/depends/relic/art/rlc_logo.svg
deleted file mode 100644
index 6a3fb890ee90..000000000000
--- a/src/dashbls/depends/relic/art/rlc_logo.svg
+++ /dev/null
@@ -1,1694 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="155px" height="68px" viewBox="0 0 155 68" enable-background="new 0 0 155 68" xml:space="preserve">
-<pattern  x="-222" y="428.5" width="69" height="69" patternUnits="userSpaceOnUse" id="Polka_Dot_Pattern" viewBox="2.125 -70.896 69 69" overflow="visible">
-	<g>
-		<polygon fill="none" points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 		"/>
-		<polygon fill="#F7BC60" points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 		"/>
-		<g>
-			<path fill="#FFFFFF" d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335
-				c-0.051,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.063-0.165,0.128
-				c-0.051,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-		</g>
-		<path fill="#FFFFFF" d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.063-0.165,0.128
-			c-0.051,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-			c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-			c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-			c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-			c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337
-			c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-			c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626
-			c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-		<g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					C8.15-41.004,8.149-41.02,8.14-41.04"/>
-				<path fill="#FFFFFF" d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239
-					c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-					C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-				<path fill="#FFFFFF" d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-					C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161
-					c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631
-					C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45
-					c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071
-					c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-					c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-					c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-					c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			</g>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46
-				c-0.051,0.063-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				c-0.021,0.011-0.021-0.005-0.03-0.025"/>
-			<path fill="#FFFFFF" d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.063-0.165,0.128
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207
-				c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169
-				C15.81-2.74,15.809-2.756,15.8-2.776"/>
-			<path fill="#FFFFFF" d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46
-				c-0.05,0.063-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587
-				c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631
-				C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221
-				c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367
-				c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751
-				C8.15-2.74,8.149-2.756,8.14-2.776"/>
-			<path fill="#FFFFFF" d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46
-				C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161
-				c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631
-				C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45
-				c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419
-				c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337
-				c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367
-				c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751
-				C0.489-2.74,0.488-2.756,0.479-2.776"/>
-		</g>
-	</g>
-</pattern>
-<g>
-	<text transform="matrix(1 0 0 1 108.25 59.4277)" fill="#8CC63F" font-family="'FontinSans-Bold'" font-size="13.1277">toolkit</text>
-	<g>
-		
-			<image overflow="visible" opacity="0.75" width="383" height="229" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAADpCAYAAAAkoEDjAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAKpVJREFUeNrsXWlzG0eSTVwEwFui
-aMm2fM3Gzv4B/yfPT9r5T+NPe8TG7sbM+pJlXRRJ8QQBLErKZL9OVgNNoEF0o9+LqAAIgiTYnVkv
-X1ZWlghBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARB
-EARBEARBLIhGEb/kh7/8sFYX5a//+ldaBlF5W6cdEw9KCOAcjTW7LmM6GbEGtj6mzRJLJwTnHH5U
-lSDGQATjyGtRsqCz1YoIym7r3m5x0FaJmWgvSCStyWjqoz1vVJwQRjDuOBU8jnTCIEHUI2iqgq2j
-DQ912POpypcg5opuNGJqqFN0JmNjMrr62KkoKZgjmRMNnEPFyCJGGimnIzmshTqoiq2jjQb7vZ6M
-K300ex7TJomiFUJDHSH8bG8ytidjRx/7zlGqpgxu1IFs3OiwKOsmMkZAHEgQt+qBTljpgKkqto5k
-cDEZHybjVB/RxqkSiGIUgkZMJpuDg+xOxpPJONTHHXUUk9RVgU3qFlVdRqIrjLqu4PtIHkMgiTvq
-gcRQOXVQJVs3G75QIngzGa/18URt+mPgQjskilIIRiBNlc1bk3EwGc8n40t1lC2InKpGCAN1nAt9
-NEJAMgjfO9PHc328iJCIEcRt2omKoZLBUlVs3dTBmZJAT19DWx7q/0WVQCwlZbQ5GfuT8XQyvp6M
-zzWS2qhg2ghVgE3uA5jcr4EEzlSK26PJ8zMgiSv3O0gM1U4ZldnWLR10rWpgU202PH83GcfwGUkG
-xFIIIUjlrkZJ+yqln03GI329aoSAKmEQifJRIZwDIZyqw53AOAWiOHdqg8RQPUIou62b/V4BGbzT
-z9uVdFUUQRRKCAYrv9tQI7QFt12Vqy2p5sKyLS5jJRGSgimISyUETwrvdRzpo71+5pTHbTlgIAaS
-QqlRdls3hXuptrutn3MDPjtBLI0QGi56Cr/HyvI2wBCrFpH4agzcc+ArjWKK4VQn/yON0N7o41sg
-B0srXev1uSUFqoXSqoSy2/oYlKeVxLal+nuDiAopBJTU6DA4qkgIsUdxCmIsSToJK5Os3M+UQiCC
-1zDeKFkYMVxIes8D1UL500dltPWxUzJN93kJ4kEIwUdRWdv7q+T0ngjQ6VqgHDpKDl1J8raWTjLF
-YGWKgQz+gGHK4UTfe+XVAkmh9IqhbLY+1+eZ1qyPNkhCINLEMI0sxhApjoEcQm16WMyzHHNYhAyL
-j4/1cV+/t6kK4gjUgpUGjkgKxLLgSKAx5X1sy0JCIHKSRSODHCy/3IuQQxh7+jXueLXSQFMLH9NR
-JAViifbbjNizRIIeEfbtqg2avASFyPSmpPPKHUnKFAMBhNRRqFv/ZjL+aTL+PBn/Mhn/PBnfyaeN
-Tp/pezf15z/mpdftrAlipTaK9mk2aoHLJoy+vt6F995p6hdsk/ZJhUDkUw6xyhRzQCxd3Fbi6Kuy
-aOvP2oLzDZUCMac9WqBi9mdRv9kkDty4ZqXXufp2sUKOCoHI74wWkfWVAMJaQtjU9DWohT/r869U
-KexL0jytTaVAzKEIbNK39GUIOnbV/oJiDTuuv1Cb+0aVqo1v9PUv9H1P9Od29ff0JClvvVUNtFEq
-BCKfamg56Y6O2nPyHN8bxrn+DioFIi8ZtCNBSF+/t6HP+6BMzfaakvREmta3y/fushLsEdUCCYHI
-RwrNSPRm+Vnb4ITSHUFSIPLaGu6o3lfF2dFJuyPJOoGlKjdBjVrKaCDxvl3WkuUUBu7AN2Jg6TQJ
-gZhTLTQl345SkgKRVx0ExbmnZBDwRCf6PpDANpBBN0IIsb5dYd9MqIY7kmQ3vm20/KDEMCApkBCI
-+dVCI/K1RIgBSwFZkkrEbKsJKiCkiUY68Q/0e1hNZKlKbHVhuJF0599LUArWQTVsrnwlnzZavpb0
-RkvupyEhEHMSQ9tN/rF6cE8IYzob4WxmDISwpV9vKDFYZVEXhqUoseeRIda3C1uzBEUQNlWGjZY7
-knRVtTUw7qepKO7VBfH777/HRdEQbViO8pmkq2OycuHEXYmPqSQbdv2akj7r2RzUSv/CPZEf//Yj
-r2bBqLCt+2M/bWNkSCHtSrJLfhOIAVUCjg4QCKqLLUmqjbqOVPCUwNsjO2mnVAhEfgc2Yu5FFAG2
-38YzGqzBnlcSRL1TRiLJGQh2appAgNGU2SnKrL5dQ0n20dj6gx+4l8Z+Ptgt1xRICEQBpDAC2Y7H
-c952XQ3133Q0Aib+htw9HS2LAO7btytWHWe7nXuSlK/GugMzeKmA8RDlIgWL7IK0P9AURTjHN2xk
-CxuFDlX6p9IV3BREuEm/FRm+LXYj5+9rOkKwstZgh0/ULoN9/kk+bWz7Su12X5JWLE1VCbxLVAjE
-HEohyP5tSSo+rK22bQpCpTBg9EVEIvzGEn6nyN3SaSQcU7RWtmonBA7FrSsQVAhEPsfDRUHbafq5
-KoXnGn2F1/DMXKoE4iFVSNOphT1QC1/qQDvdoJ1SIRDFkEKQ5nj4jp3lbGco2BnNDUZfxAOrEKxU
-NLWKJwfibmYriKCdUiEQc0RhsTYEX+gI0dcjRl9ESezUynNtXeGZqtpDtd1gp2zrToVAFBCB2dkK
-j1QhhKjrvQ7bHTpg9EWs2E5tl7Slj4J9vpP0AVC0UyoEYgFna0ZIIURd1pZ4nyqBKKGd7ktypviB
-KoeeJJVxBAmBWOA++UXm4GifqbPtgLOV4cB3or52aqSwrcHLgQ48DZCl0iQEYoHoqxGR5AdKCqYS
-NqkSiBLYKbb72FbbtLYZfSQEBi4kBGJxUsDo61DHY6oEoiR2airBiiG2lRB2fNDCy0VCIBZzNqzm
-yFIJrOQgykIKtp5gA3sdsfklCYEoWCXYwt0TVQzbVAlESeYVUwk9IATrsHrb8p1BCwmBKEYl9JxK
-sEPQsccRHY5YVeBiawldSXdHtZQR1xFICETBKsHK+6yS487iMh2OWLFKsDMV7OyEjnANgYRAFK4S
-OpKUoe4DIWyDLOf9JVatErBldpvqgIRALF8l7CkZ7Euk2ohpI2LFduoHyYCEUBqMI6OKzoY5Wivt
-s/K+PkhzofMRK7RTJIcG7bHcqFMvo7F7zGPIZXc2Uwl2WIltAMJWFoE4hjR1YsU+N76nDxIkhAcz
-ynGGvG1UhBz87uW+koAdom4HoIf7e12WD50ndcWjQNdaiZdSmdMu66cQ7KSmIYyx3D0i0B8xWGZi
-iK0l7IJCwIXlxkMdcD7DuRo5fn5Mx1wrMgi+Zqf+3YDvPSgp0C5JCBIxyitJDqu3NIrl4rEKAqsh
-miUnBa8StoEQfN+Y8QM4WSODuETu5pT9fYopuqmOSYIoPRkM1O/M9+wwp6WSQcQ2aZckhFtlEMjA
-TnEK40yNcwwRNtZKh7HhSKJspBDbABRIwTYApRTCkp1smnNlqbCY441gjDOc0B5HJIjS+52RwQUM
-UwqFqoQpttmkXZIQ/A0KRhgO5ziajNfy6cCOM41g2jCRYoRtzbh6QAxlJQXcANTX0SuKEMDZpjlV
-lnPhIewdSZce4r0aQkQ5jKQWvGN6Bx2jI5IYVu57di8tEDtVH7SjND/eu0XukyOBmG02I4N2SYXw
-UQ0EAngzGb9Oxgv5dJrTtSRtIAIRWKWO9XHflyQnP1bDKSMpNDMIwe9YHs/pcFlO1oLUWhucqw3v
-aUtyGLsNJCpUcdcwMN88grSfH/a9lCNihEZyWEnKaKjq4EzJwM5WvoL7VnSAgnaJtoejVQa7LKtN
-1i1lFEjgj8n4eTJe6WsNSS/K4olkTyVZb9jR39kpKSG0I4Rgk/NtI7E8hhghApz8bdLvuLTaBqTa
-uo4gNlxKDonKJo9rnSwuJck33zins/dgTtoGRnDosFQND08G5nNGCJaqPdfXhvOkimYEKLj+h5N8
-V+6mgVdpl6MyE0Ndyk4xWjlSMnihRjpyKiEQwltJnwE7dhNjE14rQ8rId5fcdAoh18Kyc7imS0d1
-wLGMcPrgTPh1D36mA58Lico73kCd7kIfr8GJ0Oku9D5e6P3B/LQ5JFa0VCY6WyMYIVxCyugM0kWY
-dlk0QGlHJve+pNfTrPU2ksKq7HKAAUvZbLJOhGA371wN9FjHjRqArSUc6esf9CaOJF2JZBNvGQgB
-HaXlJu3cjcQyiAAltZHMto4dSdZaNsEB+46M2o5Mei5KM5jjXYPTeccbgLOdwSRzCjlqe+3cRXOV
-iM7WTCXcAClcwn3NvX5wzwDF1gB3wE63Ina6Krs0hYTX4aZsxFCnncoxiWcycKwGd+EigbGkW/ii
-QTVKqhJyNxLLiLyQCMzRbG1lH8YeOBsqAy+/W84BO/C5/L0ZuChq6L53Bc5njnei4z2MEyCGS4jQ
-UOrLQ+3NqCkpjGDCHMjdfQj3VQSzApRdGNbCxQhh0ymEh7LLY2eXx/q6KQgkhlIEK+0aGqpfDLK6
-6IYzXFMGlkqyxnHWXrpMfaDu1UhsigTvABFsgXOFBfZw3oIdxPNIv7cNjtaV9LoCLjhjnherPfwE
-MoJrj4txI8jnXkPEaRGZEcKRjnegAFE5mBM27PdTLSxdmQ+dSsubssyySx+gPIIgxZPBFgQpG44M
-HsouzSbfqF2+BWJAmxyUQcW2abTJ4qOky8UaakC2rvBE4ofQlK0ENTa809lr5hgonbF7qpFAGIdy
-t/IK9zt0IOpCZ/MOntUiBO9FrNbbV3RcQ27XJLpFYu+AGPDxBHLZAx+ZkRSW6mN5VEEeu/QBymMI
-UHYyFIGvMHpIu7RgJRDBayUGIwdTDWegZAerVLFt2usnTC46lipaXvA0MqHYZNJ15FE2tdDIoSZM
-gm86IjgAEjgEx9sHh+u51FRDsjf4NDIevePFHmPRGuaoBxEHPAZieKOO+EqfH0lSE3+FkRnVwmoA
-ZJDXLmMByrakixw24Hc1MhTAQ9ilpZHsM5s9Gjm8dcRwDir2wUmBhJAmhXDxMTdoFRIm8T5IemNN
-1YBOtwHpsD1QQcFoPwMiOIB02ZakF4xbzslmtThuzPhsMiWStF3lRsIdiKT6kuwj2QfFcKwOZ6mu
-PSUGc8IPklSB3KAD0hsenAya97TLWICCdunXz1Zll7bQbSXtGGxZoPIagpVjmGeuHzpYISHEScGX
-nJ1LukIAyxmrRgQWfZmhmoE+hXHoiGAbIi9UBI0pamCRz5rHMcdyN8eMi402mTwCMrDF8F1Jdqy/
-Bwc0tUA8LBmYXWIr9zx2OS1AKfoMhkXt0oKWnYja+QOGqQbbyIfrC0tXCySE6XlPrEqyG1M1dWBO
-Ybn9rhqlRSvPJuMLfXwG0fRuBhE0ZbWHneDf9U6INem+HcmOJDloI4iX+v+9UwVoamGujVPEXPcS
-mzPiel2wxc915LHLZZBAUXaJhNdz9vhIknUQI7q+koKlNxsPRQokhPzkUMXT1bBkz+T4jhrgU3W2
-L3U8VaczGd6fQgRlWkj3Tmi5Yr+DGpUD5p03JamQOtafvaJSeHAysMXipxqgfAmBSl67lJLYprfL
-RgYxYDrJKqRw34RV7PlgZbQsUiAh5JtQW+6xig7XUmM7ACJ4rk73VF/fk3Tr7LISwSxJ3wJH9PXr
-phjQ8bA0saNR2aUk5chE8ffK7ktfJ/tDtcWvdHy5RnaZRQyYTjI1i5vp+hnBysf1rmWQAgnBIVLx
-gNviNyIStexksKmPPUgRPVenMzJ4DNGyb/JVtQPRPTHEOsL2JN3ioC93Ny6FqOxacuz0JuYig6Yj
-g2CT3+h4rnZ6sGZ2mUUMPs1po58RrFzo7yycFEgI2TeuDROpsTcuYDVK7nBWtrenxrenTobKIFRt
-PJIkJ9uR7NLRKt5HkXRrbr9DtesiNN//6VSS3eokheJs0xpK7ikZhODk28n4bjK+Vjt9rOmUdbRL
-JAZf7LGREbT45nu3Z0sUSQokhLQyiKVaLO+Mi1ntkhqn/+z7IEsPJcnLhpTREyfFcUOZrNEEmOWA
-nhh8N0xbe7kU1zWWWIgM7HrvqA0aGfxJyeBzUAa9NbdLr2KnpZN8O3tEYaRAQrg7cbRAvlk1jtU8
-70iBB88s4fPbJNZXAgspj5F+bltEtuhrF6R4a02ir3kcEPvZbLgJqCVJlUeuRoHETDKwye2xKtXv
-dHwDZLAjd0/8a6yxTTYluydZLFjBlNl5kaTQrqlxxk78Eknn3fc0gvlMx2Mw1LItLmOay8ransBn
-3ZNkU4+X4q01jL7u64BNiS9UhtdeqzQvY7uSqpLBjirVb4EMvnC2WYcgZd5gxfdbsseF1xTaNTPM
-ZoSBbZNZU9IlcFj+9sxFLmWMFFEd7KuBPNLX9kDlbIHKadXE4fI6oC9fNLV4JklOt13Ta1YEGezr
-NT3U9NC3U8igbmrsPsEKEgE22rttpT0vKbRrcqH9wo3l5q4kKVFsQ/TyBCKYr/X5gU6mGyWcSPEY
-zU0lgg0lu44k9c5bEq/WqOtkhUTayLCbcP3e6/NtSGWQFGZfX7/PwHbIf65+9TXJYK5gJdZUz3dP
-mGvPVF0UAhqmbR0/1///Ghx/SyfTkF6xMrjn+vWepNcPyjixGSE09XEk6WqaTs2keN5gwa5DLyPC
-3Vans/bnZbOBsqrxNpCB7bTdUxJ4rsRAMrhfsGJkgOcw2BkueBobFcIMwwwGt6vR/5m+9kEvorV0
-sK3zuIvX1g+2XLqorCkjI8AePDdCjHV8JJJoNkYKVi9/Kcn6DFNHs0kW17MO1HeaGowF/3qmvkYy
-yB+s4PkLZ5Ju9X6sxNCUBVrr1IUQLHJ+rI7dUmM81wvcUoM1hRDeZ4209hwZlHFC9RFFC6KEaW2p
-iTgp+NbmXbCb3ZIqxTIGJ7iedaV+aI3r9oFcSQaz57CA2G57PMUx19npdSUEuyhNSXKXB/r1tiSd
-BEfwHmyjjIdtbJSYDLzheGMoW5+XKilKPCjpSp/bRsUO1VauICy2nmUlz12SwUKqwfdYW7jnWp1S
-Rpvg3FajP5R0zxtjYDxkY6NCqZasiZ/Odn+bsbSbrS8N9Pu2JtOh6pqqVPOuZ5EMpsOfzHatmY0z
-SQ7UwZPWFmrA2a6Rc3dBCWwDGYzlbldQfyZwlZyezlXM9WvB121Jup+inTBlND1lJML1rCLIwE5i
-C2nLsFEyrBvgoTqnAp1QSQizgQvBdqLRKIM8fB0wJ9l6k4KtLWDw0JD67uG4j0rgelYxZGAHdYWG
-i+GchHCQzu/y6TyP8DWe5MiU0T0M1OfestItzLkTSApjN6kJJ7RcypzrWYuTwo1G/x9UGQQS+HUy
-flNiCArhTJKUkXCncn4jxSZnTLkQeUkhZhe0k3zXjtdtfnVg+w3COsF7JYDflBBeyKe00amkz3nn
-GsICTk4QtBletzKTQdhbcKKT/wtQB6/k096Dc0l2Ki/c3I6LYgRBEOUiA79uEBaPf1cy+FWVQkgf
-Wen8TRFkQEIgCIIoHynE1g1+UTIIxHBnIbmoA3JICARBEOVRB3nWDU6kwHUDEgJBEER5ySDPusFt
-I7siz1QmIRAEQayeDFa2bkBCIAiCKBcprGzdgIRAEARRHnWw0nUDEgJBEES5yGBl6wYkBIIgiNWT
-QSnWDRBt3huCIDhB50Kj4L9ZinUDEgJBECSB7OfYyLBRMDmUbt2AhEAQRN2JwB5HbpKOEULTPc5L
-CqVcNyAhEARRVzKwyd4Okxm6ceMIwc50aLnn9yWF0q4bkBAIgqgrGVju/kYn5iudeO3RInLRid+O
-0e3CwEPt70sKpVs3ICEQBFFHMhjBhHwhybnEdjbxhX7vRn/OzoAOZ0JvTcaOjvA1ngs9ixRKvW5A
-QiAIoo5kYHn7EIGHHP2RjjA5nyoxXOr7jBD6SgL7k3Gg49Fk7CoxyAxSKP26AQmBIIg6ksG5pM8l
-/kMn4nc6GZ+pQogRQiCCZ+KOq9Tvb2SQQiXWDUgIBEHUiRRuYDK2yNzy9i91Mj7R6P1akjWEMD92
-lRAew3uQECylg6QQ+/ulXTcgIRAEURd1MNRJ3ibjMAH/YzL+D6JzVAc3MNm3VCVsSpLOwTUGD68U
-KrFuQEIgCKIOGIE6ONXJN0zEPykhvNDo3JPBSJI9CC1VBZegHvxeBgESCGjC3y/9ugEJgSCIOqgD
-nJCPdAL+TcfvEJ3bugHm/G2Cb0pSpjp03x/L3Y1qmzqvNiSdqirtugEJgSCIOpCCEUKYdN8rAdhi
-8ltVDRduso+pDL+DOaYKBFRFTx8xVfUSyKBU6wYkBIIg6kAIQ43+jRDe6URsawaXSAYZE/L4h7/8
-MJzxt4KKwJ3MY3281L+FqaIXqhZKs27g/xGCIIh1VAe2oHyuauBYJ+K8ZPAR+j1ra3Glv+utRvqh
-WuhnnexfS7ImYPsdAhG90ve+cO8pxboBCYEgiLooBKv/P1ciwN3IQ5jwpyJCCmGyP4LJ/pWShJWm
-2k7oY339taT3OwykRKkiEgJBEHVRCta36FqmrxfkIQX7faY8PigJoPLA/khGRNYe4wqUgZSJDEgI
-BEHUBdPONpiXbIxwcGSdrSDw928/xw9/+YGEQBAE8UAEYIu9YYOZdSltzUMQMHk39feE3xcqijZ1
-9CVpemd/L7xmjfG2JN3q4uNnKBMpkBAIglhnMujoJN2Hge2rc03I+p4GkIv1OAotLZ5MxqF8anq3
-DX8nPN+H7z/R9wTy6M5LTCSEYjGODIIg1o8UmjB5h8l5FyL1riQbyDJJIbweIYMwoe/pJP/5ZDyX
-T43vnujf2IK/GQjj6WR8oeMQSOFWKZRFJdRpH0LWdvMsYyIIotqEYAfcbGqk/lhHqPYJi8G2uPtx
-TCblcQ61Yb/rMyWCbybja53snyjh9CQ5WS2sK4QF5rDYbNVHvg1GeB72O6y84qgOCgGVgC38DCNj
-RPVAEGtDBkgIWzqJH2q07tM7HUnWFpqR0Xa/J5DBV5Px7WR8p8+f6vf6oD66+jOPVEF8qSTypX6G
-Pfj7pVAKrfu8+fvvv2/ABerDxXmmj3ZBbvNzJSIFIwIrQRtMIQOqBoJYL5jv2zGZfoewkUgTontT
-BTixP9VJPZDBn0AdHCjBdN385+fBMXwW7JFkwWqYZ+XHv/1IQliiOrAbYLLtXNJH5sXIIUYCJAWC
-qJZSGLvnvi8REkAbBh6fuePI4DsdRgYhDbUbIYOGI4Wm+xxZxLAyUlj3NQTcmGJbycOwDoPWc8QO
-z+5J+iBtf5g2SYEgqkMGAv69pRO3HW7TUn8Pk701uvOnoTUhVfRIknWDrzVN9Ex/544kVUM+EDaV
-seVIAMlgIOkNczcwf5EQCiQDkfQBFWGruW0hP9MbYGrHDtLehrEF5NAiKRBE5dCEyX9X54WmSwNZ
-w7sPmjEYwmTe07nAFMLnqgqe6mtIBi252/0USWns1IGlrmNprOEqFpnrohCulQBCl0HrOPheX2/D
-TQ8Gs6esj4dpj0EtkBTWM3C4b+RJVEsliAZ9DacODjRQPJlCCEYcYV441J/Zg4AxRgb4GSzD0HVZ
-C2tvcSklqTyqW8rIjrAL3Qlf6WsNiBZ29aZ/phLytlc53NwWJ4W1IoLxgpMNUR1S2HCEYFVDlkb2
-Zyrbz/h9DNuS3kcwa70UF6u7+vOWKsJy1GtJn9r2cTwkKbRr4vjYF906FL5QQxiBSrDFo3dKCBYt
-+MWhBieFytvE2AUNs8ih4QaJoZqkgOWoNjljQzo8U9m3qLA1RltfbEr+4hksyLG5ZgB/+1LSzfds
-gTm8Rx6KFOpECL5D4bGOG71ZtqPxPaiDIVwnG00wKqK6ZDB2jjd05OCJwJcjlqmsmshPCs1IxL4p
-6SqfcWQSt8Vhf/8b9/wMWKW5K+lOrNcS78r6YIvMddqpPHLEcAXsbAtNJt2u4CbYBpOeRgUdMAhG
-iNUkA1zUu5L0ot4Q3usbpFlU2YVJgjZQLVJowL1FBRDrVoqTeNMFB/Pcd1QqtuvZVACSwpWsaJG5
-XfMJwdh5JMmh2AOnDCzXaHlD62bYpEqorA3g4etYinzl7r9FlNgPx3LIfYlvPCKqRQwCAaFkEIJI
-caniWOURBqqXssJF5jYnh1SaACME7IMSKgrC2sK+TgY9vXZjTgaVVYtYaBDKDsO6kZ1zO3B2YPI+
-VJd85tIITdpB5dNIjRzpmEbBfzdrkTnW7wg30y1VKbD9tWJygX05mD/+zmqVL0BVsN9RdQMBPAox
-3NvfJuPvk/Ffk/Efk/FvOv59Mv5zMv5XPpUsv5FkY+OI93/tVEPWWMbf84vMocIx7HP4Skes51Hu
-lt0khMVJAScLI4UTjSJt44qVoo54xdaGGHxJciCG/5mM/9bHv+vrf+j7LuRuLxyCWIQUTIViF9Vv
-gBR2ITOxtIN12rwn0UkCScEOy/Z1ypwMqu+E1rOmpfcSFcO53ueOPm9pBGdrDUPef6IAWxQpUXsL
-KoRslYCVKH7ln5NBtR0Qpbodb2gHm7T13l9K+gD1D0oM17QBomCbtEo2W0/A1NE3kvRNeqQ2urSD
-dUgI02GlaNiRkMpgfRSC9bex3emH+tycTmRKR0qCKNgmPSkEEngud9cTlnbaGglhNnhozvpHZKF6
-yI45fKaOF1RDX5LS4kVbXRDEPKTwuTzgwTokBKKuzmd5WzvX4xAc7wtHCm36CrEC9frglUc0coIq
-IemV/xRIITghnpHbluWVIBJEjBQevPKIVUYEJXpaovvuk+F9A0naVZAUiGXbpciKKo+oEIi6wy8w
-h8jrC5XnzyU5CAUX8gjiIRXsfSqPZBGVQEIg6HjpNiV2TrhfT9iVcp0XXgWwIKN4BYuVR2ibPbTN
-eUmBKSOCjpdI9K7Kczt790q/7ukj9rFi6igfGcy67sT9SAGb4IVNkmFvDHZovj1DYR4CJiEQRNzx
-rCXxSF+7VmkeVESH6nouZdBw142kkN82sfIICQG79VpjRjvngwqBuBMZ0Onyw68nWMS1oVHYhrid
-ory+mWRgC6G2uVMkfcgQ7XN+UtjVyT8c5BVOgHwnSbdeLIYYz+MAxHpHZszd5nc6czzbnxAcLyza
-HejYFbdLlJct0w6t7csFRLLnLoqlbd7fNu3ALmu5sqeP/oznuRaXqRDWkwz86zwDeH5i6Kmz2ffy
-Hqxed3WAZHCprxnR2kFTIjx1bhEbxeM8C7FHEsL6kYFJdVSBTWHu9r7X0K6j1X2P4H3CyHbqdTRC
-ONeUxql+3dFodl/f05d0KS/tcjbR4qLyOagua7p4GxTOc4gOCWH9ZDoeC2r32AZJYTYZYNvzMJEd
-67jUCa3jHY+4A5u4wmQVzo94rc/bSgb+cCGSQrZdom+bXYa1Aju4K4x3aqt4VstctklCWL/owc5j
-tdIzS3t0JWmGRVLITnNcSfq0vDc6qYXvWXvsPWEOfJZCMFsMk9crvYaihHAVmbRICtlByhAU13u9
-ni8m4xf5dNKfXd9LCFbmAglh/WS6Rbbn4GghZ7sNEr1NUkg5HS6AftA0R4i8/lBnO9H3P9JryANy
-8qlVO3UwXM+Xeo2PdOKKXT+SQpwMTBkYGYSjXP9Px69qqydUCERMpl9odPtev7a87ZUkHRJ7kq6l
-b9TQ4WJS/Fjl90uNvH5XZ7vQaxau0xPhuRj3sUc8he5Mr+/lFELdqLmKjaUvz0BpGRn8Qz4d6/pS
-r6kd3vTxus6zfkBCWD8jMpl+rMZzps61CwaDC3p1TCFlSfFjnfxNiv+qz9/r+/aAWHmm9nyk8E5t
-LEYI+Py2z3/N7BKDFLtuZ5KswwR7/AnI4Hcl2g9ol/OSAQlhPWW6bVh5o8ZiLRdOJH0E5NiRwro7
-3ziSJkIp/lpJ4Ccdlpu185RbJIO5gJObVRvNIoS+xBsJrrNt+iDFjnA9kvSawU/6+Lski8mFkAEJ
-YT0JAdNGf+iE1tVJzxPCuCbOh4u/I0nnt1GKY/RlC3U3kqwbkAwWJ4WzKYSAkyLuCG+usV1mBSlW
-SfTSqdbf1K/fOWUwXJQMSAjrSwo22b3TCKOhBHEh6UPiR2vufDGHs4npPEOK/6JfH+n1Er0uJIPi
-SMETgq+Us53Mm5KcQ7FuAcusIOW1qoBfgAxeSlL1ZmQwLIoMSAjriZHczT9eS1KnbAtPwzV3viyH
-s92zR5JeM/jZSfEPen3awoqiokkBD3WJlf3asF7//TUKWPIEKW/ULn/WYWRg/YpQ6Y+KIgMSwvqT
-gkUc5/qIZHDtnC8sNlt7547E+/431sDhTtSxXunk/6skC8goxa/155skg6WQwlDi5ZV2Yp21dQ6t
-yHdnBCxVsM1pasjWC1Cx/gpkgHZ5AUFcoWRAQqhH+sjq68dgSDfO+QJZfKbOZwfL40a2WJ+URgmd
-bZrDmSqwvGwgg9+ACIIjHoMUH0V+N1EcKVjgEtshjm2dAzEcgFqYFrBUxS6HoIZs35AFKS8lWSuw
-woYjvRaXSKZFkwEJoR6kgBPjjVMP5nyn4ICBFPacVJ9GDKtywnFG9DXN4V5Lskj3Qp+bw2HrYFt0
-53GZyyUFJN0bCF7O1RZPHTFgwOLtslkhu0TfO3aK9UUkSDmTdFHDUsigSEIoY8vlZXymKv6fYyfT
-RxHns54971UpWERmUh13OFuJ6rTuio0lO1rM2cZO/cQczsjgd3W4t+Bw2JZ5NOV/YHvx4vxjBOQ7
-cmmjMyCFUyAHC1isY2qMGMpul5a6NMVqtvlSkt3xPkgZLpsMiiCEsZS3B3+Rn20d/s+R3O3kaRUf
-RghmoIEUnqjz7QMx9BwxNHOQw7Iir5GbSHwXyBMluJjDvZakC6evvProcJFe8mW2gbITQvQa6XUe
-yfRunh/gXoZxqAFLIIVtsMuuSyWZTS77EKN57TIEKW/UNm2YXVqJeCpIWSYRLEoIWa2Cb2CMV5zP
-G8vdqoaRy1uOa/Z/jpzBDiTdwwcbuh2C8z12Dth1kVkr4oBFOWJsYsHW1CbBr2ACMVXwNsPhUIYP
-ZkRfVbCBMhHCvXxOScF+blrKzwKWNxCsPNIU0g6kOG3h2UZD0qfblcUuX0u6W6lVEFl6bCBLXi8o
-WiHEGN3k0FBWf6LUGKLgC0n3DL9PH5p1+z9jzncNpPAeHO+1Ot8Tdb59cL5Nl8tF1VCEA3pnG7rJ
-eOAkuK2F4Od/k+FwF+4ajWxyqqgNlI0Q7uVzU0jhJmKbb5QMLK1pdoknh/UygpZWAcqhKLt8I8k+
-oRN934XARrOHSBEVQQixDpH2D2/p611Z/YlSZlhXkB+3FEGeI/zW8v/McL4bl7s9dflNc8B9SCHt
-RBSDpZPQCRd1PIy47HP6yOvUpRXegrO9X8DhqmIDZSKEuXzO7sGUFBJe+zdKAPtACo+AFDBg6Tpy
-aJfILm1d5BLU6ihnkFIqQsDOmid6g7b0tR29+GWZKG1T1iv9nLZQM0sprO3/GXG+UYQYLHdrUc0u
-OOEuOJ+PytAB2wtEz34xDvdMWD72FNIJ5nj2/ES/d7aAw1XFBspGCPP6XN6AxQh529nlPgQq20AM
-Rg69EtrltU9bPrQqWIQQLFfqj8h7oa+9l6RhWrMEBopnBFhP9iPI0WXVmtfi/1SjG6sDIjEMwMBN
-qm9KcrD3tj7ugkowUuhLusV2a85rhLlkS9FcSProwA/gYB/A0c5BDdxRBDkdrmo2UBbM63OSM2C5
-kvSa1zsggG1QCFtAGluwxtAvmV2OUDmtiggM92bIyU2yRZoNvdh7kMfb0uhwEUlWZLSCOc0zyOPZ
-BqSP5VyTmzCu6//p/meR9CHzLUgBdfR/tkl/E5zMkwFGY4s63rVzPHS+C+doqAQGcxJBFW2gTAqh
-EFucYZcNSRaN0S69DW6CnSIhVNouy54yGuvFOQEHKYuExgUqiyysnOu+KaN1/T9nKQYz/rb+XiOH
-DUgN4SOmjuZpre37wg+cJL8CqY6PA0nvxB4X4HBVsoGypY0WssUpdjkC5Xbj8vZtsM0NsEMMUtbB
-LsujECBy8hGkX6wpy0Tpe9qkGHpapFKX/3NGZCYuMmvCRIjlfS0gi47c3d3cmOP/QXk+iDjXjZPd
-I+dwCy/KVcgGyqYSCrXFKXaZxzaNINbGLsukEJAlsZ4dt4+XsZ+Ir8Ef8f/MFZnhIl9DkuqKhkZA
-TTewxK+o8r4hjJEb6KSyBIerkg2srS3G7DKiGho6ETc1Qsfdy214XAe7LI9CiOT2pAKREpa73TeX
-XIv/857RmUj2RrSidomOMxwrugN2mc5WMRuohS3OUA5eQaylXZaKEDImiVJjkZtTl/9zQYKIPRYR
-bfrHlThalWygbraYkyDW0i5LRQgEsexJs8pORtAuCYIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg
-CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg
-CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg
-CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg
-CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgiCri/wUYAD8O5HH6
-b19JAAAAAElFTkSuQmCC" transform="matrix(0.24 0 0 0.24 62.2632 5.377)">
-		</image>
-		<g>
-			<g>
-				<g>
-					
-						<text transform="matrix(1 0 0 1 69.8926 43.0293)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					
-						<text transform="matrix(1 0 0 1 69.8926 43.0293)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					
-						<text transform="matrix(1 0 0 1 69.8926 43.0293)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-				</g>
-				<g>
-					
-						<text transform="matrix(1 0 0 1 66.0464 43.0283)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-					
-						<text transform="matrix(1 0 0 1 66.0464 43.0283)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-					
-						<text transform="matrix(1 0 0 1 66.0464 43.0283)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-				</g>
-			</g>
-			<g>
-				<g>
-					<text transform="matrix(1 0 0 1 69.8926 43.0293)" fill="#00B0D8" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					<text transform="matrix(1 0 0 1 69.8926 43.0293)" fill="#8CC63F" font-family="'Moderna'" font-size="39.3832"> elic</text>
-				</g>
-				<g>
-					<text transform="matrix(1 0 0 1 66.0464 43.0283)" fill="#00B0D8" font-family="'Moderna'" font-size="39.3832">R</text>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		
-			<image overflow="visible" opacity="0.75" width="251" height="251" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAP4AAAD+CAYAAAAalrhRAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEpFJREFUeNrsnYl2G0UWhkubZTvx
-kpAQZhhggFfIOzGPNLzT8ArAwGQSSBw73m3Z0qjn3Bv9uqnWYmtpyd93Tp22HNNSgr+7VFdXpwQA
-AAAAAGtI7aH8RX/4xw8P6u8LU9P78Z8/Iv6aCV4rOQL0So5rHRBqayZ67uijHl4jP/RkdMPrsoCw
-FoGgtkai1zNHH43+aNqxjvwQhL+1cWOvuxIIupnAsPKBoLaiwke5GyJ3M/O6GBv90bKB/Eiv0nf6
-49qONzI0IPjrGBRWMgjUVkj2WiaDN0XmQuy2HVXyto1N+fNmkB75H2ZP79Jf2bi0Y0eCwbV971q+
-3wmBQSuClQgAtRUQPsrukm+GsdUf23bcEsnb8udbIn4d4R803SD+hY1Lkd2/fx7+/FJ+rpOpCD7O
-E1Q1ANQqKrxmdy3VXeBH/fFYxiM5bgfJ2xIc2hY4EB+6UsZrxlfxXfozG6fheCbBwKsCDQKVDQC1
-igqvZbyLu21y79nY749dGzsivmZ8bQM2RPoG/T0lf+jhr0M5rxlfxT/pjw/9cWxfH9v3T6UyuAzt
-QOUCQK1iwjdKZH8ssj/pj6d23BPpXfjNjOTM6kNO/NysfgwGXgloADg2+X0cyTiWIHApVUClAkCt
-AtJr/+6l/GPL5C77vsnuwqv025kM30zDl/O4jg+j5I+X7bqhFchVAKcSAArhD2y8t/HBKoKzEAD8
-3GmZAaC2ROG1rG+L8J7Vn/XHZzZc+H0R/pH08XqZrj5CcmbxISd/PPZGBIHY/58G+d/2xzsbB/b9
-sgCwtOxfW5L0WtZvmsSe1Z/3x4v++Ny+dul3QobfyGT3MtETwsOEASCVBIJuaAv8ct+lSX0i8r+z
-APCnBAFtA65kDmAp8teWIH0jZPldE7uQ/Iv++IuN55bt96SH1/69MUFmB5hlRaBD5wKuJABo9i/E
-/8OGB4FDCxLnof9faOlfW6D0Mct7Wf+ZCP9Xkf6pSb9tPx/LeWSHKgSBeFnwQsr/9yZ7If5rG2+k
-BTi1gDE0+bcI+WsLEF57+Q3J8k+tnHfhVXov7bdGCI/sUKUgECsA7/8PRf5XNt7Y6/eW/S8k+y9E
-/sYCpfcs/8Qy/N/64+/98a0dvxbx96zv99K+MSLTAyyD2GLW5ffUk5yuGt0Mrar/LueqiPTy5cv0
-079+Wi3xQz/fsr/4jpX1RWb/xoT/zr4ugsALqwI800fh6wgPKxAE9KYxXUAWV4/qPFVuDqE3T/kb
-c5Jeo962ZfBnltG/NuG/ta+/DFm+nfKLbQBWLQDovJbeRNZOw5PUNZF/6GafecnfmKP0bRP5ifXy
-num/s9L+KwsEZVmekh5WOQAk+T2ON5i10/CdpA0p+32ysDtP+Rszlr6Wkf6FSa79vJf2+9b3b5Ll
-4YHMATRC+a+T13G9wNzkb8xY+oaU9z6J93Xo572037fgEG+TRXp4KNm/lSn5C/lv5i3/TMTvfyCP
-aC2Tft8yuvfz35v0f7VefzeU9ggPD6331ztQm5L8ekH+oeW9s5L/3uJbtvco5tfon1s575neL9U9
-S4NVeDqryb3x8JCyf7w5TcWP8t+msMHHLORvzEB6vU6/Y3J/KT39Nyb9Z9LPt+jlAfk/lv7a+zdC
-v6/y++q+e1/nb8xI+nYavk6v0n9pwWAnDS7VUdoDpf/g978RhidFFz/u83dv+Zv3kF4n84pM/tQy
-+1cmvF+ue2J9P9IDfBoAPPluyve11NdNPzsi/s1CS/0RM/i+OOf7NLhkpxN5LaQHKM3+KZP1/R6A
-6yD/zX37/anFL94oDS/FLWbwv7AM/62N4mu/Tr9tAYKeHmC8/LpEPVm5rzsAXaXhHX3vVPJPVeqH
-22sLmR9Zif/CMvxX1uMXK/X2JNMjPcB4+XWi3IX3+/x9Z1+9k69715K/MaX0tYz0uhT3G+nrdXEO
-0gNMl/11/b7u/68P/bhzyV+f8kPlZvGLMv/LNLilVlfksY01wPTS16WV3jOvfN+KLyzh+g1tHx2z
-5Dy7Ur+kxPd1+L6BxudpMIOv0gPA9CV/L7jmG3uc2PFeJX99yg/TnDYKIT/AnYgL47y6dt+K137F
-7ONDYibN+mMzfujtC6n9mv2LER+CyTyA+2X9VFLye9b3DTt9y25d1juTjB+zfSH4MxP+izTYI09L
-fACYTclfH9FeP8sl3EmyfnPKbO8z+Z/bB3hOiQ+w8JJfH+JRHIvLfFfTZP36FG/sM/m+B/7n9iF2
-0mAjDUp8gNlm/TjL7/I/l8T7OE05w1+fINvX5E19W+xndtTluJT4APMt+VtWXe+Z/M8sEe+G5Hvv
-Hl83zdQ3LKSPO+hQ4gPMt+RvScu9lwYPki3E1zm2+n3Ez+2J7w+01L3yWJILsJiSvxb6ffdxLw3v
-XTm23K+PKfN1Oy1/xt2TTIRBeIDFZP3miKyvbXftrhk/vsm+lPg7IdsDwGKyfpzo06w/8TLe+ohs
-X5vwDSjzARYbAHQxXa79HjvJVx+T7bXM92zvZT7ZHmA5WT8+mu6JuBnn3SYWX0sK7SX2ZRKhnbhu
-D7BM+XXSfVdacJ97GznJVx9xcr10sGsjPuoK4QGWV+5vSNbfDYl55GW9ekl/r5fxHsmJ4+QBACwn
-40dHPTHHPr82TanvG/17xn9sx7IHWwLAcnr9diY5b43r8+uZE+odQVsivvYOZHyAapT7Len1NeMP
-7YAV+/yyHqAZxN+2rynzAapX7rdN9i0bPrPfGJvxQ3+vkWTLxI8no8wHqEa57/JvSYLWZ/HVpunx
-N0IU2Rg3YQAASwkArSD+Zvr0yVUT9/hNkX8jk+0BYPnS10ck6tJLevWS8sGl16GlAwBUq8938bdD
-sv549U0n+OolJ9Iev52YzQeoetb3cn8zlPoTZfwkZUNbRgvpASqd9T1Zt8TX+sgePzOj3wz9Qjsx
-ow+wCr2+jlqaYnJPM/5myiwG4N8ZoJKZPzfSuFK/lpkw8LKhifgAKxUERlI2q9+Qkr+B9ADrRX3K
-sgHxAdZU/FwAAIAHIj4AID4AID4AID4AID4AID4AID4AID4AID4AID4AID4AID4AID4AID4AID4A
-ID4A4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMA4gMgPgAg
-PgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgAgPgDiAwDiAwDiAwDi
-AwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAwDiAyA+/wQAiA8AiA8AiA8AiA8A
-iA8AiA8AiA8AiA8AiA8AiA8AiA8AiA8AiA8AiA8AiA8AiA8AiA+A+ACA+ACA+ACA+ACA+ACA+ACA
-+ACA+ACA+ACA+ACA+ACA+ACA+ACA+ACA+ACA+ACA+ACIDwCIDwCIDwCIDwCIDwCIDwCIDwCIDwCI
-DwCIDwCIDwCIDwCIDwCIDwCIDwCIDwCID4D4AID4AID4AID4AID4AID4ALDS4vdkAMCai98bMwBg
-zcR3uW9t3MjXiA+whuJrVu+a9B0bN8gPsBJM5Ggu4xeCX/fHVX9c2rhGfIDKyz5xa/5/8X/8549J
-Mr2X+IXwFzauLPPf0u8DVFL8rrTlt+NczU3uaca/ykgPANXK9C59R8atfX+s+LmTXJr416HPB4Bq
-ZftOaM+vzNnupD1+z/6D6zD8JF3+rQEqle3d10L48zSYl+to1reWvlT8buZk15keHwCq09u7qz4v
-dy3l/tiM7ycrO9GNRBAAqIb8neDrpfg6usfPzOx35ERePjCzD1CtUt+vwl0F6TtSvU80q5+kzC9O
-dGbi+2U9JvgAqiN/rjqPSXpsqa89vop/avIzuw9QzWx/Lkn6Mo2Y2BvX4/sJXfwzCwSxhCAAACxH
-fr2M5+KfpTGX8j4RP/T5vnrv3MQ/sa+vZNIAAJaX8b0ld0dPpSUfefm9PuLEHcn4xzZOQtZHfoDl
-lfkd8/FU/Jw+44cTdyWanNiJtde/pdwHWJr8t5KYP9g4Dn5m+/tRGV8v6bn4fuIzawEo9wGWk+29
-t780N4/649AcdfFHVuSfiC/RQU9+aic9MvkvQlQBgMXg82+a7Q9teMYfe1NdfYI+4trEP7LxwV5f
-puGVfAQAgMVk/BtJyJrttb8vLfNHia+Rxfv8IpochJKCGX6AxUp/K07msv3INfojxZfLej67f2En
-ft8f7+x4TNYHWKj4sf0+MhePrNdXH9PU4pf0EycWWd5Z5j9Kn84gAsD8s/2Z+XdgPh5aINAl9aVl
-/kjxJevHywbFG721SPMhfXpdnwAAMHvpu6H6PggeTjSpN2nGj6v4vNx/awHgKDehgPwAM0Ur71Op
-vN9aAPC2+2MCHpXtx4oflvDq7H7xpn/am2rWv+X/EcDM+/puKPEL//4w8T35TtVyNyd8c70//4MJ
-X4j/WX/s98fj/mjb+eoSUGr8vwOYaYlfSP8mJN6psv0kpX5Zr+/l/h/2Ad7nJhco+QFmUuL7Cr0D
-c+6NHd9Lqz3VBHtziujjH8IjTyH+bn/s9cdOf2xL1q9NcW4AGF/iH5rs/7XxNg1P6k2c7SfK+CVZ
-/9SiTfFBXvXH68wHYWNOgNmU+B/Mr9cmvWb7sevy75Pxc1nfP8wj6/GLjL/VHxvS69fo9wHulO1j
-if/GpH+TBjP5F0l2xJo02xc0Jv3Bn/71U3r58mWMKi52cZ6Wlfob9nVTAkBCfoCppfeW+j/98auN
-V/a9kzS4jP7R0Xlk/NyEw7EIv2Vj0163pN9vID3AWOlvM+30G5P9VSqf0Jsq20+V8SXrp9BP9Exq
-F3xDMn/TvsclPoDJpNfyvujp/22Z/jd77eJ37lLi30n8IL9ORPSk7G+Z9BsZ+WvIDzCx9IXsv5j8
-RX//Lg1fNp+6xL+z+Jl+X7N/XTK/9vma9ZEfoFz690F67+vfpeE7Yu9U4t+nx8/1+xciu2f8VhDd
-2ZCAg/yA9MPS/9cy/M8mfTGx55fKfRa/ex/p75zxS/p9vf6o5X+jJPMrBABA+oH0nul/T4P1+Bf3
-7etnIn5Jv++rjXQHXm8BGjK8EqghPzww4fX5lGXS/zJP6e8tfuj3exn5df1wQwJAPchPAICHJL1u
-bnNg0v9WIr2vhL2ZlfQzET/IH8sYlb+Xhlfz1UrER35YN+GTJMS4Is8n8n7OlPdzkX5m4k8gvz7O
-R/t/neEn+8O6l/b+IFq/vfb1iJ5+btLPVPwR8t/I8UaCQLyNkOwP657lfSONQu5XQfr/LEr6mYtf
-Ir//xTsW8Xx00vAOvYnsD2ua5XUS7w+T3KX3xTlxIm9u0s9F/CC/Tva5+FcyPADEp3qWZX8CAFRd
-eK10PcsfSpbXSbzf0mBF3odFST838Uvkvw3yX4YAkMv+oyAAQFVK+ii89/K5LP+r9PNFj3+Qhp9C
-fTtv6ecqfkb++A9znZFfs3+35B+YIABVEr4rv9cdEb4o2/+0jP67CP9bGtxa6/vhT71nXqXFF/lz
-UbEj0ueyv47bkmqgRxCAJWZ3/10ufm/P0/Au1K+ltI9Z3kv7c/l97y1K+oWIH+TPRUnN/nHkgkE3
-EwR6VAMwB8lj7x6zu/fwJyL8m4zwmuV9Y9qh0n6R0i9Fih/+8YO/r+7cU2zeUWzhVWzV/bQ/nvXH
-cxvF6yc2fGPP4meLTT98w49W+nQpcJwgJADAtFm9l8nwPlN/ZfK6+P4AS3/CjT90xh88c2w/eynC
-ezu7UOmXJoPI7wGgaRIXAeCxCb4vwj8dEwC2JADo3v7jVggClGX2uPT8JiP8sQnvD688sPE+DT/M
-0oWPk9gLF74SZXAm+3sAKETetiCwEwKBB4Di9a79+eM02ParFYJArhIAyEkfRddW9EpK+1MR/lAk
-P5Tsfloi/NKyfKX630z29wCwIVXAtlQCHgT25fVOGuzt7y1AbhcgxIcy8V34TpDdhT8X6Y+ltD+S
-zO6yX0hJf5PCQ2aWKXzlJr4yAcBbAA8Cmyb1I6kEdizr70rpvy3ZX6sA3fIbQNFJOxf9Qo4u/Zn0
-9Md2PAmy60R05YSvnPiZAJAkAHgV0JIg4JWA7uu/LT3/Virf6x8gJ75fYj43keM4D0eX/Spk925V
-ha+s+CUBIFcFxHagLWNThu74yyw/xBJfS/24tuRSsrheWvbFZp1Ufpm5ksKnVfrlz1QBvqVXIw1v
-7dUKQcH3/tP9/+jzIcqfW1Z+HcTOLSiLt5pXXviVEn9EFRDnBLQ18IDArD5MK//tCMGHyvhVkn1l
-xR8RBGIg0IDAdXyYRv6c3L306f0iKyf7Wog/YSBI9PRwx55fjysv+tqKP2EwAJgoAKyT5AAA/+d/
-AgwAaFeeoOG0Fd8AAAAASUVORK5CYII=" transform="matrix(0.24 0 0 0.24 1.3169 5.2104)">
-		</image>
-		<g>
-			<path fill="none" stroke="#FFFFFF" stroke-width="5" d="M57.421,49.944c0,6.282-5.089,11.37-11.369,11.37H16.685
-				c-6.278,0-11.368-5.088-11.368-11.37V20.578c0-6.278,5.09-11.368,11.368-11.368h29.367c6.28,0,11.369,5.089,11.369,11.368V49.944
-				z"/>
-			<path fill="#00B0D8" d="M57.421,49.944c0,6.282-5.089,11.37-11.369,11.37H16.685c-6.278,0-11.368-5.088-11.368-11.37V20.578
-				c0-6.278,5.09-11.368,11.368-11.368h29.367c6.28,0,11.369,5.089,11.369,11.368V49.944z"/>
-		</g>
-	</g>
-	<g>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="16.863" y1="20.652" x2="16.703" y2="27.521"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="16.703" y1="27.521" x2="24.674" y2="33.102"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="24.674" y1="33.102" x2="37.905" y2="33.102"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="16.703" y1="27.521" x2="8.574" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="24.674" y1="33.102" x2="21.327" y2="43.405"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="21.327" y1="43.405" x2="41.571" y2="43.405"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="21.327" y1="43.405" x2="8.574" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="8.734" y1="25.231" x2="8.574" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="8.734" y1="25.231" x2="24.674" y2="15.931"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="24.674" y1="15.931" x2="38.065" y2="15.931"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="8.574" y1="36.537" x2="31.369" y2="57.574"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="21.327" y1="43.405" x2="31.369" y2="57.574"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="45.875" y1="20.652" x2="46.036" y2="27.521"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="46.036" y1="27.521" x2="38.065" y2="33.102"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="46.036" y1="27.521" x2="54.166" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="38.065" y1="33.102" x2="41.413" y2="43.405"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="41.413" y1="43.405" x2="54.166" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="54.006" y1="25.231" x2="54.166" y2="36.537"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="54.006" y1="25.231" x2="38.065" y2="15.931"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="54.166" y1="36.537" x2="31.369" y2="57.574"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="1.8947" stroke-linecap="round" stroke-linejoin="round" x1="41.413" y1="43.405" x2="31.369" y2="57.574"/>
-	</g>
-</g>
-<g>
-	<text transform="matrix(1 0 0 1 102.8281 163.3496)" fill="#8CC63F" font-family="'FontinSans-Bold'" font-size="13.1277">toolkit</text>
-	<g>
-		
-			<image overflow="visible" opacity="0.75" width="383" height="229" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAADpCAYAAAAkoEDjAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAKmdJREFUeNrsXYl220ayLa6SKMmS
-LduJnW3mH/JPzie9+afJL7zzJhM7XiVZsjaKJB7bqTIuig1wFwHi3nP6kCK1EajqW1tXiRAEQRAE
-QRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRDEkmis
-8pe9+u3V1l2gf/3PvyglROVlnXJMPBghqHI03O9sVPi6JJHnCZWMqJise9lNKLPE2ggBrKTwe5q6
-GvBYRWJIClYhWVDZauERVEHWUS5H8DiirBJFaK/gd5hytHV1xqulq1FRQjDlGepCZYqtkW4aJIjt
-RlVk3eTS5Pd+vAa6TJYJYnUeArjOLVWM3fHa07ULylIVUrDN3BRmoIoUUyYkCySNxBEHyWF7vIOq
-yDqSQZDd2/G60XWrr4X3GD4iVu4hNFURdsbrcLyOdT1SZeno95TJnZ7FxQ6bf3+87nT1gRSGQBT3
-+t49EEjUqzDvgUpYae+g7LKORs29ksDFeJ3rQoNlyFtKrMRDcBaTKciz8fp+vF6M11NVlB2wnKoA
-U5SBEoFZV30ghT6QBVpe9v19RxJGEJkwE4mhkt5BFWTdZPhOyeDjeP01Xm/H68N4Xep79BKIlXsI
-Df0du6oUz8fr5/F6OV5P1HJqVyxsNISN/xY2e/QKwtfXuq504XMjijv4WQw7mcdAhayW8VR2WTeD
-Y6DydzpePZXpayUDM3AIYqWEgNUW3fHaH6/Hqig/qhW1r650lQhhBGGhPqwhhIWMKIKSfYF1qVbZ
-pa4YQdyTGCpJBlWQdSOEe5W7nsrauXoHXclWSCW8tcQqPQSRtOpiR5XiSJUluNIHko2tVgGYOMa8
-wMiRAoaMrhwhfHbrQpd5EreOGEbMMVQCVZB1yx/sqXyd6f+6o/97k7eRWCchmPVkFRg7klZg9EBJ
-qlRplDhiSNxrAxc+unXEYKRwrm77qSrmmb5+mUMMXz0GkkLpPYWyynoChDDU/2tH0iqoqughUVFC
-aMBqgrK0JK3VbldQEH3ZqH8+Aq9hAOElI4Zr8BbOlBA+qtv+Sb8+h7DSHXoi9BZKSwZll3WsImrD
-/4dhoiqeDSIq5CHElKYZUZ6qKb/3GjxZeK9hGPEariQt+ztVQnivy8jhHDyGPr2FyhFEmWS9UfC/
-EcSDE0JMYWKbbJU8hcYUssDVVWLoKTGEEkWLMz/RdaKPx/r+eyWLz0ogt95bIClUhhw2LetJzv8z
-FdOa9VEGSQhEsVIlTvESCCOE5xhjDkm9AyWHY1hHSgoH6jGcgbdwZ94CSYFYl3y7Hk3+eQKEwZP3
-JARiRrLIIwfsebOjnkNPCeDQrX0lDwsjZbwFkgKxQk/GwkmJe60RkWP27SIhECskBzvlasQQwkq7
-znOwZaTQVW8h5B9ugBRGVDxiCSLA5nwGTI77SiQsoCjs28VCCBICMRs5YH8bLFn0xGCho56kDdNM
-Oa/BdScpEPPIou/QuiNpKxUzVLoqbx1Jq5NEsuduivp22e9jhRwJgZiBHBLJ9s+P1bL3JK1p3wHF
-NOvuiqRALEAG2KE1GB53+txOXe84ues6Qijq23UHJIEEwQo5EgIxRTljoSSz3MxjMAU1S82XMJIU
-iHlkrqUyFYyN0H/pqcrXSF83Q2Rf0vxWF/YF6+lV1LfLvr6RbGdgegskBGIJbwHzDC3Jr2cnKRCz
-egcd3eRDRdt3Kl+3+p6FKi2PZaHKHechmDfg+3bFWrTgCfwBvQUSArG4t+BHM/r3BAjlWiCZR2Uj
-ImRg+QJr1y1KDEMgCvMMLGTUBYPECMFyB75vlx24/KTroy4rnbZW8DxPQ0IgFvAWitoKYPsMxFeF
-o7IREflqqcV/pLKzp/JiByitoGFH0jCl907zTuCbtxC8gnCo8r3+nX39vV19j+dpKobWIj/066+/
-otDtqMt5om7pd/r8ULJDQ3h8Pp8YfH04hpBw6MpIskN3vs3HDffk93//ziu6YlRM1v3hMpMnzCM8
-hnWkrx1IdiQo5rN84rknk+XSsVGi3pD5+pxySkIgIUxXYrs2zQgp4BB3nJWbGbhDUiAh5JBBCzZ1
-28wxVLQDoaK2M0Sakm3e14HftSvZ2dI7LuTUlOx8Z8opQ0bEnEqcAEnvuvf9PAZPCHlhJaKectQA
-gmo72YiFKRtTPA6UMU8MO86LsNfajhgSho9ICMRqSMHCRVYXjqM9v1lgVDTCeQnmKcQ2+qLGjeLI
-IK9vVyviPZi30AQPITZbnCgZOD2pnIosoGi7GqYIHVLDYPcfdYVZvqF65Eitsm8nm6d1riRqQwYi
-2eq1oiq2xozkgr/TwlFBRkPY7ERl9Kfx+kVXkNXnIKdtyik9BGIxT6EJpIAegg3hmTgMJGnSmSAa
-a/yd6DW0ZbJs2sJDd05W78FToJzSQyDmtPKQFMwKe6GW1w9qfYX68h69BGJDXojJKFYzWeL9pcqr
-ebN2GppySg+BWFDxrB/NniqVjeu0Q0JXaoGhp0Dri3hIb9bkVFROrQ8SjpO9kOzIWMopPQRiAfcc
-yx731SN4ppaXWV/HwlwCsXk5bYLxYv2TrET3qTDnRUIgVqJsTcnWwoeDRc9V0Z7p1weSLfcjiE3J
-aVeNl0AAJyqrZrhY2AgPsREkBGIBZWs7UnimynYiaYyW1hdRNjk90YWGS4t7EAmBWE7h0CUPSeYn
-SgpPQdm69BKIEsgplk0fS9ouAz3ZBg0XEgKxuPXVcC75sVpez5QcHtFLIEoip954OQJC2AWjhWEj
-EgKxoLKhou1O8RLokhObllMLHfUkbYbXIyGQEIjVu+RW9+29hENhJQdRHjlFUrDmeruSTSyTFEgI
-xIq9hKdKDMeqdKzkIMpECDalzTyETLtsGi0kBGJ1XoKV92HYKOOWU+GIDRgulvMyUrC22VgeTQ+B
-hECsyEvwlRxPlBAeiQsb8bIRG/YSrCOqn5tA2SQhECtSNmtrYT1kjoEQejI5xYogNmm82GpRLkkI
-xPoUzdpaHCkpGCGw3psom7x6r4CkUBLUubldUiC4VQM2vztUMojVe4+Eg0mIzZBBEUkQJISNEkGS
-QwoNeK1REYLAiiMr7XukC8tPA2kMKPLEho0vr380UEgIGxXKBCxlbzE3ZHLebFJicvCnQvEA0CN9
-DITQBVd9tOl/etawFUeBbpXuWavr0o7TpFzWz0MYSTpVzNYQNn2cE9uSybGD01zgTcKP3DxwhBDe
-C/3pGw8xdzlHuWLE2sizJsP/mePJkTCq55EPVd/udQ0cKWxy06dc1owQErBSgjCG4TI3kg6qH0k6
-ChDL4my1ZbJErkykgKMM/QEgDBnheMN1KVmRcjUKljiLMcmxIHMVkwRRWp0bqt7dqc7dSnaY00MQ
-AOWShDDhHQxVKMMEp/Px+ix/T3C615tvA8P3dNmGagdpbGMtk6fgw0Zt9zl8i4B1EMAsioUVJt4D
-i3lxFlYYTVFI23RIEOUlBZsFfq36ZjOW++4er5MAmpRLEoJn94FaJ4EI3uk6VeEUSU/9hlALdmd8
-FAm/NEvmKcTaBCAhLN1IzClbTKGaBcqFdejoeTWdJTYqCC2MIorpFfSbopoikhg2bojdq45dqTH2
-xRHC1/u16H3KIQHMB/pQMOWSHkKGEMJs1/fj9cd4/aVCOtSN00o37dRvaAVhTeOsR9BuiUnBSlB3
-nXfj2wQkcyqcJwFULjxshCdSO+518152dHlyHYE1eSfp7N0BKNcQlPJev/celHUiaakKSHLYnFdu
-hPDFEcL9Mt5BjoHiDZJORCY74O1vXC7LJJN1yiEYg/fVUjkbr7fj9ad6CX0VkF3Jzhn4ToX4Rm9u
-khNnLIuHYEqAXgKGu741EpsmiBEi8NaUV6IdCFftgHfSkWx+JkZUqHgWa75xijUCZbvT9zEXZI/9
-iMKO6DVsxCsf6v0wD+GLhozuZMEcwhQDxbfIQFlEfejCxr8JuRw4mSwFMdSxyshu7JV6Cp/G6yOE
-jaxS51DfszxDXwUcLZCyJJnxbzdzCGFmDyGicK0corHE9b4LUe1FyKgDP78bCWV5SwyTj2hhWXLy
-GmLSV+75FShkP+bikxgejBjwnt24+zJX/mAGA2UnIp8oo/a8t2G5vAEv45vXUAZiaNdQQNG9uwVX
-9kpftw31El63SqSmsz5asGGW0Uvw7nFhDqGACMz6N8V6BOtIyROrmvZkMhnfht8Va3DmQwz9iNL5
-apVrvUe2LnR91ke7f95C++Y1kBjW7iX4KiO7DwMgg8JNcE4DZV/l0U7sh0csw+7Bxv+QcvkZ5PMC
-yOIOyHHjxFDXk8qYABq4mJ+oMOAGkkA4CQXLTyXbdPio4UhhpkZiBZYXEsGBbv6PdVlX1WNHCLsu
-hOTLdjGu68944L3BcyJoSQ4iFueVU7wzXVZJdgmhihsXA/7mtpMU1qpvA7dG07yDGeVy3xknuJAQ
-9iNe60PK5bnK5CnI52cXQutvOpRU915GnhyG4ObizbZTwNZi2prH7Uk5u4nGGolNhLZcUg4rLiwp
-3ZO02ips/jZv4alk22zvu9hsR7KdLf3/kXfgzyufL+3zyuetsiunfKiARg5eCe/L5LJvcag2idzT
-IiKYJpcxA8UKP7AycD/irXY2JJcmjx91fQJiuNTvvXXGyoN6sW3KavSm+55GHb1xn3Sd6+ZopFCm
-fixFB2waBcSRRwRPJB3P6SuuHjmvAL2RZgEhxZ57oo4992G/kbPMTAEvI8Rg984UEYmh7xWQpLA2
-A2wWMphHLmMGyqFkzxB1HQm0NiSXJpOBFD6oLH5QeTydQgwP4sWSEIqFF0vmLmGDuZBspURHyleC
-Ogtx+Koki7/6klsjgxNVOuukignrdsTaylOuxpT/S5yyFW0s3pW/0///2rnrpoSh3PidPjcltDzD
-N2KAw0TEAwHIYFa5jBko+xFvoBUxTjYhl0fgzZwoETxTWTSCOFV5vZQ0f/kt77VuUiAhRBAuuAqn
-Mb4vm7NqgaXqqDeIJtx/PHvxGLyB57qeAREcS5o/wVLW1gzeiMyhfKZgjRkU01ZH75Vv8IehrhMX
-VninSngGCngrG+qzQzKIHq6cRS69gdJxnuo8ZeLrlMs9R24+DPte1wcIJ1nJuxkrw3WGkEgIs5MC
-1iH7XixJgaCU1StoSZoXsXnMQdG+1/UduOIxImjnEME8yrUKxcTEnx/VaGdK7OS5Tz7mEYMviyQe
-RjbxUKUNe3o6p1zGDJRGSeQSy2PNaDl2XoN9Lgt7YXjzVn/vcF0hJBLC9Jsrkk00x3qZVClE1AYL
-zKwvU7iXukzpHkuamIsRQXOFiraMYnolxCorJAfrT2XkgAlICzV0VQEtJDikGjyIx4pDnh6BXL5Q
-mXyhMjqLXK6aBFYllw0nl1gpZQYKFq14srvwxsqqSYGEMN+NLuMJ5XkUzg7ddVTYToAIfnBkgBPX
-ioigTA3+vBI2IuSArjsOEupJtlLqHKyyoXCy1zpl0wo3euAVvFCZ/HFBuSyDbHq5bE4hBvMacO27
-UBgaK4NVkwIJYXahjdX2NytADva/d2DT6wEZ/OiU7olMzmMuKxEUKWGMGJouLNGLLN8Q8BJcdc4g
-X5+hYmTwXGXxZ10/qJxuk1zmEQN6svuSPV29m2OsfE04r4oUSAg5iFQ8+JbSxthlri7C/72nwthV
-l/s7RwbP9fVDybbMblZE4WYhhrxwErYt8O0+WuqqDyR7CJFYjWzagU8jgyCP/xivX8brJ5XTky2V
-S9w7UC5RJvdk8vS/GStBLm+AFEbLkgIJYTahxUTXgXNZy7pJeDI4hv/9OYSIgmv+DN7flcl4bJUU
-bhEFzJshgecqriVbw06sRq86avk/AzL4p3oHL9QzsAqibZZLfwgvZrDk9Sa7BkN2KVIgIcS9A+yZ
-YokuOxCDFQBdmV5psylha8L/fgSvPZY0b/C9Wl9H4IpX2fpaVAF9dZJv3R1WqEAaymS7EmJxMmip
-3D0FMjDv4IXKJhop2yqXseQzXqciY8V+7moVpFB3QvCbOA7VsJvRUwvGDsScSDoXYaWTyNZEBmZ9
-mcttLb2f62c6lOzgn22wvuZRwLYLX8RyRHY9b8AzbJIUlvJa98FAeZlDBoeODLZVLvOMlRgx+FPX
-Aj97LTBrYRFSqCsh5E1TslJSJINj3VCtDtrCKz0pXx8j9GxM6Z7o10Pd+I3YjsEV72yp9TWPAorE
-+z8hIZzrc7xmrD6anwx6et321Dj5GcJEL8FQqQMZLGOs5OFrWeoipNCuqWD6GGYXwiUSsa6DO/uT
-Pj7XEEtZNwUjBDtnMFRiEPB2rO7eV2tsu8IVKeC0Gva2XrN7va47MkNLcWKCDCyEaad1X6pXYJ6B
-J4NWzeRyHmMFvYPYvOe5S1LbNRVM3yzrBqzoJmymT9Qr+Fnd2R9c+KVdso0UD5/t6sbf1k2sIWm9
-s58NXUcyiJECXrsYye6pW24nvMsYMiyrN25G1jHo4QkYWySD+Y0VP+s5NimQHsKMgvlIBfJar8O1
-XsA2WDF2QOZHSeuhLX9QNu/AC1BXn3eB6NpABHXIF8xrlQlsQjFSCERwqdfSOt226SXMpXNoUD2V
-7PkXksHsxgqOJ7VGjn5etfXjIiHkCCaGUk70woVrEBJbd5I2o+oBYTxXgcXSTD9ztaxJZXtM3DVo
-SvW6sz6kAiIpYJ+qQKYX+rUdGupKNQ4obuJaFuWzevr1M0lbUZAMio0VbPxne5T1QTqSbBh4ISOl
-bh6CMeyRMmhLn19JOi3NPAQchoO9/8tOBr7ePnEKSq9g9muIFhnmEQYQNtqRbOiQyF7Lafksv5GR
-DIqJwU+Oi5VJ+7kOM3sJ7ZpdSIytW7XIU0mbRYlkk184QN6fkiyr0OKGlhRYG1S46TKDFpnJxp7K
-isnSrjC5XOSpzpPPIhlMB85bwNyBLd+BmSGjHNgG2dWvLTSEQ9dxE+gA8/qRe2UXWow9FrmgxGwW
-rrd2R85Kq2uV1izyN2s+iyHM2YjARnWGEHfIF9jQLt/faKE5Le2aCSjGetug3IkLrfhYu5+z2qjI
-ZyZWt6lhbiYB46ElrDSa5iUwn7U6r8AmOIZcVpiuZhMAwzwP64S6UEK5bh6CSDZ+3oKLnPd9sVIv
-Cm09SaEJXyfCnMw8Rhh+Lbx2S3kGt+oJBDJ4O15vxusv+XvK2mdZcpJj3ZLK4oQUn0+zsCmwJIVY
-go4b2mykwHzWcqRgYaIrIIPXut7qa5eSDnVaaMxmu6ZCKjLbyEsKKjGLzFBOZiNUXrfFvAMMFQUv
-4L16Bn8qIZh3sFT+oK6EQGEkKDO8blUlg7D5/wVkEMjhTD0H8w5Gi3gHIuzWSBAEUVYyyMsb+FDR
-l1WQAQmBIAiivKSQlzf4U72ET5KOeB0sSwYkBIIgiHJ6B7PmDZaqKiIhEARBVIsM1po3ICEQBEGU
-kwwePG9AQiAIgignKTx43oCEQBAEUT7vYCN5AxICQRBEucngwfIGJASCIIjykMFG8waINu8JQRDE
-tw069tywjv5LG88bkBAIgiCyG38SsdoTRwC4sD9TY8G/W4q8AQmBIAgSQfo4gke/sP15bC1CCqXK
-G5AQCIKoOxnYGuoaSDqS8l6f2wZsw3xscqJNU7Sxn/MM+Cld3oCEQBBE3cnAZhL3dcO91XWjj3eS
-xutt2luYsLgn6bz1PX1t3nnQpcobkBAIgqgzGQzBOr9SK/xC16W+dqNkYYSwoyRwOF5HsA6UGLoz
-kEIp8wYkBIIg6kwGOJc4xOg/6gqWug2rv1ZCGOpGHwhhf7yOx+vpeD0H69026w7sqY0ZyWDjeQMS
-AkEQdSQDCxPhZmxzid/q12dKCGido4dwrGRwoYSAw+x7bl9tuL9fyrwBCYEgiDqSgm3Gl+oRBCL4
-z3j9oc8/KlFcS5pDsJnQwfoPoaFH8D19RwiJehGxvbW0eQMSAkEQdfQOLFQTwkLvlAj+Vx/fSjZU
-Y1VGZumHsFFXsuEkDBchjBRa4CWUNm9AQiAIoo7eQV839E9qkf9X12v1Dr4469zIxM4h3OnvuI94
-Bojw/RY+aur7pc0bkBAIgqibdzDUzf5CCeGtbsrv9OsL3bAHbrPHTd426lGEDGKVRT31EkZS4rwB
-CYEgiLoRA1YWnUpaWXQGnsE9bPh55JJIcSgHTzWH513d5K/0b72TkuUNSAgEQdSJDPDcQdj8z3Vz
-/qwb9QQZxDbkV7+9wkql2xwisJPMHfUO9vTvX4Jn8kbJoBR5AwTbXxMEse2EYAldPIhmyWE8kVxo
-nevrnhQu1eMwy/+1Pj/V9671b1qo6r2+b2SA1Uob9Q5ICARB1IUQ7EBaX9LWFFYp9C1nMG0zjpDC
-HXgdp7rpnwEZ3AIRXej3xQ6/zfT3SQgEQRCrJQdMDM8dogFSwHBUHzZ/TzYDICOrUsLmeaUgAxIC
-QRB1gM0wsGRvS9IupfbeMr/bfmfbrRb8zfB1V1c49Yx5hq9//9Vvr0gIBEEQayYDbF+9o6srae+h
-5jykoBs3/s5d+fswWjjFfKyP1vRuVx/t/cfwPT1J22h//R82TQokBIIg6uAdtCXtR3SgG3RP0vbV
-M23IETIIvyN0PQ0N774br+/H65lu+gf6/n7B9+xL2im1semL1Vrkh3799Ve70NYFMHzwE/2w3+nz
-Q32vtQK3bB1ICgSIIIjtgO9yalU/IelrTewyVT5hf/v9379PEMH4de9tWPfT0Ozux/H6x3j9os+f
-KwnsAeGIpMlon1PAv5/4v/9QaNdYQGKk0JDJk4ckCIKotodgMfwQvrGwTbDQ/Qlla3Ex0jMHfi/w
-ngGSwS85ZNCV9KAbJp9xEA+2wghfJ+HvbyLJXCcPwc9QtVI0PI4+muJJkBwIolpk4A1BPyltovTU
-EQAmoi0xHPMM/qmE8L3uf/tKQJijwFyF/R/mLfiqoyTmqZAQVotRRCDugKUnbsoMgkYQRLUiBDFj
-MHGbdkuylUNd3eAP1MMIZPCTI4MXbu/rRMgA90L/vwzc/yQPTQp1IQTfAtcOilyqy/hF0iPsfWDu
-keQ3ryIpEER1PIVG5DmGlPzmb+WhvkrI9jn0DH5WMnii+555Bi1HAo0cbyFxnkJm73lIUqhTDsGY
-+E6JIJwWtF4m95I2ojIBwEHaFgvsOBIlKRBE+ckgcQbsoaQ5g5az/O2UMeYVGpIOyLFqoUAAP+j6
-HshgB8gg9vct5IRhayODGCEsdHiOhDDdO8CJSYEI3knac+RGv7craVla0TDtNkmBICpHDLZJ77mN
-3kpHn0m27cQ9fJ/tDeYlPFdPAUtMY2SApIDJ7dhJZwtf972X8Oq3VyPOVF49MRghhDBRaDIVJiX9
-pQIw1Ju+p2RwrDf+ma4TFZrYiDySwnbIxyKbDFEtL6EJJNCEjd4IwULIt44QzEM40L3Blh0ww/MM
-MdlAUmgBKVg57J2k1Ucbqzxq10jZzUXrS9qbPLSi/VO9hD7cKKsieKqhpSt9fyTZeGCLm8LWEIF3
-zacVFOAmQxmoDinghm3kgCEja0jXdyGjNhiMdtjMTiLbwbLmFEMh5ilgkQv2QsKzCeYpjNZNCnU7
-h4AdCrEl7UcIG7XBS8B4os1XxVI0n6wiqkcGWHCAj0WEgPe/SY+hkqSARp2dYt6XeFGJn3Vg+URs
-fdGcUQawpNVI4VDSg2o4ptNXPg7WTQrtGm4A2ArXXDSrMhqCG3kpaeXR0FkJlkfABllENckAE3sD
-yS899s3RbDPwGwJRnfBRy232OxIfk4n3v+WMwuaCRmFDsofcsD13rDPqgySZ63pSOZbht4svkj2b
-MIRrhRVIVmfcopdQeTLA06M3kn9YCZuZ7UHIoEMZqBwpiAshNfXrdsGm24isRbzDvMqjoUzmFB40
-ydzmpjBxajmR7KEVkbRcbV/dO+tmaJsBvYTqyoCFEINH+FmX9bgZgEGAiUXranksk4eZiGoSgz8w
-Nu1nFiGCvPAVnudCQnjw9hacqRz3HrCnUdNtBKHeOFQcPQZS4HWs9v22QgMbhRhySheSDj43xbUa
-dqtDt3JE8xQTegmVJgYkh1m/f9m/m5dkNg8hRgiJyuxw1aTAjazYe7CDbFdqOZ7ppmFWpM1j7cjs
-SSWiXMCw0Re9v2+AFO4kzS3tqUFwrQTQU4Kw8ynEdpHDQ/69vCRzUR5h5ZVHTIRFABcXTzffaFgB
-2+bey2TyiaiW8mNiMHHeQihL/u94/UdXOLcSypTfq3GA5ciUA2JZWfQzFnwn1ZeSbQu08sE69BDm
-syAxrtePsDa9g+oq4Y5kk8QWqzXyT/QxfP9jJYM7kAGCWEYOS9Hegh5CsZfgE894UzJdCYnKKWAj
-ooDBKnuiG/4jJYimZCuRYgeH6BkQq5BJ25MtdHSg8hh6Jf2k6wf1HI4lHcH5tRR2FV4CCWE+TyG2
-iOp7CNjj/pkqoO/a23TGwbQDbASxDCm0HClYh9WwXqqc4hCelYSOSAjzIZENdCAk1uol+Gla2Mny
-hSqeeQttmaxIIYh1ewqHapx8P4UUWsuSAgmBoAKmXgKORXwJpPAUSKFDvSE2YKxYuXOQy591Wfjo
-yMnmwqRAwSZojU0eDrK47Q9ACtHqDl5C4gGMlQerPGKVEUGlmzwcFJTLJ5FDAvkMvIkyjYYltlcu
-H7TyiB4CQUxaY8H9xtCRxWzNPe85UiCIdXuw0yqPMJ+wcOiIhEAQ2cZ0FjqyfMJ3qnCBFDCfsCsM
-Hc2KJGcR85FCrPLoBzBYorI5DykwZEQQWRfd5xOshcBAX/+iFpiNTKSXMDsZxDY64fWbSzax5xE2
-wbvShRPX5i6NJiEQRLHiBYvLut+G1y/1e+klzE4GsdYey8wSqLungLIZjJVrSbv12gjQa31vrutK
-Qth+hRRaYgspH3a5tYSd6NeBHHqSnk1gY8NiMsABRJgobfP6LSybmFOw+e9PJDvj2Vq4N2b1EphD
-2F5ljHZGFMZuZ7XEYop3pAp3KGli2Q6rcTOLy6G1/bDJhDhzwnqCDYV5hUVkMzawKVoWPWsegR7C
-9lpmRgBFBgA3sdkVEQkikfhcbWJSBq1bsHUKvtPrtacke6Df14H9iNdzNoNvKMXjX+cGCWG7FdGW
-SHYeMGO3s19DTNzZshnbtGyLYQ0hgycQYtuf1DNIJK3iGkCYQ0gKM8kmzoS3WS3n+mhz4DOt+Wed
-l0BC2F43HedEm0XbgTBHi55CrsLh1Kor3czCfIQz3dDC9bLBOAMSwlRZtOFDn3Td67W7kuxhqn2S
-wsxGyrUSwAf5e25HGOr0XuXU5nTMbbCQELZXaPpgLVjJpNXX7zoXncoXt74s5v0RlO1GSXWoG5gv
-7+MmNkmuVgkTrNh3Kpddvb52/Qwkhel6bdcyyORr+XtwUxjk9Bd4YUgIM4OEsL1uOo7+vJN0BGSw
-bA8krURglcekwt2AV/BeLbB36iEM9PoFQj1xFi4Rl0fLI5iXcKbvXUYIgaQQJ4MBkMFnlcswve//
-dP1XZfRcv2ehaY4khO1VQlPAU93cEklbMjxRAdsHb6FVQ+UrcsU/qsX1Wtd73cDCdXqq19GsMM7F
-mN1IMVLoOw8hySEF7BlVR9mMGXgfVCaNDP4T8Q6+TfKbZ94yCWH7hCg2NP6DClTwCB7rpncn2clg
-34Zs1ET58lxxVDhzxd/AJmZjNjk+c365tAT9pW5ul5LOpE7cfRHJ9oySmhgsvkoQw5fnIJs26/sP
-JYNT/Z67RcmAhLD9FtktuJcXuuEfqSLeyGT8uw7Kl+SQJ7rir1XZ/k/dcvMORK/fLUNFKyEFmRLa
-8HLZrIFsxsKXl5KGL98oGfxXZfMdeAa3y5ABCWH7lc82ujMVJgsTXUpamoazobdd+ZKIK96PuOJG
-BsH6equW2Z2kh9RIBsuTgslfnoeAdfb7klbHbWPJdJGREgw5DF/+qeuNyutZxDNIFiEDEsL2ewmW
-zLtSwQmPHSdAQ7e2UfliCmeWKrrib5wr/lbSMr6RpG0rePZgeVIwDzZGCCMgCyudtmaCnS0zWKYZ
-KR9BLv9QUnirXoGdO7gDw25hMiAh1EfxjBTO9XULF9npRq98PtlsA+armFvIUzhzxc/AFf9TFe+1
-c8Xv9XN3SQYrl03fUgXDSjigKNwzO/uxDQZL4j6zP2xmRspfQAYWIjpV2b0GPV44TERCqJfi+aQp
-uuuDiPKF9VgtMlS+qhFDnsKZV/BZN/z3kq0m+su54lZJ1CYZrI0URpJ/Ovxa0tbOocz3KMdbSCpC
-DjG5RCPli8qeeayvwUixszBfJJsDXAkZkBDqRQpmed2Ai+mV70qFLTxi58RdSXMLZVbAxD0WKdxH
-SU94vlEieK8kceFccSERrJUUMIeFHsK13q9LSVs63+QYLL6ddhXk0gy1W0nzBadgpLyBENF79Rrw
-sOlKyYCEUE/FGziBjClfEMznYJFZd88dySadTQE3SQ5J5BHnzuYp3FsggndKEOeSrcAaCE8fP5TB
-gpvlADxZlEtbV0oKRyCXHfBkGyUwWmaRS9O7S+exvlW59EaKlYtnihpWRQbrIoSyjctb1/9Txc/p
-m95569kSWWe6cQZSeAregsVwUQF9189kzVZakqN0nvTQ88lTuLfqmp+Cwt16V7zgM3A05GquC57G
-zSNzNFbMYHmipLAPculDnGi0yBoJYlG5NCPF2qO80/UBjBQMEQ3XRQarJoTEuX224bRKIKD4/4xk
-udkA2/A5RxFBNeX7AqQQNtBnuk4kPci2HyGGlkwebIsp4qoUzieLhxGFs8Z0ZzkK9wkUDnvzIxlU
-TQbKgkV0zq75fUQur51snqpcBlI4VmNl34U42xDmxBbmZZLLTyqLuE5VLtErWHm+YB2EkERcoXvJ
-Vq0kstkRg76M7V7i9fdJjT6nzyug8nkX9qMKqZHCEwgjWTXSbo5ltsqTz0nkPvgcgSXFr+AznEaU
-7hTCQ9cQk82UlAalg8EiVZCBsoUoZ9Y5uNYxY8XngOy+fgCZPJZ0gNGBZJs4dqbI5qbl8qOus4hc
-+uu2NjJYlYfgS6ZsQ+npex3Z/GQ2E86rgotdt8+Z5Li0fcn2WT8DUjgBT+EYlM88Buyi2i7wHJZR
-OD8QxO4HJsUvVLHMArM1k8IVKF0VZKBMHsJcOgekkEj8XALG3M9VLo9VHp+AXB45T9YMlq4jh1aJ
-5NKmyF07b3XCSFknVuEhYPWKDcHoSTp3tl2SjXKgF/ujpEka376hjp+zqDzzOmKRHTvFM28BrbKd
-HAVsLvG50PU2i/wuEmO2EY3nQADmfi+jcFWRgTIRwtw6Z9e/wFvA0Oa5yt0jXV42zYs1Ythz8lk2
-ubTzFgP32eUhyGBZQkBmtN4knyQ9zXmmF79dAhfaElbW28dO+tlIv6Kxc1v7OSPK15D4aV60yg6c
-EtoyUkDF23VewyLhFKxXv5fseYkbCCNgwvECFM3KaG+WULgqyUCZwkaL6lyetxA7wGWx+P2IXB6C
-B7vvyAHDnGWQy/tI2DJ5KCJYpYeAN72jH+iz3ohuSWKq2NsHWxV8hvhxUtfPCcSAQ1785DUMI9mm
-vw+KaB5CD9631YVwyqKKdw9xZFzXYImZkl3B+3cQx/aHoOZRuKrIQNnyCIvq3DSDxYc3L3WT77m1
-D48H8DUWRVRZLleKhYVXb5LN6N2BC44162VyobGNg1m8dqO+WSz+JtTlc0Y+s7j4ql2DtqSJuh1d
-6BHswHO0xFaleGaBYVsDtMzuwOJCq2thhaugDMi2yGKBXIqTS5PNLiwvn0YEvTUYKg8ul2X0EIy1
-+/q1DRhZJkSwbosFS8As5jetzLAun7PIY/CVEy29BkgQuLoQq8UWA4sqHnoraF35hQ37RjLZOG1R
-hauSDMi2yGKBXGI4Cf9G3xFEG+SxCwbLtshlOTwEYGyzIFuSbW1QtrGMGIfEGulvMbu8G1KXzzmD
-Zea9hgZcg5az1loSPz266GacSDaBN3QKVlReK8sqXMVkQLZVFqfIpUTksum8W78qLZdl8xBEJpM+
-91LO1rSJu5HI8vycs8dy8To0VOD9oR+vkMueRcir9cbXfKmirEHhqiIDsq2ymHdfndfQAI+uUUAS
-2yKX5fAQpjB1ZYR1gRjmVn/OBa6Fvx6NiMUmSyqeRJQrydl81qZsFZWBrZbFOWRza+WyVIRQcCNK
-jUVvTl0+5wquybo2zGQTn7HKMlAnWZzTeNkquSwVIRDEQ2yaVVMygnJJEARBEARBEARBEARBEARB
-EARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARB
-EARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARB
-EARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARB
-EARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARBEARB
-VBH/L8AARx9eJtj2nTIAAAAASUVORK5CYII=" transform="matrix(0.24 0 0 0.24 56.8418 109.2988)">
-		</image>
-		<g>
-			<g>
-				<g>
-					
-						<text transform="matrix(1 0 0 1 64.4712 146.9512)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					
-						<text transform="matrix(1 0 0 1 64.4712 146.9512)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					
-						<text transform="matrix(1 0 0 1 64.4712 146.9512)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832"> elic</text>
-				</g>
-				<g>
-					
-						<text transform="matrix(1 0 0 1 60.625 146.9502)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-					
-						<text transform="matrix(1 0 0 1 60.625 146.9502)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-					
-						<text transform="matrix(1 0 0 1 60.625 146.9502)" fill="none" stroke="#FFFFFF" stroke-width="5" font-family="'Moderna'" font-size="39.3832">R</text>
-				</g>
-			</g>
-			<g>
-				<g>
-					<text transform="matrix(1 0 0 1 64.4712 146.9512)" fill="#00B0D8" font-family="'Moderna'" font-size="39.3832"> elic</text>
-					<text transform="matrix(1 0 0 1 64.4712 146.9512)" fill="#8CC63F" font-family="'Moderna'" font-size="39.3832"> elic</text>
-				</g>
-				<g>
-					<text transform="matrix(1 0 0 1 60.625 146.9502)" fill="#00B0D8" font-family="'Moderna'" font-size="39.3832">R</text>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		
-			<image overflow="visible" opacity="0.75" width="265" height="265" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQsAAAEPCAYAAABVxOFEAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAE5JJREFUeNrsnYtW21YWho9tjLkl
-QCDpdJpe5h3yTp1Hmr5T+w69TdOQkAuEq8GMlNk7/r0j2TI2WDLft9ZeIoQCbZc+/XufIyklAAAA
-AAAAAAAAgIbSeij/oj/++8cW/7vhLvjpPz/dIIvlEENL/j1bD02ScGfcFBxvllkerSWTQxRDu+SI
-MGBeohhY3cjxZhnl0VoiQbgMvDpyzGtFPtdGFjCjLFwS11ldWV1bDYJElkIerYYLQuXgMujax3pc
-taN/rh1SCMA0onBZ5ILoZ3Up1bcqE8hncTRNGq0GSUKrI4JwIfRMCmv2sdaafF4TBu0I3Kb98ESR
-S+Eiq/OszuR4YVUkkCJ5NCJttGouiBQSREfSQ1dksJ7VhtWmfLxmf7cuf/Z0QbKAWZLFlYkgF8Rp
-VifheBoEch4k4vJojDRaDZGEthM9kYDLYSurR1k9tuOWfd5Focmia8JBFjCLLDRZnEp9NGH48aTg
-c6eSQDRx1FoarRpLohNajDI5eG0HWbgkVqVF6abRISfAbdDh5qW0IuciDRXFkdUHqSMRx3kTpNGq
-kSg0SXibsSaCcCFo7QRhbNnXr4sgVqQ6pAqYc7q4lpnEpbQaZ1YujFwQ77N6l9VhVm/tzx/s71Ua
-fW1P6iKMVg0kkUKSWBVJbIkUnmS1l9Wu1bYIYnOMJNqhEAXMUxhFS6h9aVEupD1xYeSyeGN1aAKJ
-0rgMSWPhKaO1YFG05GrvktgUSbgg9q1cFo/DXKIn84iYIHTVgw1ZME9ZqDRUHCoPXTHJU8axyeGt
-yeK1SOOtSONEpOEJZqEpo7UgSWia0HbjkaSIXA5Prfbtc7v2NSqJbkmKiAkCQcB9iuNGpKHD0DNJ
-Ge8kZbwWcXiLchzak4WmjNYCROFXe2851kUSeyaHr7J6Zh/vSduxVSCJMkEgB6iLPDxtXMlc47RA
-GrksDqQOTRofTTLamtx7ymgtQBSeJnqWELZFEv/I6muTxVNLEy6JjTCPQBDQNHHE9uQ8SOOtCeNV
-Vi/teCDtyUJTRuueJKFth88mPE08E0n8U0Ths4m4maqTuCEMmiuOcdI4spShwnBpvLG/Ow4p495W
-TDoLShM7JoRvsvouqx+svjVhPJP5xEZJ28GqBjSNeNOj7kiOGw7jRkK9p+mLm9NevHiRfvn5l2bK
-IswnupImdi09PA+ieG4JY99aj82QKLhbFJZZGrpLWe9xijuP26GtGdyXMDr3JIp1ayn2rN3IE8T3
-Wf3Ljt+ENLFWMpsAWGZptEPSKBOGpwvd7Tm4a2F07lgUqyKKp9ZifGeS+ME+/trSxE5IE+y0hIck
-jRSEEe+H0naklb7c13Hnwujcgyi2ZT7xvYjC2449k8l6SBOIAkgZw1sfvD3pFrQi95IwOnckim4F
-UeRtR740ukWaAKiUMnRF0L9ucF/CmJsssl9MVz209Yii8PmEtx298B8AUQDCKE4ZK+EY25E7FcZc
-ZGGpQlc9ikThg8ynJooN2g6ASimjaOWkM0YYI7e5z0sYK3NsP3zDVd5W7No84ltLEyoKn0/QdgBU
-F0an4nnyee+F4bs9F5ssgih8w1UuinyF47vQejy1GYYPMhEFwPQJo12SMFL6cnfo5x2e80gXnTmI
-wlc+NtJww9W36cth5o6IgrYDYL7C8BUSfer4XIUx66PldOUj30y1Z+3HN1ZxabSLKABmEkbRHqZ8
-n5LvYfouDRcRttNwNvgpyc/yGs9bzSxkoLli7ceWiOK51deh9WBGATC/hOHC0FmFPzdDH++nTxG/
-mWV+0bmlKFoiCk8UvvLxQxruzPR9FL48iigA5tuSaFuiey/0uaD9ebQj7RkkoxuvnlkM+jYNd2a6
-KBhmAtxdSxLPxX27UD9Pwzu4fatCd5Z2ZKo2RNqP/AeuhTnF8zS6hVsTBTeCAdxdwvBtCxsmBn/5
-0ZlUfGjO1O1IZ0pRxPbDBys/pOHKx1dpdNMVA02A+2tJvOKLkM5lhvFJGNO2I9MOOH2oGVPF12n4
-LApWPgDuXxhxweFJGn04sL/U6FzmF1dzTxYhVeh2bt2h+U+ThT+PgoEmwGLmGDro1HeynqfRt59N
-NeycZsCpqcLN9SwNn8LtN4Yx0ARYnCjiA6f2bTTwVRo+N+ZWey8mtiEFz9H0Icq+iGI3MdAEqEs7
-0pF2xJ936+9YPbZ25ELakeu5yKIkVeym4QuAnljroRuvAGDx8wsfGeyZJPSlzKcpPCF8Hm1ITBX6
-no892g+AWgpDl1O3QyfgF/jPnUCVVqRdoQXRWLMpLci+tB9rtB8AtW5HvBt4lsrv15opWRQNTPw9
-pE/S8CVAet8HANQD3d3pr+HYS8M3/U016GxPSBVFccZ/2E5iqAlQ53QRz1+/2O/J+atdwczJQqPM
-ttlJXy24SqoAqHU7spJG3y28a7LwPVGVWpF2BVH4czV9GcbfaL5JqgBojDC8HdHz+HEaLk5MHHS2
-J7Qg8Yc8ttqadjgCAAsjbn3QdFF5gaJd4Qf0pN/ZKUkVAFD/2UU3nMveilS68Len6HXGpQqSBUAz
-WpE1mV24LCqtirRv0YIwqwBopix0ZWTLROEX/4kLFeOSRWxBttNwBYQWBKCZwtDzeivIYmwAaE+w
-kH/TR5Iq1mhBABqJy2JVOoatggAwtSy6Mq94ZOWyoAUBaF6yiLOLDTunN2IIKJpbtAvmFWogH4Zs
-2VF7G1oQgOVoRbRj6EybLHyZxePKZogq3F0K0GxZrEq68GQxdm7RLhGI2mfdqmcC4XF5AM0WRqeg
-FZn4DuJ2SV/TkZnFWpAFswqA5Zhb9CRZrKewyhnnFu0KMWW9SkQBgEa1Ir7noifneLdSGyIW0dta
-16SfiUsrCAOguemiI6GgZ0cfcFaaWah1PKb0pAXpkCwAliZdqCx66RYDTreOroh05XOIAmB5WpFu
-SBelq51lA079Zp2QKGhBAJYnWehCxtgOoj2hr2khCYClE4V2ELqQ4enicwehKyKTnpTVQhQAS9+G
-VJpNsmUb4OEKY6rZJLIAeJiimHo2iSwAkEal2SSyAEAYlWaTyAIAKoEsAABZAACyAABkAQDIAgCQ
-BQAgCwAAZAEAyAIAkAUAIAsAQBYAgCwAAFkAACALAEAWAIAsAABZAACyAABkAQDIAgAAWQAAsgAA
-ZAEAyAIAkAUAIAsAQBYAAMgCAJAFACALAEAWAIAsAABZAACyAABAFgCALAAAWQAAsgAAZAEAyAIA
-kAUAALIAAGQBAMgCAJAFACALAEAWAIAsAACQBQAgCwBAFgCALAAAWQAAsgAAZAEAgCwAAFkAALIA
-AGQBAMgCAJAFACALAABkAQDIAgCQBQAgCwBAFgCALAAAWQAAIAsAQBYAgCwAAFkAALIAAGQBAMgC
-AABZAACyAABkAQDIAgCQBQAgCwBAFgAAyAIAkAUAIAsAQBYAgCwAAFkAALIAAEAWAIAsAABZAACy
-AABkAQDIAgCQBQAAsgAAZAEAyAIAkAUAIAsAQBYAgCwAAJAFACALAEAWAIAsAABZAACyAABkAQCA
-LAAAWQAAsgAAZAEAyAIAkAUAIAsAAGQBAMgCAJAFACALAEAWAIAsAABZAAAgCwBAFgCALAAAWQAA
-sgCA+nNTUMgCAEpFMZgkDGQBgCSupUqlgSwAHq4wXBD9rC7t6J+7IVkAgCaKXBAXUv2QMCrJovLg
-AwAaJQpNFpcmiTM7Xmqy+Ok/P91MksVUgw8AaHyyOJ82Wdxq8AEAjZOFJ4srSxM+s7iSZDGxDSkb
-fOg3AYBmMxBZXMk5PigLBO0x8eRS4sn5uHgCAI1MFoMgiis5x1OpLGSQMZBokg89TmX40R9nHgBo
-XAviM4vLcS3IuJnFtcjixISh6QJRADRXFto9eOegKyGDadqQK/lGpyKLy9DXAEAz2w9PFNo96Pk9
-smxaJIskyaJvgsiTxUf7hhfIAqDxwtDz+9TO8bM0usdifLIwk6h59JtpK8LcAqC5LciVpIoTq4md
-Q7vCNzy1ZHHC3AJgqVqQEzm3Y7JI08riUloR/4a0IgDNRM9rDwFHIQh8Oq/jvKJMFtrX6IpIWbpA
-GADNa0Hyc/nYys/rq6mShcwtfAhyJgY6TsNBZ+nmDQCodQsSz+mTKh1De4KFdEXkqCyy8P8CoDEt
-yIWcz+/tqCudUz9WL0aW3EIf7Jt/qGoiAKhVCxJTxZF9fDZpXjFOFjq3cBPlknhn5TYaOz0FgFrO
-Kvxcfm+yqLTKWSiLMLfwyWn+Aw6zeis/hHQBUH9Z6Hl8JBf9D3IeT7zoT0oWGl2OTBRv7Ojpgn0X
-AM1IFR/tQv/WLvwfYodQ1oKMlYX9Q4PQirw3WbwxM3mEIV0A1DdV9CVVxAv+yLzitsmi6Id5K/I6
-mIl0AVDfVHFuF/Z3crF/n4YLFZ+2QYxLFVVkkSb8QNIFQD1FobMK7wpmutCPlUXBBq2idOGGGnvH
-GgDcK7qp8tjajtdWRRf5NJMsJqQL/8Fv7Zc5E0sBwOLbj4twvh5ICzKSKia1IJVkUZIufNB5EEzF
-UipAvdqPDyKKA7u4T50qclam+EViunhrP3w3q+2strJas+/Zyapl/1yL/4cAC2k/juyi/iqrl3a+
-fjE2qJIqKrchBZu0fGByYL/EK/uljmhHABbefpzbaOBQRPHK/nx8m1QxbbJIJb/Mo6we23Ejq15W
-XRORF+kC4H7bj/fWfry0ei2ziqlTRbJ2oRK//PxLevHihX6qZdUx6fSsDclr1YTRkfSCMADuRxT5
-DPHvrH7P6tes/rA/uyw+PbdiGlFUbkNCO+K7On124VHnLzPYm1SwjTQx8AS4K1EMCuYUL+2c/FvO
-yZlGBCu3/CV1iJL/EutZbab/Dzk3JV2siJA6JAyAuaOiOC64eB9Y0rh1+zF1GzKmHdGU0jFJrEor
-slIwu0AYALOnCt1PcWwJIpfEb9J+vEphX8VtRDF1G1LQjsRhZx55/rR6GeLPZeIVAgB3MafwrQx+
-/v1h0jiYR/sxaxtS1I68tyQRE0UrJInVxNATYF6i8E2SuRj+a6L408ThmyVnaj9u3YaMaUduQrkM
-Omm4YtKhJQG4E1H8aa3HbyaN1ynsqZhFFDPJokAYulIyQBgAc5VESqMvNPabOj1R/G6i+FPaD59T
-DPx8XWQbkuRfoi9/blUUQDexSgJQJU3EFwT5PR9/Wevhc4rXYU4xmLX9mEuyKEkXMWF4ytCE0ZGE
-0SJhAEwUhb9y8NhmEa8kUfxqR51TXMxjTjFXWRQIYzBGGCkNl1jbQRZIA6B4PuHv78k3XPmq4x/S
-ergo/N6Pz+8AmZco5iaLWwhD5YAwACbPJ3xn5l+SJn5Nw63cX9wkNk9RzFUWFYSh0oh3u5XJAmHA
-Q04T+qDs10EUvurhrccXd5POOtC8U1mMEca11FUavoC1LG20CmQC8FDShG7fzkXgKx6/BVH47swv
-Hjw171RxJ7IoEYbXlf2H6Fu8Gvc29qKEgTTgoaQJbzt8V6Zu4dZVj9MginQXorgzWRQIQ5d+fPnn
-UsQR25QyaSAMWDZJ6JLoeRpd7Yhth99GcZiGD5oa2Z0579bjXmRRQRj9AmmoOKrcQ4I4oOmS8JUO
-f17mYUGa+F3aDp1PzHUfxUJlEYQR92CoLC6szu3Yl1hV9PDfG6QBDZxJRElcWBvhj+rX+zt+s/oj
-jT7p6uQ+5hMLvzL/+O8f9ela+e7N/Ola+aP48sfy5Q/+3c/qWVZfZfUPO+7b38XH9rF1HJoiiJs0
-Ore7FFF8tETh7/XQZ2b607h9NqFvO7/T+UQtYrwIo20nfH7i+8Nzcmk8MUG4MHJ5PDVhPLavy79e
-H7BTtskLeUAdBBHTxJlI4l0avrTrQMpf4PVRZhNXac67MmvVhlRsS3SGcS51ZuUfe7tyKa1K3PSl
-z8wYN/dAIjCLEOLnVAzXIUGcpeEKh7/+82VJy/GXJIrjNLracX3faaI2J0xIGbE1yduOHUsae3Lc
-tc9vW9LYsqTRS6PP0hiXOFhhgdsmhhQuQjFFXIeLn8riowjjMA3fGXwo7cZH+9rzNFzpWFiaqNXV
-1YSR0uiNZqvWZrg0Hpscdqx2gzS27Gu9PVFxdNPojWsqj6KH8wAUyeKmJL3qDuW+tBo+kzgVSXjb
-8U4E8V4kcSqSuFrUbKK2siiQhqeMFTvheyaBDZOCy2NHyhPGpn3dRhq+lqAns42VNPpcDS+EAZNE
-cV1QRS2Ht8y+ynFsonApaB1ZitDhZV/b6jpIorZ9e2hNdAi6KgLYFHE8so+3RBhbIg0XhyYNffyf
-Jg6AiLYX/YJ5WVzdOA0tx7Ecj6XNOJU5XJy/3dQlTdRaFgWtSTukDRXHuqSOdZHDZjj6TEMrvgyJ
-dAHjUoUO4C/S6EbCS0kTJ1IqBpeD//MqnUGdJVFrWZQkjZg2VByr0rL0ZHaxPkYU/jU+EEUWUCYL
-3Wl5JnMFFcakFTwVTLy9odaSaIwsJqSNdhp9vudKaDPiO0y6IhWfZ+iqSUIYIKJIYS5xIaLQIaQm
-DC2Vw5V8r8/L+nUXRCNlMSZttCoIZKVAKDr0ZFUExiWLeBNknDEUPX6hKD3cNCVFLI0sxiSOoidw
-tQtKV0N40ztMEsYgSEFFEPdZlG4MbKIglkoWFeQxSSRszIIq7UjZPotU9nHT5bD0shgjj1QiEUQB
-0wgjyuEzyyaHByeLKSQCMJFlFwIAAAAAAECN+J8AAwCwYhP9FOOiowAAAABJRU5ErkJggg==" transform="matrix(0.24 0 0 0.24 -5.7759 107.4629)">
-		</image>
-		<g>
-			<path fill="none" stroke="#FFFFFF" stroke-width="5.278" d="M53.449,154.683c0,6.632-5.372,12.002-12.001,12.002h-31
-				c-6.628,0-12-5.37-12-12.002v-31c0-6.627,5.373-11.998,12-11.998h31c6.629,0,12.001,5.371,12.001,11.998V154.683z"/>
-			<path fill="#00B0D8" d="M53.449,154.683c0,6.632-5.372,12.002-12.001,12.002h-31c-6.628,0-12-5.37-12-12.002v-31
-				c0-6.627,5.373-11.998,12-11.998h31c6.629,0,12.001,5.371,12.001,11.998V154.683z"/>
-		</g>
-	</g>
-	<g>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="10.635" y1="123.762" x2="10.466" y2="131.012"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="10.466" y1="131.012" x2="18.881" y2="136.903"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="18.881" y1="136.903" x2="32.848" y2="136.903"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="10.466" y1="131.012" x2="1.885" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="18.881" y1="136.903" x2="15.347" y2="147.779"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="15.347" y1="147.779" x2="36.717" y2="147.779"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="15.347" y1="147.779" x2="1.885" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="2.054" y1="128.596" x2="1.885" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="2.054" y1="128.596" x2="18.881" y2="118.777"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="18.881" y1="118.777" x2="33.016" y2="118.777"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="1.885" y1="140.53" x2="25.947" y2="162.737"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="15.347" y1="147.779" x2="25.947" y2="162.737"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="41.26" y1="123.762" x2="41.43" y2="131.012"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="41.43" y1="131.012" x2="33.016" y2="136.903"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="41.43" y1="131.012" x2="50.013" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="33.016" y1="136.903" x2="36.55" y2="147.779"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="36.55" y1="147.779" x2="50.013" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="49.843" y1="128.596" x2="50.013" y2="140.53"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="49.843" y1="128.596" x2="33.016" y2="118.777"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="50.013" y1="140.53" x2="25.947" y2="162.737"/>
-		
-			<line fill="#00B0D8" stroke="#FFFFFF" stroke-width="2.0001" stroke-linecap="round" stroke-linejoin="round" x1="36.55" y1="147.779" x2="25.947" y2="162.737"/>
-	</g>
-</g>
-<rect id="_x3C_Slice_x3E_" x="58" y="108.5" fill="none" width="93" height="58"/>
-</svg>
diff --git a/src/dashbls/depends/relic/bench/CMakeLists.txt b/src/dashbls/depends/relic/bench/CMakeLists.txt
deleted file mode 100644
index d9e6a46e1375..000000000000
--- a/src/dashbls/depends/relic/bench/CMakeLists.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-macro(ADD_MODULE MODULE)
-	add_executable(bench_${MODULE} bench_${MODULE}.c)
-	if (STLIB)
-		target_link_libraries(bench_${MODULE} ${RELIC_S})
-	else(STLIB)
-		if (SHLIB)
-			target_link_libraries(bench_${MODULE} ${RELIC})
-		endif(SHLIB)
-	endif(STLIB)
-endmacro(ADD_MODULE)
-
-if (CHECK)
-	ADD_MODULE(err)
-endif(CHECK)
-
-if (WITH_BN)
-	ADD_MODULE(bn)
-endif(WITH_BN)
-
-if (WITH_DV)
-	ADD_MODULE(dv)
-endif(WITH_DV)
-
-if (WITH_FP)
-	ADD_MODULE(fp)
-endif(WITH_FP)
-
-if (WITH_FPX)
-	ADD_MODULE(fpx)
-endif(WITH_FPX)
-
-if (WITH_FB)
-	ADD_MODULE(fb)
-endif(WITH_FB)
-
-if (WITH_FBX)
-	ADD_MODULE(fbx)
-endif(WITH_FBX)
-
-if (WITH_EP)
-	ADD_MODULE(ep)
-endif(WITH_EP)
-
-if (WITH_EPX)
-	ADD_MODULE(epx)
-endif(WITH_EPX)
-
-if (WITH_EB)
-	ADD_MODULE(eb)
-endif(WITH_EB)
-
-if (WITH_ED)
-	ADD_MODULE(ed)
-endif (WITH_ED)
-
-if (WITH_EC)
-	ADD_MODULE(ec)
-endif(WITH_EC)
-
-if (WITH_PP)
-	ADD_MODULE(pp)
-endif(WITH_PP)
-
-if (WITH_PC)
-	ADD_MODULE(pc)
-endif(WITH_PC)
-
-if (WITH_MD)
-	ADD_MODULE(md)
-endif(WITH_MD)
-
-if (WITH_CP)
-	ADD_MODULE(cp)
-endif(WITH_CP)
-
-if (WITH_MPC)
-	ADD_MODULE(mpc)
-endif(WITH_MPC)
-
-ADD_MODULE(rand)
diff --git a/src/dashbls/depends/relic/bench/bench_bn.c b/src/dashbls/depends/relic/bench/bench_bn.c
deleted file mode 100644
index 5747351ebd67..000000000000
--- a/src/dashbls/depends/relic/bench/bench_bn.c
+++ /dev/null
@@ -1,943 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for multiple precision integer arithmetic.
- *
- * @ingroup bench
- */
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	bn_t a[BENCH];
-
-	BENCH_FEW("bn_null", bn_null(a[i]), 1);
-
-	BENCH_FEW("bn_new", bn_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	BENCH_FEW("bn_new_size", bn_new_size(a[i], 2 * RLC_BN_DIGS), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new(a[i]);
-		bn_clean(a[i]);
-	}
-	BENCH_FEW("bn_make", bn_make(a[i], RLC_BN_DIGS), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new(a[i]);
-	}
-	BENCH_FEW("bn_clean", bn_clean(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new(a[i]);
-	}
-	BENCH_FEW("bn_grow", bn_grow(a[i], 2 * RLC_BN_DIGS), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new(a[i]);
-		bn_grow(a[i], 2 * RLC_BN_DIGS);
-	}
-	BENCH_FEW("bn_trim", bn_trim(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		bn_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new(a[i]);
-	}
-	BENCH_FEW("bn_free", bn_free(a[i]), 1);
-
-	for (int i = 0; i < BENCH; i++) {
-		bn_new_size(a[i], 2 * RLC_BN_DIGS);
-	}
-	BENCH_FEW("bn_free (size)", bn_free(a[i]), 1);
-}
-
-static void util(void) {
-	dig_t digit;
-	char str[RLC_CEIL(RLC_BN_BITS, 8) * 3 + 1];
-	uint8_t bin[RLC_CEIL(RLC_BN_BITS, 8)];
-	dig_t raw[RLC_BN_DIGS];
-	bn_t a, b;
-
-	bn_null(a);
-	bn_null(b);
-
-	bn_new(a);
-	bn_new(b);
-
-	bn_rand(b, RLC_POS, RLC_BN_BITS);
-
-	BENCH_RUN("bn_copy") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_abs") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_abs(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_neg") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_sign") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sign(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_zero") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_zero(b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_is_zero") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_is_even") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_is_even(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_bits") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_bits(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_get_bit") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_get_bit(a, RLC_BN_BITS / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_set_bit") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_set_bit(a, RLC_BN_BITS / 2, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_ham") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_ham(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_get_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_get_dig(&digit, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_set_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_set_2b") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_set_2b(a, RLC_BN_BITS / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rand") {
-		BENCH_ADD(bn_rand(a, RLC_POS, RLC_BN_BITS));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rand_mod") {
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_rand_mod(a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_size_str") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_size_str(a, 10));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_write_str") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_write_str(str, sizeof(str), a, 10));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_read_str") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_read_str(a, str, sizeof(str), 10));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_size_bin") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_size_bin(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_write_bin") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_write_bin(bin, bn_size_bin(a), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_read_bin") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_read_bin(a, bin, bn_size_bin(a)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_size_raw") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_size_raw(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_write_raw") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_write_raw(raw, bn_size_raw(a), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_read_raw") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_read_raw(a, raw, bn_size_raw(a)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_cmp_abs") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_cmp_abs(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_cmp_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_cmp") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_cmp(b, a));
-	}
-	BENCH_END;
-
-	bn_free(a);
-	bn_free(b);
-}
-
-static void arith(void) {
-	bn_t a, b, c, d, e;
-	dig_t f;
-	int len;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-
-	bn_new(a);
-	bn_new(b);
-	bn_new(c);
-	bn_new(d);
-	bn_new(e);
-
-	BENCH_RUN("bn_add") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_add_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		bn_get_dig(&f, b);
-		BENCH_ADD(bn_add_dig(c, a, f));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_sub") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_sub_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		bn_get_dig(&f, b);
-		BENCH_ADD(bn_sub_dig(c, a, f));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mul") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mul(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mul_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		bn_get_dig(&f, b);
-		BENCH_ADD(bn_mul_dig(c, a, f));
-	}
-	BENCH_END;
-
-#if BN_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_mul_basic") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MUL == COMBA || !defined(STRIP)
-	BENCH_RUN("bn_mul_comba") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mul_comba(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-	BENCH_RUN("bn_mul_karat") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mul_karat(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_sqr") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sqr(c, a));
-	}
-	BENCH_END;
-
-#if BN_SQR == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_sqr_basic") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if BN_SQR == COMBA || !defined(STRIP)
-	BENCH_RUN("bn_sqr_comba") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sqr_comba(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-	BENCH_RUN("bn_sqr_karat") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_sqr_karat(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_dbl") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_dbl(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_hlv") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_hlv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_lsh") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_lsh(c, a, RLC_BN_BITS / 2 + RLC_DIG / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rsh") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_rsh(c, a, RLC_BN_BITS / 2 + RLC_DIG / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_div") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_div(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_div_rem") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_div_rem(c, d, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_div_dig") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		do {
-			bn_rand(b, RLC_POS, RLC_DIG);
-		} while (bn_is_zero(b));
-		BENCH_ADD(bn_div_dig(c, a, b->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_div_rem_dig") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		do {
-			bn_rand(b, RLC_POS, RLC_DIG);
-		} while (bn_is_zero(b));
-		BENCH_ADD(bn_div_rem_dig(c, &f, a, b->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod_2b") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mod_2b(c, a, RLC_BN_BITS / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		do {
-			bn_rand(b, RLC_POS, RLC_DIG);
-		} while (bn_is_zero(b));
-		BENCH_ADD(bn_mod_dig(&f, a, b->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod") {
-#if BN_MOD == PMERS
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_set_2b(b, RLC_BN_BITS);
-		bn_rand(c, RLC_POS, RLC_DIG);
-		bn_sub(b, b, c);
-		bn_mod_pre(d, b);
-#else
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod_pre(d, b);
-#endif
-		BENCH_ADD(bn_mod(c, a, b, d));
-	}
-	BENCH_END;
-
-#if BN_MOD == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_mod_basic") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mod_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MOD == BARRT || !defined(STRIP)
-	BENCH_RUN("bn_mod_pre_barrt") {
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mod_pre_barrt(d, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MOD == BARRT || !defined(STRIP)
-	BENCH_RUN("bn_mod_barrt") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		bn_mod_pre_barrt(d, b);
-		BENCH_ADD(bn_mod_barrt(c, a, b, d));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MOD == MONTY || !defined(STRIP)
-	BENCH_RUN("bn_mod_pre_monty") {
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		BENCH_ADD(bn_mod_pre_monty(d, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod_monty_conv") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod(a, a, b);
-		BENCH_ADD(bn_mod_monty_conv(a, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod_monty") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod(a, a, b);
-		bn_mod_pre_monty(d, b);
-		BENCH_ADD(bn_mod_monty(c, a, b, d));
-	}
-	BENCH_END;
-
-#if BN_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_mod_monty_basic") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod(a, a, b);
-		bn_mod_pre_monty(d, b);
-		BENCH_ADD(bn_mod_monty_basic(c, a, b, d));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MUL == COMBA || !defined(STRIP)
-	BENCH_RUN("bn_mod_monty_comba") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod(a, a, b);
-		bn_mod_pre_monty(d, b);
-		BENCH_ADD(bn_mod_monty_comba(c, a, b, d));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_mod_monty_back") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		bn_mod(a, a, b);
-		bn_mod_pre_monty(d, b);
-		BENCH_ADD(bn_mod_monty_back(c, c, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MOD == PMERS || !defined(STRIP)
-	BENCH_RUN("bn_mod_pre_pmers") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_set_2b(b, RLC_BN_BITS);
-		bn_rand(c, RLC_POS, RLC_DIG);
-		bn_sub(b, b, c);
-		BENCH_ADD(bn_mod_pre_pmers(d, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_mod_pmers") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_set_2b(b, RLC_BN_BITS);
-		bn_rand(c, RLC_POS, RLC_DIG);
-		bn_sub(b, b, c);
-		bn_mod_pre_pmers(d, b);
-		BENCH_ADD(bn_mod_pmers(c, a, b, d));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_mxp") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-#if BN_MOD != PMERS
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-#else
-		bn_set_2b(b, RLC_BN_BITS);
-		bn_rand(c, RLC_POS, RLC_DIG);
-		bn_sub(b, b, c);
-#endif
-		bn_mod(a, a, b);
-		BENCH_ADD(bn_mxp(c, a, b, b));
-	}
-	BENCH_END;
-
-#if BN_MXP == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_mxp_basic") {
-		bn_mod(a, a, b);
-		BENCH_ADD(bn_mxp_basic(c, a, b, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MXP == SLIDE || !defined(STRIP)
-	BENCH_RUN("bn_mxp_slide") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_mod(a, a, b);
-		BENCH_ADD(bn_mxp_slide(c, a, b, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_MXP == CONST || !defined(STRIP)
-	BENCH_RUN("bn_mxp_monty") {
-		bn_rand(a, RLC_POS, 2 * RLC_BN_BITS - RLC_DIG / 2);
-		bn_mod(a, a, b);
-		BENCH_ADD(bn_mxp_monty(c, a, b, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_mxp_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(d, RLC_POS, RLC_DIG);
-		bn_get_dig(&f, d);
-		BENCH_ADD(bn_mxp_dig(c, a, f, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_srt") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_srt(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_gcd") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd(c, a, b));
-	}
-	BENCH_END;
-
-#if BN_GCD == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_gcd_basic") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_GCD == LEHME || !defined(STRIP)
-	BENCH_RUN("bn_gcd_lehme") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_lehme(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_GCD == STEIN || !defined(STRIP)
-	BENCH_RUN("bn_gcd_stein") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_stein(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_gcd_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_DIG);
-		bn_get_dig(&f, b);
-		BENCH_ADD(bn_gcd_dig(c, a, f));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_gcd_ext") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_ext(c, d, e, a, b));
-	}
-	BENCH_END;
-
-#if BN_GCD == BASIC || !defined(STRIP)
-	BENCH_RUN("bn_gcd_ext_basic") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_ext_basic(c, d, e, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_GCD == LEHME || !defined(STRIP)
-	BENCH_RUN("bn_gcd_ext_lehme") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_ext_lehme(c, d, e, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if BN_GCD == STEIN || !defined(STRIP)
-	BENCH_RUN("bn_gcd_ext_stein") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_ext_stein(c, d, e, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("bn_gcd_ext_mid") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_gcd_ext_mid(c, c, d, d, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_gcd_ext_dig") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_DIG);
-		BENCH_ADD(bn_gcd_ext_dig(c, d, e, a, b->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_lcm") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_lcm(c, a, b));
-	}
-	BENCH_END;
-
-	bn_gen_prime(b, RLC_BN_BITS);
-
-	BENCH_RUN("bn_smb_leg") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_smb_leg(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_smb_jac") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		if (bn_is_even(b)) {
-			bn_add_dig(b, b, 1);
-		}
-		BENCH_ADD(bn_smb_jac(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_ONE("bn_gen_prime", bn_gen_prime(a, RLC_BN_BITS), 1);
-
-#if BN_GEN == BASIC || !defined(STRIP)
-	BENCH_ONE("bn_gen_prime_basic", bn_gen_prime_basic(a, RLC_BN_BITS), 1);
-#endif
-
-#if BN_GEN == SAFEP || !defined(STRIP)
-	BENCH_ONE("bn_gen_prime_safep", bn_gen_prime_safep(a, RLC_BN_BITS), 1);
-#endif
-
-#if BN_GEN == STRON || !defined(STRIP)
-	BENCH_ONE("bn_gen_prime_stron", bn_gen_prime_stron(a, RLC_BN_BITS), 1);
-#endif
-
-	BENCH_ONE("bn_is_prime", bn_is_prime(a), 1);
-
-	BENCH_ONE("bn_is_prime_basic", bn_is_prime_basic(a), 1);
-
-	BENCH_ONE("bn_is_prime_rabin", bn_is_prime_rabin(a), 1);
-
-	BENCH_ONE("bn_is_prime_solov", bn_is_prime_solov(a), 1);
-
-	/* It should be the case that a is prime here. */
-	BENCH_RUN("bn_mod_inv") {
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_mod_inv(c, b, a));
-	}
-	BENCH_END;
-
-	bn_rand(a, RLC_POS, RLC_BN_BITS);
-
-	BENCH_ONE("bn_factor", bn_factor(c, a), 1);
-
-	BENCH_RUN("bn_is_factor") {
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD(bn_is_factor(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rec_win") {
-		uint8_t win[RLC_BN_BITS + 1];
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD((len = RLC_BN_BITS + 1, bn_rec_win(win, &len, a, 4)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rec_slw") {
-		uint8_t win[RLC_BN_BITS + 1];
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD((len = RLC_BN_BITS + 1, bn_rec_slw(win, &len, a, 4)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rec_naf") {
-		int8_t naf[RLC_BN_BITS + 1];
-		int len;
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD((len = RLC_BN_BITS + 1, bn_rec_naf(naf, &len, a, 4)));
-	}
-	BENCH_END;
-
-#if defined(WITH_EB) && defined(EB_KBLTZ) && (EB_MUL == LWNAF || EB_MUL == RWNAF || EB_FIX == LWNAF || EB_SIM == INTER || !defined(STRIP))
-	if (eb_param_set_any_kbltz() == RLC_OK) {
-		BENCH_RUN("bn_rec_tnaf") {
-			int8_t tnaf[RLC_FB_BITS + 8];
-			int len = RLC_BN_BITS + 1;
-			eb_curve_get_ord(e);
-			bn_rand_mod(a, e);
-			if (eb_curve_opt_a() == RLC_ZERO) {
-				BENCH_ADD((len = RLC_FB_BITS + 8, bn_rec_tnaf(tnaf, &len, a, -1, RLC_FB_BITS, 4)));
-			} else {
-				BENCH_ADD((len = RLC_FB_BITS + 8, bn_rec_tnaf(tnaf, &len, a, 1, RLC_FB_BITS, 4)));
-			}
-		}
-		BENCH_END;
-
-		BENCH_RUN("bn_rec_rtnaf") {
-			int8_t tnaf[RLC_FB_BITS + 8];
-			eb_curve_get_ord(e);
-			bn_rand_mod(a, e);
-			if (eb_curve_opt_a() == RLC_ZERO) {
-				BENCH_ADD((len = RLC_FB_BITS + 8, bn_rec_rtnaf(tnaf, &len, a, -1, RLC_FB_BITS, 4)));
-			} else {
-				BENCH_ADD((len = RLC_FB_BITS + 8, bn_rec_rtnaf(tnaf, &len, a, 1, RLC_FB_BITS, 4)));
-			}
-		}
-		BENCH_END;
-	}
-#endif
-
-	BENCH_RUN("bn_rec_reg") {
-		int8_t naf[RLC_BN_BITS + 1];
-		int len = RLC_BN_BITS + 1;
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD((len = RLC_BN_BITS + 1, bn_rec_reg(naf, &len, a, RLC_BN_BITS, 4)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("bn_rec_jsf") {
-		int8_t jsf[2 * (RLC_BN_BITS + 1)];
-		bn_rand(a, RLC_POS, RLC_BN_BITS);
-		bn_rand(b, RLC_POS, RLC_BN_BITS);
-		BENCH_ADD((len = 2 * (RLC_BN_BITS + 1), bn_rec_jsf(jsf, &len, a, b)));
-	}
-	BENCH_END;
-
-#if defined(WITH_EP) && defined(EP_ENDOM) && (EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || EP_SIM == INTER || !defined(STRIP))
-	if (ep_param_set_any_endom() == RLC_OK) {
-		bn_t v1[3], v2[3];
-
-		for (int j = 0; j < 3; j++) {
-			bn_new(v1[j]);
-			bn_new(v2[j]);
-		}
-
-		BENCH_RUN("bn_rec_glv") {
-			bn_rand(a, RLC_POS, RLC_FP_BITS);
-			ep_curve_get_v1(v1);
-			ep_curve_get_v2(v2);
-			ep_curve_get_ord(e);
-			bn_rand_mod(a, e);
-			BENCH_ADD(bn_rec_glv(b, c, a, e, (const bn_t *)v1,
-							(const bn_t *)v2));
-		}
-		BENCH_END;
-
-		for (int j = 0; j < 3; j++) {
-			bn_free(v1[j]);
-			bn_free(v2[j]);
-		}
-	}
-#endif /* WITH_EP && EP_KBLTZ */
-
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the BN module:", 0);
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-	util_banner("Arithmetic:", 1);
-	arith();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_cp.c b/src/dashbls/depends/relic/bench/bench_cp.c
deleted file mode 100644
index 621df803f316..000000000000
--- a/src/dashbls/depends/relic/bench/bench_cp.c
+++ /dev/null
@@ -1,1809 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for cryptographic protocols.
- *
- * @version $Id$
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-#if defined(WITH_BN)
-
-static void rsa(void) {
-	rsa_t pub, prv;
-	uint8_t in[10], new[10], h[RLC_MD_LEN], out[RLC_BN_BITS / 8 + 1];
-	int out_len, new_len;
-
-	rsa_null(pub);
-	rsa_null(prv);
-
-	rsa_new(pub);
-	rsa_new(prv);
-
-	BENCH_ONE("cp_rsa_gen", cp_rsa_gen(pub, prv, RLC_BN_BITS), 1);
-
-	BENCH_RUN("cp_rsa_enc") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		BENCH_ADD(cp_rsa_enc(out, &out_len, in, sizeof(in), pub));
-		cp_rsa_dec(new, &new_len, out, out_len, prv);
-	} BENCH_END;
-
-	BENCH_RUN("cp_rsa_dec") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		cp_rsa_enc(out, &out_len, in, sizeof(in), pub);
-		BENCH_ADD(cp_rsa_dec(new, &new_len, out, out_len, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_rsa_sig (h = 0)") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		BENCH_ADD(cp_rsa_sig(out, &out_len, in, sizeof(in), 0, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_rsa_sig (h = 1)") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		md_map(h, in, sizeof(in));
-		BENCH_ADD(cp_rsa_sig(out, &out_len, h, RLC_MD_LEN, 1, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_rsa_ver (h = 0)") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		cp_rsa_sig(out, &out_len, in, sizeof(in), 0, prv);
-		BENCH_ADD(cp_rsa_ver(out, out_len, in, sizeof(in), 0, pub));
-	} BENCH_END;
-
-	BENCH_RUN("cp_rsa_ver (h = 1)") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		new_len = out_len;
-		rand_bytes(in, sizeof(in));
-		md_map(h, in, sizeof(in));
-		cp_rsa_sig(out, &out_len, h, RLC_MD_LEN, 1, prv);
-		BENCH_ADD(cp_rsa_ver(out, out_len, h, RLC_MD_LEN, 1, pub));
-	} BENCH_END;
-
-	rsa_free(pub);
-	rsa_free(prv);
-}
-
-static void rabin(void) {
-	rabin_t pub, prv;
-	uint8_t in[1000], new[1000], out[RLC_BN_BITS / 8 + 1];
-	int in_len, out_len, new_len;
-
-	rabin_null(pub);
-	rabin_null(prv);
-
-	rabin_new(pub);
-	rabin_new(prv);
-
-	BENCH_ONE("cp_rabin_gen", cp_rabin_gen(pub, prv, RLC_BN_BITS), 1);
-
-	BENCH_RUN("cp_rabin_enc") {
-		in_len = bn_size_bin(pub->n) - 9;
-		out_len = RLC_BN_BITS / 8 + 1;
-		rand_bytes(in, in_len);
-		BENCH_ADD(cp_rabin_enc(out, &out_len, in, in_len, pub));
-		cp_rabin_dec(new, &new_len, out, out_len, prv);
-	} BENCH_END;
-
-	BENCH_RUN("cp_rabin_dec") {
-		in_len = bn_size_bin(pub->n) - 9;
-		new_len = in_len;
-		out_len = RLC_BN_BITS / 8 + 1;
-		rand_bytes(in, in_len);
-		cp_rabin_enc(out, &out_len, in, in_len, pub);
-		BENCH_ADD(cp_rabin_dec(new, &new_len, out, out_len, prv));
-	} BENCH_END;
-
-	rabin_free(pub);
-	rabin_free(prv);
-}
-
-static void benaloh(void) {
-	bdpe_t pub, prv;
-	dig_t in, new;
-	uint8_t out[RLC_BN_BITS / 8 + 1];
-	int out_len;
-
-	bdpe_null(pub);
-	bdpe_null(prv);
-
-	bdpe_new(pub);
-	bdpe_new(prv);
-
-	BENCH_ONE("cp_bdpe_gen", cp_bdpe_gen(pub, prv, bn_get_prime(47),
-		RLC_BN_BITS), 1);
-
-	BENCH_RUN("cp_bdpe_enc") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		rand_bytes(out, 1);
-		in = out[0] % bn_get_prime(47);
-		BENCH_ADD(cp_bdpe_enc(out, &out_len, in, pub));
-		cp_bdpe_dec(&new, out, out_len, prv);
-	} BENCH_END;
-
-	BENCH_RUN("cp_bdpe_dec") {
-		out_len = RLC_BN_BITS / 8 + 1;
-		rand_bytes(out, 1);
-		in = out[0] % bn_get_prime(47);
-		cp_bdpe_enc(out, &out_len, in, pub);
-		BENCH_ADD(cp_bdpe_dec(&new, out, out_len, prv));
-	} BENCH_END;
-
-	bdpe_free(pub);
-	bdpe_free(prv);
-}
-
-static void paillier(void) {
-	bn_t c, m, pub;
-	phpe_t prv;
-
-	bn_null(c);
-	bn_null(m);
-	bn_null(pub);
-	phpe_null(prv);
-
-	bn_new(c);
-	bn_new(m);
-	bn_new(pub);
-	phpe_new(prv);
-
-	BENCH_ONE("cp_phpe_gen", cp_phpe_gen(pub, prv, RLC_BN_BITS / 2), 1);
-
-	BENCH_RUN("cp_phpe_enc") {
-		bn_rand_mod(m, pub);
-		BENCH_ADD(cp_phpe_enc(c, m, pub));
-	} BENCH_END;
-
-	BENCH_RUN("cp_phpe_dec") {
-		bn_rand_mod(m, pub);
-		cp_phpe_enc(c, m, pub);
-		BENCH_ADD(cp_phpe_dec(m, c, prv));
-	} BENCH_END;
-
-	BENCH_ONE("cp_ghpe_gen", cp_ghpe_gen(pub, prv->n, RLC_BN_BITS / 2), 1);
-
-	BENCH_RUN("cp_ghpe_enc (1)") {
-		bn_rand_mod(m, pub);
-		BENCH_ADD(cp_ghpe_enc(c, m, pub, 1));
-	} BENCH_END;
-
-	BENCH_RUN("cp_ghpe_dec (1)") {
-		bn_rand_mod(m, pub);
-		cp_ghpe_enc(m, c, pub, 1);
-		BENCH_ADD(cp_ghpe_dec(c, m, pub, prv->n, 1));
-	} BENCH_END;
-
-	BENCH_ONE("cp_ghpe_gen", cp_ghpe_gen(pub, prv->n, RLC_BN_BITS / 4), 1);
-
-	BENCH_RUN("cp_ghpe_enc (2)") {
-		bn_rand(m, RLC_POS, 2 * bn_bits(pub) - 1);
-		BENCH_ADD(cp_ghpe_enc(m, c, pub, 2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_ghpe_dec (2)") {
-		bn_rand(m, RLC_POS, 2 * bn_bits(pub) - 1);
-		cp_ghpe_enc(m, c, pub, 2);
-		BENCH_ADD(cp_ghpe_dec(c, m, pub, prv->n, 2));
-	} BENCH_END;
-
-	bn_free(c);
-	bn_free(m);
-	bn_free(pub);
-	phpe_free(prv);
-}
-
-#endif
-
-#if defined(WITH_EC)
-
-static void ecdh(void) {
-	bn_t d;
-	ec_t p;
-	uint8_t key[RLC_MD_LEN];
-
-	bn_null(d);
-	ec_null(p);
-
-	bn_new(d);
-	ec_new(p);
-
-	BENCH_RUN("cp_ecdh_gen") {
-		BENCH_ADD(cp_ecdh_gen(d, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecdh_key") {
-		BENCH_ADD(cp_ecdh_key(key, RLC_MD_LEN, d, p));
-	}
-	BENCH_END;
-
-	bn_free(d);
-	ec_free(p);
-}
-
-static void ecmqv(void) {
-	bn_t d1, d2;
-	ec_t p1, p2;
-	uint8_t key[RLC_MD_LEN];
-
-	bn_null(d1);
-	bn_null(d2);
-	ec_null(p1);
-	ec_null(p2);
-
-	bn_new(d1);
-	bn_new(d2);
-	ec_new(p1);
-	ec_new(p2);
-
-	BENCH_RUN("cp_ecmqv_gen") {
-		BENCH_ADD(cp_ecmqv_gen(d1, p1));
-	}
-	BENCH_END;
-
-	cp_ecmqv_gen(d2, p2);
-
-	BENCH_RUN("cp_ecmqv_key") {
-		BENCH_ADD(cp_ecmqv_key(key, RLC_MD_LEN, d1, d2, p1, p1, p2));
-	}
-	BENCH_END;
-
-	bn_free(d1);
-	bn_free(d2);
-	ec_free(p1);
-	ec_free(p2);
-}
-
-static void ecies(void) {
-	ec_t q, r;
-	bn_t d;
-	uint8_t in[10], out[16 + RLC_MD_LEN];
-	int in_len, out_len;
-
-	bn_null(d);
-	ec_null(q);
-	ec_null(r);
-
-	ec_new(q);
-	ec_new(r);
-	bn_new(d);
-
-	BENCH_RUN("cp_ecies_gen") {
-		BENCH_ADD(cp_ecies_gen(d, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecies_enc") {
-		in_len = sizeof(in);
-		out_len = sizeof(out);
-		rand_bytes(in, sizeof(in));
-		BENCH_ADD(cp_ecies_enc(r, out, &out_len, in, in_len, q));
-		cp_ecies_dec(out, &out_len, r, out, out_len, d);
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecies_dec") {
-		in_len = sizeof(in);
-		out_len = sizeof(out);
-		rand_bytes(in, sizeof(in));
-		cp_ecies_enc(r, out, &out_len, in, in_len, q);
-		BENCH_ADD(cp_ecies_dec(in, &in_len, r, out, out_len, d));
-	}
-	BENCH_END;
-
-	ec_free(q);
-	ec_free(r);
-	bn_free(d);
-}
-
-static void ecdsa(void) {
-	uint8_t msg[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-	bn_t r, s, d;
-	ec_t p;
-
-	bn_null(r);
-	bn_null(s);
-	bn_null(d);
-	ec_null(p);
-
-	bn_new(r);
-	bn_new(s);
-	bn_new(d);
-	ec_new(p);
-
-	BENCH_RUN("cp_ecdsa_gen") {
-		BENCH_ADD(cp_ecdsa_gen(d, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecdsa_sign (h = 0)") {
-		BENCH_ADD(cp_ecdsa_sig(r, s, msg, 5, 0, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecdsa_sign (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_ecdsa_sig(r, s, h, RLC_MD_LEN, 1, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecdsa_ver (h = 0)") {
-		BENCH_ADD(cp_ecdsa_ver(r, s, msg, 5, 0, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecdsa_ver (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_ecdsa_ver(r, s, h, RLC_MD_LEN, 1, p));
-	}
-	BENCH_END;
-
-	bn_free(r);
-	bn_free(s);
-	bn_free(d);
-	ec_free(p);
-}
-
-static void ecss(void) {
-	uint8_t msg[5] = { 0, 1, 2, 3, 4 };
-	bn_t r, s, d;
-	ec_t p;
-
-	bn_null(r);
-	bn_null(s);
-	bn_null(d);
-	ec_null(p);
-
-	bn_new(r);
-	bn_new(s);
-	bn_new(d);
-	ec_new(p);
-
-	BENCH_RUN("cp_ecss_gen") {
-		BENCH_ADD(cp_ecss_gen(d, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecss_sign") {
-		BENCH_ADD(cp_ecss_sig(r, s, msg, 5, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ecss_ver") {
-		BENCH_ADD(cp_ecss_ver(r, s, msg, 5, p));
-	}
-	BENCH_END;
-
-	bn_free(r);
-	bn_free(s);
-	bn_free(d);
-	ec_free(p);
-}
-
-static void vbnn(void) {
-	uint8_t ida[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	uint8_t idb[] = { 5, 6, 7, 8, 9, 0, 1, 2, 3, 4 };
-	bn_t msk, ska, skb;
-	ec_t mpk, pka, pkb;
-
-	uint8_t m[] = "Thrice the brinded cat hath mew'd.";
-
-	ec_t r;
-	bn_t z;
-	bn_t h;
-
-	bn_null(z);
-	bn_null(h);
-	bn_null(msk);
-	bn_null(ska);
-	bn_null(skb);
-	ec_null(r);
-	ec_null(mpk);
-	bn_null(pka);
-	bn_null(pkb);
-
-	bn_new(z);
-	bn_new(h);
-	bn_new(msk);
-	bn_new(ska);
-	bn_new(skb);
-	ec_new(r);
-	ec_new(mpk);
-	ec_new(pka);
-	ec_new(pkb);
-
-	BENCH_RUN("cp_vbnn_gen") {
-		BENCH_ADD(cp_vbnn_gen(msk, mpk));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_vbnn_gen_prv") {
-		BENCH_ADD(cp_vbnn_gen_prv(ska, pka, msk, ida, sizeof(ida)));
-	}
-	BENCH_END;
-
-	cp_vbnn_gen_prv(skb, pkb, msk, idb, sizeof(idb));
-
-	BENCH_RUN("cp_vbnn_sig") {
-		BENCH_ADD(cp_vbnn_sig(r, z, h, ida, sizeof(ida), m, sizeof(m), ska, pka));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_vbnn_ver") {
-		BENCH_ADD(cp_vbnn_ver(r, z, h, ida, sizeof(ida), m, sizeof(m), mpk));
-	}
-	BENCH_END;
-
-	bn_free(z);
-	bn_free(h);
-	bn_free(msk);
-	bn_free(ska);
-	bn_free(skb);
-	ec_free(r);
-	ec_free(mpk);
-	ec_free(pka);
-	ec_free(pkb);
-}
-
-#define MAX_KEYS	RLC_MAX(BENCH, 16)
-#define MIN_KEYS	RLC_MIN(BENCH, 16)
-
-static void ers(void) {
-	int size;
-	ec_t pp, pk[MAX_KEYS + 1];
-	bn_t sk[MAX_KEYS + 1], td;
-	ers_t ring[MAX_KEYS + 1];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(td);
-	ec_null(pp);
-
-	bn_new(td);
-	ec_new(pp);
-	for (int i = 0; i <= MAX_KEYS; i++) {
-		bn_null(sk[i]);
-		bn_new(sk[i]);
-		ec_null(pk[i]);
-		ec_new(pk[i]);
-		ers_null(ring[i]);
-		ers_new(ring[i]);
-		cp_ers_gen_key(sk[i], pk[i]);
-	}
-
-	cp_ers_gen(pp);
-
-	BENCH_RUN("cp_ers_sig") {
-		BENCH_ADD(cp_ers_sig(td, ring[0], m, 5, sk[0], pk[0], pp));
-	} BENCH_END;
-
-	BENCH_RUN("cp_ers_ver") {
-		BENCH_ADD(cp_ers_ver(td, ring, 1, m, 5, pp));
-	} BENCH_END;
-
-	size = 1;
-	BENCH_FEW("cp_ers_ext", cp_ers_ext(td, ring, &size, m, 5, pk[size], pp), 1);
-
-	size = 1;
-	cp_ers_sig(td, ring[0], m, 5, sk[0], pk[0], pp);
-	for (int j = 1; j < MAX_KEYS && size < BENCH; j = j << 1) {
-		for (int k = 0; k < j && size < BENCH; k++) {
-			cp_ers_ext(td, ring, &size, m, 5, pk[size], pp);
-		}
-		cp_ers_ver(td, ring, size, m, 5, pp);
-		util_print("(%2d exts) ", j);
-		BENCH_FEW("cp_ers_ver", cp_ers_ver(td, ring, size, m, 5, pp), 1);
-	}
-
-	bn_free(td);
-	ec_free(pp);
-	for (int i = 0; i <= MAX_KEYS; i++) {
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		ers_free(ring[i])
-	}
-}
-
-static void etrs(void) {
-	int size;
-	ec_t pp, pk[MAX_KEYS + 1];
-	bn_t sk[MAX_KEYS + 1], td[MAX_KEYS + 1], y[MAX_KEYS + 1];
-	etrs_t ring[MAX_KEYS + 1];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	ec_null(pp);
-	ec_new(pp);
-	for (int i = 0; i <= MAX_KEYS; i++) {
-		bn_null(td[i]);
-		bn_new(td[i]);
-		bn_null(y[i]);
-		bn_new(y[i]);
-		bn_null(sk[i]);
-		bn_new(sk[i]);
-		ec_null(pk[i]);
-		ec_new(pk[i]);
-		etrs_null(ring[i]);
-		etrs_new(ring[i]);
-		ec_curve_get_ord(sk[i]);
-		bn_rand_mod(td[i], sk[i]);
-		bn_rand_mod(y[i], sk[i]);
-		cp_etrs_gen_key(sk[i], pk[i]);
-	}
-
-	cp_etrs_gen(pp);
-
-	BENCH_FEW("cp_etrs_sig", cp_etrs_sig(td, y, MIN_KEYS, ring[0], m, 5, sk[0], pk[0], pp), 1);
-
-	BENCH_FEW("cp_etrs_ver", cp_etrs_ver(1, td, y, MIN_KEYS, ring, 1, m, 5, pp), 1);
-
-	size = 1;
-	BENCH_FEW("cp_etrs_ext", (size = 1, cp_etrs_ext(td, y, MIN_KEYS, ring, &size, m, 5, pk[size], pp)), 1);
-
-	size = 1;
-	cp_etrs_sig(td, y, MIN_KEYS, ring[0], m, 5, sk[0], pk[0], pp);
-	BENCH_FEW("cp_etrs_uni", cp_etrs_uni(1, td, y, MIN_KEYS, ring, &size, m, 5, sk[size], pk[size], pp), 1);
-
-	size = 1;
-	cp_etrs_sig(td, y, MIN_KEYS, ring[0], m, 5, sk[0], pk[0], pp);
-	for (int j = 1; j < MIN_KEYS && size < MIN_KEYS; j = j << 1) {
-		for (int k = 0; k < j && size < MIN_KEYS; k++) {
-			cp_etrs_ext(td, y, MIN_KEYS, ring, &size, m, 5, pk[size], pp);
-		}
-		cp_etrs_ver(1, td+size-1, y+size-1, MIN_KEYS-size+1, ring, size, m, 5, pp);
-		util_print("(%2d exts) ", j);
-		BENCH_FEW("cp_etrs_ver", cp_etrs_ver(1, td+size-1, y+size-1, MIN_KEYS-size+1, ring, size, m, 5, pp), 1);
-	}
-
-	ec_free(pp);
-	for (int i = 0; i <= MAX_KEYS; i++) {
-		bn_free(td[i]);
-		bn_free(y[i]);
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		etrs_free(ring[i])
-	}
-}
-
-#endif /* WITH_EC */
-
-#if defined(WITH_PC)
-
-static void pdpub(void) {
-	bn_t r1, r2;
-	g1_t p, u1, v1;
-	g2_t q, u2, v2, w2;
-	gt_t e, r, g[3];
-
-	bn_null(r1);
-	bn_null(r2);
-	g1_null(p);
-	g1_null(u1);
-	g1_null(v1);
-	g2_null(q);
-	g2_null(u2);
-	g2_null(v2);
-	g2_null(w2);
-	gt_null(e);
-	gt_null(r);
-	gt_null(g[0]);
-	gt_null(g[1]);
-	gt_null(g[2]);
-
-	bn_new(r1);
-	bn_new(r2);
-	g1_new(p);
-	g1_new(u1);
-	g1_new(v1);
-	g2_new(q);
-	g2_new(u2);
-	g2_new(v2);
-	g2_new(w2);
-	gt_new(e);
-	gt_new(r);
-	gt_new(g[0]);
-	gt_new(g[1]);
-	gt_new(g[2]);
-
-	BENCH_RUN("cp_pdpub_gen") {
-		BENCH_ADD(cp_pdpub_gen(r1, r2, u1, u2, v2, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdpub_ask") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_pdpub_ask(v1, w2, p, q, r1, r2, u1, u2, v2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdpub_ans") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_pdpub_ans(g, p, q, v1, v2, w2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdpub_ver") {
-		g1_rand(p);
-		g2_rand(q);
-		pc_map(e, p, q);
-		BENCH_ADD(cp_pdpub_ver(r, g, r1, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvpub_gen") {
-		BENCH_ADD(cp_lvpub_gen(r2, u1, u2, v2, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvpub_ask") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_lvpub_ask(r1, v1, w2, p, q, r2, u1, u2, v2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvpub_ans") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_lvpub_ans(g, p, q, v1, v2, w2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvpub_ver") {
-		g1_rand(p);
-		g2_rand(q);
-		pc_map(e, p, q);
-		BENCH_ADD(cp_lvpub_ver(r, g, r1, e));
-	} BENCH_END;
-
-	bn_free(r1);
-	bn_free(r2);
-	g1_free(p);
-	g1_free(u1);
-	g1_free(v1);
-	g2_free(q);
-	g2_free(u2);
-	g2_free(v2);
-	g2_free(w2);
-	gt_free(e);
-	gt_free(r);
-	gt_free(g[0]);
-	gt_free(g[1]);
-	gt_free(g[2]);
-}
-
-static void pdprv(void) {
-	bn_t r1, r2[3];
-	g1_t p, u1[2], v1[3];
-	g2_t q, u2[2], v2[4], w2[4];
-	gt_t e[2], r, g[4];
-
-	bn_null(r1);
-	g1_null(p);
-	g2_null(q);
-	gt_null(r);
-	for (int i = 0; i < 2; i++) {
-		g1_null(u1[i]);
-		g2_null(u2[i]);
-		gt_null(e[i]);
-	}
-	for (int i = 0; i < 3; i++) {
-		g1_null(v1[i]);
-		bn_null(r2[i]);
-	}
-	for (int i = 0; i < 4; i++) {
-		g2_null(v2[i]);
-		g2_null(w2[i]);
-		gt_null(g[i]);
-	}
-
-	bn_new(r1);
-	g1_new(p);
-	g2_new(q);
-	gt_new(r);
-	for (int i = 0; i < 2; i++) {
-		g1_new(u1[i]);
-		g2_new(u2[i]);
-		gt_new(e[i]);
-	}
-	for (int i = 0; i < 3; i++) {
-		g1_new(v1[i]);
-		bn_new(r2[i]);
-	}
-	for (int i = 0; i < 4; i++) {
-		g2_new(v2[i]);
-		g2_new(w2[i]);
-		gt_new(g[i]);
-	}
-
-	BENCH_RUN("cp_pdprv_gen") {
-		BENCH_ADD(cp_pdprv_gen(r1, r2, u1, u2, v2, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdprv_ask") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_pdprv_ask(v1, w2, p, q, r1, r2, u1, u2, v2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdprv_ans") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_pdprv_ans(g, v1, w2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pdprv_ver") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_pdprv_ver(r, g, r1, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvprv_gen") {
-		BENCH_ADD(cp_lvprv_gen(r1, r2, u1, u2, v2, e));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvprv_ask") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_lvprv_ask(v1, w2, p, q, r1, r2, u1, u2, v2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvprv_ans") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_lvprv_ans(g, v1, w2));
-	} BENCH_END;
-
-	BENCH_RUN("cp_lvprv_ver") {
-		g1_rand(p);
-		g2_rand(q);
-		BENCH_ADD(cp_lvprv_ver(r, g, r1, e));
-	} BENCH_END;
-
-	bn_free(r1);
-	g1_free(p);
-	g2_free(q);
-	gt_free(r);
-	for (int i = 0; i < 2; i++) {
-		g1_free(u1[i]);
-		g2_free(u2[i]);
-		gt_free(e[i]);
-	}
-	for (int i = 0; i < 3; i++) {
-		g1_free(v1[i]);
-		bn_free(r2[i]);
-	}
-	for (int i = 0; i < 4; i++) {
-		g2_free(v2[i]);
-		g2_free(w2[i]);
-		gt_free(g[i]);
-	}
-}
-
-static void sokaka(void) {
-	sokaka_t k;
-	bn_t s;
-	uint8_t key1[RLC_MD_LEN];
-	char *id_a = "Alice";
-	char *id_b = "Bob";
-
-	sokaka_null(k);
-
-	sokaka_new(k);
-	bn_new(s);
-
-	BENCH_RUN("cp_sokaka_gen") {
-		BENCH_ADD(cp_sokaka_gen(s));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_sokaka_gen_prv") {
-		BENCH_ADD(cp_sokaka_gen_prv(k, id_b, s));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_sokaka_key (g1)") {
-		BENCH_ADD(cp_sokaka_key(key1, RLC_MD_LEN, id_b, k, id_a));
-	}
-	BENCH_END;
-
-	if (pc_map_is_type3()) {
-		cp_sokaka_gen_prv(k, id_a, s);
-
-		BENCH_RUN("cp_sokaka_key (g2)") {
-			BENCH_ADD(cp_sokaka_key(key1, RLC_MD_LEN, id_a, k, id_b));
-		}
-		BENCH_END;
-	}
-
-	sokaka_free(k);
-	bn_free(s);
-}
-
-static void ibe(void) {
-	bn_t s;
-	g1_t pub;
-	g2_t prv;
-	uint8_t in[10], out[10 + 2 * RLC_FP_BYTES + 1];
-	char *id = "Alice";
-	int in_len, out_len;
-
-	bn_null(s);
-	g1_null(pub);
-	g2_null(prv);
-
-	bn_new(s);
-	g1_new(pub);
-	g2_new(prv);
-
-	rand_bytes(in, sizeof(in));
-
-	BENCH_RUN("cp_ibe_gen") {
-		BENCH_ADD(cp_ibe_gen(s, pub));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ibe_gen_prv") {
-		BENCH_ADD(cp_ibe_gen_prv(prv, id, s));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ibe_enc") {
-		in_len = sizeof(in);
-		out_len = in_len + 2 * RLC_FP_BYTES + 1;
-		rand_bytes(in, sizeof(in));
-		BENCH_ADD(cp_ibe_enc(out, &out_len, in, in_len, id, pub));
-		cp_ibe_dec(out, &out_len, out, out_len, prv);
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_ibe_dec") {
-		in_len = sizeof(in);
-		out_len = in_len + 2 * RLC_FP_BYTES + 1;
-		rand_bytes(in, sizeof(in));
-		cp_ibe_enc(out, &out_len, in, in_len, id, pub);
-		BENCH_ADD(cp_ibe_dec(out, &out_len, out, out_len, prv));
-	}
-	BENCH_END;
-
-	bn_free(s);
-	g1_free(pub);
-	g2_free(prv);
-}
-
-static void bgn(void) {
-	g1_t c[2];
-	g2_t d[2];
-	gt_t e[4];
-	bgn_t pub, prv;
-	dig_t in;
-
-	g1_null(c[0]);
-	g1_null(c[1]);
-	g2_null(d[0]);
-	g2_null(d[1]);
-	bgn_null(pub);
-	bgn_null(prv);
-
-	g1_new(c[0]);
-	g1_new(c[1]);
-	g2_new(d[0]);
-	g2_new(d[1]);
-	bgn_new(pub);
-	bgn_new(prv);
-	for (int i = 0; i < 4; i++) {
-		gt_null(e[i]);
-		gt_new(e[i]);
-	}
-
-	BENCH_RUN("cp_bgn_gen") {
-		BENCH_ADD(cp_bgn_gen(pub, prv));
-	} BENCH_END;
-
-	in = 10;
-
-	BENCH_RUN("cp_bgn_enc1") {
-		BENCH_ADD(cp_bgn_enc1(c, in, pub));
-		cp_bgn_dec1(&in, c, prv);
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_dec1 (10)") {
-		cp_bgn_enc1(c, in, pub);
-		BENCH_ADD(cp_bgn_dec1(&in, c, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_enc2") {
-		BENCH_ADD(cp_bgn_enc2(d, in, pub));
-		cp_bgn_dec2(&in, d, prv);
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_dec2 (10)") {
-		cp_bgn_enc2(d, in, pub);
-		BENCH_ADD(cp_bgn_dec2(&in, d, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_mul") {
-		BENCH_ADD(cp_bgn_mul(e, c, d));
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_dec (100)") {
-		BENCH_ADD(cp_bgn_dec(&in, e, prv));
-	} BENCH_END;
-
-	BENCH_RUN("cp_bgn_add") {
-		BENCH_ADD(cp_bgn_add(e, e, e));
-	} BENCH_END;
-
-	g1_free(c[0]);
-	g1_free(c[1]);
-	g2_free(d[0]);
-	g2_free(d[1]);
-	bgn_free(pub);
-	bgn_free(prv);
-	for (int i = 0; i < 4; i++) {
-		gt_free(e[i]);
-	}
-}
-
-static void bls(void) {
-	uint8_t msg[5] = { 0, 1, 2, 3, 4 };
-	g1_t s;
-	g2_t p;
-	bn_t d;
-
-	g1_null(s);
-	g2_null(p);
-	bn_null(d);
-
-	g1_new(s);
-	g2_new(p);
-	bn_new(d);
-
-	BENCH_RUN("cp_bls_gen") {
-		BENCH_ADD(cp_bls_gen(d, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bls_sign") {
-		BENCH_ADD(cp_bls_sig(s, msg, 5, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bls_ver") {
-		BENCH_ADD(cp_bls_ver(s, msg, 5, p));
-	}
-	BENCH_END;
-
-	g1_free(s);
-	bn_free(d);
-	g2_free(p);
-}
-
-static void bbs(void) {
-	uint8_t msg[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-	g1_t s;
-	g2_t p;
-	gt_t z;
-	bn_t d;
-
-	g1_null(s);
-	g2_null(p);
-	gt_null(z);
-	bn_null(d);
-
-	g1_new(s);
-	g2_new(p);
-	gt_new(z);
-	bn_new(d);
-
-	BENCH_RUN("cp_bbs_gen") {
-		BENCH_ADD(cp_bbs_gen(d, p, z));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bbs_sign (h = 0)") {
-		BENCH_ADD(cp_bbs_sig(s, msg, 5, 0, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bbs_sign (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_bbs_sig(s, h, RLC_MD_LEN, 1, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bbs_ver (h = 0)") {
-		BENCH_ADD(cp_bbs_ver(s, msg, 5, 0, p, z));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_bbs_ver (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_bbs_ver(s, h, RLC_MD_LEN, 1, p, z));
-	}
-	BENCH_END;
-
-	g1_free(s);
-	bn_free(d);
-	g2_free(p);
-}
-
-static int cls(void) {
-	int i, code = RLC_ERR;
-	bn_t r, t, u, v, _v[4];
-	g1_t a, A, b, B, c, _A[4], _B[4];
-	g2_t x, y, z, _z[4];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-	uint8_t *msgs[5] = {m, m, m, m, m};
-	int lens[5] = {sizeof(m), sizeof(m), sizeof(m), sizeof(m), sizeof(m)};
-
-	bn_null(r);
-	bn_null(t);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(A);
-	g1_null(b);
-	g1_null(B);
-	g1_null(c);
-	g2_null(x);
-	g2_null(y);
-	g2_null(z);
-	for (i = 0; i < 4; i++) {
-		bn_null(_v[i]);
-		g1_null(_A[i]);
-		g1_null(_B[i]);
-		g2_null(_z[i]);
-	}
-
-	bn_new(r);
-	bn_new(t);
-	bn_new(u);
-	bn_new(v);
-	g1_new(a);
-	g1_new(A);
-	g1_new(b);
-	g1_new(B);
-	g1_new(c);
-	g2_new(x);
-	g2_new(y);
-	g2_new(z);
-	for (i = 0; i < 4; i++) {
-		bn_new(_v[i]);
-		g1_new(_A[i]);
-		g1_new(_B[i]);
-		g2_new(_z[i]);
-	}
-
-	BENCH_RUN("cp_cls_gen") {
-		BENCH_ADD(cp_cls_gen(u, v, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_cls_sig") {
-		BENCH_ADD(cp_cls_sig(a, b, c, m, sizeof(m), u, v));
-	} BENCH_END;
-
-	BENCH_RUN("cp_cls_ver") {
-		BENCH_ADD(cp_cls_ver(a, b, c, m, sizeof(m), x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_cli_gen") {
-		BENCH_ADD(cp_cli_gen(t, u, v, x, y, z));
-	} BENCH_END;
-
-	bn_rand(r, RLC_POS, 2 * pc_param_level());
-	BENCH_RUN("cp_cli_sig") {
-		BENCH_ADD(cp_cli_sig(a, A, b, B, c, m, sizeof(m), r, t, u, v));
-	} BENCH_END;
-
-	BENCH_RUN("cp_cli_ver") {
-		BENCH_ADD(cp_cli_ver(a, A, b, B, c, m, sizeof(m), r, x, y, z));
-	} BENCH_END;
-
-	BENCH_RUN("cp_clb_gen (5)") {
-		BENCH_ADD(cp_clb_gen(t, u, _v, x, y, _z, 5));
-	} BENCH_END;
-
-	BENCH_RUN("cp_clb_sig (5)") {
-		BENCH_ADD(cp_clb_sig(a, _A, b, _B, c, msgs, lens, t, u, _v, 5));
-	} BENCH_END;
-
-	BENCH_RUN("cp_clb_ver (5)") {
-		BENCH_ADD(cp_clb_ver(a, _A, b, _B, c, msgs, lens, x, y, _z, 5));
-	} BENCH_END;
-
-	bn_free(r);
-	bn_free(t);
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(A);
-	g1_free(b);
-	g1_free(B);
-	g1_free(c);
-	g2_free(x);
-	g2_free(y);
-	g2_free(z);
-	for (i = 0; i < 4; i++) {
-		bn_free(_v[i]);
-		g1_free(_A[i]);
-		g1_free(_B[i]);
-		g2_free(_z[i]);
-	}
-	return code;
-}
-
-static void pss(void) {
-	bn_t ms[10], n, u, v, _v[10];
-	g1_t a, b;
-	g2_t g, x, y, _y[10];
-
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(b);
-	g2_null(g);
-	g2_null(x);
-	g2_null(y);
-	bn_new(n);
-	bn_new(u);
-	bn_new(v);
-	g1_new(a);
-	g1_new(b);
-	g2_new(g);
-	g2_new(x);
-	g2_new(y);
-
-	g1_get_ord(n);
-	for (int i = 0; i < 10; i++) {
-		bn_null(ms[i]);
-		bn_null(_v[i]);
-		g2_null(_y[i]);
-		bn_new(ms[i]);
-		bn_rand_mod(ms[i], n);
-		bn_new(_v[i]);
-		g2_new(_y[i]);
-	}
-
-	BENCH_RUN("cp_pss_gen") {
-		BENCH_ADD(cp_pss_gen(u, v, g, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pss_sig") {
-		BENCH_ADD(cp_pss_sig(a, b, ms[0], u, v));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pss_ver") {
-		BENCH_ADD(cp_pss_ver(a, b, ms[0], g, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_gen (10)") {
-		BENCH_ADD(cp_psb_gen(u, _v, g, x, _y, 10));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_sig (10)") {
-		BENCH_ADD(cp_psb_sig(a, b, ms, u, _v, 10));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_ver (10)") {
-		BENCH_ADD(cp_psb_ver(a, b, ms, g, x, _y, 10));
-	} BENCH_END;
-
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(b);
-	g2_free(g);
-	g2_free(x);
-	g2_free(y);
-	for (int i = 0; i < 10; i++) {
-		bn_free(ms[i]);
-		bn_free(_v[i]);
-		g1_free(_y[i]);
-	}
-}
-
-#ifdef WITH_MPC
-
-static void mpss(void) {
-	bn_t m[2], n, u[2], v[2], ms[10][2], _v[10][2];
-	g1_t g, s[2];
-	g2_t h, x[2], y[2], _y[10][2];
-	gt_t r[2];
-	mt_t tri[3][2];
-	pt_t t[2];
-
-	bn_null(n);
-	g1_null(g);
-	g2_null(h);
-
-	bn_new(n);
-	g1_new(g);
-	g2_new(h);
-	for (int i = 0; i < 2; i++) {
-		bn_null(m[i]);
-		bn_null(u[i]);
-		bn_null(v[i]);
-		g1_null(s[i]);
-		g2_null(x[i]);
-		g2_null(y[i]);
-		gt_null(r[i]);
-		mt_null(tri[0][i]);
-		mt_null(tri[1][i]);
-		mt_null(tri[2][i]);
-		pt_null(t[i]);
-		bn_new(m[i]);
-		bn_new(u[i]);
-		bn_new(v[i]);
-		g1_new(s[i]);
-		g2_new(x[i]);
-		g2_new(y[i]);
-		gt_new(r[i]);
-		mt_new(tri[0][i]);
-		mt_new(tri[1][i]);
-		mt_new(tri[2][i]);
-		pt_new(t[i]);
-
-		g1_get_ord(n);
-		for (int j = 0; j < 10; j++) {
-			bn_null(ms[j][i]);
-			bn_null(_v[j][i]);
-			g2_null(_y[j][i]);
-			bn_new(ms[j][i]);
-			bn_rand_mod(ms[j][i], n);
-			bn_new(_v[j][i]);
-			g2_new(_y[j][i]);
-		}
-	}
-
-	pc_map_tri(t);
-	mt_gen(tri[0], n);
-	mt_gen(tri[1], n);
-	mt_gen(tri[2], n);
-
-	bn_rand_mod(m[0], n);
-	bn_rand_mod(m[1], n);
-	bn_sub(m[0], m[1], m[0]);
-	if (bn_sign(m[0]) == RLC_NEG) {
-		bn_add(m[0], m[0], n);
-	}
-	gt_exp_gen(r[0], tri[2][0]->c);
-	gt_exp_gen(r[1], tri[2][1]->c);
-	tri[2][0]->bt = &r[0];
-	tri[2][1]->bt = &r[1];
-	tri[2][0]->ct = &r[0];
-	tri[2][1]->ct = &r[1];
-
-	BENCH_RUN("cp_mpss_gen") {
-		BENCH_ADD(cp_mpss_gen(u, v, h, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpss_bct") {
-		BENCH_ADD(cp_mpss_bct(x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpss_sig") {
-		BENCH_ADD(cp_mpss_sig(g, s, m, u, v, tri[0], tri[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpss_ver") {
-		BENCH_ADD(cp_mpss_ver(r[0], g, s, m, h, x[0], y[0], tri[2], t));
-	} BENCH_DIV(2);
-
-	g1_get_ord(n);
-	pc_map_tri(t);
-	mt_gen(tri[0], n);
-	mt_gen(tri[1], n);
-	mt_gen(tri[2], n);
-
-	BENCH_RUN("cp_mpsb_gen (10)") {
-		BENCH_ADD(cp_mpsb_gen(u, _v, h, x, _y, 10));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpsb_bct (10)") {
-		BENCH_ADD(cp_mpsb_bct(x, _y, 10));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpsb_sig (10)") {
-		BENCH_ADD(cp_mpsb_sig(g, s, ms, u, _v, tri[0], tri[1], 10));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpsb_ver (10)") {
-		BENCH_ADD(cp_mpsb_ver(r[1], g, s, ms, h, x[0], _y, NULL, tri[2], t, 10));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpsb_ver (10,sk)") {
-		BENCH_ADD(cp_mpsb_ver(r[1], g, s, ms, h, x[0], _y, _v, tri[2], t, 10));
-	} BENCH_DIV(2);
-
-  	bn_free(n);
-	g1_free(g);
-	g2_free(h);
-	for (int i = 0; i < 2; i++) {
-		bn_free(m[i]);
-		bn_free(u[i]);
-		bn_free(v[i]);
-		g1_free(s[i]);
-		g2_free(x[i]);
-		g2_free(y[i]);
-		gt_null(r[i]);
-		mt_free(tri[0][i]);
-		mt_free(tri[1][i]);
-		mt_free(tri[2][i]);
-		pt_free(t[i]);
-		for (int j = 0; j < 10; j++) {
-			bn_free(ms[j][i]);
-			bn_free(_v[j][i]);
-			g2_free(_y[j][i]);
-		}
-	}
-}
-
-#endif
-
-static void zss(void) {
-	uint8_t msg[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-	g1_t p;
-	g2_t s;
-	gt_t z;
-	bn_t d;
-
-	bn_null(d);
-	g1_null(p);
-	g2_null(s);
-	gt_null(z);
-
-	g1_new(p);
-	g2_new(s);
-	gt_new(z);
-	bn_new(d);
-
-	BENCH_RUN("cp_zss_gen") {
-		BENCH_ADD(cp_zss_gen(d, p, z));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_zss_sign (h = 0)") {
-		BENCH_ADD(cp_zss_sig(s, msg, 5, 0, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_zss_sign (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_zss_sig(s, h, RLC_MD_LEN, 1, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_zss_ver (h = 0)") {
-		BENCH_ADD(cp_zss_ver(s, msg, 5, 0, p, z));
-	}
-	BENCH_END;
-
-	BENCH_RUN("cp_zss_ver (h = 1)") {
-		md_map(h, msg, 5);
-		BENCH_ADD(cp_zss_ver(s, h, RLC_MD_LEN, 1, p, z));
-	}
-	BENCH_END;
-
-	bn_free(d);
-	g1_free(p);
-	g2_free(s);
-}
-
-/* Size of the dataset for benchmarking. */
-#define S	10			/* Number of signers. */
-#define L	16			/* Number of labels, must be <= RLC_TERMS. */
-#define K	RLC_MD_LEN	/* Size of PRF key. */
-//#define BENCH_LHS		/* Uncomment for fine-grained benchmarking. */
-
-static void lhs(void) {
-	uint8_t k[S][K];
-	bn_t m, n, msg[L], sk[S], d[S], x[S][L];
-	g1_t _r, h, as[S], cs[S], sig[S];
-	g1_t a[S][L], c[S][L], r[S][L];
-	g2_t _s, s[S][L], pk[S], y[S], z[S];
-	gt_t *hs[S], vk;
-	char *data = "id";
-	char *id[S] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
-	dig_t ft[S];
-	dig_t *f[S];
-	int flen[S];
-
-	bn_null(m);
-	bn_null(n);
-	g1_null(h);
-	g1_null(_r);
-	g2_null(_s);
-	gt_null(vk);
-
-	bn_new(m);
-	bn_new(n);
-	g1_new(h);
-	g1_new(_r);
-	g2_new(_s);
-	gt_new(vk);
-
-	pc_get_ord(n);
-	for (int i = 0; i < L; i++) {
-		bn_null(msg[i]);
-		bn_new(msg[i]);
-		bn_rand_mod(msg[i], n);
-	}
-	for (int i = 0; i < S; i++) {
-		hs[i] = RLC_ALLOCA(gt_t, RLC_TERMS);
-		for (int j = 0; j < RLC_TERMS; j++) {
-			gt_null(hs[i][j]);
-			gt_new(hs[i][j]);
-		}
-		for (int j = 0; j < L; j++) {
-			bn_null(x[i][j]);
-			g1_null(a[i][j]);
-			g1_null(c[i][j]);
-			g1_null(r[i][j]);
-			g2_null(s[i][j]);
-			bn_new(x[i][j]);
-			g1_new(a[i][j]);
-			g1_new(c[i][j]);
-			g1_new(r[i][j]);
-			g2_new(s[i][j]);
-		}
-		bn_null(sk[i]);
-		bn_null(d[i]);
-		g1_null(sig[i]);
-		g1_null(as[i]);
-		g1_null(cs[i]);
-		g2_null(y[i]);
-		g2_null(z[i]);
-		g2_null(pk[i]);
-
-		bn_new(sk[i]);
-		bn_new(d[i]);
-		g1_new(sig[i]);
-		g1_new(as[i]);
-		g1_new(cs[i]);
-		g2_new(y[i]);
-		g2_new(z[i]);
-		g2_new(pk[i]);
-	}
-
-	/* Define linear function. */
-	for (int i = 0; i < S; i++) {
-		f[i] = RLC_ALLOCA(dig_t, RLC_TERMS);
-		for (int j = 0; j < RLC_TERMS; j++) {
-			uint32_t t;
-			rand_bytes((uint8_t *)&t, sizeof(uint32_t));
-			f[i][j] = t;
-		}
-		flen[i] = L;
-	}
-
-	/* Initialize scheme for messages of single components. */
-	cp_cmlhs_init(h);
-
-	BENCH_ONE("cp_cmlhs_gen",
-		for (int j = 0; j < S; j++) {
-			BENCH_ADD(cp_cmlhs_gen(x[j], hs[j], L, k[j], K, sk[j], pk[j], d[j], y[j]));
-		},
-	S);
-
-	int label[L];
-
-	BENCH_FEW("cp_cmlhs_sig",
-		/* Compute all signatures. */
-		for (int j = 0; j < S; j++) {
-			for (int l = 0; l < L; l++) {
-				label[l] = l;
-				bn_mod(msg[l], msg[l], n);
-				BENCH_ADD(cp_cmlhs_sig(sig[j], z[j], a[j][l], c[j][l], r[j][l],
-					s[j][l], msg[l], data, label[l], x[j][l], h, k[j], K, d[j], sk[j]));
-			}
-		},
-	S * L);
-
-	BENCH_RUN("cp_cmlhs_fun") {
-		for (int j = 0; j < S; j++) {
-			BENCH_ADD(cp_cmlhs_fun(as[j], cs[j], a[j], c[j], f[j], L));
-		}
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_cmlhs_evl") {
-		cp_cmlhs_evl(_r, _s, r[0], s[0], f[0], L);
-		for (int j = 1; j < S; j++) {
-			BENCH_ADD(cp_cmlhs_evl(r[0][0], s[0][0], r[j], s[j], f[j], L));
-			g1_add(_r, _r, r[0][0]);
-			g2_add(_s, _s, s[0][0]);
-		}
-		g1_norm(_r, _r);
-		g2_norm(_s, _s);
-	} BENCH_DIV(S);
-
-	bn_zero(m);
-	for (int j = 0; j < L; j++) {
-		dig_t sum = 0;
-		for (int l = 0; l < S; l++) {
-			sum += f[l][j];
-		}
-		bn_mul_dig(msg[j], msg[j], sum);
-		bn_add(m, m, msg[j]);
-		bn_mod(m, m, n);
-	}
-
-	BENCH_RUN("cp_cmlhs_ver") {
-		BENCH_ADD(cp_cmlhs_ver(_r, _s, sig, z, as, cs, m, data, h, label, hs,
-			f, flen, y, pk, S));
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_cmlhs_off") {
-		BENCH_ADD(cp_cmlhs_off(vk, h, label, hs, f, flen, y, pk, S));
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_cmlhs_onv") {
-		BENCH_ADD(cp_cmlhs_onv(_r, _s, sig, z, as, cs, m, data, h, vk, y,
-			pk, S));
-	} BENCH_DIV(S);
-
-#ifdef BENCH_LHS
-	for (int t = 1; t <= S; t++) {
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_cmlhs_ver") {
-			BENCH_ADD(cp_cmlhs_ver(_r, _s, sig, z, as, cs, m, data, h, label,
-				hs, f, flen, y, pk, t));
-		} BENCH_END;
-
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_cmlhs_off") {
-			BENCH_ADD(cp_cmlhs_off(vk, h, label, hs, f, flen, y, pk, t));
-		} BENCH_END;
-
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_cmlhs_onv") {
-			BENCH_ADD(cp_cmlhs_onv(_r, _s, sig, z, as, cs, m, data, h, vk, y,
-				pk, t));
-		} BENCH_END;
-	}
-
-	for (int t = 1; t <= L; t++) {
-		util_print("(%2d lbs) ", t);
-		for (int u = 0; u < S; u++) {
-			flen[u] = t;
-		}
-		BENCH_RUN("cp_cmlhs_ver") {
-			BENCH_ADD(cp_cmlhs_ver(_r, _s, sig, z, as, cs, m, data, h, label,
-				hs,	f, flen, y, pk, S));
-		} BENCH_END;
-
-		util_print("(%2d lbs) ", t);
-		BENCH_RUN("cp_cmlhs_off") {
-			BENCH_ADD(cp_cmlhs_off(vk, h, label, hs, f, flen, y, pk, t));
-		} BENCH_END;
-
-		util_print("(%2d lbs) ", t);
-		BENCH_RUN("cp_cmlhs_onv") {
-			BENCH_ADD(cp_cmlhs_onv(_r, _s, sig, z, as, cs, m, data, h, vk, y,
-				pk, t));
-		} BENCH_END;
-	}
-#endif  /* BENCH_LHS */
-
-	char *ls[L];
-
-	BENCH_RUN("cp_mklhs_gen") {
-		for (int j = 0; j < S; j++) {
-			BENCH_ADD(cp_mklhs_gen(sk[j], pk[j]));
-		}
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_mklhs_sig") {
-		for (int j = 0; j < S; j++) {
-			for (int l = 0; l < L; l++) {
-				ls[l] = "l";
-				bn_mod(msg[l], msg[l], n);
-				BENCH_ADD(cp_mklhs_sig(a[j][l], msg[l], data,
-					id[j], ls[l], sk[j]));
-			}
-		}
-	} BENCH_DIV(S * L);
-
-	BENCH_RUN("cp_mklhs_fun") {
-		for (int j = 0; j < S; j++) {
-			bn_zero(d[j]);
-			BENCH_ADD(cp_mklhs_fun(d[j], msg, f[j], L));
-		}
-	}
-	BENCH_DIV(S);
-
-	BENCH_RUN("cp_mklhs_evl") {
-		g1_set_infty(_r);
-		for (int j = 0; j < S; j++) {
-			BENCH_ADD(cp_mklhs_evl(r[0][j], a[j], f[j], L));
-			g1_add(_r, _r, r[0][j]);
-		}
-		g1_norm(_r, _r);
-	}
-	BENCH_DIV(S);
-
-	bn_zero(m);
-	for (int j = 0; j < L; j++) {
-		dig_t sum = 0;
-		for (int l = 0; l < S; l++) {
-			sum += f[l][j];
-		}
-		bn_mul_dig(msg[j], msg[j], sum);
-		bn_add(m, m, msg[j]);
-		bn_mod(m, m, n);
-	}
-
-	BENCH_RUN("cp_mklhs_ver") {
-		BENCH_ADD(cp_mklhs_ver(_r, m, d, data, id, ls, f, flen, pk, S));
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_mklhs_off") {
-		BENCH_ADD(cp_mklhs_off(cs, ft, id, ls, f, flen, S));
-	} BENCH_DIV(S);
-
-	BENCH_RUN("cp_mklhs_onv") {
-		BENCH_ADD(cp_mklhs_onv(_r, m, d, data, id, cs, ft, pk, S));
-	} BENCH_DIV(S);
-
-#ifdef BENCH_LHS
-	for (int t = 1; t <= S; t++) {
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_mklhs_ver") {
-			BENCH_ADD(cp_mklhs_ver(_r, m, d, data, id, ls, f, flen, pk, t));
-		} BENCH_END;
-
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_mklhs_off") {
-			BENCH_ADD(cp_mklhs_off(cs, ft, id, ls, f, flen, t));
-		} BENCH_END;
-
-		util_print("(%2d ids) ", t);
-		BENCH_RUN("cp_mklhs_onv") {
-			BENCH_ADD(cp_mklhs_onv(_r, m, d, data, id, cs, ft, pk, t));
-		} BENCH_END;
-	}
-
-	for (int t = 1; t <= L; t++) {
-		util_print("(%2d lbs) ", t);
-		for (int u = 0; u < S; u++) {
-			flen[u] = t;
-		}
-		BENCH_RUN("cp_mklhs_ver") {
-			BENCH_ADD(cp_mklhs_ver(_r, m, d, data, id, ls, f, flen, pk, S));
-		} BENCH_END;
-
-		util_print("(%2d lbs) ", t);
-		BENCH_RUN("cp_mklhs_off") {
-			BENCH_ADD(cp_mklhs_off(cs, ft, id, ls, f, flen, S));
-		} BENCH_END;
-
-		util_print("(%2d lbs) ", t);
-		BENCH_RUN("cp_mklhs_onv") {
-			BENCH_ADD(cp_mklhs_onv(_r, m, d, data, id, cs, ft, pk, S));
-		} BENCH_END;
-	}
-#endif /* BENCH_LHS */
-
-	bn_free(n);
-	bn_free(m);
-	g1_free(h);
-	g1_free(_r);
-	g2_free(_s);
-	gt_free(vk);
-
-	for (int i = 0; i < L; i++) {
-		bn_free(msg[i]);
-	}
-	for (int i = 0; i < S; i++) {
-		RLC_FREE(f[i]);
-		for (int j = 0; j < RLC_TERMS; j++) {
-			gt_free(hs[i][j]);
-		}
-		RLC_FREE(hs[i]);
-		for (int j = 0; j < L; j++) {
-			bn_free(x[i][j]);
-			g1_free(a[i][j]);
-			g1_free(c[i][j]);
-			g1_free(r[i][j]);
-			g2_free(s[i][j]);
-		}
-		bn_free(sk[i]);
-		bn_free(d[i]);
-		g1_free(sig[i]);
-		g1_free(as[i]);
-		g1_free(cs[i]);
-		g2_free(y[i]);
-		g2_free(z[i]);
-		g2_free(pk[i]);
-	}
-}
-
-#endif /* WITH_PC */
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Benchmarks for the CP module:", 0);
-
-#if defined(WITH_BN)
-	util_banner("Protocols based on integer factorization:\n", 0);
-	rsa();
-	rabin();
-	benaloh();
-	paillier();
-#endif
-
-#if defined(WITH_EC)
-	if (ec_param_set_any() == RLC_OK) {
-		util_banner("Protocols based on elliptic curves:\n", 0);
-		ecdh();
-		ecmqv();
-		ecies();
-		ecdsa();
-		ecss();
-		vbnn();
-		ers();
-		etrs();
-	}
-#endif
-
-#if defined(WITH_PC)
-	if (pc_param_set_any() == RLC_OK) {
-		util_banner("Protocols based on pairings:\n", 0);
-		pdpub();
-		pdprv();
-		sokaka();
-		ibe();
-		bgn();
-		bls();
-		bbs();
-		cls();
-		pss();
-#if defined(WITH_MPC)
-		mpss();
-#endif
-		zss();
-		lhs();
-	}
-#endif
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_dv.c b/src/dashbls/depends/relic/bench/bench_dv.c
deleted file mode 100644
index 7f1584619770..000000000000
--- a/src/dashbls/depends/relic/bench/bench_dv.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for manipulating temporary double-precision digit vectors.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	dv_t a[BENCH];
-
-	BENCH_FEW("dv_null", dv_null(a[i]), 1);
-
-	BENCH_FEW("dv_new", dv_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		dv_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		dv_new(a[i]);
-	}
-	BENCH_FEW("dv_free", dv_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void copy(void) {
-	dv_t a, b;
-
-	dv_null(a);
-	dv_null(b);
-
-	dv_new(a);
-	dv_new(b);
-
-	BENCH_RUN("dv_copy") {
-		rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-		rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-		BENCH_ADD(dv_copy(a, b, RLC_DV_DIGS));
-	} BENCH_END;
-
-	BENCH_RUN("dv_copy_cond") {
-		rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-		rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-		BENCH_ADD(dv_copy_cond(a, b, RLC_DV_DIGS, 1));
-	} BENCH_END;
-
-	BENCH_RUN("dv_swap_cond") {
-		rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-		rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-		BENCH_ADD(dv_swap_cond(a, b, RLC_DV_DIGS, 1));
-	} BENCH_END;
-
-	BENCH_RUN("dv_cmp") {
-		rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-		rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-		BENCH_ADD(dv_cmp(a, b, RLC_DV_DIGS));
-	} BENCH_END;
-
-	BENCH_RUN("dv_cmp_const") {
-		rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-		rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-		BENCH_ADD(dv_cmp_const(a, b, RLC_DV_DIGS));
-	} BENCH_END;
-
-	dv_free(a);
-	dv_free(b);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the DV module:", 0);
-	util_banner("Utilities:\n", 0);
-	memory();
-	copy();
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_eb.c b/src/dashbls/depends/relic/bench/bench_eb.c
deleted file mode 100644
index 1bd9d94d333b..000000000000
--- a/src/dashbls/depends/relic/bench/bench_eb.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for arithmetic on binary elliptic curves.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	eb_t a[BENCH];
-
-	BENCH_FEW("eb_null", eb_null(a[i]), 1);
-
-	BENCH_FEW("eb_new", eb_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		eb_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		eb_new(a[i]);
-	}
-	BENCH_FEW("eb_free", eb_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	eb_t p, q, t[4];
-	uint8_t bin[2 * RLC_FB_BYTES + 1];
-	int l;
-
-	eb_null(p);
-	eb_null(q);
-	for (int j= 0; j < 4; j++) {
-		eb_null(t[j]);
-	}
-
-	eb_new(p);
-	eb_new(q);
-	for (int j= 0; j < 4; j++) {
-		eb_new(t[j]);
-	}
-
-	BENCH_RUN("eb_is_infty") {
-		eb_rand(p);
-		BENCH_ADD(eb_is_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_set_infty") {
-		eb_rand(p);
-		BENCH_ADD(eb_set_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_copy") {
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_copy(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_cmp") {
-		eb_rand(p);
-		eb_dbl(p, p);
-		eb_rand(q);
-		eb_dbl(q, q);
-		BENCH_ADD(eb_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_cmp (1 norm)") {
-		eb_rand(p);
-		eb_dbl(p, p);
-		eb_rand(q);
-		BENCH_ADD(eb_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_cmp (2 norm)") {
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_rand") {
-		BENCH_ADD(eb_rand(p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_blind") {
-		BENCH_ADD(eb_blind(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_rhs") {
-		eb_rand(p);
-		BENCH_ADD(eb_rhs(q->x, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_tab (4)") {
-		eb_rand(p);
-		BENCH_ADD(eb_tab(t, p, 4));
-	} BENCH_END;
-
-	BENCH_RUN("eb_on_curve") {
-		eb_rand(p);
-		BENCH_ADD(eb_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_size_bin (0)") {
-		eb_rand(p);
-		BENCH_ADD(eb_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("eb_size_bin (1)") {
-		eb_rand(p);
-		BENCH_ADD(eb_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("eb_write_bin (0)") {
-		eb_rand(p);
-		l = eb_size_bin(p, 0);
-		BENCH_ADD(eb_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("eb_write_bin (1)") {
-		eb_rand(p);
-		l = eb_size_bin(p, 1);
-		BENCH_ADD(eb_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("eb_read_bin (0)") {
-		eb_rand(p);
-		l = eb_size_bin(p, 0);
-		eb_write_bin(bin, l, p, 0);
-		BENCH_ADD(eb_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("eb_read_bin (1)") {
-		eb_rand(p);
-		l = eb_size_bin(p, 1);
-		eb_write_bin(bin, l, p, 1);
-		BENCH_ADD(eb_read_bin(p, bin, l));
-	} BENCH_END;
-
-	eb_free(p);
-	eb_free(q);
-	for (int j = 0; j < 4; j++) {
-		eb_free(t[j]);
-	}
-}
-
-static void arith(void) {
-	eb_t p, q, r, t[RLC_EB_TABLE_MAX];
-	bn_t k, l, n;
-
-	eb_null(p);
-	eb_null(q);
-	eb_null(r);
-	for (int i = 0; i < RLC_EB_TABLE_MAX; i++) {
-		eb_null(t[i]);
-	} bn_null(k);
-	bn_null(l);
-	bn_null(n);
-
-	eb_new(p);
-	eb_new(q);
-	eb_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-
-	eb_curve_get_ord(n);
-
-	BENCH_RUN("eb_add") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add(p, p, q);
-		eb_rand(q);
-		eb_rand(p);
-		eb_add(q, q, p);
-		BENCH_ADD(eb_add(r, p, q));
-	} BENCH_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_add_basic") {
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_add_basic(r, p, q));
-	} BENCH_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("eb_add_projc") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		eb_rand(q);
-		eb_rand(p);
-		eb_add_projc(q, q, p);
-		BENCH_ADD(eb_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_add_projc (z2 = 1)") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		eb_rand(q);
-		eb_norm(q, q);
-		BENCH_ADD(eb_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_add_projc (z1,z2 = 1)") {
-		eb_rand(p);
-		eb_norm(p, p);
-		eb_rand(q);
-		eb_norm(q, q);
-		BENCH_ADD(eb_add_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("eb_sub") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add(p, p, q);
-		eb_rand(q);
-		eb_rand(p);
-		eb_add(q, q, p);
-		BENCH_ADD(eb_sub(r, p, q));
-	} BENCH_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_sub_basic") {
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_sub_basic(r, p, q));
-	} BENCH_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("eb_sub_projc") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		eb_rand(q);
-		eb_rand(p);
-		eb_add_projc(q, q, p);
-		BENCH_ADD(eb_sub_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_sub_projc (z2 = 1)") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		eb_rand(q);
-		eb_norm(q, q);
-		BENCH_ADD(eb_sub_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("eb_sub_projc (z1,z2 = 1)") {
-		eb_rand(p);
-		eb_norm(p, p);
-		eb_rand(q);
-		eb_norm(q, q);
-		BENCH_ADD(eb_sub_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("eb_dbl") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add(p, p, q);
-		BENCH_ADD(eb_dbl(r, p));
-	} BENCH_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_dbl_basic") {
-		eb_rand(p);
-		BENCH_ADD(eb_dbl_basic(r, p));
-	} BENCH_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("eb_dbl_projc") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		BENCH_ADD(eb_dbl_projc(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_dbl_projc (z1 = 1)") {
-		eb_rand(p);
-		eb_norm(p, p);
-		BENCH_ADD(eb_dbl_projc(r, p));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("eb_hlv") {
-		eb_rand(p);
-		BENCH_ADD(eb_hlv(r, p));
-	}
-	BENCH_END;
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		BENCH_RUN("eb_frb") {
-			eb_rand(p);
-			eb_rand(q);
-			eb_add_projc(p, p, q);
-			BENCH_ADD(eb_frb(r, p));
-		}
-		BENCH_END;
-	}
-
-#if EB_ADD == BASIC || !defined(STRIP)
-	if (eb_curve_is_kbltz()) {
-		BENCH_RUN("eb_frb (z = 1)") {
-			eb_rand(p);
-			BENCH_ADD(eb_frb(r, p));
-		}
-		BENCH_END;
-	}
-#endif
-
-#endif /* EB_KBLTZ */
-
-	BENCH_RUN("eb_neg") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add(p, p, q);
-		BENCH_ADD(eb_neg(r, p));
-	}
-	BENCH_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_neg_basic") {
-		eb_rand(p);
-		BENCH_ADD(eb_neg_basic(r, p));
-	}
-	BENCH_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("eb_neg_projc") {
-		eb_rand(p);
-		eb_rand(q);
-		eb_add_projc(p, p, q);
-		BENCH_ADD(eb_neg_projc(r, p));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("eb_mul") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul(q, p, k));
-	}
-	BENCH_END;
-
-#if EB_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_mul_basic") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		BENCH_ADD(eb_mul_basic(q, p, k));
-	}
-	BENCH_END;
-#endif
-
-#if EB_MUL == LODAH || !defined(STRIP)
-	BENCH_RUN("eb_mul_lodah") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		BENCH_ADD(eb_mul_lodah(q, p, k));
-	}
-	BENCH_END;
-#endif
-
-#if EB_MUL == LWNAF || !defined(STRIP)
-	BENCH_RUN("eb_mul_lwnaf") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		BENCH_ADD(eb_mul_lwnaf(q, p, k));
-	}
-	BENCH_END;
-#endif
-
-#if EB_MUL == RWNAF || !defined(STRIP)
-	BENCH_RUN("eb_mul_rwnaf") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		BENCH_ADD(eb_mul_rwnaf(q, p, k));
-	}
-	BENCH_END;
-#endif
-
-#if EB_MUL == HALVE || !defined(STRIP)
-		BENCH_RUN("eb_mul_halve") {
-			bn_rand_mod(k, n);
-			eb_rand(p);
-			BENCH_ADD(eb_mul_halve(q, p, k));
-		}
-		BENCH_END;
-#endif
-
-	BENCH_RUN("eb_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(eb_mul_gen(q, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("eb_mul_dig") {
-		bn_rand(k, RLC_POS, RLC_DIG);
-		bn_rand_mod(k, n);
-		BENCH_ADD(eb_mul_dig(p, q, k->dp[0]));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_EB_TABLE; i++) {
-		eb_new(t[i]);
-	}
-
-	BENCH_RUN("eb_mul_pre") {
-		eb_rand(p);
-		BENCH_ADD(eb_mul_pre(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_mul_fix") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_mul_pre(t, p);
-		BENCH_ADD(eb_mul_fix(q, (const eb_t *)t, k));
-	} BENCH_END;
-
-	for (int i = 0; i < RLC_EB_TABLE; i++) {
-		eb_free(t[i]);
-	}
-
-#if EB_FIX == BASIC || !defined(STRIP)
-	for (int i = 0; i < RLC_EB_TABLE_BASIC; i++) {
-		eb_new(t[i]);
-	}
-	BENCH_RUN("eb_mul_pre_basic") {
-		eb_rand(p);
-		BENCH_ADD(eb_mul_pre_basic(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_mul_fix_basic") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_mul_pre_basic(t, p);
-		BENCH_ADD(eb_mul_fix_basic(q, (const eb_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EB_TABLE_BASIC; i++) {
-		eb_free(t[i]);
-	}
-#endif
-
-#if EB_FIX == COMBS || !defined(STRIP)
-	for (int i = 0; i < RLC_EB_TABLE_COMBS; i++) {
-		eb_new(t[i]);
-	}
-	BENCH_RUN("eb_mul_pre_combs") {
-		eb_rand(p);
-		BENCH_ADD(eb_mul_pre_combs(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_mul_fix_combs") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_mul_pre_combs(t, p);
-		BENCH_ADD(eb_mul_fix_combs(q, (const eb_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EB_TABLE_COMBS; i++) {
-		eb_free(t[i]);
-	}
-#endif
-
-#if EB_FIX == COMBD || !defined(STRIP)
-	for (int i = 0; i < RLC_EB_TABLE_COMBD; i++) {
-		eb_new(t[i]);
-	}
-	BENCH_RUN("eb_mul_pre_combd") {
-		eb_rand(p);
-		BENCH_ADD(eb_mul_pre_combd(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_mul_fix_combd") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_mul_pre_combd(t, p);
-		BENCH_ADD(eb_mul_fix_combd(q, (const eb_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EB_TABLE_COMBD; i++) {
-		eb_free(t[i]);
-	}
-#endif
-
-#if EB_FIX == LWNAF || !defined(STRIP)
-	for (int i = 0; i < RLC_EB_TABLE_LWNAF; i++) {
-		eb_new(t[i]);
-	}
-	BENCH_RUN("eb_mul_pre_lwnaf") {
-		eb_rand(p);
-		BENCH_ADD(eb_mul_pre_lwnaf(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_mul_fix_lwnaf") {
-		bn_rand_mod(k, n);
-		eb_rand(p);
-		eb_mul_pre_lwnaf(t, p);
-		BENCH_ADD(eb_mul_fix_lwnaf(q, (const eb_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EB_TABLE_LWNAF; i++) {
-		eb_free(t[i]);
-	}
-#endif
-
-	BENCH_RUN("eb_mul_sim") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim(r, p, k, q, l));
-	} BENCH_END;
-
-#if EB_SIM == BASIC || !defined(STRIP)
-	BENCH_RUN("eb_mul_sim_basic") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim_basic(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EB_SIM == TRICK || !defined(STRIP)
-	BENCH_RUN("eb_mul_sim_trick") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim_trick(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EB_SIM == INTER || !defined(STRIP)
-	BENCH_RUN("eb_mul_sim_inter") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim_inter(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EB_SIM == JOINT || !defined(STRIP)
-	BENCH_RUN("eb_mul_sim_joint") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(p);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim_joint(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("eb_mul_sim_gen") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		eb_rand(q);
-		BENCH_ADD(eb_mul_sim_gen(r, k, q, l));
-	} BENCH_END;
-
-	BENCH_RUN("eb_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(eb_map(p, msg, 5));
-	} BENCH_END;
-
-	BENCH_RUN("eb_pck") {
-		eb_rand(p);
-		BENCH_ADD(eb_pck(q, p));
-	} BENCH_END;
-
-	BENCH_RUN("eb_upk") {
-		eb_rand(p);
-		BENCH_ADD(eb_upk(q, p));
-	} BENCH_END;
-
-	eb_free(p);
-	eb_free(q);
-	bn_free(k);
-	bn_free(l);
-	bn_free(n);
-}
-
-static void bench(void) {
-	eb_param_print();
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-	util_banner("Arithmetic:", 1);
-	arith();
-}
-
-int main(void) {
-	int r0 = RLC_ERR, r1 = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the EB module:", 0);
-
-#if defined(EB_PLAIN)
-	r0 = eb_param_set_any_plain();
-	if (r0 == RLC_OK) {
-		bench();
-	}
-#endif
-
-#if defined(EB_KBLTZ)
-	r1 = eb_param_set_any_kbltz();
-	if (r1 == RLC_OK) {
-		bench();
-	}
-#endif
-
-	if (r0 == RLC_ERR && r1 == RLC_ERR) {
-		if (eb_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-		}
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_ec.c b/src/dashbls/depends/relic/bench/bench_ec.c
deleted file mode 100644
index 1926a987a951..000000000000
--- a/src/dashbls/depends/relic/bench/bench_ec.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for Elliptic Curve Cryptography.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	ec_t a[BENCH];
-
-	BENCH_FEW("ec_null", ec_null(a[i]), 1);
-
-	BENCH_FEW("ec_new", ec_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		ec_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		ec_new(a[i]);
-	}
-	BENCH_FEW("ec_free", ec_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	ec_t p, q;
-	uint8_t bin[2 * RLC_FC_BYTES + 1];
-	int l;
-
-	ec_null(p);
-	ec_null(q);
-
-	ec_new(p);
-	ec_new(q);
-
-	BENCH_RUN("ec_is_infty") {
-		ec_rand(p);
-		BENCH_ADD(ec_is_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_set_infty") {
-		ec_rand(p);
-		BENCH_ADD(ec_set_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_copy") {
-		ec_rand(p);
-		ec_rand(q);
-		BENCH_ADD(ec_copy(p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_cmp") {
-		ec_rand(p);
-		ec_dbl(p, p);
-		ec_rand(q);
-		ec_dbl(q, q);
-		BENCH_ADD(ec_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ec_cmp (1 norm)") {
-		ec_rand(p);
-		ec_dbl(p, p);
-		ec_rand(q);
-		BENCH_ADD(ec_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ec_cmp (2 norm)") {
-		ec_rand(p);
-		ec_rand(q);
-		BENCH_ADD(ec_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ec_rand") {
-		BENCH_ADD(ec_rand(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_blind") {
-		BENCH_ADD(ec_blind(p, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_on_curve") {
-		ec_rand(p);
-		BENCH_ADD(ec_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("ec_size_bin (0)") {
-		ec_rand(p);
-		BENCH_ADD(ec_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ec_size_bin (1)") {
-		ec_rand(p);
-		BENCH_ADD(ec_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ec_write_bin (0)") {
-		ec_rand(p);
-		l = ec_size_bin(p, 0);
-		BENCH_ADD(ec_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ec_write_bin (1)") {
-		ec_rand(p);
-		l = ec_size_bin(p, 1);
-		BENCH_ADD(ec_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ec_read_bin (0)") {
-		ec_rand(p);
-		l = ec_size_bin(p, 0);
-		ec_write_bin(bin, l, p, 0);
-		BENCH_ADD(ec_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("ec_read_bin (1)") {
-		ec_rand(p);
-		l = ec_size_bin(p, 1);
-		ec_write_bin(bin, l, p, 1);
-		BENCH_ADD(ec_read_bin(p, bin, l));
-	} BENCH_END;
-
-	ec_free(p);
-	ec_free(q);
-}
-
-static void arith(void) {
-	ec_t p, q, r, t[RLC_EC_TABLE];
-	bn_t k, l, n;
-
-	ec_null(p);
-	ec_null(q);
-	ec_null(r);
-	for (int i = 0; i < RLC_EC_TABLE; i++) {
-		ec_null(t[i]);
-	}
-
-	ec_new(p);
-	ec_new(q);
-	ec_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-
-	ec_curve_get_ord(n);
-
-	BENCH_RUN("ec_add") {
-		ec_rand(p);
-		ec_rand(q);
-		ec_add(p, p, q);
-		ec_rand(q);
-		ec_rand(p);
-		ec_add(q, q, p);
-		BENCH_ADD(ec_add(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_sub") {
-		ec_rand(p);
-		ec_rand(q);
-		ec_add(p, p, q);
-		ec_rand(q);
-		ec_rand(p);
-		ec_add(q, q, p);
-		BENCH_ADD(ec_sub(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_dbl") {
-		ec_rand(p);
-		ec_rand(q);
-		ec_add(p, p, q);
-		BENCH_ADD(ec_dbl(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_neg") {
-		ec_rand(p);
-		ec_rand(q);
-		ec_add(p, p, q);
-		BENCH_ADD(ec_neg(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_mul") {
-		bn_rand_mod(k, n);
-		ec_rand(p);
-		BENCH_ADD(ec_mul(q, p, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ec_mul_gen(q, k));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_EC_TABLE; i++) {
-		ec_new(t[i]);
-	}
-
-	BENCH_RUN("ec_mul_pre") {
-		BENCH_ADD(ec_mul_pre(t, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_mul_fix") {
-		bn_rand_mod(k, n);
-		ec_mul_pre(t, p);
-		BENCH_ADD(ec_mul_fix(q, (const ec_t *)t, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_mul_sim") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ec_rand(p);
-		ec_rand(q);
-		BENCH_ADD(ec_mul_sim(r, p, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_mul_sim_gen") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ec_rand(q);
-		BENCH_ADD(ec_mul_sim_gen(r, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ec_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(ec_map(p, msg, 5));
-	} BENCH_END;
-
-	BENCH_RUN("ec_pck") {
-		ec_rand(p);
-		BENCH_ADD(ec_pck(q, p));
-	} BENCH_END;
-
-	BENCH_RUN("ec_upk") {
-		ec_rand(p);
-		BENCH_ADD(ec_upk(q, p));
-	} BENCH_END;
-
-	ec_free(p);
-	ec_free(q);
-	bn_free(k);
-	bn_free(l);
-	bn_free(n);
-	for (int i = 0; i < RLC_EC_TABLE; i++) {
-		ec_free(t[i]);
-	}
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the EC module:", 0);
-
-	if (ec_param_set_any() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	ec_param_print();
-
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-
-	util_banner("Arithmetic:", 1);
-	arith();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_ed.c b/src/dashbls/depends/relic/bench/bench_ed.c
deleted file mode 100644
index 7dfa39424cab..000000000000
--- a/src/dashbls/depends/relic/bench/bench_ed.c
+++ /dev/null
@@ -1,679 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for arithmetic on Edwards elliptic curves.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	ed_t a[BENCH];
-
-	BENCH_FEW("ed_null", ed_null(a[i]), 1);
-
-	BENCH_FEW("ed_new", ed_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		ed_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		ed_new(a[i]);
-	}
-	BENCH_FEW("ed_free", ed_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	ed_t p, q, t[4];
-	uint8_t bin[2 * RLC_FP_BYTES + 1];
-	int l;
-
-	ed_null(p);
-	ed_null(q);
-	for (int j = 0; j < 4; j++) {
-		ed_null(t[j]);
-	}
-
-	ed_new(p);
-	ed_new(q);
-	for (int j = 0; j < 4; j++) {
-		ed_new(t[j]);
-	}
-
-	BENCH_RUN("ed_is_infty") {
-		ed_rand(p);
-		BENCH_ADD(ed_is_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_set_infty") {
-		ed_rand(p);
-		BENCH_ADD(ed_set_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_copy") {
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_copy(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_cmp") {
-		ed_rand(p);
-		ed_dbl(p, p);
-		ed_rand(q);
-		ed_dbl(q, q);
-		BENCH_ADD(ed_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_cmp (1 norm)") {
-		ed_rand(p);
-		ed_dbl(p, p);
-		ed_rand(q);
-		BENCH_ADD(ed_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_cmp (2 norm)") {
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_rand") {
-		BENCH_ADD(ed_rand(p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_blind") {
-		BENCH_ADD(ed_blind(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_rhs") {
-		ed_rand(p);
-		BENCH_ADD(ed_rhs(q->x, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_tab (4)") {
-		ed_rand(p);
-		BENCH_ADD(ed_tab(t, p, 4));
-	} BENCH_END;
-
-	BENCH_RUN("ed_on_curve") {
-		ed_rand(p);
-		BENCH_ADD(ed_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_size_bin (0)") {
-		ed_rand(p);
-		BENCH_ADD(ed_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ed_size_bin (1)") {
-		ed_rand(p);
-		BENCH_ADD(ed_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ed_write_bin (0)") {
-		ed_rand(p);
-		l = ed_size_bin(p, 0);
-		BENCH_ADD(ed_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ed_write_bin (1)") {
-		ed_rand(p);
-		l = ed_size_bin(p, 1);
-		BENCH_ADD(ed_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ed_read_bin (0)") {
-		ed_rand(p);
-		l = ed_size_bin(p, 0);
-		ed_write_bin(bin, l, p, 0);
-		BENCH_ADD(ed_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("ed_read_bin (1)") {
-		ed_rand(p);
-		l = ed_size_bin(p, 1);
-		ed_write_bin(bin, l, p, 1);
-		BENCH_ADD(ed_read_bin(p, bin, l));
-	} BENCH_END;
-
-	ed_free(p);
-	ed_free(q);
-	for (int j = 0; j < 4; j++) {
-		ed_free(t[j]);
-	}
-}
-
-static void arith(void) {
-	ed_t p, q, r, t[RLC_ED_TABLE_MAX];
-	bn_t k, l, n;
-
-	ed_null(p);
-	ed_null(q);
-	ed_null(r);
-	for (int i = 0; i < RLC_ED_TABLE_MAX; i++) {
-		ed_null(t[i]);
-	}
-
-	ed_new(p);
-	ed_new(q);
-	ed_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-
-	ed_curve_get_ord(n);
-
-	BENCH_RUN("ed_add") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add(q, q, p);
-		BENCH_ADD(ed_add(r, p, q));
-	} BENCH_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_add_basic") {
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_add_basic(r, p, q));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ed_add_projc") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add_projc(q, q, p);
-		BENCH_ADD(ed_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_add_projc (z2 = 1)") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_add_projc (z1,z2 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_add_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == EXTND || !defined(STRIP)
-	BENCH_RUN("ed_add_extnd") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_extnd(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add_extnd(q, q, p);
-		BENCH_ADD(ed_add_extnd(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_add_extnd (z2 = 1)") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_extnd(p, p, q);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_add_extnd(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_add_extnd (z1,z2 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_add_extnd(r, p, q));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_sub") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add(q, q, p);
-		BENCH_ADD(ed_sub(r, p, q));
-	} BENCH_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_sub_basic") {
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_sub_basic(r, p, q));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ed_sub_projc") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add_projc(q, q, p);
-		BENCH_ADD(ed_sub_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_sub_projc (z2 = 1)") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_sub_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_sub_projc (z1,z2 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_sub_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == EXTND || !defined(STRIP)
-	BENCH_RUN("ed_sub_extnd") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_extnd(p, p, q);
-		ed_rand(q);
-		ed_rand(p);
-		ed_add_extnd(q, q, p);
-		BENCH_ADD(ed_sub_extnd(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_sub_projc (z2 = 1)") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_extnd(p, p, q);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_sub_extnd(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ed_sub_projc (z1,z2 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		ed_rand(q);
-		ed_norm(q, q);
-		BENCH_ADD(ed_sub_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_dbl") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add(p, p, q);
-		BENCH_ADD(ed_dbl(r, p));
-	} BENCH_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_dbl_basic") {
-		ed_rand(p);
-		BENCH_ADD(ed_dbl_basic(r, p));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ed_dbl_projc") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		BENCH_ADD(ed_dbl_projc(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_dbl_projc (z1 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		BENCH_ADD(ed_dbl_projc(r, p));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ed_dbl_extnd") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_extnd(p, p, q);
-		BENCH_ADD(ed_dbl_extnd(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_dbl_extnd (z1 = 1)") {
-		ed_rand(p);
-		ed_norm(p, p);
-		BENCH_ADD(ed_dbl_extnd(r, p));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_neg") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add(p, p, q);
-		BENCH_ADD(ed_neg(r, p));
-	} BENCH_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_neg_basic") {
-		ed_rand(p);
-		BENCH_ADD(ed_neg_basic(r, p));
-	} BENCH_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ed_neg_projc") {
-		ed_rand(p);
-		ed_rand(q);
-		ed_add_projc(p, p, q);
-		BENCH_ADD(ed_neg_projc(r, p));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_mul") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		BENCH_ADD(ed_mul(q, p, k));
-	} BENCH_END;
-
-#if ED_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_mul_basic") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ed_mul_basic(q, p, k));
-	} BENCH_END;
-#endif
-
-#if ED_MUL == SLIDE || !defined(STRIP)
-	BENCH_RUN("ed_mul_slide") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		BENCH_ADD(ed_mul_slide(q, p, k));
-	} BENCH_END;
-#endif
-
-#if ED_MUL == MONTY || !defined(STRIP)
-	BENCH_RUN("ed_mul_monty") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		BENCH_ADD(ed_mul_monty(q, p, k));
-	} BENCH_END;
-#endif
-
-#if ED_MUL == LWNAF || !defined(STRIP)
-	BENCH_RUN("ed_mul_lwnaf") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		BENCH_ADD(ed_mul_lwnaf(q, p, k));
-	} BENCH_END;
-#endif
-
-#if ED_MUL == LWREG || !defined(STRIP)
-	BENCH_RUN("ed_mul_lwreg") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		BENCH_ADD(ed_mul_lwreg(q, p, k));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ed_mul_gen(q, k));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_dig") {
-		bn_rand(k, RLC_POS, RLC_DIG);
-		bn_rand_mod(k, n);
-		BENCH_ADD(ed_mul_dig(p, q, k->dp[0]));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_ED_TABLE; i++) {
-		ed_new(t[i]);
-	}
-
-	BENCH_RUN("ed_mul_pre") {
-		ed_rand(p);
-		BENCH_ADD(ed_mul_pre(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_fix") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		ed_mul_pre(t, p);
-		BENCH_ADD(ed_mul_fix(q, (const ed_t *)t, k));
-	} BENCH_END;
-
-	for (int i = 0; i < RLC_ED_TABLE; i++) {
-		ed_free(t[i]);
-	}
-
-#if ED_FIX == BASIC || !defined(STRIP)
-	for (int i = 0; i < RLC_ED_TABLE_BASIC; i++) {
-		ed_new(t[i]);
-	}
-	BENCH_RUN("ed_mul_pre_basic") {
-		ed_rand(p);
-		BENCH_ADD(ed_mul_pre_basic(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_fix_basic") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		ed_mul_pre_basic(t, p);
-		BENCH_ADD(ed_mul_fix_basic(q, (const ed_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_ED_TABLE_BASIC; i++) {
-		ed_free(t[i]);
-	}
-#endif
-
-#if ED_FIX == COMBS || !defined(STRIP)
-	for (int i = 0; i < RLC_ED_TABLE_COMBS; i++) {
-		ed_new(t[i]);
-	}
-	BENCH_RUN("ed_mul_pre_combs") {
-		ed_rand(p);
-		BENCH_ADD(ed_mul_pre_combs(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_fix_combs") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		ed_mul_pre_combs(t, p);
-		BENCH_ADD(ed_mul_fix_combs(q, (const ed_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_ED_TABLE_COMBS; i++) {
-		ed_free(t[i]);
-	}
-#endif
-
-#if ED_FIX == COMBD || !defined(STRIP)
-	for (int i = 0; i < RLC_ED_TABLE_COMBD; i++) {
-		ed_new(t[i]);
-	}
-	BENCH_RUN("ed_mul_pre_combd") {
-		BENCH_ADD(ed_mul_pre_combd(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_fix_combd") {
-		bn_rand_mod(k, n);
-		ed_mul_pre_combd(t, p);
-		BENCH_ADD(ed_mul_fix_combd(q, (const ed_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_ED_TABLE_COMBD; i++) {
-		ed_free(t[i]);
-	}
-#endif
-
-#if ED_FIX == LWNAF || !defined(STRIP)
-	for (int i = 0; i < RLC_ED_TABLE_LWNAF; i++) {
-		ed_new(t[i]);
-	}
-	BENCH_RUN("ed_mul_pre_lwnaf") {
-		ed_rand(p);
-		BENCH_ADD(ed_mul_pre_lwnaf(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_mul_fix_lwnaf") {
-		bn_rand_mod(k, n);
-		ed_rand(p);
-		ed_mul_pre_lwnaf(t, p);
-		BENCH_ADD(ed_mul_fix_lwnaf(q, (const ed_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_ED_TABLE_LWNAF; i++) {
-		ed_free(t[i]);
-	}
-#endif
-	BENCH_RUN("ed_mul_sim") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim(r, p, k, q, l));
-	} BENCH_END;
-
-#if ED_SIM == BASIC || !defined(STRIP)
-	BENCH_RUN("ed_mul_sim_basic") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim_basic(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if ED_SIM == TRICK || !defined(STRIP)
-	BENCH_RUN("ed_mul_sim_trick") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim_trick(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if ED_SIM == INTER || !defined(STRIP)
-	BENCH_RUN("ed_mul_sim_inter") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim_inter(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if ED_SIM == JOINT || !defined(STRIP)
-	BENCH_RUN("ed_mul_sim_joint") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(p);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim_joint(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ed_mul_sim_gen") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ed_rand(q);
-		BENCH_ADD(ed_mul_sim_gen(r, k, q, l));
-	} BENCH_END;
-
-	BENCH_RUN("ed_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(ed_map(p, msg, 5));
-	} BENCH_END;
-
-	BENCH_RUN("ed_pck") {
-		ed_rand(p);
-		BENCH_ADD(ed_pck(q, p));
-	} BENCH_END;
-
-	BENCH_RUN("ed_upk") {
-		ed_rand(p);
-		BENCH_ADD(ed_upk(q, p));
-	} BENCH_END;
-
-	ed_free(p);
-	ed_free(q);
-	ed_free(r);
-	bn_free(k);
-	bn_free(l);
-	bn_free(n);
-}
-
-static void bench(void) {
-	ed_param_print();
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-	util_banner("Arithmetic:", 1);
-	arith();
-}
-
-int main(void) {
-	int r0 = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the ED module:", 0);
-	r0 = ed_param_set_any();
-	if (r0 == RLC_OK) {
-		bench();
-	}
-
-	if (r0 == RLC_ERR) {
-		if (ed_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-		}
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_ep.c b/src/dashbls/depends/relic/bench/bench_ep.c
deleted file mode 100644
index 04ccdfc835ff..000000000000
--- a/src/dashbls/depends/relic/bench/bench_ep.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for arithmetic on prime elliptic curves.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	ep_t a[BENCH];
-
-	BENCH_FEW("ep_null", ep_null(a[i]), 1);
-
-	BENCH_FEW("ep_new", ep_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		ep_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		ep_new(a[i]);
-	}
-	BENCH_FEW("ep_free", ep_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	ep_t p, q, t[4];
-	uint8_t bin[2 * RLC_FP_BYTES + 1];
-	int l;
-
-	ep_null(p);
-	ep_null(q);
-	for (int j = 0; j < 4; j++) {
-		ep_null(t[j]);
-	}
-
-	ep_new(p);
-	ep_new(q);
-	for (int j = 0; j < 4; j++) {
-		ep_new(t[j]);
-	}
-
-	BENCH_RUN("ep_is_infty") {
-		ep_rand(p);
-		BENCH_ADD(ep_is_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_set_infty") {
-		ep_rand(p);
-		BENCH_ADD(ep_set_infty(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_copy") {
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_copy(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_norm") {
-		ep_rand(p);
-		ep_dbl(p, p);
-		BENCH_ADD(ep_norm(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_norm_sim (2)") {
-		ep_rand(t[0]);
-		ep_rand(t[1]);
-		ep_dbl(t[0], t[0]);
-		ep_dbl(t[1], t[1]);
-		BENCH_ADD(ep_norm_sim(t, t, 2));
-	} BENCH_END;
-
-	BENCH_RUN("ep_cmp") {
-		ep_rand(p);
-		ep_dbl(p, p);
-		ep_rand(q);
-		ep_dbl(q, q);
-		BENCH_ADD(ep_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_cmp (1 norm)") {
-		ep_rand(p);
-		ep_dbl(p, p);
-		ep_rand(q);
-		BENCH_ADD(ep_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_cmp (2 norm)") {
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_rand") {
-		BENCH_ADD(ep_rand(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_blind") {
-		BENCH_ADD(ep_blind(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_rhs") {
-		ep_rand(p);
-		BENCH_ADD(ep_rhs(q->x, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_tab (4)") {
-		ep_rand(p);
-		BENCH_ADD(ep_tab(t, p, 4));
-	} BENCH_END;
-
-	BENCH_RUN("ep_on_curve") {
-		ep_rand(p);
-		BENCH_ADD(ep_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_size_bin (0)") {
-		ep_rand(p);
-		BENCH_ADD(ep_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep_size_bin (1)") {
-		ep_rand(p);
-		BENCH_ADD(ep_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep_write_bin (0)") {
-		ep_rand(p);
-		l = ep_size_bin(p, 0);
-		BENCH_ADD(ep_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep_write_bin (1)") {
-		ep_rand(p);
-		l = ep_size_bin(p, 1);
-		BENCH_ADD(ep_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep_read_bin (0)") {
-		ep_rand(p);
-		l = ep_size_bin(p, 0);
-		ep_write_bin(bin, l, p, 0);
-		BENCH_ADD(ep_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("ep_read_bin (1)") {
-		ep_rand(p);
-		l = ep_size_bin(p, 1);
-		ep_write_bin(bin, l, p, 1);
-		BENCH_ADD(ep_read_bin(p, bin, l));
-	} BENCH_END;
-
-	ep_free(p);
-	ep_free(q);
-	for (int j = 0; j < 4; j++) {
-		ep_free(t[j]);
-	}
-}
-
-static void arith(void) {
-	ep_t p, q, r, t[RLC_EP_TABLE_MAX];
-	bn_t k, l[2], n;
-
-	ep_null(p);
-	ep_null(q);
-	ep_null(r);
-	for (int i = 0; i < RLC_EP_TABLE_MAX; i++) {
-		ep_null(t[i]);
-	}
-
-	ep_new(p);
-	ep_new(q);
-	ep_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l[0]);
-	bn_new(l[1]);
-
-	ep_curve_get_ord(n);
-
-	BENCH_RUN("ep_add") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add(p, p, q);
-		ep_rand(q);
-		ep_rand(p);
-		ep_add(q, q, p);
-		BENCH_ADD(ep_add(r, p, q));
-	} BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep_add_basic") {
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_add_basic(r, p, q));
-	} BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep_add_projc") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_projc(p, p, q);
-		ep_rand(q);
-		ep_rand(p);
-		ep_add_projc(q, q, p);
-		BENCH_ADD(ep_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_add_projc (z2 = 1)") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_projc(p, p, q);
-		ep_rand(q);
-		ep_norm(q, q);
-		BENCH_ADD(ep_add_projc(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_add_projc (z1,z2 = 1)") {
-		ep_rand(p);
-		ep_norm(p, p);
-		ep_rand(q);
-		ep_norm(q, q);
-		BENCH_ADD(ep_add_projc(r, p, q));
-	} BENCH_END;
-#endif
-
-#if EP_ADD == JACOB || !defined(STRIP)
-	BENCH_RUN("ep_add_jacob") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_jacob(p, p, q);
-		ep_rand(q);
-		ep_rand(p);
-		ep_add_jacob(q, q, p);
-		BENCH_ADD(ep_add_jacob(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_add_jacob (z2 = 1)") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_jacob(p, p, q);
-		ep_rand(q);
-		ep_norm(q, q);
-		BENCH_ADD(ep_add_jacob(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_add_jacob (z1,z2 = 1)") {
-		ep_rand(p);
-		ep_norm(p, p);
-		ep_rand(q);
-		ep_norm(q, q);
-		BENCH_ADD(ep_add_jacob(r, p, q));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep_sub") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add(p, p, q);
-		ep_rand(q);
-		ep_rand(p);
-		ep_add(q, q, p);
-		BENCH_ADD(ep_sub(r, p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep_dbl") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add(p, p, q);
-		BENCH_ADD(ep_dbl(r, p));
-	} BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep_dbl_basic") {
-		ep_rand(p);
-		BENCH_ADD(ep_dbl_basic(r, p));
-	} BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep_dbl_projc") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_projc(p, p, q);
-		BENCH_ADD(ep_dbl_projc(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_dbl_projc (z1 = 1)") {
-		ep_rand(p);
-		ep_norm(p, p);
-		BENCH_ADD(ep_dbl_projc(r, p));
-	} BENCH_END;
-#endif
-
-#if EP_ADD == JACOB || !defined(STRIP)
-	BENCH_RUN("ep_dbl_jacob") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add_jacob(p, p, q);
-		BENCH_ADD(ep_dbl_jacob(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_dbl_jacob (z1 = 1)") {
-		ep_rand(p);
-		ep_norm(p, p);
-		BENCH_ADD(ep_dbl_jacob(r, p));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep_neg") {
-		ep_rand(p);
-		ep_rand(q);
-		ep_add(p, p, q);
-		BENCH_ADD(ep_neg(r, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		BENCH_ADD(ep_mul(q, p, k));
-	} BENCH_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("ep_mul_basic") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep_mul_basic(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-	BENCH_RUN("ep_mul_slide") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		BENCH_ADD(ep_mul_slide(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-	BENCH_RUN("ep_mul_monty") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		BENCH_ADD(ep_mul_monty(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-	BENCH_RUN("ep_mul_lwnaf") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		BENCH_ADD(ep_mul_lwnaf(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == LWREG || !defined(STRIP)
-	BENCH_RUN("ep_mul_lwreg") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		BENCH_ADD(ep_mul_lwreg(q, p, k));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep_mul_gen(q, k));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_dig") {
-		bn_rand(k, RLC_POS, RLC_DIG);
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep_mul_dig(p, q, k->dp[0]));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		ep_new(t[i]);
-	}
-
-	BENCH_RUN("ep_mul_pre") {
-		ep_rand(p);
-		BENCH_ADD(ep_mul_pre(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_fix") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		ep_mul_pre(t, p);
-		BENCH_ADD(ep_mul_fix(q, (const ep_t *)t, k));
-	} BENCH_END;
-
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		ep_free(t[i]);
-	}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-	for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-		ep_new(t[i]);
-	}
-	BENCH_RUN("ep_mul_pre_basic") {
-		ep_rand(p);
-		BENCH_ADD(ep_mul_pre_basic(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_fix_basic") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		ep_mul_pre_basic(t, p);
-		BENCH_ADD(ep_mul_fix_basic(q, (const ep_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-		ep_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-	for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-		ep_new(t[i]);
-	}
-	BENCH_RUN("ep_mul_pre_combs") {
-		ep_rand(p);
-		BENCH_ADD(ep_mul_pre_combs(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_fix_combs") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		ep_mul_pre_combs(t, p);
-		BENCH_ADD(ep_mul_fix_combs(q, (const ep_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-		ep_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-	for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-		ep_new(t[i]);
-	}
-	BENCH_RUN("ep_mul_pre_combd") {
-		BENCH_ADD(ep_mul_pre_combd(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_fix_combd") {
-		bn_rand_mod(k, n);
-		ep_mul_pre_combd(t, p);
-		BENCH_ADD(ep_mul_fix_combd(q, (const ep_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-		ep_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-	for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-		ep_new(t[i]);
-	}
-	BENCH_RUN("ep_mul_pre_lwnaf") {
-		ep_rand(p);
-		BENCH_ADD(ep_mul_pre_lwnaf(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_mul_fix_lwnaf") {
-		bn_rand_mod(k, n);
-		ep_rand(p);
-		ep_mul_pre_lwnaf(t, p);
-		BENCH_ADD(ep_mul_fix_lwnaf(q, (const ep_t *)t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-		ep_free(t[i]);
-	}
-#endif
-	BENCH_RUN("ep_mul_sim") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim(r, p, l[0], q, l[1]));
-	} BENCH_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-	BENCH_RUN("ep_mul_sim_basic") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim_basic(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-	BENCH_RUN("ep_mul_sim_trick") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim_trick(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-	BENCH_RUN("ep_mul_sim_inter") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim_inter(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-	BENCH_RUN("ep_mul_sim_joint") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(p);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim_joint(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep_mul_sim_gen") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(q);
-		BENCH_ADD(ep_mul_sim_gen(r, l[0], q, l[1]));
-	} BENCH_END;
-
-	for (int i = 0; i < 2; i++) {
-		ep_new(t[i]);
-	}
-
-	BENCH_RUN("ep_mul_sim_lot (2)") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep_rand(t[0]);
-		ep_rand(t[1]);
-		BENCH_ADD(ep_mul_sim_lot(r, t, l, 2));
-	} BENCH_END;
-
-	for (int i = 0; i < 2; i++) {
-		ep_free(t[i]);
-	}
-
-	BENCH_RUN("ep_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(ep_map(p, msg, 5));
-	} BENCH_END;
-
-	BENCH_RUN("ep_pck") {
-		ep_rand(p);
-		BENCH_ADD(ep_pck(q, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep_upk") {
-		ep_rand(p);
-		BENCH_ADD(ep_upk(q, p));
-	} BENCH_END;
-
-	ep_free(p);
-	ep_free(q);
-	ep_free(r);
-	bn_free(k);
-	bn_free(l[0]);
-	bn_free(l[1]);
-	bn_free(n);
-}
-
-static void bench(void) {
-	ep_param_print();
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-	util_banner("Arithmetic:", 1);
-	arith();
-}
-
-int main(void) {
-	int r0 = RLC_ERR, r1 = RLC_ERR, r2 = RLC_ERR, r3 = RLC_ERR;;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the EP module:", 0);
-
-#if defined(EP_PLAIN)
-	r0 = ep_param_set_any_plain();
-	if (r0 == RLC_OK) {
-		bench();
-	}
-#endif
-
-#if defined(EP_ENDOM)
-	r1 = ep_param_set_any_endom();
-	if (r1 == RLC_OK) {
-		bench();
-	}
-#endif
-
-	r2 = ep_param_set_any_pairf();
-	if (r2 == RLC_OK) {
-		bench();
-	}
-
-#if defined(EP_SUPER)
-	r3 = ep_param_set_any_super();
-	if (r3 == RLC_OK) {
-		bench();
-	}
-#endif
-
-	if (r0 == RLC_ERR && r1 == RLC_ERR && r2 == RLC_ERR && r3 == RLC_ERR) {
-		if (ep_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-		}
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_epx.c b/src/dashbls/depends/relic/bench/bench_epx.c
deleted file mode 100644
index 487d3dad675c..000000000000
--- a/src/dashbls/depends/relic/bench/bench_epx.c
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for elliptic curves defined over extensions of prime fields.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory2(void) {
-	ep4_t a[BENCH];
-
-	BENCH_FEW("ep4_null", ep4_null(a[i]), 1);
-
-	BENCH_FEW("ep4_new", ep4_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		ep4_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		ep4_new(a[i]);
-	}
-	BENCH_FEW("ep4_free", ep4_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util2(void) {
-	ep2_t p, q, t[2];
-	uint8_t bin[4 * RLC_FP_BYTES + 1];
-	int l;
-
-	ep2_null(p);
-	ep2_null(q);
-	ep2_null(t[0]);
-	ep2_null(t[1]);
-
-	ep2_new(p);
-	ep2_new(q);
-	ep2_new(t[0]);
-	ep2_new(t[1]);
-
-	BENCH_RUN("ep2_is_infty") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_is_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_set_infty") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_set_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_copy") {
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_copy(p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_cmp") {
-		ep2_rand(p);
-		ep2_dbl(p, p);
-		ep2_rand(q);
-		ep2_dbl(q, q);
-		BENCH_ADD(ep2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_norm") {
-		ep2_rand(p);
-		ep2_dbl(p, p);
-		BENCH_ADD(ep2_norm(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_norm_sim (2)") {
-		ep2_rand(t[0]);
-		ep2_rand(t[1]);
-		ep2_dbl(t[0], t[0]);
-		ep2_dbl(t[1], t[1]);
-		BENCH_ADD(ep2_norm_sim(t, t, 2));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_cmp (1 norm)") {
-		ep2_rand(p);
-		ep2_dbl(p, p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_cmp (2 norm)") {
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_rand") {
-		BENCH_ADD(ep2_rand(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_blind") {
-		BENCH_ADD(ep2_blind(p, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_on_curve") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_size_bin (0)") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_size_bin (1)") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_write_bin (0)") {
-		ep2_rand(p);
-		l = ep2_size_bin(p, 0);
-		BENCH_ADD(ep2_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_write_bin (1)") {
-		ep2_rand(p);
-		l = ep2_size_bin(p, 1);
-		BENCH_ADD(ep2_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_read_bin (0)") {
-		ep2_rand(p);
-		l = ep2_size_bin(p, 0);
-		ep2_write_bin(bin, l, p, 0);
-		BENCH_ADD(ep2_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_read_bin (1)") {
-		ep2_rand(p);
-		l = ep2_size_bin(p, 1);
-		ep2_write_bin(bin, l, p, 1);
-		BENCH_ADD(ep2_read_bin(p, bin, l));
-	} BENCH_END;
-
-	ep2_free(p);
-	ep2_free(q);
-	ep2_free(t[0]);
-	ep2_free(t[1]);
-}
-
-static void arith2(void) {
-	ep2_t p, q, r, t[RLC_EPX_TABLE_MAX];
-	bn_t k, n, l[2];
-	fp2_t s;
-
-	ep2_null(p);
-	ep2_null(q);
-	ep2_null(r);
-	bn_null(k);
-	bn_null(n);
-	fp2_null(s);
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep2_null(t[i]);
-	}
-
-	ep2_new(p);
-	ep2_new(q);
-	ep2_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l[0]);
-	bn_new(l[1]);
-	fp2_new(s);
-
-	ep2_curve_get_ord(n);
-
-	BENCH_RUN("ep2_add") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add(p, p, q);
-		ep2_rand(q);
-		ep2_rand(p);
-		ep2_add(q, q, p);
-		BENCH_ADD(ep2_add(r, p, q));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep2_add_basic") {
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_add_basic(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_add_slp_basic") {
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_add_slp_basic(r, s, p, q));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep2_add_projc") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add_projc(p, p, q);
-		ep2_rand(q);
-		ep2_rand(p);
-		ep2_add_projc(q, q, p);
-		BENCH_ADD(ep2_add_projc(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_add_projc (z2 = 1)") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add_projc(p, p, q);
-		ep2_rand(q);
-		ep2_norm(q, q);
-		BENCH_ADD(ep2_add_projc(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_add_projc (z1,z2 = 1)") {
-		ep2_rand(p);
-		ep2_norm(p, p);
-		ep2_rand(q);
-		ep2_norm(q, q);
-		BENCH_ADD(ep2_add_projc(r, p, q));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("ep2_sub") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add(p, p, q);
-		ep2_rand(q);
-		ep2_rand(p);
-		ep2_add(q, q, p);
-		BENCH_ADD(ep2_sub(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_dbl") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add(p, p, q);
-		BENCH_ADD(ep2_dbl(r, p));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep2_dbl_basic") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_dbl_basic(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_dbl_slp_basic") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_dbl_slp_basic(r, s, p));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep2_dbl_projc") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add_projc(p, p, q);
-		BENCH_ADD(ep2_dbl_projc(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_dbl_projc (z1 = 1)") {
-		ep2_rand(p);
-		ep2_norm(p, p);
-		BENCH_ADD(ep2_dbl_projc(r, p));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("ep2_neg") {
-		ep2_rand(p);
-		ep2_rand(q);
-		ep2_add(p, p, q);
-		BENCH_ADD(ep2_neg(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep2_mul") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep2_mul(q, p, k));
-	} BENCH_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("ep2_mul_basic") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep2_mul_basic(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-	BENCH_RUN("ep2_mul_slide") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_slide(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-	BENCH_RUN("ep2_mul_monty") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_monty(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-	BENCH_RUN("ep2_mul_lwnaf") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_lwnaf(q, p, k));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep2_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep2_mul_gen(q, k));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_dig") {
-		bn_rand(k, RLC_POS, RLC_DIG);
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep2_mul_dig(p, q, k->dp[0]));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep2_new(t[i]);
-	}
-
-	BENCH_RUN("ep2_mul_pre") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_pre(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_fix") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		ep2_mul_pre(t, p);
-		BENCH_ADD(ep2_mul_fix(q, t, k));
-	} BENCH_END;
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep2_free(t[i]);
-	}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_BASIC; i++) {
-		ep2_new(t[i]);
-	}
-	BENCH_RUN("ep2_mul_pre_basic") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_pre_basic(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_fix_basic") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		ep2_mul_pre_basic(t, p);
-		BENCH_ADD(ep2_mul_fix_basic(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_BASIC; i++) {
-		ep2_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_COMBS; i++) {
-		ep2_new(t[i]);
-	}
-	BENCH_RUN("ep2_mul_pre_combs") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_pre_combs(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_fix_combs") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		ep2_mul_pre_combs(t, p);
-		BENCH_ADD(ep2_mul_fix_combs(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_COMBS; i++) {
-		ep2_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_COMBD; i++) {
-		ep2_new(t[i]);
-	}
-	BENCH_RUN("ep2_mul_pre_combd") {
-		BENCH_ADD(ep2_mul_pre_combd(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_fix_combd") {
-		bn_rand_mod(k, n);
-		ep2_mul_pre_combd(t, p);
-		BENCH_ADD(ep2_mul_fix_combd(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_COMBD; i++) {
-		ep2_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_LWNAF; i++) {
-		ep2_new(t[i]);
-	}
-	BENCH_RUN("ep2_mul_pre_lwnaf") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_mul_pre_lwnaf(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_mul_fix_lwnaf") {
-		bn_rand_mod(k, n);
-		ep2_rand(p);
-		ep2_mul_pre_lwnaf(t, p);
-		BENCH_ADD(ep2_mul_fix_lwnaf(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_LWNAF; i++) {
-		ep2_free(t[i]);
-	}
-#endif
-
-	BENCH_RUN("ep2_mul_sim") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim(r, p, l[0], q, l[1]));
-	} BENCH_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-	BENCH_RUN("ep2_mul_sim_basic") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim_basic(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-	BENCH_RUN("ep2_mul_sim_trick") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim_trick(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-	BENCH_RUN("ep2_mul_sim_inter") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim_inter(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-	BENCH_RUN("ep2_mul_sim_joint") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(p);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim_joint(r, p, l[0], q, l[1]));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep2_mul_sim_gen") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(q);
-		BENCH_ADD(ep2_mul_sim_gen(r, l[0], q, l[1]));
-	} BENCH_END;
-
-	for (int i = 0; i < 2; i++) {
-		ep2_new(t[i]);
-	}
-
-	BENCH_RUN("ep2_mul_sim_lot (2)") {
-		bn_rand_mod(l[0], n);
-		bn_rand_mod(l[1], n);
-		ep2_rand(t[0]);
-		ep2_rand(t[1]);
-		BENCH_ADD(ep2_mul_sim_lot(r, t, l, 2));
-	} BENCH_END;
-
-	for (int i = 0; i < 2; i++) {
-		ep2_free(t[i]);
-	}
-
-	BENCH_RUN("ep2_frb") {
-		ep2_rand(q);
-		BENCH_ADD(ep2_frb(r, q, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(ep2_map(p, msg, 5));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_pck") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_pck(q, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep2_upk") {
-		ep2_rand(p);
-		BENCH_ADD(ep2_upk(q, p));
-	} BENCH_END;
-
-	ep2_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	bn_free(k);
-	bn_free(n);
-	bn_free(l[0]);
-	bn_free(l[1]);
-	fp2_free(s);
-}
-
-static void memory4(void) {
-	ep4_t a[BENCH];
-
-	BENCH_FEW("ep4_null", ep4_null(a[i]), 1);
-
-	BENCH_FEW("ep4_new", ep4_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		ep4_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		ep4_new(a[i]);
-	}
-	BENCH_FEW("ep4_free", ep4_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util4(void) {
-	ep4_t p, q, t[2];
-	uint8_t bin[8 * RLC_FP_BYTES + 1];
-	int l;
-
-	ep4_null(p);
-	ep4_null(q);
-	ep4_null(t[0]);
-	ep4_null(t[1]);
-
-	ep4_new(p);
-	ep4_new(q);
-	ep4_new(t[0]);
-	ep4_new(t[1]);
-
-	BENCH_RUN("ep4_is_infty") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_is_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_set_infty") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_set_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_copy") {
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_copy(p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_cmp") {
-		ep4_rand(p);
-		ep4_dbl(p, p);
-		ep4_rand(q);
-		ep4_dbl(q, q);
-		BENCH_ADD(ep4_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_norm") {
-		ep4_rand(p);
-		ep4_dbl(p, p);
-		BENCH_ADD(ep4_norm(p, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_norm_sim (2)") {
-		ep4_rand(t[0]);
-		ep4_rand(t[1]);
-		ep4_dbl(t[0], t[0]);
-		ep4_dbl(t[1], t[1]);
-		BENCH_ADD(ep4_norm_sim(t, t, 2));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_cmp (1 norm)") {
-		ep4_rand(p);
-		ep4_dbl(p, p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_cmp (2 norm)") {
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_rand") {
-		BENCH_ADD(ep4_rand(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_blind") {
-		BENCH_ADD(ep4_blind(p, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_on_curve") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_on_curve(p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_size_bin") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_write_bin") {
-		ep4_rand(p);
-		l = ep4_size_bin(p, 0);
-		BENCH_ADD(ep4_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_read_bin") {
-		ep4_rand(p);
-		l = ep4_size_bin(p, 0);
-		ep4_write_bin(bin, l, p, 0);
-		BENCH_ADD(ep4_read_bin(p, bin, l));
-	} BENCH_END;
-
-	ep4_free(p);
-	ep4_free(q);
-	ep4_free(t[0]);
-	ep4_free(t[1]);
-}
-
-static void arith4(void) {
-	ep4_t p, q, r, t[RLC_EPX_TABLE_MAX];
-	bn_t k, n, l;
-	fp4_t s;
-
-	ep4_null(p);
-	ep4_null(q);
-	ep4_null(r);
-	bn_null(k);
-	bn_null(n);
-	fp4_null(s);
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep4_null(t[i]);
-	}
-
-	ep4_new(p);
-	ep4_new(q);
-	ep4_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-	fp4_new(s);
-
-	ep4_curve_get_ord(n);
-
-	BENCH_RUN("ep4_add") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add(p, p, q);
-		ep4_rand(q);
-		ep4_rand(p);
-		ep4_add(q, q, p);
-		BENCH_ADD(ep4_add(r, p, q));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep4_add_basic") {
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_add_basic(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_add_slp_basic") {
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_add_slp_basic(r, s, p, q));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep4_add_projc") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add_projc(p, p, q);
-		ep4_rand(q);
-		ep4_rand(p);
-		ep4_add_projc(q, q, p);
-		BENCH_ADD(ep4_add_projc(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_add_projc (z2 = 1)") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add_projc(p, p, q);
-		ep4_rand(q);
-		ep4_norm(q, q);
-		BENCH_ADD(ep4_add_projc(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_add_projc (z1,z2 = 1)") {
-		ep4_rand(p);
-		ep4_norm(p, p);
-		ep4_rand(q);
-		ep4_norm(q, q);
-		BENCH_ADD(ep4_add_projc(r, p, q));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("ep4_sub") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add(p, p, q);
-		ep4_rand(q);
-		ep4_rand(p);
-		ep4_add(q, q, p);
-		BENCH_ADD(ep4_sub(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_dbl") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add(p, p, q);
-		BENCH_ADD(ep4_dbl(r, p));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("ep4_dbl_basic") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_dbl_basic(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_dbl_slp_basic") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_dbl_slp_basic(r, s, p));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("ep4_dbl_projc") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add_projc(p, p, q);
-		BENCH_ADD(ep4_dbl_projc(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_dbl_projc (z1 = 1)") {
-		ep4_rand(p);
-		ep4_norm(p, p);
-		BENCH_ADD(ep4_dbl_projc(r, p));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("ep4_neg") {
-		ep4_rand(p);
-		ep4_rand(q);
-		ep4_add(p, p, q);
-		BENCH_ADD(ep4_neg(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("ep4_mul") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep4_mul(q, p, k));
-	} BENCH_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("ep4_mul_basic") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep4_mul_basic(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-	BENCH_RUN("ep4_mul_slide") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_slide(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-	BENCH_RUN("ep4_mul_monty") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_monty(q, p, k));
-	} BENCH_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-	BENCH_RUN("ep4_mul_lwnaf") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_lwnaf(q, p, k));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep4_mul_gen") {
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep4_mul_gen(q, k));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_dig") {
-		bn_rand(k, RLC_POS, RLC_DIG);
-		bn_rand_mod(k, n);
-		BENCH_ADD(ep4_mul_dig(p, q, k->dp[0]));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep4_new(t[i]);
-	}
-
-	BENCH_RUN("ep4_mul_pre") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_pre(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_fix") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		ep4_mul_pre(t, p);
-		BENCH_ADD(ep4_mul_fix(q, t, k));
-	} BENCH_END;
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep4_free(t[i]);
-	}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_BASIC; i++) {
-		ep4_new(t[i]);
-	}
-	BENCH_RUN("ep4_mul_pre_basic") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_pre_basic(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_fix_basic") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		ep4_mul_pre_basic(t, p);
-		BENCH_ADD(ep4_mul_fix_basic(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_BASIC; i++) {
-		ep4_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_COMBS; i++) {
-		ep4_new(t[i]);
-	}
-	BENCH_RUN("ep4_mul_pre_combs") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_pre_combs(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_fix_combs") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		ep4_mul_pre_combs(t, p);
-		BENCH_ADD(ep4_mul_fix_combs(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_COMBS; i++) {
-		ep4_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_COMBD; i++) {
-		ep4_new(t[i]);
-	}
-	BENCH_RUN("ep4_mul_pre_combd") {
-		BENCH_ADD(ep4_mul_pre_combd(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_fix_combd") {
-		bn_rand_mod(k, n);
-		ep4_mul_pre_combd(t, p);
-		BENCH_ADD(ep4_mul_fix_combd(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_COMBD; i++) {
-		ep4_free(t[i]);
-	}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-	for (int i = 0; i < RLC_EPX_TABLE_LWNAF; i++) {
-		ep4_new(t[i]);
-	}
-	BENCH_RUN("ep4_mul_pre_lwnaf") {
-		ep4_rand(p);
-		BENCH_ADD(ep4_mul_pre_lwnaf(t, p));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_mul_fix_lwnaf") {
-		bn_rand_mod(k, n);
-		ep4_rand(p);
-		ep4_mul_pre_lwnaf(t, p);
-		BENCH_ADD(ep4_mul_fix_lwnaf(q, t, k));
-	} BENCH_END;
-	for (int i = 0; i < RLC_EPX_TABLE_LWNAF; i++) {
-		ep4_free(t[i]);
-	}
-#endif
-
-	BENCH_RUN("ep4_mul_sim") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim(r, p, k, q, l));
-	} BENCH_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-	BENCH_RUN("ep4_mul_sim_basic") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim_basic(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-	BENCH_RUN("ep4_mul_sim_trick") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim_trick(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-	BENCH_RUN("ep4_mul_sim_inter") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim_inter(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-	BENCH_RUN("ep4_mul_sim_joint") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(p);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim_joint(r, p, k, q, l));
-	} BENCH_END;
-#endif
-
-	BENCH_RUN("ep4_mul_sim_gen") {
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		ep4_rand(q);
-		BENCH_ADD(ep4_mul_sim_gen(r, k, q, l));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_frb") {
-		ep4_rand(q);
-		BENCH_ADD(ep4_frb(r, q, 1));
-	} BENCH_END;
-
-	BENCH_RUN("ep4_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(ep4_map(p, msg, 5));
-	} BENCH_END;
-
-	ep4_free(p);
-	ep4_free(q);
-	ep4_free(r);
-	bn_free(k);
-	bn_free(n);
-	bn_free(l);
-	fp4_free(s);
-}
-
-int main(void) {
-	int r0, r1;
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Benchmarks for the EPX module:", 0);
-
-	if (ep_param_set_any_pairf() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	if ((r0 = ep2_curve_is_twist())) {
-		ep_param_print();
-
-		util_banner("Utilities:", 1);
-		memory2();
-		util2();
-
-		util_banner("Arithmetic:", 1);
-		arith2();
-	}
-
-	if ((r1 = ep4_curve_is_twist())) {
-		ep_param_print();
-
-		util_banner("Utilities:", 1);
-		memory4();
-		util4();
-
-		util_banner("Arithmetic:", 1);
-		arith4();
-	}
-
-	if (!r0 && !r1) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_err.c b/src/dashbls/depends/relic/bench/bench_err.c
deleted file mode 100644
index bb99e94edefd..000000000000
--- a/src/dashbls/depends/relic/bench/bench_err.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for error-management routines.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void dummy2(void) {
-
-}
-
-static void dummy(void) {
-	RLC_TRY {
-		/* Empty block just to test overhead of error triggering mechanism. */
-	}
-	RLC_CATCH_ANY {
-		/* Exceptions are thrown here. */
-	}
-	RLC_FINALLY {
-		/* This is executed after exception handling. */
-	}
-}
-
-static void error(void) {
-	BENCH_RUN("empty function") {
-		BENCH_ADD(dummy2());
-	}
-	BENCH_END;
-
-	BENCH_RUN("try-catch-finnaly") {
-		BENCH_ADD(dummy());
-	}
-	BENCH_END;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the ERR module:\n", 0);
-	error();
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_fb.c b/src/dashbls/depends/relic/bench/bench_fb.c
deleted file mode 100644
index 41fbb026ed02..000000000000
--- a/src/dashbls/depends/relic/bench/bench_fb.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for binary field arithmetic.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	fb_t a[BENCH];
-
-	BENCH_FEW("fb_null", fb_null(a[i]), 1);
-
-	BENCH_FEW("fb_new", fb_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fb_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fb_new(a[i]);
-	}
-	BENCH_FEW("fb_free", fb_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	char str[2 * RLC_FB_BYTES + 1];
-	uint8_t bin[RLC_FB_BYTES];
-	fb_t a, b;
-
-	fb_null(a);
-	fb_null(b);
-
-	fb_new(a);
-	fb_new(b);
-
-	BENCH_RUN("fb_copy") {
-		fb_rand(a);
-		BENCH_ADD(fb_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_zero") {
-		fb_rand(a);
-		BENCH_ADD(fb_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_is_zero") {
-		fb_rand(a);
-		BENCH_ADD(fb_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_get_bit") {
-		fb_rand(a);
-		BENCH_ADD(fb_get_bit(a, RLC_DIG / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_set_bit") {
-		fb_rand(a);
-		BENCH_ADD(fb_set_bit(a, RLC_DIG / 2, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_set_dig") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_set_dig(a, b[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_bits") {
-		fb_rand(a);
-		BENCH_ADD(fb_bits(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_rand") {
-		BENCH_ADD(fb_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_size_str (16)") {
-		fb_rand(a);
-		BENCH_ADD(fb_size_str(a, 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_write_str (16)") {
-		fb_rand(a);
-		BENCH_ADD(fb_write_str(str, sizeof(str), a, 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_read_str (16)") {
-		fb_rand(a);
-		fb_write_str(str, sizeof(str), a, 16);
-		BENCH_ADD(fb_read_str(a, str, sizeof(str), 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_write_bin") {
-		fb_rand(a);
-		BENCH_ADD(fb_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_read_bin") {
-		fb_rand(a);
-		fb_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fb_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_cmp_dig") {
-		fb_rand(a);
-		BENCH_ADD(fb_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_cmp") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_cmp(b, a));
-	}
-	BENCH_END;
-
-	fb_free(a);
-	fb_free(b);
-}
-
-static void arith(void) {
-	fb_t a, b, c, d[2];
-	fb_st t[RLC_FB_TABLE_MAX];
-	dv_t e;
-	bn_t f;
-	int bits;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	fb_null(d[0]);
-	fb_null(d[1]);
-	dv_null(e);
-	bn_null(f);
-
-	fb_new(a);
-	fb_new(b);
-	fb_new(c);
-	fb_new(d[0]);
-	fb_new(d[1]);
-	dv_new(e);
-	dv_zero(e, 2 * RLC_FB_DIGS);
-	bn_new(f);
-
-	BENCH_RUN("fb_add") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_add_dig") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_add_dig(c, a, b[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_poly_add") {
-		fb_rand(a);
-		BENCH_ADD(fb_poly_add(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_mul") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_mul_dig") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul_dig(c, a, b[0]));
-	}
-	BENCH_END;
-
-#if FB_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_mul_basic") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FB_MUL == INTEG || !defined(STRIP)
-	BENCH_RUN("fb_mul_integ") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FB_MUL == LODAH || !defined(STRIP)
-	BENCH_RUN("fb_mul_lodah") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul_lodah(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FB_KARAT > 0 || !defined(STRIP)
-	BENCH_RUN("fb_mul_karat") {
-		fb_rand(a);
-		fb_rand(b);
-		BENCH_ADD(fb_mul_karat(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_sqr") {
-		fb_rand(a);
-		BENCH_ADD(fb_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FB_SQR == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_sqr_basic") {
-		fb_rand(a);
-		BENCH_ADD(fb_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_SQR == INTEG || !defined(STRIP)
-	BENCH_RUN("fb_sqr_integ") {
-		fb_rand(a);
-		BENCH_ADD(fb_sqr_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_SQR == QUICK || !defined(STRIP)
-	BENCH_RUN("fb_sqr_quick") {
-		fb_rand(a);
-		BENCH_ADD(fb_sqr_quick(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_lsh") {
-		fb_rand(a);
-		a[RLC_FB_DIGS - 1] = 0;
-		bits = a[0] & RLC_MASK(RLC_DIG_LOG);
-		BENCH_ADD(fb_lsh(c, a, bits));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_rsh") {
-		fb_rand(a);
-		a[RLC_FB_DIGS - 1] = 0;
-		bits = a[0] & RLC_MASK(RLC_DIG_LOG);
-		BENCH_ADD(fb_rsh(c, a, bits));
-
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_rdc") {
-		fb_rand(a);
-		fb_lsh(e, a, RLC_FB_BITS);
-		fb_rand(e);
-		BENCH_ADD(fb_rdc(c, e));
-	}
-	BENCH_END;
-
-#if FB_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_rdc_basic") {
-		fb_rand(a);
-		fb_lsh(e, a, RLC_FB_BITS);
-		fb_rand(e);
-		BENCH_ADD(fb_rdc_basic(c, e));
-	}
-	BENCH_END;
-#endif
-
-#if FB_RDC == QUICK || !defined(STRIP)
-	BENCH_RUN("fb_rdc_quick") {
-		fb_rand(a);
-		fb_lsh(e, a, RLC_FB_BITS);
-		fb_rand(e);
-		BENCH_ADD(fb_rdc_quick(c, e));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_srt") {
-		fb_rand(a);
-		fb_sqr(e, a);
-		BENCH_ADD(fb_srt(c, e));
-	}
-	BENCH_END;
-
-#if FB_SRT == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_srt_basic") {
-		fb_rand(a);
-		fb_sqr(e, a);
-		BENCH_ADD(fb_srt_basic(c, e));
-	}
-	BENCH_END;
-#endif
-
-#if FB_SRT == QUICK || !defined(STRIP)
-	BENCH_RUN("fb_srt_quick") {
-		fb_rand(a);
-		fb_sqr(e, a);
-		BENCH_ADD(fb_srt_quick(c, e));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_trc") {
-		fb_rand(a);
-		BENCH_ADD(fb_trc(a));
-	}
-	BENCH_END;
-
-#if FB_TRC == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_trc_basic") {
-		fb_rand(a);
-		BENCH_ADD(fb_trc_basic(a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_TRC == QUICK || !defined(STRIP)
-	BENCH_RUN("fb_trc_quick") {
-		fb_rand(a);
-		BENCH_ADD(fb_trc_quick(a));
-	}
-	BENCH_END;
-#endif
-
-	if (RLC_FB_BITS % 2 != 0) {
-		BENCH_RUN("fb_slv") {
-			fb_rand(a);
-			BENCH_ADD(fb_slv(c, a));
-		}
-		BENCH_END;
-
-#if FB_SLV == BASIC || !defined(STRIP)
-		BENCH_RUN("fb_slv_basic") {
-			fb_rand(a);
-			BENCH_ADD(fb_slv_basic(c, a));
-		}
-		BENCH_END;
-#endif
-
-#if FB_SLV == QUICK || !defined(STRIP)
-		BENCH_RUN("fb_slv_quick") {
-			fb_rand(a);
-			BENCH_ADD(fb_slv_quick(c, a));
-		}
-		BENCH_END;
-#endif
-	}
-
-	BENCH_RUN("fb_inv") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv(c, a));
-	}
-	BENCH_END;
-
-#if FB_INV == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_inv_basic") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == BINAR || !defined(STRIP)
-	BENCH_RUN("fb_inv_binar") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_binar(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == ALMOS || !defined(STRIP)
-	BENCH_RUN("fb_inv_almos") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_almos(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == EXGCD || !defined(STRIP)
-	BENCH_RUN("fb_inv_exgcd") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_exgcd(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == BRUCH || !defined(STRIP)
-	BENCH_RUN("fb_inv_bruch") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_bruch(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == ITOHT || !defined(STRIP)
-	BENCH_RUN("fb_inv_itoht") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_itoht(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == CTAIA || !defined(STRIP)
-	BENCH_RUN("fb_inv_ctaia") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_ctaia(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FB_INV == LOWER || !defined(STRIP)
-	BENCH_RUN("fb_inv_lower") {
-		fb_rand(a);
-		BENCH_ADD(fb_inv_lower(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_inv_sim (2)") {
-		fb_rand(d[0]);
-		fb_rand(d[1]);
-		BENCH_ADD(fb_inv_sim(d, (const fb_t *)d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb_exp") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, RLC_FB_BITS);
-		BENCH_ADD(fb_exp(c, a, f));
-	}
-	BENCH_END;
-
-#if FB_EXP == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_exp_basic") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, RLC_FB_BITS);
-		BENCH_ADD(fb_exp_basic(c, a, f));
-	}
-	BENCH_END;
-#endif
-
-#if FB_EXP == SLIDE || !defined(STRIP)
-	BENCH_RUN("fb_exp_slide") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, RLC_FB_BITS);
-		BENCH_ADD(fb_exp_slide(c, a, f));
-	}
-	BENCH_END;
-#endif
-
-#if FB_EXP == MONTY || !defined(STRIP)
-	BENCH_RUN("fb_exp_monty") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, RLC_FB_BITS);
-		BENCH_ADD(fb_exp_monty(c, a, f));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fb_itr") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, 8);
-		fb_itr_pre(t, f->dp[0]);
-		BENCH_ADD(fb_itr(c, a, f->dp[0], t));
-	}
-	BENCH_END;
-
-#if FB_ITR == BASIC || !defined(STRIP)
-	BENCH_RUN("fb_itr_basic") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, 8);
-		BENCH_ADD(fb_itr_basic(c, a, f->dp[0]));
-	}
-	BENCH_END;
-#endif
-
-#if FB_ITR == QUICK || !defined(STRIP)
-	BENCH_RUN("fb_itr_quick") {
-		fb_rand(a);
-		bn_rand(f, RLC_POS, 8);
-		fb_itr_pre_quick(t, f->dp[0]);
-		BENCH_ADD(fb_itr_quick(c, a, t));
-	}
-	BENCH_END;
-#endif
-
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	fb_free(d[0]);
-	fb_free(d[1]);
-	dv_free(e);
-	bn_free(f);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the FB module:", 0);
-
-	fb_param_set_any();
-	fb_param_print();
-	util_banner("Utilities:\n", 0);
-	memory();
-	util();
-	util_banner("Arithmetic:\n", 0);
-	arith();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_fbx.c b/src/dashbls/depends/relic/bench/bench_fbx.c
deleted file mode 100644
index d3c9f59761da..000000000000
--- a/src/dashbls/depends/relic/bench/bench_fbx.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for extensions defined over binary fields.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory2(void) {
-	fb2_t a[BENCH];
-
-	BENCH_FEW("fb2_null", fb2_null(a[i]), 1);
-
-	BENCH_FEW("fb2_new", fb2_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fb2_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fb2_new(a[i]);
-	}
-	BENCH_FEW("fb2_free", fb2_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util2(void) {
-	fb2_t a, b;
-
-	fb2_null(a);
-	fb2_null(b);
-
-	fb2_new(a);
-	fb2_new(b);
-
-	BENCH_RUN("fb2_copy") {
-		fb2_rand(a);
-		BENCH_ADD(fb2_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_zero") {
-		fb2_rand(a);
-		BENCH_ADD(fb2_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_is_zero") {
-		fb2_rand(a);
-		BENCH_ADD((void)fb2_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_rand") {
-		BENCH_ADD(fb2_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_cmp") {
-		fb2_rand(a);
-		fb2_rand(b);
-		BENCH_ADD((void)fb2_cmp(b, a));
-	}
-	BENCH_END;
-
-	fb2_free(a);
-	fb2_free(b);
-}
-
-static void arith2(void) {
-	fb2_t a, b, c;
-
-	fb2_new(a);
-	fb2_new(b);
-	fb2_new(c);
-
-	BENCH_RUN("fb2_add") {
-		fb2_rand(a);
-		fb2_rand(b);
-		BENCH_ADD(fb2_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_mul") {
-		fb2_rand(a);
-		fb2_rand(b);
-		BENCH_ADD(fb2_mul(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_sqr") {
-		fb2_rand(a);
-		BENCH_ADD(fb2_sqr(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_slv") {
-		fb2_rand(a);
-		BENCH_ADD(fb2_slv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fb2_inv") {
-		fb2_rand(a);
-		BENCH_ADD(fb2_inv(c, a));
-	}
-	BENCH_END;
-
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Benchmarks for the FBX module:", 0);
-
-	fb_param_set_any();
-	fb_param_print();
-
-	util_banner("Quadratic extension:", 0);
-	util_banner("Utilities:", 1);
-	memory2();
-	util2();
-
-	util_banner("Arithmetic:", 1);
-	arith2();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_fp.c b/src/dashbls/depends/relic/bench/bench_fp.c
deleted file mode 100644
index c2887f650f7c..000000000000
--- a/src/dashbls/depends/relic/bench/bench_fp.c
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for prime field arithmetic.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory(void) {
-	fp_t a[BENCH];
-
-	BENCH_FEW("fp_null", fp_null(a[i]), 1);
-
-	BENCH_FEW("fp_new", fp_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp_new(a[i]);
-	}
-	BENCH_FEW("fp_free", fp_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	char str[2 * RLC_FP_BYTES + 1];
-	uint8_t bin[RLC_FP_BYTES];
-	fp_t a, b;
-
-	fp_null(a);
-	fp_null(b);
-
-	fp_new(a);
-	fp_new(b);
-
-	BENCH_RUN("fp_copy") {
-		fp_rand(a);
-		BENCH_ADD(fp_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_zero") {
-		fp_rand(a);
-		BENCH_ADD(fp_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_is_zero") {
-		fp_rand(a);
-		BENCH_ADD(fp_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_get_bit") {
-		fp_rand(a);
-		BENCH_ADD(fp_get_bit(a, RLC_DIG / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_set_bit") {
-		fp_rand(a);
-		BENCH_ADD(fp_set_bit(a, RLC_DIG / 2, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_set_dig (1)") {
-		fp_rand(a);
-		BENCH_ADD(fp_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_set_dig") {
-		fp_rand(a);
-		BENCH_ADD(fp_set_dig(a, a[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_bits") {
-		fp_rand(a);
-		BENCH_ADD(fp_bits(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_rand") {
-		BENCH_ADD(fp_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_size_str (16)") {
-		fp_rand(a);
-		BENCH_ADD(fp_size_str(a, 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_write_str (16)") {
-		fp_rand(a);
-		BENCH_ADD(fp_write_str(str, sizeof(str), a, 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_read_str (16)") {
-		fp_rand(a);
-		fp_write_str(str, sizeof(str), a, 16);
-		BENCH_ADD(fp_read_str(a, str, sizeof(str), 16));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_write_bin") {
-		fp_rand(a);
-		BENCH_ADD(fp_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_read_bin") {
-		fp_rand(a);
-		fp_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_cmp") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_cmp_dig") {
-		fp_rand(a);
-		BENCH_ADD(fp_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp_free(a);
-	fp_free(b);
-}
-
-static void arith(void) {
-	fp_t a, b, c, f[2];
-	dv_t d;
-	bn_t e;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	dv_null(d);
-	bn_null(e);
-	fp_null(f[0]);
-	fp_null(f[1]);
-
-	fp_new(a);
-	fp_new(b);
-	fp_new(c);
-	dv_new(d);
-	bn_new(e);
-	fp_new(f[0]);
-	fp_new(f[1]);
-
-	dv_zero(d, RLC_DV_DIGS);
-
-	BENCH_RUN("fp_add") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_add(c, a, b));
-	}
-	BENCH_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_add_basic") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_add_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_add_integ") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_add_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_add_dig (1)") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_add_dig(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_add_dig") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_add_dig(c, a, b[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_sub") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_sub(c, a, b));
-	}
-	BENCH_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_sub_basic") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_sub_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_sub_integ") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_sub_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_sub_dig (1)") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_sub_dig(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_sub_dig") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_sub_dig(c, a, b[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_neg") {
-		fp_rand(a);
-		BENCH_ADD(fp_neg(b, a));
-	}
-	BENCH_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_neg_basic") {
-		fp_rand(a);
-		BENCH_ADD(fp_neg_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_neg_integ") {
-		fp_rand(a);
-		BENCH_ADD(fp_neg_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_mul") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FP_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_mul_basic") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FP_MUL == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_mul_integ") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FP_MUL == COMBA || !defined(STRIP)
-	BENCH_RUN("fp_mul_comba") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul_comba(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FP_KARAT > 0 || !defined(STRIP)
-	BENCH_RUN("fp_mul_karat") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul_karat(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_mul_dig") {
-		fp_rand(a);
-		fp_rand(b);
-		BENCH_ADD(fp_mul_dig(c, a, b[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_sqr") {
-		fp_rand(a);
-		BENCH_ADD(fp_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FP_SQR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_sqr_basic") {
-		fp_rand(a);
-		BENCH_ADD(fp_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_SQR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_sqr_integ") {
-		fp_rand(a);
-		BENCH_ADD(fp_sqr_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_SQR == COMBA || !defined(STRIP)
-	BENCH_RUN("fp_sqr_comba") {
-		fp_rand(a);
-		BENCH_ADD(fp_sqr_comba(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_dbl") {
-		fp_rand(a);
-		BENCH_ADD(fp_dbl(c, a));
-	}
-	BENCH_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_dbl_basic") {
-		fp_rand(a);
-		BENCH_ADD(fp_dbl_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_dbl_integ") {
-		fp_rand(a);
-		BENCH_ADD(fp_dbl_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_hlv") {
-		fp_rand(a);
-		BENCH_ADD(fp_hlv(c, a));
-	}
-	BENCH_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_hlv_basic") {
-		fp_rand(a);
-		BENCH_ADD(fp_hlv_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-	BENCH_RUN("fp_hlv_integ") {
-		fp_rand(a);
-		BENCH_ADD(fp_hlv_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_lsh") {
-		fp_rand(a);
-		a[RLC_FP_DIGS - 1] = 0;
-		BENCH_ADD(fp_lsh(c, a, RLC_DIG / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_rsh") {
-		fp_rand(a);
-		a[RLC_FP_DIGS - 1] = 0;
-		BENCH_ADD(fp_rsh(c, a, RLC_FP_BITS / 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_rdc") {
-		fp_rand(a);
-		fp_lsh(d, a, RLC_FP_BITS);
-		BENCH_ADD(fp_rdc(c, d));
-	}
-	BENCH_END;
-
-#if FP_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_rdc_basic") {
-		fp_rand(a);
-		fp_lsh(d, a, RLC_FP_BITS);
-		BENCH_ADD(fp_rdc_basic(c, d));
-	}
-	BENCH_END;
-#endif
-
-#if FP_RDC == MONTY || !defined(STRIP)
-	BENCH_RUN("fp_rdc_monty") {
-		fp_rand(a);
-		fp_lsh(d, a, RLC_FP_BITS);
-		BENCH_ADD(fp_rdc_monty(c, d));
-	}
-	BENCH_END;
-
-#if FP_MUL == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_rdc_monty_basic") {
-		fp_rand(a);
-		fp_lsh(d, a, RLC_FP_BITS);
-		BENCH_ADD(fp_rdc_monty_basic(c, d));
-	}
-	BENCH_END;
-#endif
-
-#if FP_MUL == COMBA || !defined(STRIP)
-	BENCH_RUN("fp_rdc_monty_comba") {
-		fp_rand(a);
-		fp_lsh(d, a, RLC_FP_BITS);
-		BENCH_ADD(fp_rdc_monty_comba(c, d));
-	}
-	BENCH_END;
-#endif
-#endif
-
-#if FP_RDC == QICK || !defined(STRIP)
-	if (fp_prime_get_sps(NULL) != NULL) {
-		BENCH_RUN("fp_rdc_quick") {
-			fp_rand(a);
-			fp_lsh(d, a, RLC_FP_BITS);
-			BENCH_ADD(fp_rdc_quick(c, d));
-		}
-		BENCH_END;
-	}
-#endif
-
-	BENCH_RUN("fp_inv") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv(c, a));
-	}
-	BENCH_END;
-
-#if FP_INV == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_inv_basic") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_INV == BINAR || !defined(STRIP)
-	BENCH_RUN("fp_inv_binar") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_binar(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_INV == MONTY || !defined(STRIP)
-	BENCH_RUN("fp_inv_monty") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_monty(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_INV == EXGCD || !defined(STRIP)
-	BENCH_RUN("fp_inv_exgcd") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_exgcd(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_INV == DIVST || !defined(STRIP)
-	BENCH_RUN("fp_inv_divst") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_divst(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FP_INV == LOWER || !defined(STRIP)
-	BENCH_RUN("fp_inv_lower") {
-		fp_rand(a);
-		BENCH_ADD(fp_inv_lower(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_inv_sim (2)") {
-		fp_rand(f[0]);
-		fp_rand(f[1]);
-		BENCH_ADD(fp_inv_sim(f, (const fp_t *)f, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_exp") {
-		fp_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_exp(c, a, e));
-	}
-	BENCH_END;
-
-#if FP_EXP == BASIC || !defined(STRIP)
-	BENCH_RUN("fp_exp_basic") {
-		fp_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_exp_basic(c, a, e));
-	}
-	BENCH_END;
-#endif
-
-#if FP_EXP == SLIDE || !defined(STRIP)
-	BENCH_RUN("fp_exp_slide") {
-		fp_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_exp_slide(c, a, e));
-	}
-	BENCH_END;
-#endif
-
-#if FP_EXP == MONTY || !defined(STRIP)
-	BENCH_RUN("fp_exp_monty") {
-		fp_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_exp_monty(c, a, e));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp_srt") {
-		fp_rand(a);
-		fp_sqr(a, a);
-		BENCH_ADD(fp_srt(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_prime_conv") {
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_prime_conv(a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_prime_conv_dig") {
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp_prime_conv_dig(a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp_prime_back") {
-		fp_rand(c);
-		BENCH_ADD(fp_prime_back(e, c));
-	}
-	BENCH_END;
-
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	dv_free(d);
-	bn_free(e);
-	fp_free(f[0]);
-	fp_free(f[1]);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the FP module:", 0);
-
-	fp_param_set_any();
-	fp_param_print();
-
-	util_banner("Utilities:\n", 0);
-	memory();
-	util();
-	util_banner("Arithmetic:\n", 0);
-	arith();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_fpx.c b/src/dashbls/depends/relic/bench/bench_fpx.c
deleted file mode 100644
index 62ee13cc37cb..000000000000
--- a/src/dashbls/depends/relic/bench/bench_fpx.c
+++ /dev/null
@@ -1,3340 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for extensions of prime fields
- *
- * @ingroup bench
- */
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory2(void) {
-	fp2_t a[BENCH];
-
-	BENCH_FEW("fp2_null", fp2_null(a[i]), 1);
-
-	BENCH_FEW("fp2_new", fp2_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp2_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp2_new(a[i]);
-	}
-	BENCH_FEW("fp2_free", fp2_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util2(void) {
-	uint8_t bin[2 * RLC_FP_BYTES];
-	fp2_t a, b;
-
-	fp2_null(a);
-	fp2_null(b);
-
-	fp2_new(a);
-	fp2_new(b);
-
-	BENCH_RUN("fp2_copy") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_neg") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_zero") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_is_zero") {
-		fp2_rand(a);
-		BENCH_ADD((void)fp2_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_set_dig (1)") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_set_dig") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_set_dig(a, a[0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_rand") {
-		BENCH_ADD(fp2_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_size_bin (0)") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_size_bin (1)") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		BENCH_ADD(fp2_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_write_bin (0)") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_write_bin(bin, sizeof(bin), a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_write_bin (1)") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		BENCH_ADD(fp2_write_bin(bin, sizeof(bin), a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_read_bin (0)") {
-		fp2_rand(a);
-		fp2_write_bin(bin, sizeof(bin), a, 0);
-		BENCH_ADD(fp2_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_read_bin") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		fp2_write_bin(bin, sizeof(bin), a, 1);
-		BENCH_ADD(fp2_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_cmp") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_cmp_dig") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp2_free(a);
-	fp2_free(b);
-}
-
-static void arith2(void) {
-	fp2_t a, b, c, d[2];
-	bn_t e;
-
-	fp2_new(a);
-	fp2_new(b);
-	fp2_new(c);
-	fp2_new(d[0]);
-	fp2_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp2_add") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_add(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_add_basic") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_add_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_add_integ") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_add_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_sub") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_sub(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_sub_basic") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_sub_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_sub_integ") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_sub_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_dbl") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_dbl(c, a));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_dbl_basic") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_dbl_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_dbl_integ") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_dbl_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_mul") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_mul_basic") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_mul_integ") {
-		fp2_rand(a);
-		fp2_rand(b);
-		BENCH_ADD(fp2_mul_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_mul_art") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_mul_art(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_mul_nor") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_mul_nor(c, a));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_mul_nor_basic") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_mul_nor_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_mul_nor_integ") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_mul_nor_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_sqr") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_sqr(c, a));
-	}
-	BENCH_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-	BENCH_RUN("fp2_sqr_basic") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-	BENCH_RUN("fp2_sqr_integ") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_sqr_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp2_test_cyc") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		BENCH_ADD(fp2_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_conv_cyc") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_inv") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_inv_cyc") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_inv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_inv_sim (2)") {
-		fp2_rand(d[0]);
-		fp2_rand(d[1]);
-		BENCH_ADD(fp2_inv_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_exp") {
-		fp2_rand(a);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp2_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_exp_dig") {
-		fp2_rand(a);
-		bn_rand(e, RLC_POS, RLC_DIG);
-		BENCH_ADD(fp2_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_exp_cyc") {
-		fp2_rand(a);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp2_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_frb") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_mul_frb") {
-		fp2_rand(a);
-		BENCH_ADD(fp2_mul_frb(c, a, 1, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_srt") {
-		fp2_rand(a);
-		fp2_sqr(a, a);
-		BENCH_ADD(fp2_srt(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_pck") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		BENCH_ADD(fp2_pck(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp2_upk") {
-		fp2_rand(a);
-		fp2_conv_cyc(a, a);
-		fp2_pck(a, a);
-		BENCH_ADD(fp2_upk(c, a));
-	}
-	BENCH_END;
-
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d[0]);
-	fp2_free(d[1]);
-	bn_free(e);
-}
-
-static void memory3(void) {
-	fp3_t a[BENCH];
-
-	BENCH_FEW("fp3_null", fp3_null(a[i]), 1);
-
-	BENCH_FEW("fp3_new", fp3_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp3_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp3_new(a[i]);
-	}
-	BENCH_FEW("fp3_free", fp3_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util3(void) {
-	uint8_t bin[3 * RLC_FP_BYTES];
-	fp3_t a, b;
-
-	fp3_null(a);
-	fp3_null(b);
-
-	fp3_new(a);
-	fp3_new(b);
-
-	BENCH_RUN("fp3_copy") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_neg") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_zero") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_is_zero") {
-		fp3_rand(a);
-		BENCH_ADD((void)fp3_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_set_dig (1)") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_set_dig") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_set_dig(a, a[0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_rand") {
-		BENCH_ADD(fp3_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_size_bin") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_size_bin(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_write_bin") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_read_bin") {
-		fp3_rand(a);
-		fp3_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp3_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_cmp") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_cmp_dig") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp3_free(a);
-	fp3_free(b);
-}
-
-static void arith3(void) {
-	fp3_t a, b, c, d[2];
-	bn_t e;
-
-	fp3_new(a);
-	fp3_new(b);
-	fp3_new(c);
-	fp3_new(d[0]);
-	fp3_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp3_add") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_add(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp3_add_basic") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_add_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-	BENCH_RUN("fp3_add_integ") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_add_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp3_sub") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_sub(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp3_sub_basic") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_sub_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-	BENCH_RUN("fp3_sub_integ") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_sub_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp3_dbl") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_dbl(c, a));
-	}
-	BENCH_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp3_dbl_basic") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_dbl_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-	BENCH_RUN("fp3_dbl_integ") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_dbl_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp3_mul") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp3_mul_basic") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-	BENCH_RUN("fp3_mul_integ") {
-		fp3_rand(a);
-		fp3_rand(b);
-		BENCH_ADD(fp3_mul_integ(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp3_mul_nor") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_mul_nor(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_sqr") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_sqr(c, a));
-	}
-	BENCH_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp3_sqr_basic") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-	BENCH_RUN("fp3_sqr_integ") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_sqr_integ(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp3_inv") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_inv_sim (2)") {
-		fp3_rand(d[0]);
-		fp3_rand(d[1]);
-		BENCH_ADD(fp3_inv_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_exp") {
-		fp3_rand(a);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp3_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_frb") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_mul_frb (0,1)") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_mul_frb(c, a, 0, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp3_mul_frb (1,1)") {
-		fp3_rand(a);
-		BENCH_ADD(fp3_mul_frb(c, a, 1, 1));
-	}
-	BENCH_END;
-
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	fp3_free(d[0]);
-	fp3_free(d[1]);
-	bn_free(e);
-}
-
-static void memory4(void) {
-	fp4_t a[BENCH];
-
-	BENCH_FEW("fp4_null", fp4_null(a[i]), 1);
-
-	BENCH_FEW("fp4_new", fp4_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp4_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp4_new(a[i]);
-	}
-	BENCH_FEW("fp4_free", fp4_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util4(void) {
-	uint8_t bin[4 * RLC_FP_BYTES];
-	fp4_t a, b;
-
-	fp4_null(a);
-	fp4_null(b);
-
-	fp4_new(a);
-	fp4_new(b);
-
-	BENCH_RUN("fp4_copy") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_neg") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_zero") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_is_zero") {
-		fp4_rand(a);
-		BENCH_ADD((void)fp4_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_set_dig (1)") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_set_dig") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_set_dig(a, a[0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_rand") {
-		BENCH_ADD(fp4_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_size_bin") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_size_bin(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_write_bin") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_read_bin") {
-		fp4_rand(a);
-		fp4_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp4_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_cmp") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_cmp_dig") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp4_free(a);
-	fp4_free(b);
-}
-
-static void arith4(void) {
-	fp4_t a, b, c;
-	bn_t d;
-
-	fp4_new(a);
-	fp4_new(b);
-	fp4_new(c);
-	bn_new(d);
-
-	BENCH_RUN("fp4_add") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_sub") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_dbl") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_dbl(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_mul") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp4_mul_basic") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp4_mul_lazyr") {
-		fp4_rand(a);
-		fp4_rand(b);
-		BENCH_ADD(fp4_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp4_mul_art") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_mul_art(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_sqr") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp4_sqr_basic") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp4_sqr_lazyr") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp4_inv") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_exp") {
-		fp4_rand(a);
-		d->used = RLC_FP_DIGS;
-		dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp4_exp(c, a, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_frb") {
-		fp4_rand(a);
-		BENCH_ADD(fp4_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp4_srt") {
-		fp4_rand(a);
-		fp4_sqr(a, a);
-		BENCH_ADD(fp4_srt(c, a));
-	}
-	BENCH_END;
-
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	bn_free(d);
-}
-
-static void memory6(void) {
-	fp6_t a[BENCH];
-
-	BENCH_FEW("fp6_null", fp6_null(a[i]), 1);
-
-	BENCH_FEW("fp6_new", fp6_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp6_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp6_new(a[i]);
-	}
-	BENCH_FEW("fp6_free", fp6_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util6(void) {
-	uint8_t bin[6 * RLC_FP_BYTES];
-	fp6_t a, b;
-
-	fp6_null(a);
-	fp6_null(b);
-
-	fp6_new(a);
-	fp6_new(b);
-
-	BENCH_RUN("fp6_copy") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_neg") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_zero") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_is_zero") {
-		fp6_rand(a);
-		BENCH_ADD((void)fp6_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_set_dig (1)") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_set_dig") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_set_dig(a, a[0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_rand") {
-		BENCH_ADD(fp6_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_size_bin") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_size_bin(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_write_bin") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_read_bin") {
-		fp6_rand(a);
-		fp6_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp6_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_cmp") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_cmp_dig") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp6_free(a);
-	fp6_free(b);
-}
-
-static void arith6(void) {
-	fp6_t a, b, c;
-	bn_t d;
-
-	fp6_new(a);
-	fp6_new(b);
-	fp6_new(c);
-	bn_new(d);
-
-	BENCH_RUN("fp6_add") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_sub") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_dbl") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_dbl(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_mul") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp6_mul_basic") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp6_mul_lazyr") {
-		fp6_rand(a);
-		fp6_rand(b);
-		BENCH_ADD(fp6_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp6_mul_art") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_mul_art(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_sqr") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp6_sqr_basic") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp6_sqr_lazyr") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp6_inv") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_exp") {
-		fp6_rand(a);
-		d->used = RLC_FP_DIGS;
-		dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp6_exp(c, a, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp6_frb") {
-		fp6_rand(a);
-		BENCH_ADD(fp6_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-}
-
-static void memory8(void) {
-	fp8_t a[BENCH];
-
-	BENCH_FEW("fp8_null", fp8_null(a[i]), 1);
-
-	BENCH_FEW("fp8_new", fp8_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp8_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp8_new(a[i]);
-	}
-	BENCH_FEW("fp8_free", fp8_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util8(void) {
-	fp8_t a, b;
-	uint8_t bin[8 * RLC_FP_BYTES];
-
-	fp8_null(a);
-	fp8_null(b);
-
-	fp8_new(a);
-	fp8_new(b);
-
-	BENCH_RUN("fp8_copy") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_neg") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_zero") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_is_zero") {
-		fp8_rand(a);
-		BENCH_ADD((void)fp8_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_set_dig (1)") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_set_dig") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_set_dig(a, a[0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_rand") {
-		BENCH_ADD(fp8_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_size_bin (0)") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_size_bin (1)") {
-		fp8_rand(a);
-		fp8_conv_cyc(a, a);
-		BENCH_ADD(fp8_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_write_bin") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_read_bin") {
-		fp8_rand(a);
-		fp8_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp8_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_cmp") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_cmp_dig") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp8_free(a);
-	fp8_free(b);
-}
-
-static void arith8(void) {
-	fp8_t a, b, c, d[2];
-	bn_t e;
-
-	fp8_new(a);
-	fp8_new(b);
-	fp8_new(c);
-	fp8_new(d[0]);
-	fp8_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp8_add") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_sub") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_mul") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp8_mul_basic") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp8_mul_lazyr") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp8_mul_dxs") {
-		fp8_rand(a);
-		fp8_rand(b);
-		BENCH_ADD(fp8_mul_dxs(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_sqr") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp8_sqr_basic") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp8_sqr_lazyr") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp8_sqr_cyc") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_sqr_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_test_cyc") {
-		fp8_rand(a);
-		fp8_conv_cyc(a, a);
-		BENCH_ADD(fp8_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_conv_cyc") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_inv") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_inv_sim (2)") {
-		fp8_rand(d[0]);
-		fp8_rand(d[1]);
-		BENCH_ADD(fp8_inv_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_inv_sim (2)") {
-		fp8_rand(d[0]);
-		fp8_rand(d[1]);
-		BENCH_ADD(fp8_inv_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_inv_cyc") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_inv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_exp") {
-		fp8_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp8_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_exp (cyc)") {
-		fp8_rand(a);
-		fp8_conv_cyc(a, a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp8_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_exp_cyc (param or sparse)") {
-		fp8_rand(a);
-		fp8_conv_cyc(a, a);
-		bn_zero(e);
-		fp_prime_get_par(e);
-		if (bn_is_zero(e)) {
-			bn_set_2b(e, RLC_FP_BITS - 1);
-			bn_set_bit(e, RLC_FP_BITS / 2, 1);
-			bn_set_bit(e, 0, 1);
-		}
-		BENCH_ADD(fp8_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp8_frb") {
-		fp8_rand(a);
-		BENCH_ADD(fp8_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	fp8_free(d[0]);
-	fp8_free(d[1]);
-	bn_free(e);
-}
-
-static void memory9(void) {
-	fp9_t a[BENCH];
-
-	BENCH_FEW("fp9_null", fp9_null(a[i]), 1);
-
-	BENCH_FEW("fp9_new", fp9_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp9_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp9_new(a[i]);
-	}
-	BENCH_FEW("fp9_free", fp9_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util9(void) {
-	uint8_t bin[9 * RLC_FP_BYTES];
-	fp9_t a, b;
-
-	fp9_null(a);
-	fp9_null(b);
-
-	fp9_new(a);
-	fp9_new(b);
-
-	BENCH_RUN("fp9_copy") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_neg") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_zero") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_is_zero") {
-		fp9_rand(a);
-		BENCH_ADD((void)fp9_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_set_dig (1)") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_set_dig") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_set_dig(a, a[0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_rand") {
-		BENCH_ADD(fp9_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_size_bin") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_size_bin(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_write_bin") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_write_bin(bin, sizeof(bin), a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_read_bin") {
-		fp9_rand(a);
-		fp9_write_bin(bin, sizeof(bin), a);
-		BENCH_ADD(fp9_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_cmp") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_cmp_dig") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp9_free(a);
-	fp9_free(b);
-}
-
-static void arith9(void) {
-	fp9_t a, b, c;
-	bn_t d;
-
-	fp9_new(a);
-	fp9_new(b);
-	fp9_new(c);
-	bn_new(d);
-
-	BENCH_RUN("fp9_add") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_sub") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_dbl") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_dbl(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_mul") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp9_mul_basic") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp9_mul_lazyr") {
-		fp9_rand(a);
-		fp9_rand(b);
-		BENCH_ADD(fp9_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp9_mul_art") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_mul_art(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_sqr") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp9_sqr_basic") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp9_sqr_lazyr") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp9_inv") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_exp") {
-		fp9_rand(a);
-		d->used = RLC_FP_DIGS;
-		dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp9_exp(c, a, d));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp9_frb") {
-		fp9_rand(a);
-		BENCH_ADD(fp9_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-}
-
-static void memory12(void) {
-	fp12_t a[BENCH];
-
-	BENCH_FEW("fp12_null", fp12_null(a[i]), 1);
-
-	BENCH_FEW("fp12_new", fp12_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp12_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp12_new(a[i]);
-	}
-	BENCH_FEW("fp12_free", fp12_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util12(void) {
-	fp12_t a, b;
-	uint8_t bin[12 * RLC_FP_BYTES];
-
-	fp12_null(a);
-	fp12_null(b);
-
-	fp12_new(a);
-	fp12_new(b);
-
-	BENCH_RUN("fp12_copy") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_neg") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_zero") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_is_zero") {
-		fp12_rand(a);
-		BENCH_ADD((void)fp12_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_set_dig (1)") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_set_dig") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_set_dig(a, a[0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_rand") {
-		BENCH_ADD(fp12_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_size_bin (0)") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_size_bin (1)") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		BENCH_ADD(fp12_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_write_bin (0)") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_write_bin(bin, sizeof(bin), a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_write_bin (1)") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		BENCH_ADD(fp12_write_bin(bin, 8 * RLC_FP_BYTES, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_read_bin (0)") {
-		fp12_rand(a);
-		fp12_write_bin(bin, sizeof(bin), a, 0);
-		BENCH_ADD(fp12_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_read_bin (1)") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		fp12_write_bin(bin, fp12_size_bin(a, 1), a, 1);
-		BENCH_ADD(fp12_read_bin(a, bin, 8 * RLC_FP_BYTES));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_cmp") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_cmp_dig") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp12_free(a);
-	fp12_free(b);
-}
-
-static void arith12(void) {
-	fp12_t a, b, c, d[2];
-	bn_t e;
-
-	fp12_new(a);
-	fp12_new(b);
-	fp12_new(c);
-	fp12_new(d[0]);
-	fp12_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp12_add") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_sub") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_mul") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp12_mul_basic") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp12_mul_lazyr") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp12_mul_dxs") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul_dxs(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp12_mul_dxs_basic") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul_dxs_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp12_mul_dxs_lazyr") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_mul_dxs_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp12_sqr") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_sqr(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_sqr_cyc") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_sqr_cyc(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp12_sqr_cyc_basic") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_sqr_cyc_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp12_sqr_cyc_lazyr") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_sqr_cyc_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp12_sqr_pck") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_sqr_pck(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp12_sqr_pck_basic") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_sqr_pck_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp12_sqr_pck_lazyr") {
-		fp12_rand(a);
-		fp12_rand(b);
-		BENCH_ADD(fp12_sqr_pck_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp12_test_cyc") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		BENCH_ADD(fp12_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_conv_cyc") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_back_cyc") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_back_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_back_cyc (2)") {
-		fp12_rand(d[0]);
-		fp12_rand(d[1]);
-		BENCH_ADD(fp12_back_cyc_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_conv_cyc") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_inv") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_inv_cyc") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_inv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_exp") {
-		fp12_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp12_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_exp (cyc)") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp12_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_exp_cyc (param or sparse)") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		bn_zero(e);
-		fp_prime_get_par(e);
-		if (bn_is_zero(e)) {
-			bn_set_2b(e, RLC_FP_BITS - 1);
-			bn_set_bit(e, RLC_FP_BITS / 2, 1);
-			bn_set_bit(e, 0, 1);
-		}
-		BENCH_ADD(fp12_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_exp_cyc_sps (param)") {
-		const int *k;
-		int l;
-		k = fp_prime_get_par_sps(&l);
-		fp12_rand(a);
-		BENCH_ADD(fp12_exp_cyc_sps(c, a, k, l, RLC_POS));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_exp_dig") {
-		fp12_rand(a);
-		bn_rand(e, RLC_POS, RLC_DIG);
-		BENCH_ADD(fp12_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_frb") {
-		fp12_rand(a);
-		BENCH_ADD(fp12_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_pck") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		BENCH_ADD(fp12_pck(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_upk") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		fp12_pck(a, a);
-		BENCH_ADD(fp12_upk(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_pck_max") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		BENCH_ADD(fp12_pck_max(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp12_upk_max") {
-		fp12_rand(a);
-		fp12_conv_cyc(a, a);
-		fp12_pck_max(a, a);
-		BENCH_ADD(fp12_upk_max(c, a));
-	}
-	BENCH_END;
-
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	fp12_free(d[0]);
-	fp12_free(d[1]);
-	bn_free(e);
-}
-
-static void memory18(void) {
-	fp18_t a[BENCH];
-
-	BENCH_FEW("fp18_null", fp18_null(a[i]), 1);
-
-	BENCH_FEW("fp18_new", fp18_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp18_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp18_new(a[i]);
-	}
-	BENCH_FEW("fp18_free", fp18_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util18(void) {
-	fp18_t a, b;
-
-	fp18_null(a);
-	fp18_null(b);
-
-	fp18_new(a);
-	fp18_new(b);
-
-	BENCH_RUN("fp18_copy") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_neg") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_zero") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_is_zero") {
-		fp18_rand(a);
-		BENCH_ADD((void)fp18_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_set_dig (1)") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_set_dig") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_set_dig(a, a[0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_rand") {
-		BENCH_ADD(fp18_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_cmp") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_cmp_dig") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp18_free(a);
-	fp18_free(b);
-}
-
-static void arith18(void) {
-	fp18_t a, b, c;
-	bn_t e;
-
-	fp18_new(a);
-	fp18_new(b);
-	fp18_new(c);
-	bn_new(e);
-
-	BENCH_RUN("fp18_add") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_sub") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_mul") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp18_mul_basic") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp18_mul_lazyr") {
-		fp18_rand(a);
-		fp18_rand(b);
-		BENCH_ADD(fp18_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp18_sqr") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp18_sqr_basic") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp18_sqr_lazyr") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp18_inv") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_exp") {
-		fp18_rand(a);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		BENCH_ADD(fp18_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp18_frb") {
-		fp18_rand(a);
-		BENCH_ADD(fp18_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	bn_free(e);
-}
-
-static void memory24(void) {
-	fp24_t a[BENCH];
-
-	BENCH_FEW("fp24_null", fp24_null(a[i]), 1);
-
-	BENCH_FEW("fp24_new", fp24_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp24_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp24_new(a[i]);
-	}
-	BENCH_FEW("fp24_free", fp24_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util24(void) {
-	fp24_t a, b;
-	uint8_t bin[24 * RLC_FP_BYTES];
-
-	fp24_null(a);
-	fp24_null(b);
-
-	fp24_new(a);
-	fp24_new(b);
-
-	BENCH_RUN("fp24_copy") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_neg") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_zero") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_is_zero") {
-		fp24_rand(a);
-		BENCH_ADD((void)fp24_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_set_dig (1)") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_set_dig") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_set_dig(a, a[0][0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_rand") {
-		BENCH_ADD(fp24_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_size_bin (0)") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_size_bin (1)") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		BENCH_ADD(fp24_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_write_bin (0)") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_write_bin(bin, sizeof(bin), a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_write_bin (1)") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		BENCH_ADD(fp24_write_bin(bin, 32 * RLC_FP_BYTES, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_read_bin (0)") {
-		fp24_rand(a);
-		fp24_write_bin(bin, sizeof(bin), a, 0);
-		BENCH_ADD(fp24_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_read_bin (1)") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		fp24_write_bin(bin, fp24_size_bin(a, 1), a, 1);
-		BENCH_ADD(fp24_read_bin(a, bin, 32 * RLC_FP_BYTES));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_cmp") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_cmp_dig") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp24_free(a);
-	fp24_free(b);
-}
-
-static void arith24(void) {
-	fp24_t a, b, c, d[2];
-	bn_t e;
-
-	fp24_new(a);
-	fp24_new(b);
-	fp24_new(c);
-	fp24_new(d[0]);
-	fp24_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp24_add") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_sub") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_mul") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp24_mul_basic") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp24_mul_lazyr") {
-		fp24_rand(a);
-		fp24_rand(b);
-		BENCH_ADD(fp24_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp24_sqr") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_sqr(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp24_sqr_basic") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_sqr_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp24_sqr_lazyr") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_sqr_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp24_test_cyc") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		BENCH_ADD(fp24_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_conv_cyc") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_back_cyc") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_back_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_back_cyc (2)") {
-		fp24_rand(d[0]);
-		fp24_rand(d[1]);
-		BENCH_ADD(fp24_back_cyc_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_conv_cyc") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_inv") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_exp") {
-		fp24_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp24_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_exp (cyc)") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp24_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_exp_cyc (param or sparse)") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		bn_zero(e);
-		fp_prime_get_par(e);
-		if (bn_is_zero(e)) {
-			bn_set_2b(e, RLC_FP_BITS - 1);
-			bn_set_bit(e, RLC_FP_BITS / 2, 1);
-			bn_set_bit(e, 0, 1);
-		}
-		BENCH_ADD(fp24_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_exp_cyc_sps (param)") {
-		const int *k;
-		int l;
-		k = fp_prime_get_par_sps(&l);
-		fp24_rand(a);
-		BENCH_ADD(fp24_exp_cyc_sps(c, a, k, l, RLC_POS));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_exp_dig") {
-		fp24_rand(a);
-		bn_rand(e, RLC_POS, RLC_DIG);
-		BENCH_ADD(fp24_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_frb") {
-		fp24_rand(a);
-		BENCH_ADD(fp24_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_pck") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		BENCH_ADD(fp24_pck(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp24_upk") {
-		fp24_rand(a);
-		fp24_conv_cyc(a, a);
-		fp24_pck(a, a);
-		BENCH_ADD(fp24_upk(c, a));
-	}
-	BENCH_END;
-
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	fp24_free(d[0]);
-	fp24_free(d[1]);
-	bn_free(e);
-}
-
-static void memory48(void) {
-	fp48_t a[BENCH];
-
-	BENCH_FEW("fp48_null", fp48_null(a[i]), 1);
-
-	BENCH_FEW("fp48_new", fp48_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp48_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp48_new(a[i]);
-	}
-	BENCH_FEW("fp48_free", fp48_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util48(void) {
-	fp48_t a, b;
-	uint8_t bin[48 * RLC_FP_BYTES];
-
-	fp48_null(a);
-	fp48_null(b);
-
-	fp48_new(a);
-	fp48_new(b);
-
-	BENCH_RUN("fp48_copy") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_neg") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_zero") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_is_zero") {
-		fp48_rand(a);
-		BENCH_ADD((void)fp48_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_set_dig (1)") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_set_dig") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_set_dig(a, a[0][0][0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_rand") {
-		BENCH_ADD(fp48_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_size_bin (0)") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_size_bin (1)") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		BENCH_ADD(fp48_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_write_bin (0)") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_write_bin(bin, sizeof(bin), a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_write_bin (1)") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		BENCH_ADD(fp48_write_bin(bin, 32 * RLC_FP_BYTES, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_read_bin (0)") {
-		fp48_rand(a);
-		fp48_write_bin(bin, sizeof(bin), a, 0);
-		BENCH_ADD(fp48_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_read_bin (1)") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		fp48_write_bin(bin, fp48_size_bin(a, 1), a, 1);
-		BENCH_ADD(fp48_read_bin(a, bin, 32 * RLC_FP_BYTES));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_cmp") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_cmp_dig") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp48_free(a);
-	fp48_free(b);
-}
-
-static void arith48(void) {
-	fp48_t a, b, c, d[2];
-	bn_t e;
-
-	fp48_new(a);
-	fp48_new(b);
-	fp48_new(c);
-	fp48_new(d[0]);
-	fp48_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp48_add") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_sub") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_mul") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp48_mul_basic") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp48_mul_lazyr") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp48_mul_dxs") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_mul_dxs(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_sqr") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_sqr(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_sqr_cyc") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_sqr_cyc(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp48_sqr_cyc_basic") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_sqr_cyc_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp48_sqr_cyc_lazyr") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_sqr_cyc_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp48_sqr_pck") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_sqr_pck(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp48_sqr_pck_basic") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_sqr_pck_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp48_sqr_pck_lazyr") {
-		fp48_rand(a);
-		fp48_rand(b);
-		BENCH_ADD(fp48_sqr_pck_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp48_test_cyc") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		BENCH_ADD(fp48_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_conv_cyc") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_back_cyc") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_back_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_back_cyc (2)") {
-		fp48_rand(d[0]);
-		fp48_rand(d[1]);
-		BENCH_ADD(fp48_back_cyc_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_conv_cyc") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_inv") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_inv_cyc") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_inv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_exp") {
-		fp48_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp48_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_exp (cyc)") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp48_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_exp_cyc (param or sparse)") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		bn_zero(e);
-		fp_prime_get_par(e);
-		if (bn_is_zero(e)) {
-			bn_set_2b(e, RLC_FP_BITS - 1);
-			bn_set_bit(e, RLC_FP_BITS / 2, 1);
-			bn_set_bit(e, 0, 1);
-		}
-		BENCH_ADD(fp48_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_exp_cyc_sps (param)") {
-		const int *k;
-		int l;
-		k = fp_prime_get_par_sps(&l);
-		fp48_rand(a);
-		BENCH_ADD(fp48_exp_cyc_sps(c, a, k, l, RLC_POS));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_exp_dig") {
-		fp48_rand(a);
-		bn_rand(e, RLC_POS, RLC_DIG);
-		BENCH_ADD(fp48_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_frb") {
-		fp48_rand(a);
-		BENCH_ADD(fp48_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_pck") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		BENCH_ADD(fp48_pck(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp48_upk") {
-		fp48_rand(a);
-		fp48_conv_cyc(a, a);
-		fp48_pck(a, a);
-		BENCH_ADD(fp48_upk(c, a));
-	}
-	BENCH_END;
-
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	fp48_free(d[0]);
-	fp48_free(d[1]);
-	bn_free(e);
-}
-
-static void memory54(void) {
-	fp54_t a[BENCH];
-
-	BENCH_FEW("fp54_null", fp54_null(a[i]), 1);
-
-	BENCH_FEW("fp54_new", fp54_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		fp54_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		fp54_new(a[i]);
-	}
-	BENCH_FEW("fp54_free", fp54_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util54(void) {
-	fp54_t a, b;
-	uint8_t bin[54 * RLC_FP_BYTES];
-
-	fp54_null(a);
-	fp54_null(b);
-
-	fp54_new(a);
-	fp54_new(b);
-
-	BENCH_RUN("fp54_copy") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_neg") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_neg(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_zero") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_is_zero") {
-		fp54_rand(a);
-		BENCH_ADD((void)fp54_is_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_set_dig (1)") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_set_dig(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_set_dig") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_set_dig(a, a[0][0][0][0][0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_rand") {
-		BENCH_ADD(fp54_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_size_bin (0)") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_size_bin(a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_size_bin (1)") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		BENCH_ADD(fp54_size_bin(a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_write_bin (0)") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_write_bin(bin, sizeof(bin), a, 0));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_write_bin (1)") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		BENCH_ADD(fp54_write_bin(bin, 32 * RLC_FP_BYTES, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_read_bin (0)") {
-		fp54_rand(a);
-		fp54_write_bin(bin, sizeof(bin), a, 0);
-		BENCH_ADD(fp54_read_bin(a, bin, sizeof(bin)));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_read_bin (1)") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		fp54_write_bin(bin, fp54_size_bin(a, 1), a, 1);
-		BENCH_ADD(fp54_read_bin(a, bin, 32 * RLC_FP_BYTES));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_cmp") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_cmp_dig") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_cmp_dig(a, (dig_t)0));
-	}
-	BENCH_END;
-
-	fp54_free(a);
-	fp54_free(b);
-}
-
-static void arith54(void) {
-	fp54_t a, b, c, d[2];
-	bn_t e;
-
-	fp54_new(a);
-	fp54_new(b);
-	fp54_new(c);
-	fp54_new(d[0]);
-	fp54_new(d[1]);
-	bn_new(e);
-
-	BENCH_RUN("fp54_add") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_add(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_sub") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_sub(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_mul") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_mul(c, a, b));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp54_mul_basic") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_mul_basic(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp54_mul_lazyr") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_mul_lazyr(c, a, b));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp54_mul_dxs") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_mul_dxs(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_sqr") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_sqr(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_sqr_cyc") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_sqr_cyc(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp54_sqr_cyc_basic") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_sqr_cyc_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp54_sqr_cyc_lazyr") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_sqr_cyc_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp54_sqr_pck") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_sqr_pck(c, a));
-	}
-	BENCH_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-	BENCH_RUN("fp54_sqr_pck_basic") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_sqr_pck_basic(c, a));
-	}
-	BENCH_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-	BENCH_RUN("fp54_sqr_pck_lazyr") {
-		fp54_rand(a);
-		fp54_rand(b);
-		BENCH_ADD(fp54_sqr_pck_lazyr(c, a));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("fp54_test_cyc") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		BENCH_ADD(fp54_test_cyc(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_conv_cyc") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_back_cyc") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_back_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_back_cyc (2)") {
-		fp54_rand(d[0]);
-		fp54_rand(d[1]);
-		BENCH_ADD(fp54_back_cyc_sim(d, d, 2));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_conv_cyc") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_conv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_inv") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_inv_cyc") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_inv_cyc(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_exp") {
-		fp54_rand(a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp54_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_exp (cyc)") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		bn_rand(e, RLC_POS, RLC_FP_BITS);
-		BENCH_ADD(fp54_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_exp_cyc (param or sparse)") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		bn_zero(e);
-		fp_prime_get_par(e);
-		if (bn_is_zero(e)) {
-			bn_set_2b(e, RLC_FP_BITS - 1);
-			bn_set_bit(e, RLC_FP_BITS / 2, 1);
-			bn_set_bit(e, 0, 1);
-		}
-		BENCH_ADD(fp54_exp_cyc(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_exp_cyc_sps (param)") {
-		const int *k;
-		int l;
-		k = fp_prime_get_par_sps(&l);
-		fp54_rand(a);
-		BENCH_ADD(fp54_exp_cyc_sps(c, a, k, l, RLC_POS));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_exp_dig") {
-		fp54_rand(a);
-		bn_rand(e, RLC_POS, RLC_DIG);
-		BENCH_ADD(fp54_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_frb") {
-		fp54_rand(a);
-		BENCH_ADD(fp54_frb(c, a, 1));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_pck") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		BENCH_ADD(fp54_pck(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("fp54_upk") {
-		fp54_rand(a);
-		fp54_conv_cyc(a, a);
-		fp54_pck(a, a);
-		BENCH_ADD(fp54_upk(c, a));
-	}
-	BENCH_END;
-
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	fp54_free(d[0]);
-	fp54_free(d[1]);
-	bn_free(e);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Benchmarks for the FPX module:", 0);
-
-	/* Try using a pairing-friendly curve for faster exponentiation method. */
-	if (pc_param_set_any() != RLC_OK) {
-		/* If it does not work, try a tower-friendly field. */
-		if (fp_param_set_any_tower() == RLC_ERR) {
-			RLC_THROW(ERR_NO_FIELD);
-			core_clean();
-			return 0;
-		}
-	}
-
-	fp_param_print();
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Quadratic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory2();
-		util2();
-
-		util_banner("Arithmetic:", 1);
-		arith2();
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Cubic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory3();
-		util3();
-		util_banner("Arithmetic:", 1);
-		arith3();
-	}
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Quartic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory4();
-		util4();
-		util_banner("Arithmetic:", 1);
-		arith4();
-
-		util_banner("Sextic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory6();
-		util6();
-		util_banner("Arithmetic:", 1);
-		arith6();
-
-		util_banner("Octic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory8();
-		util8();
-		util_banner("Arithmetic:", 1);
-		arith8();
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Nonic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory9();
-		util9();
-		util_banner("Arithmetic:", 1);
-		arith9();
-	}
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Dodecic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory12();
-		util12();
-		util_banner("Arithmetic:", 1);
-		arith12();
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Octodecic extension:", 0);
-		util_banner("Utilities:", 1);
-		memory18();
-		util18();
-
-		util_banner("Arithmetic:", 1);
-		arith18();
-	}
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Extension of degree 24:", 0);
-		util_banner("Utilities:", 1);
-		memory24();
-		util24();
-		util_banner("Arithmetic:", 1);
-		arith24();
-
-		util_banner("Extension of degree 48:", 0);
-		util_banner("Utilities:", 1);
-		memory48();
-		util48();
-		util_banner("Arithmetic:", 1);
-		arith48();
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Extension of degree 54:", 0);
-		util_banner("Utilities:", 1);
-		memory54();
-		util54();
-		util_banner("Arithmetic:", 1);
-		arith54();
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_md.c b/src/dashbls/depends/relic/bench/bench_md.c
deleted file mode 100644
index 118afc0c4d20..000000000000
--- a/src/dashbls/depends/relic/bench/bench_md.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for hash functions.
- *
- * @ingroup md
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void hash(void) {
-	uint8_t hash[RLC_MD_LEN], buf[256];
-	const uint8_t *dst = (const uint8_t *)"RELIC";
-
-	BENCH_RUN("md_map (256)") {
-		rand_bytes(buf, sizeof(buf));
-		BENCH_ADD(md_map(hash, buf, sizeof(buf)));
-	} BENCH_END;
-
-	BENCH_RUN("md_xmd (256)") {
-		rand_bytes(buf, sizeof(buf));
-		BENCH_ADD(md_xmd(buf, sizeof(buf), buf, sizeof(buf), dst, 5));
-	} BENCH_END;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the MD module:\n", 0);
-	hash();
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_mpc.c b/src/dashbls/depends/relic/bench/bench_mpc.c
deleted file mode 100644
index 31cd1035948d..000000000000
--- a/src/dashbls/depends/relic/bench/bench_mpc.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for random number generation.
- *
- * @ingroup rand
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void mul_triple(void) {
-	bn_t order, d[2], e[2], x[2], y[2];
-	mt_t tri[2];
-
-	bn_null(order);
-	mt_null(tri[0]);
-	mt_null(tri[1]);
-
-	bn_new(order);
-	mt_new(tri[0]);
-	mt_new(tri[1]);
-	for (int j = 0; j < 2; j++) {
-		bn_null(d[j]);
-		bn_null(e[j]);
-		bn_null(x[j]);
-		bn_null(y[j]);
-		bn_new(d[j]);
-		bn_new(e[j]);
-		bn_new(x[j]);
-		bn_new(y[j]);
-	}
-
-	bn_gen_prime(order, RLC_BN_BITS);
-
-	BENCH_RUN("mt_gen") {
-		BENCH_ADD(mt_gen(tri, order));
-	} BENCH_END;
-
-	BENCH_RUN("mt_mul_lcl") {
-		BENCH_ADD(mt_mul_lcl(d[0], e[0], x[0], y[0], order, tri[0]));
-		BENCH_ADD(mt_mul_lcl(d[1], e[1], x[1], y[1], order, tri[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("mt_mul_bct") {
-		BENCH_ADD(mt_mul_bct(d, e, order););
-	} BENCH_END;
-
-	BENCH_RUN("mt_mul_mpc") {
-		BENCH_ADD(mt_mul_mpc(d[0], d[0], e[0], order, tri[0], 0););
-		BENCH_ADD(mt_mul_mpc(d[1], d[1], e[1], order, tri[1], 1););
-	} BENCH_DIV(2);
-
-	bn_free(order);
-	mt_free(tri[0]);
-	mt_free(tri[1]);
-	for (int j = 0; j < 2; j++) {
-		bn_free(d[j]);
-		bn_free(e[j]);
-		bn_free(x[j]);
-		bn_free(y[j]);
-	}
-}
-
-static void pair_triple(void) {
-	g1_t d[2], p[2], _p;
-	g2_t e[2], q[2], _q;
-	gt_t f[2], r[2], _r;
-	bn_t k[2], l[2], n;
-	mt_t tri[2];
-	pt_t t[2];
-
-	g1_null(_p);
-	g2_null(_q);
-	gt_null(_r);
-	bn_null(n);
-
-	g1_new(_p);
-	g2_new(_q);
-	gt_new(_r);
-	bn_new(n);
-	for (int j = 0; j < 2; j++) {
-		g1_null(d[j]);
-		g2_null(e[j]);
-		bn_null(k[j]);
-		bn_null(l[j]);
-		g1_null(p[j]);
-		g2_null(q[j]);
-		gt_null(r[j]);
-		mt_null(tri[j]);
-		pt_null(t[j]);
-		g1_new(d[j]);
-		g2_new(e[j]);
-		bn_new(k[j]);
-		bn_new(l[j]);
-		g1_new(p[j]);
-		g2_new(q[j]);
-		gt_new(r[j]);
-		gt_new(f[j]);
-		mt_new(tri[j]);
-		pt_new(t[j]);
-	}
-
-	g1_get_ord(n);
-
-	mt_gen(tri, n);
-	BENCH_RUN("g1_mul") {
-		/* Generate random inputs. */
-		g1_rand(p[0]);
-		bn_rand_mod(k[0], n);
-		BENCH_ADD(g1_mul(_p, p[0], k[0]));
-	} BENCH_END;
-
-	/* Secret share inputs. */
-	g1_rand(p[1]);
-	g1_sub(p[0], p[0], p[1]);
-	g1_norm(p[0], p[0]);
-	bn_rand_mod(k[1], n);
-	bn_sub(k[0], k[0], k[1]);
-	if (bn_sign(k[0]) == RLC_NEG) {
-		bn_add(k[0], k[0], n);
-	}
-	bn_mod(k[0], k[0], n);
-	tri[0]->b1 = tri[0]->c1 = &p[0];
-	tri[1]->b1 = tri[1]->c1 = &p[1];
-
-	BENCH_RUN("g1_mul_lcl") {
-		BENCH_ADD(g1_mul_lcl(l[0], d[0], k[0], p[0], tri[0]));
-		BENCH_ADD(g1_mul_lcl(l[1], d[1], k[1], p[1], tri[1]))
-	} BENCH_DIV(2);
-
-	BENCH_RUN("g1_mul_bct") {
-		BENCH_ADD(g1_mul_bct(l, d));
-	} BENCH_END;
-
-	BENCH_RUN("g1_mul_mpc") {
-		BENCH_ADD(g1_mul_mpc(d[0], l[0], d[0], tri[0], 0));
-		BENCH_ADD(g1_mul_mpc(d[1], l[1], d[1], tri[1], 1));
-	} BENCH_DIV(2);
-
-	mt_gen(tri, n);
-	BENCH_RUN("g2_mul") {
-		/* Generate random inputs. */
-		g2_rand(q[0]);
-		bn_rand_mod(k[0], n);
-		BENCH_ADD(g2_mul(_q, q[0], k[0]));
-	} BENCH_END;
-	/* Secret share inputs. */
-	g2_rand(q[1]);
-	g2_sub(q[0], q[0], q[1]);
-	g2_norm(q[0], q[0]);
-	bn_rand_mod(k[1], n);
-	bn_sub(k[0], k[0], k[1]);
-	if (bn_sign(k[0]) == RLC_NEG) {
-		bn_add(k[0], k[0], n);
-	}
-	bn_mod(k[0], k[0], n);
-	tri[0]->b2 = tri[0]->c2 = &q[0];
-	tri[1]->b2 = tri[1]->c2 = &q[1];
-
-	BENCH_RUN("g2_mul_lcl") {
-		BENCH_ADD(g2_mul_lcl(l[0], e[0], k[0], q[0], tri[0]));
-		BENCH_ADD(g2_mul_lcl(l[1], e[1], k[1], q[1], tri[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("g2_mul_bct") {
-		BENCH_ADD(g2_mul_bct(l, e));
-	} BENCH_END;
-
-	BENCH_RUN("g2_mul_mpc") {
-		BENCH_ADD(g2_mul_mpc(e[0], l[0], e[0], tri[0], 0));
-		BENCH_ADD(g2_mul_mpc(e[1], l[1], e[1], tri[1], 1));
-	} BENCH_DIV(2);
-
-	mt_gen(tri, n);
-	BENCH_RUN("gt_exp") {
-		/* Generate random inputs. */
-		gt_rand(r[0]);
-		bn_rand_mod(k[0], n);
-		BENCH_ADD(gt_exp(_r, r[0], k[0]));
-	} BENCH_END;
-	/* Secret share inputs. */
-	gt_rand(r[1]);
-	gt_mul(r[0], r[0], r[1]);
-	gt_inv(r[1], r[1]);
-	bn_rand_mod(k[1], n);
-	bn_sub(k[0], k[0], k[1]);
-	if (bn_sign(k[0]) == RLC_NEG) {
-		bn_add(k[0], k[0], n);
-	}
-	bn_mod(k[0], k[0], n);
-	tri[0]->bt = tri[0]->ct = &r[0];
-	tri[1]->bt = tri[1]->ct = &r[1];
-
-	BENCH_RUN("gt_exp_lcl") {
-		BENCH_ADD(gt_exp_lcl(l[0], f[0], k[0], r[0], tri[0]));
-		BENCH_ADD(gt_exp_lcl(l[1], f[1], k[1], r[1], tri[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("gt_exp_bct") {
-		BENCH_ADD(gt_exp_bct(l, f));
-	} BENCH_END;
-
-	BENCH_RUN("gt_exp_mpc") {
-		BENCH_ADD(gt_exp_mpc(f[0], l[0], f[0], tri[0], 0));
-		BENCH_ADD(gt_exp_mpc(f[1], l[1], f[1], tri[1], 1));
-	} BENCH_DIV(2);
-
-	/* Generate random inputs and triple. */
-	pc_map_tri(t);
-	BENCH_RUN("pc_map") {
-		g1_rand(p[0]);
-		g2_rand(q[0]);
-		BENCH_ADD(pc_map(r[0], p[0], q[0]));
-	} BENCH_END;
-	/* Secret share inputs. */
-	g1_rand(p[1]);
-	g1_sub(p[0], p[0], p[1]);
-	g1_norm(p[0], p[0]);
-	g2_rand(q[1]);
-	g2_sub(q[0], q[0], q[1]);
-	g2_norm(q[0], q[0]);
-
-	BENCH_RUN("pc_map_lcl") {
-		BENCH_ADD(pc_map_lcl(d[0], e[0], p[0], q[0], t[0]));
-		BENCH_ADD(pc_map_lcl(d[1], e[1], p[1], q[1], t[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("pc_map_bct") {
-		BENCH_ADD(pc_map_bct(d, e));
-	} BENCH_END;
-
-	BENCH_RUN("pc_map_mpc") {
-		BENCH_ADD(pc_map_mpc(r[0], d[0], e[0], t[0], 0));
-		BENCH_ADD(pc_map_mpc(r[1], d[1], e[1], t[1], 1));
-	} BENCH_DIV(2);
-
-	g1_free(_p);
-	g2_free(_q);
-	gt_free(_r);
-	bn_free(n);
-	for (int j = 0; j < 2; j++) {
-		g1_free(d[j]);
-		g2_free(e[j]);
-		bn_free(k[j]);
-		bn_free(l[j]);
-		g1_free(p[j]);
-		g2_free(q[j]);
-		gt_free(r[j]);
-		gt_free(f[j]);
-		pt_free(t[j]);
-		mt_free(tri[j]);
-	}
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the MPC module:", 0);
-	util_banner("Utilities:\n", 0);
-
-#if defined(WITH_BN)
-	mul_triple();
-#endif
-
-#if defined(WITH_PC)
-	if (pc_param_set_any() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	pc_param_print();
-
-	util_banner("Arithmetic:", 1);
-
-	pair_triple();
-#endif
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_pc.c b/src/dashbls/depends/relic/bench/bench_pc.c
deleted file mode 100755
index ed805a95394d..000000000000
--- a/src/dashbls/depends/relic/bench/bench_pc.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for Pairing-Based Cryptography.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void memory1(void) {
-	g1_t a[BENCH];
-
-	BENCH_FEW("g1_null", g1_null(a[i]), 1);
-
-	BENCH_FEW("g1_new", g1_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		g1_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		g1_new(a[i]);
-	}
-	BENCH_FEW("g1_free", g1_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util1(void) {
-	g1_t p, q;
-	uint8_t bin[2 * RLC_PC_BYTES + 1];
-	int l;
-
-	g1_null(p);
-	g1_null(q);
-
-	g1_new(p);
-	g1_new(q);
-
-	BENCH_RUN("g1_is_infty") {
-		g1_rand(p);
-		BENCH_ADD(g1_is_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_set_infty") {
-		g1_rand(p);
-		BENCH_ADD(g1_set_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_copy") {
-		g1_rand(p);
-		g1_rand(q);
-		BENCH_ADD(g1_copy(p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_cmp") {
-		g1_rand(p);
-		g1_dbl(p, p);
-		g1_rand(q);
-		g1_dbl(q, q);
-		BENCH_ADD(g1_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g1_cmp (1 norm)") {
-		g1_rand(p);
-		g1_dbl(p, p);
-		g1_rand(q);
-		BENCH_ADD(g1_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g1_cmp (2 norm)") {
-		g1_rand(p);
-		g1_rand(q);
-		BENCH_ADD(g1_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g1_rand") {
-		BENCH_ADD(g1_rand(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_is_valid") {
-		g1_rand(p);
-		BENCH_ADD(g1_is_valid(p));
-	} BENCH_END;
-
-	BENCH_RUN("g1_size_bin (0)") {
-		g1_rand(p);
-		BENCH_ADD(g1_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("g1_size_bin (1)") {
-		g1_rand(p);
-		BENCH_ADD(g1_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("g1_write_bin (0)") {
-		g1_rand(p);
-		l = g1_size_bin(p, 0);
-		BENCH_ADD(g1_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("g1_write_bin (1)") {
-		g1_rand(p);
-		l = g1_size_bin(p, 1);
-		BENCH_ADD(g1_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("g1_read_bin (0)") {
-		g1_rand(p);
-		l = g1_size_bin(p, 0);
-		g1_write_bin(bin, l, p, 0);
-		BENCH_ADD(g1_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("g1_read_bin (1)") {
-		g1_rand(p);
-		l = g1_size_bin(p, 1);
-		g1_write_bin(bin, l, p, 1);
-		BENCH_ADD(g1_read_bin(p, bin, l));
-	} BENCH_END;
-}
-
-static void arith1(void) {
-	g1_t p, q, r, t[RLC_G1_TABLE];
-	bn_t k, l, n;
-
-	g1_null(p);
-	g1_null(q);
-	g1_null(r);
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g1_null(t[i]);
-	}
-
-	g1_new(p);
-	g1_new(q);
-	g1_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-
-	pc_get_ord(n);
-
-	BENCH_RUN("g1_add") {
-		g1_rand(p);
-		g1_rand(q);
-		g1_add(p, p, q);
-		g1_rand(q);
-		g1_rand(p);
-		g1_add(q, q, p);
-		BENCH_ADD(g1_add(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_sub") {
-		g1_rand(p);
-		g1_rand(q);
-		g1_add(p, p, q);
-		g1_rand(q);
-		g1_rand(p);
-		g1_add(q, q, p);
-		BENCH_ADD(g1_sub(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_dbl") {
-		g1_rand(p);
-		g1_rand(q);
-		g1_add(p, p, q);
-		BENCH_ADD(g1_dbl(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_neg") {
-		g1_rand(p);
-		g1_rand(q);
-		g1_add(p, p, q);
-		BENCH_ADD(g1_neg(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g1_rand(p);
-		BENCH_ADD(g1_mul(q, p, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul_gen") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		BENCH_ADD(g1_mul_gen(q, k));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g1_new(t[i]);
-	}
-
-	BENCH_RUN("g1_mul_pre") {
-		BENCH_ADD(g1_mul_pre(t, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul_fix") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g1_mul_pre(t, p);
-		BENCH_ADD(g1_mul_fix(q, (const g1_t *)t, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul_sim") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		g1_rand(p);
-		g1_rand(q);
-		BENCH_ADD(g1_mul_sim(r, p, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul_sim_gen") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		g1_rand(q);
-		BENCH_ADD(g1_mul_sim_gen(r, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_mul_dig") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g1_rand(p);
-		BENCH_ADD(g1_mul_dig(q, p, k->dp[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g1_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(g1_map(p, msg, 5));
-	} BENCH_END;
-
-	g1_free(p);
-	g1_free(q);
-	bn_free(k);
-	bn_free(l);
-	bn_free(n);
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g1_free(t[i]);
-	}
-}
-
-static void memory2(void) {
-	g2_t a[BENCH];
-
-	BENCH_FEW("g2_null", g2_null(a[i]), 1);
-
-	BENCH_FEW("g2_new", g2_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		g2_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		g2_new(a[i]);
-	}
-	BENCH_FEW("g2_free", g2_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util2(void) {
-	g2_t p, q;
-	uint8_t bin[8 * RLC_PC_BYTES + 1];
-	int l;
-
-	g2_null(p);
-	g2_null(q);
-
-	g2_new(p);
-	g2_new(q);
-
-	BENCH_RUN("g2_is_infty") {
-		g2_rand(p);
-		BENCH_ADD(g2_is_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_set_infty") {
-		g2_rand(p);
-		BENCH_ADD(g2_set_infty(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_copy") {
-		g2_rand(p);
-		g2_rand(q);
-		BENCH_ADD(g2_copy(p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_cmp") {
-		g2_rand(p);
-		g2_dbl(p, p);
-		g2_rand(q);
-		g2_dbl(q, q);
-		BENCH_ADD(g2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g2_cmp (1 norm)") {
-		g2_rand(p);
-		g2_dbl(p, p);
-		g2_rand(q);
-		BENCH_ADD(g2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g2_cmp (2 norm)") {
-		g2_rand(p);
-		g2_rand(q);
-		BENCH_ADD(g2_cmp(p, q));
-	} BENCH_END;
-
-	BENCH_RUN("g2_rand") {
-		BENCH_ADD(g2_rand(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_is_valid") {
-		BENCH_ADD(g2_is_valid(p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_size_bin (0)") {
-		g2_rand(p);
-		BENCH_ADD(g2_size_bin(p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("g2_size_bin (1)") {
-		g2_rand(p);
-		BENCH_ADD(g2_size_bin(p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("g2_write_bin (0)") {
-		g2_rand(p);
-		l = g2_size_bin(p, 0);
-		BENCH_ADD(g2_write_bin(bin, l, p, 0));
-	} BENCH_END;
-
-	BENCH_RUN("g2_write_bin (1)") {
-		g2_rand(p);
-		l = g2_size_bin(p, 1);
-		BENCH_ADD(g2_write_bin(bin, l, p, 1));
-	} BENCH_END;
-
-	BENCH_RUN("g2_read_bin (0)") {
-		g2_rand(p);
-		l = g2_size_bin(p, 0);
-		g2_write_bin(bin, l, p, 0);
-		BENCH_ADD(g2_read_bin(p, bin, l));
-	} BENCH_END;
-
-	BENCH_RUN("g2_read_bin (1)") {
-		g2_rand(p);
-		l = g2_size_bin(p, 1);
-		g2_write_bin(bin, l, p, 1);
-		BENCH_ADD(g2_read_bin(p, bin, l));
-	} BENCH_END;
-
-	g2_free(p)
-	g2_free(q);
-}
-
-static void arith2(void) {
-	g2_t p, q, r, t[RLC_G2_TABLE];
-	bn_t k, l, n;
-
-	g2_null(p);
-	g2_null(q);
-	g2_null(r);
-	for (int i = 0; i < RLC_G2_TABLE; i++) {
-		g2_null(t[i]);
-	}
-
-	g2_new(p);
-	g2_new(q);
-	g2_new(r);
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-
-	pc_get_ord(n);
-
-	BENCH_RUN("g2_add") {
-		g2_rand(p);
-		g2_rand(q);
-		g2_add(p, p, q);
-		g2_rand(q);
-		g2_rand(p);
-		g2_add(q, q, p);
-		BENCH_ADD(g2_add(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_sub") {
-		g2_rand(p);
-		g2_rand(q);
-		g2_add(p, p, q);
-		g2_rand(q);
-		g2_rand(p);
-		g2_add(q, q, p);
-		BENCH_ADD(g2_sub(r, p, q));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_dbl") {
-		g2_rand(p);
-		g2_rand(q);
-		g2_add(p, p, q);
-		BENCH_ADD(g2_dbl(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_neg") {
-		g2_rand(p);
-		g2_rand(q);
-		g2_add(p, p, q);
-		BENCH_ADD(g2_neg(r, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g2_rand(p);
-		BENCH_ADD(g2_mul(q, p, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul_gen") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		BENCH_ADD(g2_mul_gen(q, k));
-	}
-	BENCH_END;
-
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g2_new(t[i]);
-	}
-
-	BENCH_RUN("g2_mul_pre") {
-		BENCH_ADD(g2_mul_pre(t, p));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul_fix") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g2_mul_pre(t, p);
-		BENCH_ADD(g2_mul_fix(q, t, k));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul_sim") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		g2_rand(p);
-		g2_rand(q);
-		BENCH_ADD(g2_mul_sim(r, p, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul_sim_gen") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		bn_rand_mod(l, n);
-		g2_rand(q);
-		BENCH_ADD(g2_mul_sim_gen(r, k, q, l));
-	}
-	BENCH_END;
-
-	BENCH_RUN("g2_mul_dig") {
-		bn_rand(k, RLC_POS, bn_bits(n));
-		bn_rand_mod(k, n);
-		g2_rand(p);
-		BENCH_ADD(g2_mul_dig(q, p, k->dp[0]));
-	}
-	BENCH_END;
-
-#if FP_PRIME != 509
-	BENCH_RUN("g2_map") {
-		uint8_t msg[5];
-		rand_bytes(msg, 5);
-		BENCH_ADD(g2_map(p, msg, 5));
-	} BENCH_END;
-#endif
-
-	g2_free(p);
-	g2_free(q);
-	bn_free(k);
-	bn_free(l);
-	bn_free(n);
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g2_free(t[i]);
-	}
-}
-
-static void memory(void) {
-	gt_t a[BENCH];
-
-	BENCH_FEW("gt_null", gt_null(a[i]), 1);
-
-	BENCH_FEW("gt_new", gt_new(a[i]), 1);
-	for (int i = 0; i < BENCH; i++) {
-		gt_free(a[i]);
-	}
-
-	for (int i = 0; i < BENCH; i++) {
-		gt_new(a[i]);
-	}
-	BENCH_FEW("gt_free", gt_free(a[i]), 1);
-
-	(void)a;
-}
-
-static void util(void) {
-	gt_t a, b;
-	uint8_t bin[12 * RLC_PC_BYTES];
-	int l;
-
-	gt_null(a);
-	gt_null(b);
-
-	gt_new(a);
-	gt_new(b);
-
-	BENCH_RUN("gt_copy") {
-		gt_rand(a);
-		BENCH_ADD(gt_copy(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_zero") {
-		gt_rand(a);
-		BENCH_ADD(gt_zero(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_set_unity") {
-		gt_rand(a);
-		BENCH_ADD(gt_set_unity(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_is_unity") {
-		gt_rand(a);
-		BENCH_ADD((void)gt_is_unity(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_rand") {
-		BENCH_ADD(gt_rand(a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_cmp") {
-		gt_rand(a);
-		gt_rand(b);
-		BENCH_ADD(gt_cmp(b, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_size_bin (0)") {
-		gt_rand(a);
-		BENCH_ADD(gt_size_bin(a, 0));
-	} BENCH_END;
-
-	BENCH_RUN("gt_write_bin (0)") {
-		gt_rand(a);
-		l = gt_size_bin(a, 0);
-		BENCH_ADD(gt_write_bin(bin, l, a, 0));
-	} BENCH_END;
-
-	BENCH_RUN("gt_read_bin (0)") {
-		gt_rand(a);
-		l = gt_size_bin(a, 0);
-		gt_write_bin(bin, l, a, 0);
-		BENCH_ADD(gt_read_bin(a, bin, l));
-	} BENCH_END;
-
-	if (ep_param_embed() == 12) {
-		BENCH_RUN("gt_size_bin (1)") {
-			gt_rand(a);
-			BENCH_ADD(gt_size_bin(a, 1));
-		} BENCH_END;
-
-		BENCH_RUN("gt_write_bin (1)") {
-			gt_rand(a);
-			l = gt_size_bin(a, 1);
-			BENCH_ADD(gt_write_bin(bin, l, a, 1));
-		} BENCH_END;
-
-		BENCH_RUN("gt_read_bin (1)") {
-			gt_rand(a);
-			l = gt_size_bin(a, 1);
-			gt_write_bin(bin, l, a, 1);
-			BENCH_ADD(gt_read_bin(a, bin, l));
-		} BENCH_END;
-	}
-
-	BENCH_RUN("gt_is_valid") {
-		gt_rand(a);
-		BENCH_ADD(gt_is_valid(a));
-	} BENCH_END;
-
-	gt_free(a);
-	gt_free(b);
-}
-
-static void arith(void) {
-	gt_t a, b, c;
-	bn_t d, e, f;
-
-	gt_new(a);
-	gt_new(b);
-	gt_new(c);
-	bn_new(d);
-	bn_new(e);
-	bn_new(f);
-
-	BENCH_RUN("gt_mul") {
-		gt_rand(a);
-		gt_rand(b);
-		BENCH_ADD(gt_mul(c, a, b));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_sqr") {
-		gt_rand(a);
-		gt_rand(b);
-		BENCH_ADD(gt_sqr(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_inv") {
-		gt_rand(a);
-		BENCH_ADD(gt_inv(c, a));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_exp") {
-		gt_rand(a);
-		pc_get_ord(d);
-		bn_rand_mod(e, d);
-		BENCH_ADD(gt_exp(c, a, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_exp_sim") {
-		gt_rand(a);
-		gt_rand(b);
-		gt_get_ord(d);
-		bn_rand_mod(e, d);
-		bn_rand_mod(f, d);
-		BENCH_ADD(gt_exp_sim(c, a, e, b, f));
-	}
-	BENCH_END;
-
-	BENCH_RUN("gt_exp_dig") {
-		gt_rand(a);
-		pc_get_ord(d);
-		bn_rand(e, RLC_POS, bn_bits(d));
-		BENCH_ADD(gt_exp_dig(c, a, e->dp[0]));
-	}
-	BENCH_END;
-
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	bn_free(d);
-	bn_free(e);
-	bn_free(f);
-}
-
-static void pairing(void) {
-	g1_t p[2];
-	g2_t q[2];
-	gt_t r;
-
-	g1_new(p[0]);
-	g2_new(q[0]);
-	g1_new(p[1]);
-	g2_new(q[1]);
-	gt_new(r);
-
-	BENCH_RUN("pc_map") {
-		g1_rand(p[0]);
-		g2_rand(q[0]);
-		BENCH_ADD(pc_map(r, p[0], q[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pc_exp") {
-		gt_rand(r);
-		BENCH_ADD(pc_exp(r, r));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pc_map_sim (2)") {
-		g1_rand(p[1]);
-		g2_rand(q[1]);
-		BENCH_ADD(pc_map_sim(r, p, q, 2));
-	}
-	BENCH_END;
-
-	g1_free(p[0]);
-	g2_free(q[0]);
-	g1_free(p[1]);
-	g2_free(q[1]);
-	gt_free(r);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the PC module:", 0);
-
-	if (pc_param_set_any() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	pc_param_print();
-
-	util_banner("Group G_1:", 0);
-	util_banner("Utilities:", 1);
-	memory1();
-	util1();
-
-	util_banner("Arithmetic:", 1);
-	arith1();
-
-	util_banner("Group G_2:", 0);
-	util_banner("Utilities:", 1);
-	memory2();
-	util2();
-
-	util_banner("Arithmetic:", 1);
-	arith2();
-
-	util_banner("Group G_T:", 0);
-	util_banner("Utilities:", 1);
-	memory();
-	util();
-
-	util_banner("Arithmetic:", 1);
-	arith();
-
-	util_banner("Pairing:", 0);
-	util_banner("Arithmetic:", 1);
-	pairing();
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_pp.c b/src/dashbls/depends/relic/bench/bench_pp.c
deleted file mode 100644
index 01bb27e77abc..000000000000
--- a/src/dashbls/depends/relic/bench/bench_pp.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for pairings defined over prime elliptic curves.
- *
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-static void pairing2(void) {
-	bn_t k, n, l;
-	ep_t p[2], q[2];
-	fp2_t e;
-	int j;
-
-	bn_null(k);
-	bn_null(n);
-	bn_null(l);
-	fp2_null(e);
-
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-	fp2_new(e);
-
-	for (j = 0; j < 2; j++) {
-		ep_null(p[j]);
-		ep_null(q[j]);
-		ep_new(p[0]);
-		ep_new(q[0]);
-	}
-
-	ep_curve_get_ord(n);
-
-	BENCH_RUN("pp_add_k2") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k2(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k2_basic") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k2_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-	BENCH_RUN("pp_add_k2_projc") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k2_projc(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k2_projc_basic") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k2_projc_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-	BENCH_RUN("pp_add_k2_projc_lazyr") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k2_projc_lazyr(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#endif
-
-	BENCH_RUN("pp_dbl_k2") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k2(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k2_basic") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k2_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-	BENCH_RUN("pp_dbl_k2_projc") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k2_projc(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k2_projc_basic") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k2_projc_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k2_projc_lazyr") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k2_projc_lazyr(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#endif
-	BENCH_RUN("pp_exp_k2") {
-		fp2_rand(e);
-		BENCH_ADD(pp_exp_k2(e, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_k2") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_k2(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-#if PP_MAP == TATEP || PP_MAP == OATEP || !defined(STRIP)
-	BENCH_RUN("pp_map_tatep_k2") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_tatep_k2(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_tatep_sim_k12 (2)") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		ep_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_tatep_k2(e, q, p, 2));
-	}
-	BENCH_END;
-#endif
-
-#if PP_MAP == WEILP || !defined(STRIP)
-	BENCH_RUN("pp_map_weilp_k2") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_weilp_k2(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_weilp_sim_k12 (2)") {
-		ep_rand(p[0]);
-		ep_rand(q[0]);
-		ep_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_weilp_k2(e, q, p, 2));
-	}
-	BENCH_END;
-#endif
-
-	bn_free(k);
-	bn_free(n);
-	bn_free(l);
-	fp2_free(e);
-	for (j = 0; j < 2; j++) {
-		ep_free(p[j]);
-		ep_free(q[j]);
-	}
-}
-
-static void pairing8(void) {
-	bn_t k, n, l;
-	ep2_t p[2], r;
-	ep_t q[2];
-	fp8_t e;
-	int j;
-
-	bn_null(k);
-	bn_null(n);
-	bn_null(l);
-	ep2_null(r);
-	fp8_null(e);
-
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-	ep2_new(r);
-	fp8_new(e);
-
-	for (j = 0; j < 2; j++) {
-		ep2_null(p[j]);
-		ep_null(q[j]);
-		ep2_new(p[0]);
-		ep_new(q[0]);
-	}
-
-	ep2_curve_get_ord(n);
-
-	BENCH_RUN("pp_add_k8") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k8(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k8_basic") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k8_basic(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("pp_add_k8_projc") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k8_projc(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("pp_dbl_k8") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k8(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k8_basic") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k8_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k8_projc") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k8_projc(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-	#if PP_EXT == BASIC || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k8_projc_basic") {
-			ep2_rand(p[0]);
-			ep_rand(q[0]);
-			BENCH_ADD(pp_dbl_k8_projc_basic(e, p[0], p[0], q[0]));
-		}
-		BENCH_END;
-	#endif
-
-	#if PP_EXT == LAZYR || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k8_projc_lazyr") {
-			ep2_rand(p[0]);
-			ep_rand(q[0]);
-			BENCH_ADD(pp_dbl_k8_projc_lazyr(e, p[0], p[0], q[0]));
-		}
-		BENCH_END;
-	#endif
-#endif
-
-	BENCH_RUN("pp_exp_k8") {
-		fp8_rand(e);
-		BENCH_ADD(pp_exp_k8(e, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_oate_k8") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_oatep_k8(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	bn_free(k);
-	bn_free(n);
-	bn_free(l);
-	fp8_free(e);
-	ep2_free(r);
-	for (j = 0; j < 2; j++) {
-		ep2_free(p[j]);
-		ep_free(q[j]);
-	}
-}
-
-static void pairing12(void) {
-	bn_t k, n, l;
-	ep2_t p[2], r;
-	ep_t q[2];
-	fp12_t e;
-	int j;
-
-	bn_null(k);
-	bn_null(n);
-	bn_null(l);
-	ep2_null(r);
-	fp12_null(e);
-
-	bn_new(k);
-	bn_new(n);
-	bn_new(l);
-	ep2_new(r);
-	fp12_new(e);
-
-	for (j = 0; j < 2; j++) {
-		ep2_null(p[j]);
-		ep_null(q[j]);
-		ep2_new(p[j]);
-		ep_new(q[j]);
-	}
-
-	ep2_curve_get_ord(n);
-
-	BENCH_RUN("pp_add_k12") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k12(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k12_basic") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k12_basic(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-	BENCH_RUN("pp_add_k12_projc") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k12_projc(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k12_projc_basic") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k12_projc_basic(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-	BENCH_RUN("pp_add_k12_projc_lazyr") {
-		ep2_rand(p[0]);
-		ep2_dbl(r, p[0]);
-		ep2_norm(r, r);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_add_k12_projc_lazyr(e, r, p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#endif
-
-	BENCH_RUN("pp_dbl_k12") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k12(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k12_basic") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k12_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-	BENCH_RUN("pp_dbl_k12_projc") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k12_projc(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k12_projc_basic") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k12_projc_basic(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-	BENCH_RUN("pp_dbl_k12_projc_lazyr") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_dbl_k12_projc_lazyr(e, p[0], p[0], q[0]));
-	}
-	BENCH_END;
-#endif
-
-#endif
-
-	BENCH_RUN("pp_exp_k12") {
-		fp12_rand(e);
-		BENCH_ADD(pp_exp_k12(e, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_k12") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_k12(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_sim_k12 (2)") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		ep2_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_k12(e, q, p, 2));
-	}
-	BENCH_END;
-
-#if PP_MAP == TATEP || !defined(STRIP)
-	BENCH_RUN("pp_map_tatep_k12") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_tatep_k12(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_tatep_sim_k12 (2)") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		ep2_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_tatep_k12(e, q, p, 2));
-	}
-	BENCH_END;
-#endif
-
-#if PP_MAP == WEILP || !defined(STRIP)
-	BENCH_RUN("pp_map_weilp_k12") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_weilp_k12(e, q[0], p[0]));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_weilp_sim_k12 (2)") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		ep2_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_weilp_k12(e, q, p, 2));
-	}
-	BENCH_END;
-#endif
-
-#if PP_MAP == OATEP || !defined(STRIP)
-	BENCH_RUN("pp_map_oatep_k12") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		BENCH_ADD(pp_map_oatep_k12(e, q[0], p[0]));
-	}
-	BENCH_END;
-#endif
-
-#if PP_MAP == OATEP || !defined(STRIP)
-	BENCH_RUN("pp_map_sim_oatep_k12 (2)") {
-		ep2_rand(p[0]);
-		ep_rand(q[0]);
-		ep2_rand(p[1]);
-		ep_rand(q[1]);
-		BENCH_ADD(pp_map_sim_oatep_k12(e, q, p, 2));
-	}
-	BENCH_END;
-#endif
-
-	bn_free(k);
-	bn_free(n);
-	bn_free(l);
-	fp12_free(e);
-	ep2_free(r);
-	for (j = 0; j < 2; j++) {
-		ep2_free(p[j]);
-		ep_free(q[j]);
-	}
-}
-
-static void pairing48(void) {
-	ep_t p;
-	fp8_t qx, qy, qz;
-	fp48_t e;
-
-	ep_null(p);
-	fp8_null(qx);
-	fp8_null(qy);
-	fp8_null(qz);
-	fp48_null(e);
-
-	ep_new(p);
-	fp8_new(qx);
-	fp8_new(qy);
-	fp8_new(qz);
-	fp48_new(e);
-
-	BENCH_RUN("pp_add_k48") {
-		fp8_rand(qx);
-		fp8_rand(qy);
-		fp8_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k48(e, qx, qy, qz, qy, qx, p));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k48_basic") {
-		fp8_rand(qx);
-		fp8_rand(qy);
-		fp8_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k48_basic(e, qx, qy, qy, qx, p));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("pp_add_k48_projc") {
-		fp8_rand(qx);
-		fp8_rand(qy);
-		fp8_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k48_projc(e, qx, qy, qz, qx, qy, p));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("pp_dbl_k48") {
-		fp8_rand(qx);
-		fp8_rand(qy);
-		fp8_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_dbl_k48(e, qx, qy, qz, p));
-	}
-	BENCH_END;
-
-	#if EP_ADD == BASIC || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k48_basic") {
-			fp8_rand(qx);
-			fp8_rand(qy);
-			ep_rand(p);
-			BENCH_ADD(pp_dbl_k48_basic(e, qx, qy, p));
-		}
-		BENCH_END;
-	#endif
-
-	#if EP_ADD == PROJC || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k48_projc") {
-			fp8_rand(qx);
-			fp8_rand(qy);
-			fp8_rand(qz);
-			ep_rand(p);
-			BENCH_ADD(pp_dbl_k48_projc(e, qx, qy, qz, p));
-		}
-		BENCH_END;
-	#endif
-
-	BENCH_RUN("pp_exp_k48") {
-		fp48_rand(e);
-		BENCH_ADD(pp_exp_k48(e, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_k48") {
-		fp8_rand(qx);
-		fp8_rand(qy);
-		fp8_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_map_k48(e, p, qx, qy));
-	}
-	BENCH_END;
-
-	ep_free(p);
-	fp8_free(qx);
-	fp8_free(qy);
-	fp8_free(qz);
-	fp48_free(e);
-}
-
-static void pairing54(void) {
-	ep_t p;
-	fp9_t qx, qy, qz;
-	fp54_t e;
-
-	ep_null(p);
-	fp9_null(qx);
-	fp9_null(qy);
-	fp9_null(qz);
-	fp54_null(e);
-
-	ep_new(p);
-	fp9_new(qx);
-	fp9_new(qy);
-	fp9_new(qz);
-	fp54_new(e);
-
-	BENCH_RUN("pp_add_k54") {
-		fp9_rand(qx);
-		fp9_rand(qy);
-		fp9_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k54(e, qx, qy, qz, qy, qx, p));
-	}
-	BENCH_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-	BENCH_RUN("pp_add_k54_basic") {
-		fp9_rand(qx);
-		fp9_rand(qy);
-		fp9_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k54_basic(e, qx, qy, qy, qx, p));
-	}
-	BENCH_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-	BENCH_RUN("pp_add_k54_projc") {
-		fp9_rand(qx);
-		fp9_rand(qy);
-		fp9_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_add_k54_projc(e, qx, qy, qz, qx, qy, p));
-	}
-	BENCH_END;
-#endif
-
-	BENCH_RUN("pp_dbl_k54") {
-		fp9_rand(qx);
-		fp9_rand(qy);
-		fp9_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_dbl_k54(e, qx, qy, qz, p));
-	}
-	BENCH_END;
-
-	#if EP_ADD == BASIC || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k54_basic") {
-			fp9_rand(qx);
-			fp9_rand(qy);
-			ep_rand(p);
-			BENCH_ADD(pp_dbl_k54_basic(e, qx, qy, p));
-		}
-		BENCH_END;
-	#endif
-
-	#if EP_ADD == PROJC || !defined(STRIP)
-		BENCH_RUN("pp_dbl_k54_projc") {
-			fp9_rand(qx);
-			fp9_rand(qy);
-			fp9_rand(qz);
-			ep_rand(p);
-			BENCH_ADD(pp_dbl_k54_projc(e, qx, qy, qz, p));
-		}
-		BENCH_END;
-	#endif
-
-	BENCH_RUN("pp_exp_k54") {
-		fp54_rand(e);
-		BENCH_ADD(pp_exp_k54(e, e));
-	}
-	BENCH_END;
-
-	BENCH_RUN("pp_map_k54") {
-		fp9_rand(qx);
-		fp9_rand(qy);
-		fp9_rand(qz);
-		ep_rand(p);
-		BENCH_ADD(pp_map_k54(e, p, qx, qy));
-	}
-	BENCH_END;
-
-	ep_free(p);
-	fp9_free(qx);
-	fp9_free(qy);
-	fp9_free(qz);
-	fp54_free(e);
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Benchmarks for the PP module:", 0);
-
-	if (ep_param_set_any_pairf() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	ep_param_print();
-	util_banner("Arithmetic:", 1);
-
-	if (ep_param_embed() == 2) {
-		pairing2();
-	}
-
-	if (ep_param_embed() == 8) {
-		pairing8();
-	}
-
-	if (ep_param_embed() == 12) {
-		pairing12();
-	}
-
-	if (ep_param_embed() == 48) {
-		pairing48();
-	}
-
-	if (ep_param_embed() == 54) {
-		pairing54();
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/bench/bench_rand.c b/src/dashbls/depends/relic/bench/bench_rand.c
deleted file mode 100644
index 4fd7625371ca..000000000000
--- a/src/dashbls/depends/relic/bench/bench_rand.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for random number generation.
- *
- * @ingroup rand
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-#if RAND == CALL
-
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static void test_bytes(uint8_t *buf, int size, void *args) {
-	int c, l, fd = *(int *)args;
-
-	if (fd == -1) {
-		RLC_THROW(ERR_NO_FILE);
-	}
-
-	l = 0;
-	do {
-		c = read(fd, buf + l, size - l);
-		l += c;
-		if (c == -1) {
-			RLC_THROW(ERR_NO_READ);
-		}
-	} while (l < size);
-}
-
-static void rng(void) {
-	uint8_t buffer[64];
-	int fd = open("/dev/urandom", O_RDONLY);
-
-	BENCH_RUN("rand_seed") {
-		rand_bytes(buffer, k);
-		BENCH_ADD(rand_seed(&test_bytes, (void *)&fd));
-	} BENCH_END;
-
-	for (int k = 1; k <= sizeof(buffer); k *= 2) {
-		BENCH_RUN("rand_bytes (from 1 to 256)") {
-			BENCH_ADD(rand_bytes(buffer, k));
-		} BENCH_END;
-	}
-
-	close(fd);
-}
-
-#else
-
-static void rng(void) {
-	uint8_t buffer[256];
-
-	BENCH_RUN("rand_seed (20)") {
-		rand_bytes(buffer, 20);
-		BENCH_ADD(rand_seed(buffer, 20));
-	} BENCH_END;
-
-	for (int k = 1; k <= sizeof(buffer); k *= 2) {
-		BENCH_RUN("rand_bytes (from 1 to 256)") {
-			BENCH_ADD(rand_bytes(buffer, k));
-		} BENCH_END;
-	}
-}
-
-#endif
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-	util_banner("Benchmarks for the RAND module:", 0);
-	util_banner("Utilities:\n", 0);
-	rng();
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/cmake/arch.cmake b/src/dashbls/depends/relic/cmake/arch.cmake
deleted file mode 100644
index 0b9df7e280a9..000000000000
--- a/src/dashbls/depends/relic/cmake/arch.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-message(STATUS "Available architectures (default = X64):\n")
-
-message("   ARCH=          No specific architecture (disable some features).")
-message("   ARCH=AVR       Atmel AVR ATMega128 8-bit architecture.")
-message("   ARCH=MSP       TI MSP430 16-bit architecture.")
-message("   ARCH=ARM       ARM 32-bit architecture.")
-message("   ARCH=X86       Intel x86-compatible 32-bit architecture.")
-message("   ARCH=X64       AMD x86_64-compatible 64-bit architecture.\n")
-
-message(STATUS "Available word sizes (default = 64):\n")
-
-message("   WSIZE=8        Build a 8-bit library.")
-message("   WSIZE=16       Build a 16-bit library.")
-message("   WSIZE=32       Build a 32-bit library.")
-message("   WSIZE=64       Build a 64-bit library.\n")
-
-message(STATUS "Byte boundary to align digit vectors (default = 1):\n")
-
-message("   ALIGN=1        Do not align digit vectors.")
-message("   ALIGN=2        Align digit vectors into 16-bit boundaries.")
-message("   ALIGN=8        Align digit vectors into 64-bit boundaries.")
-message("   ALIGN=16       Align digit vectors into 128-bit boundaries.\n")
-
-# Architecture and memory layout.
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
-	set(ARCH "X86" CACHE STRING "Architecture")
-endif()
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
-	set(ARCH "X64" CACHE STRING "Architecture")
-endif()
-
-if(WORD AND NOT WSIZE)
-	message(FATAL_ERROR "WORD has been replaced with WSIZE. Please update your configuration")
-endif()
-
-if(NOT WSIZE)
-	if(ARCH STREQUAL X86)
-		set(AFLAGS "-m32")
-		set(WSIZE 32)
-	endif()
-	if(ARCH STREQUAL X64)
-		set(AFLAGS "-m64")
-		set(WSIZE 64)
-	endif()
-endif()
-
-set(WSIZE ${WSIZE} CACHE STRING "Processor word size")
-
-if(NOT ALIGN)
-	set(ALIGN 1)
-endif(NOT ALIGN)
-set(ALIGN ${ALIGN} CACHE STRING "Boundary to align digit vectors")
diff --git a/src/dashbls/depends/relic/cmake/bn.cmake b/src/dashbls/depends/relic/cmake/bn.cmake
deleted file mode 100644
index 793027ac447d..000000000000
--- a/src/dashbls/depends/relic/cmake/bn.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-message(STATUS "Multiple precision arithmetic configuration (BN module):\n")
-
-message("   ** Options for the multiple precision module (default = 1024,DOUBLE,0):\n")
-
-message("      BN_PRECI=n        The base precision in bits. Let w be n in words.")
-message("      BN_MAGNI=DOUBLE   A multiple precision integer can store 2w words.")
-message("      BN_MAGNI=CARRY    A multiple precision integer can store w+1 words.")
-message("      BN_MAGNI=SINGLE   A multiple precision integer can store w words.")
-message("      BN_KARAT=n        The number of Karatsuba steps.\n")
-
-message("   ** Available multiple precision arithmetic methods (default = COMBA;COMBA;MONTY;SLIDE;BASIC;BASIC):\n")
-
-message("      Integer multiplication:")
-message("      BN_METHD=BASIC    Schoolbook multiplication.")
-message("      BN_METHD=COMBA    Comba multiplication.\n")
-
-message("      Integer squaring:")
-message("      BN_METHD=BASIC    Schoolbook squaring.")
-message("      BN_METHD=COMBA    Comba squaring.")
-message("      BN_METHD=MULTP    Reuse multiplication for squaring.\n")
-
-message("      Modular reduction:")
-message("      BN_METHD=BASIC    Division-based modular reduction.")
-message("      BN_METHD=BARRT    Barrett modular reduction.")
-message("      BN_METHD=MONTY    Montgomery modular reduction.")
-message("      BN_METHD=RADIX    Diminished radix modular reduction.\n")
-
-message("      Modular exponentiation:")
-message("      BN_METHD=BASIC    Binary modular exponentiation.")
-message("      BN_METHD=MONTY    Montgomery powering ladder.")
-message("      BN_METHD=SLIDE    Sliding window modular exponentiation.\n")
-
-message("      Greatest Common Divisor:")
-message("      BN_METHD=BASIC    Euclid's standard GCD algorithm.")
-message("      BN_METHD=LEHME    Lehmer's fast GCD algorithm.")
-message("      BN_METHD=STEIN    Stein's binary GCD algorithm.\n")
-
-message("      Prime generation:")
-message("      BN_METHD=BASIC    Basic prime generation.")
-message("      BN_METHD=SAFEP    Safe prime generation.")
-message("      BN_METHD=STRON    Strong prime generation.\n")
-
-# Choose the arithmetic precision.
-if (NOT BN_PRECI)
-	set(BN_PRECI 1024)
-endif(NOT BN_PRECI)
-set(BN_PRECI ${BN_PRECI} CACHE STRING "Arithmetic precision in bits")
-
-# Fix the number of Karatsuba instances
-if (NOT BN_KARAT)
-	set(BN_KARAT 0)
-endif(NOT BN_KARAT)
-set(BN_KARAT ${BN_KARAT} CACHE STRING "Number of Karatsuba levels.")
-
-if (NOT BN_MAGNI)
-	set(BN_MAGNI "DOUBLE")
-endif(NOT BN_MAGNI)
-set(BN_MAGNI ${BN_MAGNI} CACHE STRING "Effective size in words")
-
-# Choose the arithmetic methods.
-if (NOT BN_METHD)
-	set(BN_METHD "COMBA;COMBA;MONTY;SLIDE;BASIC;BASIC")
-endif(NOT BN_METHD)
-list(LENGTH BN_METHD BN_LEN)
-if (BN_LEN LESS 6)
-	message(FATAL_ERROR "Incomplete BN_METHD specification: ${BN_METHD}")
-endif(BN_LEN LESS 6)
-
-list(GET BN_METHD 0 BN_MUL)
-list(GET BN_METHD 1 BN_SQR)
-list(GET BN_METHD 2 BN_MOD)
-list(GET BN_METHD 3 BN_MXP)
-list(GET BN_METHD 4 BN_GCD)
-list(GET BN_METHD 5 BN_GEN)
-set(BN_METHD ${BN_METHD} CACHE STRING "Method for multiple precision arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/cp.cmake b/src/dashbls/depends/relic/cmake/cp.cmake
deleted file mode 100644
index a665f680096d..000000000000
--- a/src/dashbls/depends/relic/cmake/cp.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-message(STATUS "Cryptographic protocols configuration (CP module):\n")
-
-message("   ** Options for the cryptographic protocols module (default = on, PKCS2):\n")
-
-message("      CP_CRT=[off|on] Support for faster CRT-based exponentiation in factoring-based cryptosystems.\n")
-
-message("      CP_RSAPD=BASIC    RSA with basic padding.")
-message("      CP_RSAPD=PKCS1    RSA with PKCS#1 v1.5 padding.")
-message("      CP_RSAPD=PKCS2    RSA with PKCS#1 v2.1 padding.\n")
-
-if (NOT CP_RSAPD)
-	set(CP_RSAPD "PKCS2")
-endif(NOT CP_RSAPD)
-set(CP_RSAPD ${CP_RSAPD} CACHE STRING "RSA padding")
-
-option(CP_CRT "Support for faster CRT-based exponentiation in factoring-based cryptosystems." on)
diff --git a/src/dashbls/depends/relic/cmake/doxygen.cmake b/src/dashbls/depends/relic/cmake/doxygen.cmake
deleted file mode 100644
index f940bdeadb40..000000000000
--- a/src/dashbls/depends/relic/cmake/doxygen.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# Helper macro to add a "doc" target with CMake build system.
-# and configure doxy.config.in to doxy.config
-#
-# Please note, that the tools, e.g.:
-# doxygen, dot, latex, dvips, makeindex, gswin32, etc.
-# must be in path.
-#
-# adapted from work of Jan Woetzel 2004-2006
-# www.mip.informatik.uni-kiel.de/~jw
-
-find_package(Doxygen)
-
-if (DOXYGEN_FOUND)
-  if (OPSYS STREQUAL "MACOSX")
-    set(GENERATE_DOCSET "YES")
-  else (OPSYS STREQUAL "MACOSX")
-    set(GENERATE_DOCSET "NO")
-  endif (OPSYS STREQUAL "MACOSX")
-	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen.in")
-		message(STATUS "Configured ${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen.in")
-		configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen.in
-			${CMAKE_CURRENT_BINARY_DIR}/doc/relic.doxygen @ONLY )
-		# use config from BUILD tree
-		set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doc/relic.doxygen")
-	else (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen.in")
-		# use config from SOURCE tree
-		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen")
-			message(STATUS "Using existing ${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen")
-			set(DOXY_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen")
-		else (exists "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen")
-			# failed completely...
-			message(SEND_ERROR "Please create ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in (or doxy.config as fallback)")
-		endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen")
-
-	endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/relic.doxygen.in")
-
-	add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
-
-endif(DOXYGEN_FOUND)
diff --git a/src/dashbls/depends/relic/cmake/eb.cmake b/src/dashbls/depends/relic/cmake/eb.cmake
deleted file mode 100644
index 70c543c1409e..000000000000
--- a/src/dashbls/depends/relic/cmake/eb.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-message(STATUS "Binary elliptic curve arithmetic configuration (EB module):\n")
-
-message("   ** Options for the binary elliptic curve module (default = on, w = 4):\n")
-
-message("      EB_PLAIN=[off|on] Support for ordinary curves without endomorphisms.")
-message("      EB_KBLTZ=[off|on] Support for Koblitz anomalous binary curves.")
-message("      EB_MIXED=[off|on] Use mixed coordinates.")
-message("      EB_PRECO=[off|on] Build precomputation table for generator.")
-message("      EB_DEPTH=w        Width w in [2,8] of precomputation table for fixed point methods.")
-message("      EB_WIDTH=w        Width w in [2,6] of window processing for unknown point methods.\n")
-
-message("   ** Available binary elliptic curve methods (default = PROJC;LWNAF;COMBS;INTER):\n")
-
-message("      Point representation:")
-message("      EB_METHD=BASIC    Affine coordinates.")
-message("      EB_METHD=PROJC    Projective coordinates (L�pez-Dahab for ordinary curves).\n")
-
-message("      Variable-base scalar multiplication:")
-message("      EB_METHD=BASIC    Binary double-and-add method.")
-message("      EB_METHD=LODAH    Lopez-Dahab constant-time point multiplication.")
-message("      EB_METHD=LWNAF    Left-to-right window (T)NAF method.")
-message("      EB_METHD=RWNAF    Right-to-left window (T)NAF method.")
-message("      EB_METHD=HALVE    Halving method.\n")
-
-message("      Fixed-base scalar multiplication:")
-message("      EB_METHD=BASIC    Binary method for fixed point multiplication.")
-message("      EB_METHD=COMBS    Single-table Comb method for fixed point multiplication.")
-message("      EB_METHD=COMBD    Double-table Comb method for fixed point multiplication.")
-message("      EB_METHD=LWNAF    Left-to-right window (T)NAF method.\n")
-
-message("      Variable-base simultaneous scalar multiplication:")
-message("      EB_METHD=BASIC    Multiplication-and-addition simultaneous multiplication.")
-message("      EB_METHD=TRICK    Shamir's trick for simultaneous multiplication.")
-message("      EB_METHD=INTER    Interleaving of window (T)NAFs.")
-message("      EB_METHD=JOINT    Joint sparse form.\n")
-
-if (NOT EB_DEPTH)
-	set(EB_DEPTH 4)
-endif(NOT EB_DEPTH)
-if (NOT EB_WIDTH)
-	set(EB_WIDTH 4)
-endif(NOT EB_WIDTH)
-set(EB_DEPTH "${EB_DEPTH}" CACHE STRING "Width of precomputation table for fixed point methods.")
-set(EB_WIDTH "${EB_WIDTH}" CACHE STRING "Width of window processing for unknown point methods.")
-
-option(EB_PLAIN "Support for ordinary curves without endomorphisms" on)
-option(EB_KBLTZ "Support for Koblitz anomalous binary curves" on)
-option(EB_MIXED "Use mixed coordinates" on)
-option(EB_PRECO "Build precomputation table for generator" on)
-
-# Choose the arithmetic methods.
-if (NOT EB_METHD)
-	set(EB_METHD "PROJC;LWNAF;COMBS;INTER")
-endif(NOT EB_METHD)
-list(LENGTH EB_METHD EB_LEN)
-if (EB_LEN LESS 4)
-	message(FATAL_ERROR "Incomplete EB_METHD specification: ${EB_METHD}")
-endif(EB_LEN LESS 4)
-
-list(GET EB_METHD 0 EB_ADD)
-list(GET EB_METHD 1 EB_MUL)
-list(GET EB_METHD 2 EB_FIX)
-list(GET EB_METHD 3 EB_SIM)
-set(EB_METHD ${EB_METHD} CACHE STRING "Method for binary elliptic curve arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/ec.cmake b/src/dashbls/depends/relic/cmake/ec.cmake
deleted file mode 100644
index 9e9035478da0..000000000000
--- a/src/dashbls/depends/relic/cmake/ec.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-message(STATUS "Elliptic curve cryptography configuration (EC module):\n")
-
-message("   ** Options for the binary elliptic curve module (default = on):\n")
-message("      EC_ENDOM=[off|on] Prefer (prime or binary) curves with endomorphisms.\n")
-
-message("   ** Available elliptic curve methods (default = PRIME):\n")
-message("      EC_METHD=PRIME    Use prime curves.")
-message("      EC_METHD=CHAR2    Use binary curves.")
-message("      EC_METHD=EDDIE    Use prime Edwards curves.\n")
-
-option(EC_ENDOM "Prefer (prime or binary) curves with endomorphisms" off)
-
-# Choose the arithmetic methods.
-if (NOT EC_METHD)
-	set(EC_METHD "PRIME")
-endif(NOT EC_METHD)
-list(LENGTH EC_METHD EC_LEN)
-if (EC_LEN LESS 1)
-	message(FATAL_ERROR "Incomplete EC_METHD specification: ${EC_METHD}")
-endif(EC_LEN LESS 1)
-
-list(GET EC_METHD 0 EC_CUR)
-set(EC_METHD ${EC_METHD} CACHE STRING "Method for Elliptic Curve Cryptography.")
diff --git a/src/dashbls/depends/relic/cmake/ed.cmake b/src/dashbls/depends/relic/cmake/ed.cmake
deleted file mode 100644
index fb22da2a844c..000000000000
--- a/src/dashbls/depends/relic/cmake/ed.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-message(STATUS "Elliptic Edwards curve over prime fields arithmetic configuration (ED module):\n")
-
-message("   ** Options for the prime elliptic Edwards curve module (default = all on):")
-message("      ED_PRECO=[off|on] Build precomputation table for generator.")
-message("      ED_DEPTH=w        Width w in [2,6] of precomputation table for fixed point methods.")
-message("      ED_WIDTH=w        Width w in [2,6] of window processing for unknown point methods.\n")
-
-message("   ** Available prime elliptic Edwards curve methods (default = PROJC;LWNAF;COMBS;INTER):")
-message("      ED_METHD=BASIC    Affine coordinates.")
-message("      EP_METHD=PROJC  	 Simple projective twisted Edwards coordinates.")
-message("      EP_METHD=EXTND 	 Extended projective twisted Edwards coordinates.\n")
-
-message("      *** variable-base multiplication method ***")
-message("      ED_METHD=BASIC    Binary method.")
-message("      ED_METHD=SLIDE    Sliding window method.")
-message("      ED_METHD=MONTY    Montgomery ladder method.")
-message("      ED_METHD=LWNAF    Left-to-right window NAF method.")
-message("      EP_METHD=LWREG    Left-to-right regular recoding method (GLV for curves with endomorphisms).\n")
-
-message("      *** fixed-base multiplication method ***")
-message("      ED_METHD=BASIC    Binary method for fixed point multiplication.")
-message("      ED_METHD=COMBS    Single-table Comb method for fixed point multiplication.")
-message("      ED_METHD=COMBD    Double-table Comb method for fixed point multiplication.")
-message("      ED_METHD=LWNAF    Left-to-right window NAF method.\n")
-
-message("      *** variable-base simultaneous multiplication method ***")
-message("      ED_METHD=BASIC    Multiplication-and-addition simultaneous multiplication.")
-message("      ED_METHD=TRICK    Shamir's trick for simultaneous multiplication.")
-message("      ED_METHD=INTER    Interleaving of window NAFs (GLV for Koblitz curves).")
-message("      ED_METHD=JOINT    Joint sparse form.\n")
-
-message("      Note: these methods must be given in order. Ex: ED_METHD=\"EXTND;LWNAF;COMBD;TRICK\"\n")
-
-if (NOT ED_DEPTH)
-	set(ED_DEPTH 4)
-endif(NOT ED_DEPTH)
-if (NOT ED_WIDTH)
-	set(ED_WIDTH 4)
-endif(NOT ED_WIDTH)
-set(ED_DEPTH "${ED_DEPTH}" CACHE STRING "Width of precomputation table for fixed point methods.")
-set(ED_WIDTH "${ED_WIDTH}" CACHE STRING "Width of window processing for unknown point methods.")
-
-option(ED_PRECO "Build precomputation table for generator" on)
-
-# Choose the arithmetic methods.
-if (NOT ED_METHD)
-	set(ED_METHD "PROJC;LWNAF;COMBS;INTER")
-endif(NOT ED_METHD)
-list(LENGTH ED_METHD ED_LEN)
-if (ED_LEN LESS 4)
-	message(FATAL_ERROR "Incomplete ED_METHD specification: ${ED_METHD}")
-endif(ED_LEN LESS 4)
-
-list(GET ED_METHD 0 ED_ADD)
-list(GET ED_METHD 1 ED_MUL)
-list(GET ED_METHD 2 ED_FIX)
-list(GET ED_METHD 3 ED_SIM)
-set(ED_METHD ${ED_METHD} CACHE STRING "Method for prime elliptic Edwards curve arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/ep.cmake b/src/dashbls/depends/relic/cmake/ep.cmake
deleted file mode 100644
index ec7670804a4f..000000000000
--- a/src/dashbls/depends/relic/cmake/ep.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-message(STATUS "Prime elliptic curve arithmetic configuration (EP module):\n")
-
-message("   ** Options for the prime elliptic curve module (default = all on):\n")
-
-message("      EP_PLAIN=[off|on] Support for ordinary curves without endomorphisms.")
-message("      EP_SUPER=[off|on] Support for supersingular curves.")
-message("      EP_ENDOM=[off|on] Support for ordinary curves with endomorphisms.")
-message("      EP_MIXED=[off|on] Use mixed coordinates.")
-message("      EP_CTMAP=[off|on] Use contant-time SSWU and isogeny map for hashing.\n")
-
-message("      EP_PRECO=[off|on] Build precomputation table for generator.")
-message("      EP_DEPTH=w        Width w in [2,8] of precomputation table for fixed point methods.")
-message("      EP_WIDTH=w        Width w in [2,6] of window processing for unknown point methods.\n")
-
-message("   ** Available prime elliptic curve methods (default = PROJC;LWNAF;COMBS;INTER):\n")
-
-message("      Point representation:")
-message("      EP_METHD=BASIC    Affine coordinates.")
-message("      EP_METHD=PROJC    Homogeneous projective coordinates (complete formula).")
-message("      EP_METHD=JACOB    Jacobian projective coordinates.\n")
-
-message("      Variable-base scalar multiplication:")
-message("      EP_METHD=BASIC    Binary method.")
-message("      EP_METHD=LWNAF    Left-to-right window NAF method (GLV for Koblitz curves).\n")
-
-message("      Fixed-base scalar multiplication:")
-message("      EP_METHD=BASIC    Binary method for fixed point multiplication.")
-message("      EP_METHD=COMBS    Single-table Comb method for fixed point multiplication.")
-message("      EP_METHD=COMBD    Double-table Comb method for fixed point multiplication.")
-message("      EP_METHD=LWNAF    Left-to-right window NAF method (GLV for curves with endomorphisms).")
-message("      EP_METHD=LWREG    Left-to-right regular recoding method (GLV for curves with endomorphisms).\n")
-
-message("      Variable-base simultaneous scalar multiplication:")
-message("      EP_METHD=BASIC    Multiplication-and-addition simultaneous multiplication.")
-message("      EP_METHD=TRICK    Shamir's trick for simultaneous multiplication.")
-message("      EP_METHD=INTER    Interleaving of window NAFs (GLV for Koblitz curves).")
-message("      EP_METHD=JOINT    Joint sparse form.\n")
-
-if (NOT EP_DEPTH)
-	set(EP_DEPTH 4)
-endif(NOT EP_DEPTH)
-if (NOT EP_WIDTH)
-	set(EP_WIDTH 4)
-endif(NOT EP_WIDTH)
-set(EP_DEPTH "${EP_DEPTH}" CACHE STRING "Width of precomputation table for fixed point methods.")
-set(EP_WIDTH "${EP_WIDTH}" CACHE STRING "Width of window processing for unknown point methods.")
-
-option(EP_PLAIN "Support for ordinary curves without endomorphisms" on)
-option(EP_SUPER "Support for supersingular curves" on)
-option(EP_MIXED "Use mixed coordinates" on)
-option(EP_ENDOM "Support for ordinary curves with endomorphisms" on)
-option(EP_PRECO "Build precomputation table for generator" on)
-option(EP_CTMAP "Use contant-time SSWU and isogeny map for hashing" on)
-
-# Choose the arithmetic methods.
-if (NOT EP_METHD)
-	set(EP_METHD "PROJC;LWNAF;COMBS;INTER")
-endif(NOT EP_METHD)
-list(LENGTH EP_METHD EP_LEN)
-if (EP_LEN LESS 4)
-	message(FATAL_ERROR "Incomplete EP_METHD specification: ${EP_METHD}")
-endif(EP_LEN LESS 4)
-
-list(GET EP_METHD 0 EP_ADD)
-list(GET EP_METHD 1 EP_MUL)
-list(GET EP_METHD 2 EP_FIX)
-list(GET EP_METHD 3 EP_SIM)
-set(EP_METHD ${EP_METHD} CACHE STRING "Method for prime elliptic curve arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/err.cmake b/src/dashbls/depends/relic/cmake/err.cmake
deleted file mode 100644
index 725be3334776..000000000000
--- a/src/dashbls/depends/relic/cmake/err.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-include(CheckFunctionExists)
-include(CheckIncludeFiles)
-
-# Test for headers
-check_include_files(execinfo.h HAVE_EXECINFO_H)
-
-# Test for functions
-check_function_exists(backtrace HAVE_BACKTRACE)
-check_function_exists(backtrace_symbols HAVE_BACKTRACE_SYMBOLS)
diff --git a/src/dashbls/depends/relic/cmake/fb.cmake b/src/dashbls/depends/relic/cmake/fb.cmake
deleted file mode 100644
index a29536eadc19..000000000000
--- a/src/dashbls/depends/relic/cmake/fb.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-message(STATUS "Binary field arithmetic configuration (FB module):\n")
-
-message("   ** Options for the binary elliptic curve module (default = 283,0,on,on,on):\n")
-
-message("      FB_POLYN=n        The irreducible polynomial size in bits.")
-message("      FB_KARAT=n        The number of Karatsuba levels.")
-message("      FB_TRINO=[off|on] Prefer trinomials.")
-message("      FB_SQRTF=[off|on] Prefer square-root friendly polynomials.")
-message("      FB_PRECO=[off|on] Precompute multiplication table for sqrt(z).")
-message("      FB_WIDTH=w        Width w in [2,6] of window processing for exponentiation methods.\n")
-
-message("   ** Available binary field arithmetic methods (default = LODAH;QUICK;QUICK;BASIC;QUICK;QUICK;EXGCD;SLIDE;QUICK):\n")
-
-message("      Field multiplication:")
-message("      FB_METHD=BASIC    Right-to-left shift-and-add multiplication.")
-message("      FB_METHD=INTEG    Integrated modular multiplication.")
-message("      FB_METHD=LODAH    L�pez-Dahab comb multiplication with window of width 4.\n")
-
-message("      Field squaring:")
-message("      FB_METHD=BASIC    Bit manipulation squaring.")
-message("      FB_METHD=INTEG    Integrated modular squaring.")
-message("      FB_METHD=QUICK    Table-based squaring.\n")
-
-message("      Modular reduction:")
-message("      FB_METHD=BASIC    Shift-and-add modular reduction.")
-message("      FB_METHD=QUICK    Fast reduction modulo a trinomial or pentanomial.\n")
-
-message("      Field square root:")
-message("      FB_METHD=BASIC    Square root by repeated squaring.")
-message("      FB_METHD=QUICK    Fast square root extraction.\n")
-
-message("      Trace computation:")
-message("      FB_METHD=BASIC    Trace computation by repeated squaring.")
-message("      FB_METHD=QUICK    Fast trace computation.\n")
-
-message("      Quadratic equation solver:")
-message("      FB_METHD=BASIC    Solve a quadratic equation by half-trace computation.")
-message("      FB_METHD=QUICK    Fast solving with precomputed half-traces.\n")
-
-message("      Field inversion:")
-message("      FB_METHD=BASIC    Inversion by Fermat's Little Theorem.")
-message("      FB_METHD=BINAR    Binary Inversion algorithm.")
-message("      FB_METHD=ALMOS    Inversion by the Amost inverse algorithm.")
-message("      FB_METHD=EXGCD    Inversion by the Extended Euclidean algorithm.")
-message("      FB_METHD=ITOHT    Inversion by Itoh-Tsuji.")
-message("      FB_METHD=CTAIA    Constant-time almost inversion algorithm.")
-message("      FB_METHD=BRUCH    Hardware-friendly inversion by Brunner et al.")
-message("      FB_METHD=LOWER    Pass inversion to the lower level.\n")
-
-message("      Field exponentiation:")
-message("      FB_METHD=BASIC    Binary exponentiation.")
-message("      FB_METHD=SLIDE    Sliding window exponentiation.")
-message("      FB_METHD=MONTY    Constant-time Montgomery powering ladder.\n")
-
-message("      Iterated squaring/square-root:")
-message("      FB_METHD=BASIC    Iterated squaring/square-root by consecutive squaring/square-root.")
-message("      FB_METHD=QUICK    Iterated squaring/square-root by table-based method.\n")
-
-# Choose the polynomial size.
-if (NOT FB_POLYN)
-	set(FB_POLYN 283)
-endif(NOT FB_POLYN)
-set(FB_POLYN ${FB_POLYN} CACHE STRING "Irreducible polynomial size in bits.")
-
-# Fix the number of Karatsuba instances
-if (NOT FB_KARAT)
-	set(FB_KARAT 0)
-endif(NOT FB_KARAT)
-set(FB_KARAT ${FB_KARAT} CACHE STRING "Number of Karatsuba levels.")
-
-if (NOT FB_WIDTH)
-	set(FB_WIDTH 4)
-endif(NOT FB_WIDTH)
-set(FB_WIDTH ${FB_WIDTH} CACHE STRING "Width of window processing for exponentiation methods.")
-
-option(FB_TRINO "Prefer trinomials." on)
-option(FB_SQRTF "Prefer square-root friendly polynomials." off)
-option(FB_PRECO "Precompute multiplication table for sqrt(z)." on)
-
-# Choose the arithmetic methods.
-if (NOT FB_METHD)
-	set(FB_METHD "LODAH;QUICK;QUICK;QUICK;QUICK;QUICK;EXGCD;SLIDE;QUICK")
-endif(NOT FB_METHD)
-list(LENGTH FB_METHD FB_LEN)
-if (FB_LEN LESS 9)
-	message(FATAL_ERROR "Incomplete FB_METHD specification: ${FB_METHD}")
-endif(FB_LEN LESS 9)
-
-list(GET FB_METHD 0 FB_MUL)
-list(GET FB_METHD 1 FB_SQR)
-list(GET FB_METHD 2 FB_RDC)
-list(GET FB_METHD 3 FB_SRT)
-list(GET FB_METHD 4 FB_TRC)
-list(GET FB_METHD 5 FB_SLV)
-list(GET FB_METHD 6 FB_INV)
-list(GET FB_METHD 7 FB_EXP)
-list(GET FB_METHD 8 FB_ITR)
-
-set(FB_METHD ${FB_METHD} CACHE STRING "Method for binary field arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/fiat.cmake b/src/dashbls/depends/relic/cmake/fiat.cmake
deleted file mode 100644
index b0f45adcb49a..000000000000
--- a/src/dashbls/depends/relic/cmake/fiat.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-set(TEST_FP "${CMAKE_BINARY_DIR}/bin/test_fp")
-set(FIAT_TXT "${CMAKE_BINARY_DIR}/test_fp.txt")
-set(FIAT_LOW "${CMAKE_SOURCE_DIR}/src/low/fiat/")
-set(FIAT_FP "${FIAT_LOW}/fiat_fp.c")
-set(MONT "src/ExtractionOCaml/word_by_word_montgomery")
-
-message(STATUS "Running test_fp to discover prime modulus.")
-execute_process(COMMAND ${TEST_FP} OUTPUT_FILE ${FIAT_TXT})
-file(READ ${FIAT_TXT} OUTPUT_CONTENT)
-string(REGEX MATCHALL "[(0-9)|(A-F)]+[ \n]" MATCHES ${OUTPUT_CONTENT})
-
-set(LONGEST "0")
-foreach(MATCH ${MATCHES})
-	STRING(STRIP "${MATCH}" MATCH)
-	STRING(LENGTH "${MATCH}" LEN)
-	if (${LEN} GREATER_EQUAL ${LONGEST})
-		set(LONGEST ${LEN})
-	endif()
-endforeach()
-
-math(EXPR WSIZE "4 * ${LONGEST}")
-
-foreach(MATCH ${MATCHES})
-	STRING(STRIP "${MATCH}" MATCH)
-	STRING(LENGTH "${MATCH}" LEN)
-	if (${LEN} EQUAL ${LONGEST})
-		set(PRIME "${PRIME}${MATCH}")
-	endif()
-endforeach()
-
-execute_process(COMMAND $ENV{FIAT_CRYPTO}/${MONT} fp 64 "0x${PRIME}" OUTPUT_FILE ${FIAT_FP})
-
-file(READ ${FIAT_FP} OUTPUT_CONTENT)
-string(REPLACE "void" "static void" OUTPUT_FIXED "${OUTPUT_CONTENT}")
-file(WRITE ${FIAT_FP} "${OUTPUT_FIXED}")
-
-configure_file(${FIAT_LOW}/relic_fp_add_low.tmpl ${FIAT_LOW}/relic_fp_add_low.c COPYONLY)
-configure_file(${FIAT_LOW}/relic_fp_mul_low.tmpl ${FIAT_LOW}/relic_fp_mul_low.c COPYONLY)
-configure_file(${FIAT_LOW}/relic_fp_sqr_low.tmpl ${FIAT_LOW}/relic_fp_sqr_low.c COPYONLY)
diff --git a/src/dashbls/depends/relic/cmake/fp.cmake b/src/dashbls/depends/relic/cmake/fp.cmake
deleted file mode 100644
index 781e9363569b..000000000000
--- a/src/dashbls/depends/relic/cmake/fp.cmake
+++ /dev/null
@@ -1,81 +0,0 @@
-message(STATUS "Prime field arithmetic configuration (FP module):\n")
-
-message("   ** Arithmetic precision of the prime field module (default = 256,0,off,off):\n")
-
-message("      FP_PRIME=n        The prime modulus size in bits.")
-message("      FP_KARAT=n        The number of Karatsuba levels.")
-message("      FP_PMERS=[off|on] Prefer Pseudo-Mersenne primes over random primes.")
-message("      FP_QNRES=[off|on] Use -1 as quadratic non-residue (make sure that p = 3 mod 8).")
-message("      FP_WIDTH=w        Width w in [2,6] of window processing for exponentiation methods.\n")
-
-message("   ** Available prime field arithmetic methods (default = BASIC;COMBA;COMBA;MONTY;MONTY;SLIDE):")
-
-message("      Field addition")
-message("      FP_METHD=BASIC    Schoolbook addition.")
-message("      FP_METHD=INTEG    Integrated modular addition.\n")
-
-message("      Field multiplication")
-message("      FP_METHD=BASIC    Schoolbook multiplication.")
-message("      FP_METHD=INTEG    Integrated modular multiplication.")
-message("      FP_METHD=COMBA    Comba multiplication.\n")
-
-message("      Field squaring")
-message("      FP_METHD=BASIC    Schoolbook squaring.")
-message("      FP_METHD=INTEG    Integrated modular squaring.")
-message("      FP_METHD=COMBA    Comba squaring.")
-message("      FP_METHD=MULTP    Reuse multiplication for squaring.\n")
-
-message("      Modular reduction")
-message("      FP_METHD=BASIC    Division-based reduction.")
-message("      FP_METHD=QUICK    Fast reduction modulo special form prime (2^t - c, c > 0).")
-message("      FP_METHD=MONTY    Montgomery modular reduction.\n")
-
-message("      Field inversion")
-message("      FP_METHD=BASIC    Inversion by Fermat's Little Theorem.")
-message("      FP_METHD=BINAR    Binary Inversion algorithm.")
-message("      FP_METHD=MONTY    Montgomery inversion.")
-message("      FP_METHD=EXGCD    Inversion by the Extended Euclidean algorithm.")
-message("      FP_METHD=DIVST    Constant-time inversion by division steps.")
-message("      FP_METHD=LOWER    Pass inversion to the lower level.\n")
-
-message("      Field exponentiation")
-message("      FP_METHD=BASIC    Binary exponentiation.")
-message("      FP_METHD=SLIDE    Sliding window exponentiation.")
-message("      FP_METHD=MONTY    Constant-time Montgomery powering ladder.\n")
-
-# Choose the prime field size.
-if (NOT FP_PRIME)
-	set(FP_PRIME 256)
-endif(NOT FP_PRIME)
-set(FP_PRIME ${FP_PRIME} CACHE STRING "Prime modulus size")
-
-# Fix the number of Karatsuba instances
-if (NOT FP_KARAT)
-	set(FP_KARAT 0)
-endif(NOT FP_KARAT)
-set(FP_KARAT ${FP_KARAT} CACHE STRING "Number of Karatsuba levels.")
-
-if (NOT FP_WIDTH)
-	set(FP_WIDTH 4)
-endif(NOT FP_WIDTH)
-set(FP_WIDTH ${FP_WIDTH} CACHE STRING "Width of window processing for exponentiation methods.")
-
-option(FP_PMERS "Prefer special form primes over random primes." off)
-option(FP_QNRES "Use -1 as quadratic non-residue." off)
-
-# Choose the arithmetic methods.
-if (NOT FP_METHD)
-	set(FP_METHD "INTEG;INTEG;INTEG;MONTY;MONTY;SLIDE")
-endif(NOT FP_METHD)
-list(LENGTH FP_METHD FP_LEN)
-if (FP_LEN LESS 6)
-	message(FATAL_ERROR "Incomplete FP_METHD specification: ${FP_METHD}")
-endif(FP_LEN LESS 6)
-
-list(GET FP_METHD 0 FP_ADD)
-list(GET FP_METHD 1 FP_MUL)
-list(GET FP_METHD 2 FP_SQR)
-list(GET FP_METHD 3 FP_RDC)
-list(GET FP_METHD 4 FP_INV)
-list(GET FP_METHD 5 FP_EXP)
-set(FP_METHD ${FP_METHD} CACHE STRING "Method for prime field arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/fpx.cmake b/src/dashbls/depends/relic/cmake/fpx.cmake
deleted file mode 100644
index 07e2ad662c61..000000000000
--- a/src/dashbls/depends/relic/cmake/fpx.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-message(STATUS "Prime extension field arithmetic configuration (FPX module):\n")
-
-message("   ** Available bilinear pairing methods (default = BASIC;BASIC;BASIC):")
-
-message("      Quadratic extension arithmetic:")
-message("      FPX_METHD=BASIC    Basic quadratic extension field arithmetic.")
-message("      FPX_METHD=INTEG    Quadratic extension field arithmetic with embedded modular reduction.\n")
-
-message("      Cubic extension arithmetic:")
-message("      FPX_METHD=BASIC    Basic cubic extension field arithmetic.")
-message("      FPX_METHD=INTEG    Cubic extension field arithmetic with embedded modular reduction.\n")
-
-message("      Extension field arithmetic:")
-message("      FPX_METHD=BASIC    Basic extension field arithmetic.")
-message("      FPX_METHD=LAZYR    Lazy-reduced extension field arithmetic.\n")
-
-# Choose the arithmetic methods.
-if (NOT FPX_METHD)
-	set(FPX_METHD "INTEG;INTEG;LAZYR")
-endif(NOT FPX_METHD)
-list(LENGTH FPX_METHD FPX_LEN)
-if (FPX_LEN LESS 3)
-	message(FATAL_ERROR "Incomplete FPX_METHD specification: ${FPX_METHD}")
-endif(FPX_LEN LESS 3)
-
-list(GET FPX_METHD 0 FPX_QDR)
-list(GET FPX_METHD 1 FPX_CBC)
-list(GET FPX_METHD 2 FPX_RDC)
-set(FPX_METHD ${FPX_METHD} CACHE STRING "Method for prime extension field arithmetic.")
diff --git a/src/dashbls/depends/relic/cmake/gmp.cmake b/src/dashbls/depends/relic/cmake/gmp.cmake
deleted file mode 100644
index abb00c44c2ea..000000000000
--- a/src/dashbls/depends/relic/cmake/gmp.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-# Copyright (c) 2007, Francesco Biscani, <bluescarni@gmail.com>
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------------------
-
-# Try to find the GMP libraries:
-# GMP_FOUND - System has GMP lib
-# GMP_INCLUDE_DIR - The GMP include directory
-# GMP_LIBRARIES - Libraries needed to use GMP
-
-if (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
-	# Force search at every time, in case configuration changes
-	unset(GMP_INCLUDE_DIR CACHE)
-	unset(GMP_LIBRARIES CACHE)
-endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
-
-find_path(GMP_INCLUDE_DIR NAMES gmp.h)
-if(STBIN)
-	find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib libgmp-10 libgmp gmp)
-else(STBIN)
-	find_library(GMP_LIBRARIES NAMES libgmp.so gmp.lib libgmp-10 libgmp gmp)
-endif(STBIN)
-
-if(GMP_INCLUDE_DIR AND GMP_LIBRARIES)
-   set(GMP_FOUND TRUE)
-endif()
-
-if(GMP_FOUND)
-	message(STATUS "Configured GMP: -I${GMP_INCLUDE_DIR} -L${GMP_LIBRARIES}")
-else(GMP_FOUND)
-	message(STATUS "Could NOT find GMP")
-endif(GMP_FOUND)
-
-mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARIES)
diff --git a/src/dashbls/depends/relic/cmake/ios.cmake b/src/dashbls/depends/relic/cmake/ios.cmake
deleted file mode 100644
index 68f13b4db2c3..000000000000
--- a/src/dashbls/depends/relic/cmake/ios.cmake
+++ /dev/null
@@ -1,443 +0,0 @@
-# https://github.com/leetal/ios-cmake
-#
-# This file is part of the ios-cmake project. It was retrieved from
-# https://github.com/cristeab/ios-cmake.git, which is a fork of
-# https://code.google.com/p/ios-cmake/. Which in turn is based off of
-# the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which
-# are included with CMake 2.8.4
-#
-# The ios-cmake project is licensed under the new BSD license.
-#
-# Copyright (c) 2014, Bogdan Cristea and LTE Engineering Software,
-# Kitware, Inc., Insight Software Consortium.  All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# This file is based off of the Platform/Darwin.cmake and
-# Platform/UnixPaths.cmake files which are included with CMake 2.8.4
-# It has been altered for iOS development.
-#
-# Updated by Alex Stewart (alexs.mac@gmail.com)
-#
-# *****************************************************************************
-#      Now maintained by Alexander Widerberg (widerbergaren [at] gmail.com)
-#                      under the BSD-3-Clause license
-#                   https://github.com/leetal/ios-cmake
-# *****************************************************************************
-#
-#                           INFORMATION / HELP
-#
-# The following variables control the behaviour of this toolchain:
-#
-# IOS_PLATFORM: OS (default) or SIMULATOR or SIMULATOR64 or TVOS or SIMULATOR_TVOS
-#    OS = Build for iPhoneOS.
-#    SIMULATOR = Build for x86 i386 iPhone Simulator.
-#    SIMULATOR64 = Build for x86_64 iPhone Simulator.
-#    TVOS = Build for AppleTVOS.
-#    SIMULATOR_TVOS = Build for x86_64 AppleTV Simulator.
-# CMAKE_OSX_SYSROOT: Path to the iOS SDK to use.  By default this is
-#    automatically determined from IOS_PLATFORM and xcodebuild, but
-#    can also be manually specified (although this should not be required).
-# CMAKE_IOS_DEVELOPER_ROOT: Path to the Developer directory for the iOS platform
-#    being compiled for.  By default this is automatically determined from
-#    CMAKE_OSX_SYSROOT, but can also be manually specified (although this should
-#    not be required).
-# ENABLE_BITCODE: (1|0) Enables or disables bitcode support. Default 1 (true)
-# ENABLE_ARC: (1|0) Enables or disables ARC support. Default 1 (true, ARC enabled by default)
-# ENABLE_VISIBILITY: (1|0) Enables or disables symbol visibility support. Default 0 (false, visibility hidden by default)
-# IOS_ARCH: (armv7 armv7s arm64 i386 x86_64) If specified, will override the default architectures for the given IOS_PLATFORM
-#    OS = armv7 armv7s arm64
-#    SIMULATOR = i386
-#    SIMULATOR64 = x86_64
-#    TVOS = arm64
-#    SIMULATOR_TVOS = x86_64
-#
-# This toolchain defines the following variables for use externally:
-#
-# XCODE_VERSION: Version number (not including Build version) of Xcode detected.
-# IOS_SDK_VERSION: Version of iOS SDK being used.
-# CMAKE_OSX_ARCHITECTURES: Architectures being compiled for (generated from
-#    IOS_PLATFORM).
-#
-# This toolchain defines the following macros for use externally:
-#
-# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE XCODE_VARIANT)
-#   A convenience macro for setting xcode specific properties on targets.
-#   Available variants are: All, Release, RelWithDebInfo, Debug, MinSizeRel
-#   example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1" "all").
-#
-# find_host_package (PROGRAM ARGS)
-#   A macro used to find executable programs on the host system, not within the
-#   iOS environment.  Thanks to the android-cmake project for providing the
-#   command.
-
-# Fix for PThread library not in path
-set(CMAKE_THREAD_LIBS_INIT "-lpthread")
-set(CMAKE_HAVE_THREADS_LIBRARY 1)
-set(CMAKE_USE_WIN32_THREADS_INIT 0)
-set(CMAKE_USE_PTHREADS_INIT 1)
-
-# Get the Xcode version being used.
-execute_process(COMMAND xcodebuild -version
-  OUTPUT_VARIABLE XCODE_VERSION
-  ERROR_QUIET
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION "${XCODE_VERSION}")
-string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION "${XCODE_VERSION}")
-message(STATUS "Building with Xcode version: ${XCODE_VERSION}")
-# Default to building for iPhoneOS if not specified otherwise, and we cannot
-# determine the platform from the CMAKE_OSX_ARCHITECTURES variable. The use
-# of CMAKE_OSX_ARCHITECTURES is such that try_compile() projects can correctly
-# determine the value of IOS_PLATFORM from the root project, as
-# CMAKE_OSX_ARCHITECTURES is propagated to them by CMake.
-if (NOT DEFINED IOS_PLATFORM)
-  if (CMAKE_OSX_ARCHITECTURES)
-    if (CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*")
-      set(IOS_PLATFORM "OS")
-    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-      set(IOS_PLATFORM "SIMULATOR")
-    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-      set(IOS_PLATFORM "SIMULATOR64")
-    endif()
-  endif()
-  if (NOT IOS_PLATFORM)
-    set(IOS_PLATFORM "OS")
-  endif()
-endif()
-set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING
-  "Type of iOS platform for which to build.")
-# Determine the platform name and architectures for use in xcodebuild commands
-# from the specified IOS_PLATFORM name.
-if (IOS_PLATFORM STREQUAL "OS")
-  set(XCODE_IOS_PLATFORM iphoneos)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH armv7 armv7s arm64)
-  endif()
- elseif (IOS_PLATFORM STREQUAL "OS64")
-  set(XCODE_IOS_PLATFORM iphoneos)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH arm64)
-  endif()
-elseif (IOS_PLATFORM STREQUAL "SIMULATOR")
-  set(XCODE_IOS_PLATFORM iphonesimulator)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH i386)
-  endif()
-elseif(IOS_PLATFORM STREQUAL "SIMULATOR64")
-  set(XCODE_IOS_PLATFORM iphonesimulator)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH x86_64)
-  endif()
-elseif (IOS_PLATFORM STREQUAL "TVOS")
-  set(XCODE_IOS_PLATFORM appletvos)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH arm64)
-  endif()
-elseif (IOS_PLATFORM STREQUAL "SIMULATOR_TVOS")
-  set(XCODE_IOS_PLATFORM appletvsimulator)
-  if(NOT IOS_ARCH)
-    set(IOS_ARCH x86_64)
-  endif()
-else()
-  message(FATAL_ERROR "Invalid IOS_PLATFORM: ${IOS_PLATFORM}")
-endif()
-message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, "
-  "architecture(s): ${IOS_ARCH}")
-# If user did not specify the SDK root to use, then query xcodebuild for it.
-if (NOT CMAKE_OSX_SYSROOT)
-  execute_process(COMMAND xcodebuild -version -sdk ${XCODE_IOS_PLATFORM} Path
-    OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  message(STATUS "Using SDK: ${CMAKE_OSX_SYSROOT} for platform: ${IOS_PLATFORM}")
-endif()
-if (NOT EXISTS ${CMAKE_OSX_SYSROOT})
-  message(SEND_ERROR "Please make sure that Xcode is installed and that the toolchain"
-    "is pointing to the correct path. Please run:"
-    "sudo xcode-select -s /Applications/Xcode.app/Contents/Developer"
-    "and see if that fixes the problem for you.")
-  message(FATAL_ERROR "Invalid CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT} "
-    "does not exist.")
-endif()
-# Specify minimum version of deployment target.
-if (NOT DEFINED IOS_DEPLOYMENT_TARGET)
-  # Unless specified, SDK version 8.0 is used by default as minimum target version.
-  set(IOS_DEPLOYMENT_TARGET "8.0"
-      CACHE STRING "Minimum iOS version to build for." )
-  message(STATUS "Using the default min-version since IOS_DEPLOYMENT_TARGET not provided!")
-endif()
-# Use bitcode or not
-if (NOT DEFINED ENABLE_BITCODE AND NOT IOS_ARCH MATCHES "((^|, )(i386|x86_64))+")
-  # Unless specified, enable bitcode support by default
-  set(ENABLE_BITCODE TRUE CACHE BOOL "Whether or not to enable bitcode")
-  message(STATUS "Enabling bitcode support by default. ENABLE_BITCODE not provided!")
-endif()
-if (NOT DEFINED ENABLE_BITCODE)
-  message(STATUS "Disabling bitcode support by default on simulators. ENABLE_BITCODE not provided for override!")
-endif()
-# Use ARC or not
-if (NOT DEFINED ENABLE_ARC)
-  # Unless specified, enable ARC support by default
-  set(ENABLE_ARC TRUE CACHE BOOL "Whether or not to enable ARC")
-  message(STATUS "Enabling ARC support by default. ENABLE_ARC not provided!")
-endif()
-# Use hidden visibility or not
-if (NOT DEFINED ENABLE_VISIBILITY)
-  # Unless specified, disable symbols visibility by default
-  set(ENABLE_VISIBILITY FALSE CACHE BOOL "Whether or not to hide symbols (-fvisibility=hidden)")
-  message(STATUS "Hiding symbols visibility by default. ENABLE_VISIBILITY not provided!")
-endif()
-# Get the SDK version information.
-execute_process(COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion
-  OUTPUT_VARIABLE IOS_SDK_VERSION
-  ERROR_QUIET
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-# Find the Developer root for the specific iOS platform being compiled for
-# from CMAKE_OSX_SYSROOT.  Should be ../../ from SDK specified in
-# CMAKE_OSX_SYSROOT.  There does not appear to be a direct way to obtain
-# this information from xcrun or xcodebuild.
-if (NOT CMAKE_IOS_DEVELOPER_ROOT)
-  get_filename_component(IOS_PLATFORM_SDK_DIR ${CMAKE_OSX_SYSROOT} PATH)
-  get_filename_component(CMAKE_IOS_DEVELOPER_ROOT ${IOS_PLATFORM_SDK_DIR} PATH)
-endif()
-if (NOT EXISTS ${CMAKE_IOS_DEVELOPER_ROOT})
-  message(FATAL_ERROR "Invalid CMAKE_IOS_DEVELOPER_ROOT: "
-    "${CMAKE_IOS_DEVELOPER_ROOT} does not exist.")
-endif()
-# Find the C & C++ compilers for the specified SDK.
-if (NOT CMAKE_C_COMPILER)
-  execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang
-    OUTPUT_VARIABLE CMAKE_C_COMPILER
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  message(STATUS "Using C compiler: ${CMAKE_C_COMPILER}")
-endif()
-if (NOT CMAKE_CXX_COMPILER)
-  execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang++
-    OUTPUT_VARIABLE CMAKE_CXX_COMPILER
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  message(STATUS "Using CXX compiler: ${CMAKE_CXX_COMPILER}")
-endif()
-# Find (Apple's) libtool.
-execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find libtool
-  OUTPUT_VARIABLE IOS_LIBTOOL
-  ERROR_QUIET
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-message(STATUS "Using libtool: ${IOS_LIBTOOL}")
-# Configure libtool to be used instead of ar + ranlib to build static libraries.
-# This is required on Xcode 7+, but should also work on previous versions of
-# Xcode.
-set(CMAKE_C_CREATE_STATIC_LIBRARY
-  "${IOS_LIBTOOL} -static -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY
-  "${IOS_LIBTOOL} -static -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
-# Get the version of Darwin (OS X) of the host.
-execute_process(COMMAND uname -r
-  OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION
-  ERROR_QUIET
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-# Standard settings.
-set(CMAKE_SYSTEM_NAME Darwin CACHE INTERNAL "")
-set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION} CACHE INTERNAL "")
-set(UNIX TRUE CACHE BOOL "")
-set(APPLE TRUE CACHE BOOL "")
-set(IOS TRUE CACHE BOOL "")
-set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
-set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
-# Force unset of OS X-specific deployment target (otherwise autopopulated),
-# required as of cmake 2.8.10.
-set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING
-  "Must be empty for iOS builds." FORCE)
-# Set the architectures for which to build.
-set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE STRING "Build architecture for iOS")
-# Change the type of target generated for try_compile() so it'll work when cross-compiling
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-# Skip the platform compiler checks for cross compiling.
-set(CMAKE_CXX_COMPILER_FORCED TRUE)
-set(CMAKE_CXX_COMPILER_WORKS TRUE)
-set(CMAKE_C_COMPILER_FORCED TRUE)
-set(CMAKE_C_COMPILER_WORKS TRUE)
-# All iOS/Darwin specific settings - some may be redundant.
-set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
-set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
-set(CMAKE_SHARED_MODULE_PREFIX "lib")
-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
-set(CMAKE_C_COMPILER_ABI ELF)
-set(CMAKE_CXX_COMPILER_ABI ELF)
-set(CMAKE_C_HAS_ISYSROOT 1)
-set(CMAKE_CXX_HAS_ISYSROOT 1)
-set(CMAKE_MODULE_EXISTS 1)
-set(CMAKE_DL_LIBS "")
-set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
-set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
-set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
-set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
-
-if(IOS_ARCH MATCHES "((^|, )(arm64|x86_64))+")
-  set(CMAKE_C_SIZEOF_DATA_PTR 8)
-  set(CMAKE_CXX_SIZEOF_DATA_PTR 8)
-  message(STATUS "Using a data_ptr size of 8")
-else()
-  set(CMAKE_C_SIZEOF_DATA_PTR 4)
-  set(CMAKE_CXX_SIZEOF_DATA_PTR 4)
-  message(STATUS "Using a data_ptr size of 4")
-endif()
-
-message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}"
-               " (SDK version: ${IOS_SDK_VERSION})")
-# Note that only Xcode 7+ supports the newer more specific:
-# -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use:
-# -m(ios/ios-simulator)-version-min instead.
-if (IOS_PLATFORM STREQUAL "OS")
-  if (XCODE_VERSION VERSION_LESS 7.0)
-    set(XCODE_IOS_PLATFORM_VERSION_FLAGS
-      "-mios-version-min=${IOS_DEPLOYMENT_TARGET}")
-  else()
-    # Xcode 7.0+ uses flags we can build directly from XCODE_IOS_PLATFORM.
-    set(XCODE_IOS_PLATFORM_VERSION_FLAGS
-      "-m${XCODE_IOS_PLATFORM}-version-min=${IOS_DEPLOYMENT_TARGET}")
-  endif()
-elseif (IOS_PLATFORM STREQUAL "TVOS")
-  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
-    "-mtvos-version-min=${IOS_DEPLOYMENT_TARGET}")
-elseif (IOS_PLATFORM STREQUAL "SIMULATOR_TVOS")
-  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
-    "-mtvos-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
-else()
-  # SIMULATOR or SIMULATOR64 both use -mios-simulator-version-min.
-  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
-    "-mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
-endif()
-message(STATUS "Version flags set to: ${XCODE_IOS_PLATFORM_VERSION_FLAGS}")
-
-if (ENABLE_BITCODE)
-  set(BITCODE "-fembed-bitcode")
-  set(HEADER_PAD "")
-  message(STATUS "Enabling bitcode support.")
-else()
-  set(BITCODE "")
-  set(HEADER_PAD "-headerpad_max_install_names")
-  message(STATUS "Disabling bitcode support.")
-endif()
-
-if (ENABLE_ARC)
-  set(FOBJC_ARC "-fobjc-arc")
-  message(STATUS "Enabling ARC support.")
-else()
-  set(FOBJC_ARC "-fno-objc-arc")
-  message(STATUS "Disabling ARC support.")
-endif()
-
-if (NOT ENABLE_VISIBILITY)
-  set(VISIBILITY "-fvisibility=hidden")
-  message(STATUS "Hiding symbols (-fvisibility=hidden).")
-else()
-  set(VISIBILITY "")
-endif()
-
-set(CMAKE_C_FLAGS
-"${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fobjc-abi-version=2 ${FOBJC_ARC} ${CMAKE_C_FLAGS}")
-# Hidden visibilty is required for C++ on iOS.
-set(CMAKE_CXX_FLAGS
-"${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} -fvisibility-inlines-hidden -fobjc-abi-version=2 ${FOBJC_ARC} ${CMAKE_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -DNDEBUG -Os -ffast-math ${BITCODE} ${CMAKE_CXX_FLAGS_MINSIZEREL}")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -DNDEBUG -O2 -g -ffast-math ${BITCODE} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -DNDEBUG -O3 -ffast-math ${BITCODE} ${CMAKE_CXX_FLAGS_RELEASE}")
-set(CMAKE_C_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
-set(CMAKE_CXX_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS}  -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
-
-# In order to ensure that the updated compiler flags are used in try_compile()
-# tests, we have to forcibly set them in the CMake cache, not merely set them
-# in the local scope.
-list(APPEND VARS_TO_FORCE_IN_CACHE
-  CMAKE_C_FLAGS
-  CMAKE_CXX_FLAGS
-  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-  CMAKE_CXX_FLAGS_MINSIZEREL
-  CMAKE_CXX_FLAGS_RELEASE
-  CMAKE_C_LINK_FLAGS
-  CMAKE_CXX_LINK_FLAGS)
-foreach(VAR_TO_FORCE ${VARS_TO_FORCE_IN_CACHE})
-  set(${VAR_TO_FORCE} "${${VAR_TO_FORCE}}" CACHE STRING "" FORCE)
-endforeach()
-
-set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
-set (CMAKE_SHARED_LINKER_FLAGS "-rpath @executable_path/Frameworks -rpath @loader_path/Frameworks")
-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib ${HEADER_PAD}")
-set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle ${HEADER_PAD}")
-set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
-set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-
-# Hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old
-# build tree (where install_name_tool was hardcoded) and where
-# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't fail in
-# CMakeFindBinUtils.cmake (because it isn't rerun) hardcode
-# CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did
-# before, Alex.
-if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
-  find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
-endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
-
-# Set the find root to the iOS developer roots and to user defined paths.
-set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_OSX_SYSROOT}
-  ${CMAKE_PREFIX_PATH} CACHE string  "iOS find search path root" FORCE)
-# Default to searching for frameworks first.
-set(CMAKE_FIND_FRAMEWORK FIRST)
-# Set up the default search directories for frameworks.
-set(CMAKE_SYSTEM_FRAMEWORK_PATH
-  ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks
-  ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks
-  ${CMAKE_OSX_SYSROOT}/Developer/Library/Frameworks)
-# Only search the specified iOS SDK, not the remainder of the host filesystem.
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-# This little macro lets you set any XCode specific property.
-macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE XCODE_RELVERSION)
-  set(XCODE_RELVERSION_I "${XCODE_RELVERSION}")
-  if (XCODE_RELVERSION_I STREQUAL "All")
-    set_property(TARGET ${TARGET} PROPERTY
-    XCODE_ATTRIBUTE_${XCODE_PROPERTY} "${XCODE_VALUE}")
-  else()
-    set_property(TARGET ${TARGET} PROPERTY
-    XCODE_ATTRIBUTE_${XCODE_PROPERTY}[variant=${XCODE_RELVERSION_I}] "${XCODE_VALUE}")
-  endif()
-endmacro(set_xcode_property)
-# This macro lets you find executable programs on the host system.
-macro(find_host_package)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
-  set(IOS FALSE)
-  find_package(${ARGN})
-  set(IOS TRUE)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endmacro(find_host_package)
\ No newline at end of file
diff --git a/src/dashbls/depends/relic/cmake/md.cmake b/src/dashbls/depends/relic/cmake/md.cmake
deleted file mode 100644
index 6eb167008929..000000000000
--- a/src/dashbls/depends/relic/cmake/md.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-message(STATUS "Message digest configuration (MD module):\n")
-
-message("   ** Available hash functions (default = SH256):\n")
-message("      MD_METHD=SH224        SHA-224 hash function.")
-message("      MD_METHD=SH256        SHA-256 hash function.")
-message("      MD_METHD=SH384        SHA-384 hash function.")
-message("      MD_METHD=SH512        SHA-512 hash function.")
-message("      MD_METHD=B2S160       BLAKE2s-160 hash function.")
-message("      MD_METHD=B2S256       BLAKE2s-256 hash function.\n")
-
-# Choose the arithmetic methods.
-if (NOT MD_METHD)
-	set(MD_METHD "SH256")
-endif(NOT MD_METHD)
-list(LENGTH MD_METHD MD_LEN)
-if (MD_LEN LESS 1)
-	message(FATAL_ERROR "Incomplete MD_METHD specification: ${MD_METHD}")
-endif(MD_LEN LESS 1)
-
-list(GET MD_METHD 0 MD_MAP)
-set(MD_METHD ${MD_METHD} CACHE STRING "Method for hash functions.")
diff --git a/src/dashbls/depends/relic/cmake/pp.cmake b/src/dashbls/depends/relic/cmake/pp.cmake
deleted file mode 100644
index d1ae4dbc11e5..000000000000
--- a/src/dashbls/depends/relic/cmake/pp.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-message(STATUS "Bilinear pairings arithmetic configuration (PP module):\n")
-
-message("   ** Available bilinear pairing methods (default = BASIC;OATEP):\n")
-
-message("      Extension field arithmetic:")
-message("      PP_METHD=BASIC    Basic extension field arithmetic.")
-message("      PP_METHD=LAZYR    Lazy reduced extension field arithmetic.\n")
-
-message("      Pairing computation:")
-message("      PP_METHD=TATEP    Tate pairing.")
-message("      PP_METHD=WEILP    Weil pairing.")
-message("      PP_METHD=OATEP    Optimal ate pairing.\n")
-
-# Choose the arithmetic methods.
-if (NOT PP_METHD)
-	set(PP_METHD "LAZYR;OATEP")
-endif(NOT PP_METHD)
-list(LENGTH PP_METHD PP_LEN)
-if (PP_LEN LESS 1)
-	message(FATAL_ERROR "Incomplete PP_METHD specification: ${PP_METHD}")
-endif(PP_LEN LESS 1)
-
-list(GET PP_METHD 0 PP_EXT)
-list(GET PP_METHD 1 PP_MAP)
-set(PP_METHD ${PP_METHD} CACHE STRING "Method for pairing over prime curves.")
diff --git a/src/dashbls/depends/relic/cmake/rand.cmake b/src/dashbls/depends/relic/cmake/rand.cmake
deleted file mode 100644
index ed90c7691cbf..000000000000
--- a/src/dashbls/depends/relic/cmake/rand.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-message(STATUS "Available pseudo-random number generators (default = HASHD):\n")
-
-message("   RAND=HASHD     Use the HASH-DRBG generator. (recommended)")
-message("   RAND=RDRND     Use Intel RdRand instruction directly.")
-message("   RAND=UDEV      Use the operating system underlying generator.")
-message("   RAND=CALL      Override the generator with a callback.\n")
-
-message(STATUS "Available random number generator seeders (default = UDEV):\n")
-
-message("   SEED=          Use a zero seed. (horribly insecure!)")
-message("   SEED=LIBC      Use rand()/random() functions. (insecure!)")
-message("   SEED=RDRND     Use Intel RdRand instruction directly.")
-message("   SEED=UDEV      Use non-blocking /dev/urandom. (recommended)")
-message("   SEED=WCGR      Use Windows' CryptGenRandom. (recommended)\n")
-
-# Choose the pseudo-random number generator.
-set(RAND "HASHD" CACHE STRING "Pseudo-random number generator")
-
-if(MSVC)
-
-    # Choose the pseudo-random number generator.
-    set(SEED "WCGR" CACHE STRING "Random number generator seeder")
-
-else()
-
-    # Choose the pseudo-random number generator.
-    set(SEED "UDEV" CACHE STRING "Random number generator seeder")
-
-endif()
diff --git a/src/dashbls/depends/relic/cmake/relic-config.cmake b/src/dashbls/depends/relic/cmake/relic-config.cmake
deleted file mode 100644
index 0b2db20dd78c..000000000000
--- a/src/dashbls/depends/relic/cmake/relic-config.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-find_path(RLC_INCLUDE_DIR relic/relic.h)
-find_library(RLC_LIBRARY NAMES relic)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RELIC DEFAULT_MSG RLC_INCLUDE_DIR RLC_LIBRARY)
-
-if(RLC_FOUND)
-	set(RLC_LIBRARIES ${RLC_LIBRARY})
-	set(RLC_INCLUDE_DIRS ${RLC_INCLUDE_DIR})
-endif()
diff --git a/src/dashbls/depends/relic/cmake/with.cmake b/src/dashbls/depends/relic/cmake/with.cmake
deleted file mode 100644
index f4edd4522f3e..000000000000
--- a/src/dashbls/depends/relic/cmake/with.cmake
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default modules.
-set(WITH "ALL" CACHE STRING "Selected modules")
-LIST(FIND WITH "ALL" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_BN 1)
-	set(WITH_DV 1)
-	set(WITH_FP 1)
-	set(WITH_FPX 1)
-	set(WITH_FB 1)
-	set(WITH_FBX 1)
-	set(WITH_EP 1)
-	set(WITH_EPX 1)
-	set(WITH_EB 1)
-	set(WITH_ED 1)
-	set(WITH_EC 1)
-	set(WITH_PP 1)
-	set(WITH_PC 1)
-	set(WITH_BC 1)
-	set(WITH_MD 1)
-	set(WITH_CP 1)
-	set(WITH_MPC 1)
-endif(TEMP GREATER -1)
-
-# Check if multiple precision integer arithmetic is required.
-list(FIND WITH "BN" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_BN 1)
-endif(TEMP GREATER -1)
-
-# Check if temporary vectors are required.
-list(FIND WITH "DV" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_DV 1)
-endif(TEMP GREATER -1)
-
-# Check if prime field arithmetic is required.
-list(FIND WITH "FP" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_FP 1)
-endif(TEMP GREATER -1)
-
-# Check if prime extension field arithmetic is required.
-list(FIND WITH "FPX" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_FPX 1)
-endif(TEMP GREATER -1)
-
-# Check if binary field arithmetic is required.
-list(FIND WITH "FB" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_FB 1)
-endif(TEMP GREATER -1)
-
-# Check if binary extension field arithmetic is required.
-list(FIND WITH "FBX" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_FBX 1)
-endif(TEMP GREATER -1)
-
-# Check if prime elliptic curve support is required.
-list(FIND WITH "EP" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_EP 1)
-endif(TEMP GREATER -1)
-
-#Check if support for elliptic curves defined over prime field extensions is required.
-list(FIND WITH "EPX" TEMP)
-if (TEMP GREATER -1)
-	set(WITH_EPX 1)
-endif(TEMP GREATER -1)
-
-# Check if binary elliptic curve support is required.
-list(FIND WITH "EB" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_EB 1)
-endif(TEMP GREATER -1)
-
-# Check if binary elliptic curve support is required.
-list(FIND WITH "ED" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_ED 1)
-endif(TEMP GREATER -1)
-
-# Check if elliptic curve cryptography support is required.
-list(FIND WITH "EC" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_EC 1)
-endif(TEMP GREATER -1)
-
-# Check if support for pairings over prime curves is required.
-list(FIND WITH "PP" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_PP 1)
-endif(TEMP GREATER -1)
-
-# Check if support for pairings over binary curves is required.
-list(FIND WITH "PB" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_PB 1)
-endif(TEMP GREATER -1)
-
-# Check if elliptic curve cryptography support is required.
-list(FIND WITH "PC" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_PC 1)
-endif(TEMP GREATER -1)
-
-# Check if support for block ciphers is required.
-list(FIND WITH "BC" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_BC 1)
-endif(TEMP GREATER -1)
-
-# Check if support for hash functions is required.
-list(FIND WITH "MD" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_MD 1)
-endif(TEMP GREATER -1)
-
-# Check if support for cryptographic protocols is required.
-list(FIND WITH "CP" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_CP 1)
-endif(TEMP GREATER -1)
-
-# Check if support for cryptographic protocols is required.
-list(FIND WITH "MPC" TEMP)
-if(TEMP GREATER -1)
-	set(WITH_MPC 1)
-endif(TEMP GREATER -1)
diff --git a/src/dashbls/depends/relic/demo/cert-input/Makefile b/src/dashbls/depends/relic/demo/cert-input/Makefile
deleted file mode 100644
index 25f24241c159..000000000000
--- a/src/dashbls/depends/relic/demo/cert-input/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS=-O3 -march=native -mtune=native -ggdb
-RELIC_ROOT = ../..
-
-all: lib
-	gcc ${CFLAGS} -c test-bench.c -o test-bench.o -I ${RELIC_ROOT}/include -I target/include
-	gcc ${CFLAGS} -o test-bench test-bench.o target/lib/librelic_s.a -lgmp
-
-lib:
-	mkdir -p target
-	cd target; ${RELIC_ROOT}/../preset/x64-pbc-bls12-381.sh ${RELIC_ROOT}/../; cmake -DEP_METHD='JACOB;LWNAF;COMBS;INTER' .; make
-
-clean:
-	rm -rf target *.o test-bench 
diff --git a/src/dashbls/depends/relic/demo/cert-input/test-bench.c b/src/dashbls/depends/relic/demo/cert-input/test-bench.c
deleted file mode 100644
index a90a0381a360..000000000000
--- a/src/dashbls/depends/relic/demo/cert-input/test-bench.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for cryptographic protocols.
- *
- * @version $Id$
- * @ingroup bench
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "relic.h"
-#include "relic_test.h"
-#include "relic_bench.h"
-
-#define MSGS	10000
-
-static int test_pss(void) {
-	int i, code = RLC_ERR;
-	bn_t ms[MSGS], n, u, v, _v[MSGS];
-	g1_t a, b;
-	g2_t g, x, y, _y[MSGS];
-
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(b);
-	g2_null(g);
-	g2_null(x);
-	g2_null(y);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(u);
-		bn_new(v);
-		g1_new(a);
-		g1_new(b);
-		g2_new(g);
-		g2_new(x);
-		g2_new(y);
-
-		g1_get_ord(n);
-
-		for (i = 0; i < MSGS; i++) {
-			bn_null(ms[i]);
-			bn_null(_v[i]);
-			g2_null(_y[i]);
-			bn_new(ms[i]);
-			bn_rand_mod(ms[i], n);
-			bn_new(_v[i]);
-			g2_new(_y[i]);
-		}
-
-		TEST_CASE("pointcheval-sanders simple signature is correct") {
-			TEST_ASSERT(cp_pss_gen(u, v, g, x, y) == RLC_OK, end);
-			TEST_ASSERT(cp_pss_sig(a, b, ms[0], u, v) == RLC_OK, end);
-			TEST_ASSERT(cp_pss_ver(a, b, ms[0], g, x, y) == 1, end);
-			/* Check adversarial signature. */
-			g1_set_infty(a);
-			g1_set_infty(b);
-			TEST_ASSERT(cp_pss_ver(a, b, ms[0], g, x, y) == 0, end);
-		}
-		TEST_END;
-
-		TEST_CASE("pointcheval-sanders block signature is correct") {
-			TEST_ASSERT(cp_psb_gen(u, _v, g, x, _y, MSGS) == RLC_OK, end);
-			TEST_ASSERT(cp_psb_sig(a, b, ms, u, _v, MSGS) == RLC_OK, end);
-			TEST_ASSERT(cp_psb_ver(a, b, ms, g, x, _y, MSGS) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(n);
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(b);
-	g2_free(g);
-	g2_free(x);
-	g2_free(y);
-	for (i = 0; i < MSGS; i++) {
-		bn_free(ms[i]);
-		bn_free(_v[i]);
-		g2_free(_y[i]);
-	}
-  	return code;
-}
-
-static int test_mpss(void) {
-	int i, j, code = RLC_ERR;
-	bn_t m[2], n, u[2], v[2], ms[MSGS][2], _v[MSGS][2];
-	g1_t g, s[2];
-	g2_t h, x[2], y[2], _y[MSGS][2];
-	gt_t e;
-	mt_t tri[3][2];
-	pt_t t[2];
-
-	bn_null(n);
-	g1_null(g);
-	g2_null(h);
-	gt_null(e);
-
-	RLC_TRY {
-		bn_new(n);
-		g1_new(g);
-		g2_new(h);
-		gt_new(e);
-		g1_get_ord(n);
-		for (i = 0; i < 2; i++) {
-			bn_null(m[i]);
-			bn_null(u[i]);
-			bn_null(v[i]);
-			g1_null(s[i]);
-			g2_null(x[i]);
-			g2_null(y[i]);
-			mt_null(tri[0][i]);
-			mt_null(tri[1][i]);
-			mt_null(tri[2][i]);
-			pt_null(t[i]);
-			bn_new(m[i]);
-			bn_rand_mod(m[i], n);
-			bn_new(u[i]);
-			bn_new(v[i]);
-			g1_new(s[i]);
-			g2_new(x[i]);
-			g2_new(y[i]);
-			mt_new(tri[0][i]);
-			mt_new(tri[1][i]);
-			mt_new(tri[2][i]);
-			pt_new(t[i]);
-			for (j = 0; j < MSGS; j++) {
-				bn_null(ms[j][i]);
-				bn_null(_v[j][i]);
-				g2_null(_y[j][i]);
-				bn_new(ms[j][i]);
-				bn_rand_mod(ms[j][i], n);
-				bn_new(_v[j][i]);
-				g2_new(_y[j][i]);
-			}
-		}
-
-		TEST_CASE("multi-party pointcheval-sanders simple signature is correct") {
-			pc_map_tri(t);
-			mt_gen(tri[0], n);
-			mt_gen(tri[1], n);
-			mt_gen(tri[2], n);
-			TEST_ASSERT(cp_mpss_gen(u, v, h, x, y) == RLC_OK, end);
-			TEST_ASSERT(cp_mpss_bct(x, y) == RLC_OK, end);
-			/* Compute signature in MPC. */
-			TEST_ASSERT(cp_mpss_sig(g, s, m, u, v, tri[0], tri[1]) == RLC_OK, end);
-			/* Verify signature in MPC. */
-			cp_mpss_ver(e, g, s, m, h, x[0], y[0], tri[2], t);
-			TEST_ASSERT(gt_is_unity(e) == 1, end);
-			/* Check that signature is also valid for conventional scheme. */
-			bn_add(m[0], m[0], m[1]);
-			bn_mod(m[0], m[0], n);
-			g1_add(s[0], s[0], s[1]);
-			g1_norm(s[0], s[0]);
-			TEST_ASSERT(cp_pss_ver(g, s[0], m[0], h, x[0], y[0]) == 1, end);
-		}
-		TEST_END;
-
-		TEST_CASE("multi-party pointcheval-sanders block signature is correct") {
-			g1_get_ord(n);
-			pc_map_tri(t);
-			mt_gen(tri[0], n);
-			mt_gen(tri[1], n);
-			mt_gen(tri[2], n);
-			TEST_ASSERT(cp_mpsb_gen(u, _v, h, x, _y, MSGS) == RLC_OK, end);
-			TEST_ASSERT(cp_mpsb_bct(x, _y, MSGS) == RLC_OK, end);
-			/* Compute signature in MPC. */
-			TEST_ASSERT(cp_mpsb_sig(g, s, ms, u, _v, tri[0], tri[1], MSGS) == RLC_OK, end);
-			/* Verify signature in MPC. */
-			cp_mpsb_ver(e, g, s, ms, h, x[0], _y, NULL, tri[2], t, MSGS);
-			TEST_ASSERT(gt_is_unity(e) == 1, end);
-			cp_mpsb_ver(e, g, s, ms, h, x[0], _y, _v, tri[2], t, MSGS);
-			TEST_ASSERT(gt_is_unity(e) == 1, end);
-			bn_sub_dig(ms[0][0], ms[0][0], 1);
-			cp_mpsb_ver(e, g, s, ms, h, x[0], _y, _v, tri[2], t, MSGS);
-			TEST_ASSERT(gt_is_unity(e) == 0, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-  	bn_free(n);
-	g1_free(g);
-	g2_free(h);
-	gt_free(e);
-	for (i = 0; i < 2; i++) {
-		bn_free(m[i]);
-		bn_free(u[i]);
-		bn_free(v[i]);
-		g1_free(s[i]);
-		g2_free(x[i]);
-		g2_free(y[i]);
-		mt_free(tri[0][i]);
-		mt_free(tri[1][i]);
-		mt_free(tri[2][i]);
-		pt_free(t[i]);
-		for (j = 0; j < MSGS; j++) {
-			bn_free(ms[j][i]);
-			bn_free(_v[j][i]);
-			g2_free(_y[j][i]);
-		}
-	}
-  	return code;
-}
-
-static void bench_pss(void) {
-	bn_t ms[MSGS], n, u, v, _v[MSGS];
-	g1_t a, b;
-	g2_t g, x, y, _y[MSGS];
-
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(b);
-	g2_null(g);
-	g2_null(x);
-	g2_null(y);
-	bn_new(n);
-	bn_new(u);
-	bn_new(v);
-	g1_new(a);
-	g1_new(b);
-	g2_new(g);
-	g2_new(x);
-	g2_new(y);
-
-	g1_get_ord(n);
-	for (int i = 0; i < MSGS; i++) {
-		bn_null(ms[i]);
-		bn_null(_v[i]);
-		g2_null(_y[i]);
-		bn_new(ms[i]);
-		bn_rand_mod(ms[i], n);
-		bn_new(_v[i]);
-		g2_new(_y[i]);
-	}
-
-	BENCH_RUN("cp_pss_gen") {
-		BENCH_ADD(cp_pss_gen(u, v, g, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pss_sig") {
-		BENCH_ADD(cp_pss_sig(a, b, ms[0], u, v));
-	} BENCH_END;
-
-	BENCH_RUN("cp_pss_ver") {
-		BENCH_ADD(cp_pss_ver(a, b, ms[0], g, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_gen") {
-		BENCH_ADD(cp_psb_gen(u, _v, g, x, _y, MSGS));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_sig") {
-		BENCH_ADD(cp_psb_sig(a, b, ms, u, _v, MSGS));
-	} BENCH_END;
-
-	BENCH_RUN("cp_psb_ver") {
-		BENCH_ADD(cp_psb_ver(a, b, ms, g, x, _y, MSGS));
-	} BENCH_END;
-
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(b);
-	g2_free(g);
-	g2_free(x);
-	g2_free(y);
-	for (int i = 0; i < MSGS; i++) {
-		bn_free(ms[i]);
-		bn_free(_v[i]);
-		g1_free(_y[i]);
-	}
-}
-
-static void bench_mpss(void) {
-	bn_t m[2], n, u[2], v[2], ms[MSGS][2], _v[MSGS][2];
-	g1_t g, s[2];
-	g2_t h, x[2], y[2], _y[MSGS][2];
-	gt_t r;
-	mt_t tri[3][2];
-	pt_t t[2];
-
-	bn_null(n);
-	g1_null(g);
-	g2_null(h);
-	gt_null(r);
-
-	bn_new(n);
-	g1_new(g);
-	g2_new(h);
-	gt_new(r);
-	for (int i = 0; i < 2; i++) {
-		bn_null(m[i]);
-		bn_null(u[i]);
-		bn_null(v[i]);
-		g1_null(s[i]);
-		g2_null(x[i]);
-		g2_null(y[i]);
-		mt_null(tri[0][i]);
-		mt_null(tri[1][i]);
-		mt_null(tri[2][i]);
-		pt_null(t[i]);
-		bn_new(m[i]);
-		bn_new(u[i]);
-		bn_new(v[i]);
-		g1_new(s[i]);
-		g2_new(x[i]);
-		g2_new(y[i]);
-		mt_new(tri[0][i]);
-		mt_new(tri[1][i]);
-		mt_new(tri[2][i]);
-		pt_new(t[i]);
-
-		g1_get_ord(n);
-		for (int j = 0; j < MSGS; j++) {
-			bn_null(ms[j][i]);
-			bn_null(_v[j][i]);
-			g2_null(_y[j][i]);
-			bn_new(ms[j][i]);
-			bn_rand_mod(ms[j][i], n);
-			bn_new(_v[j][i]);
-			g2_new(_y[j][i]);
-		}
-	}
-
-	pc_map_tri(t);
-	mt_gen(tri[0], n);
-	mt_gen(tri[1], n);
-	mt_gen(tri[2], n);
-
-	bn_rand_mod(m[0], n);
-	bn_rand_mod(m[1], n);
-	bn_sub(m[0], m[1], m[0]);
-	if (bn_sign(m[0]) == RLC_NEG) {
-		bn_add(m[0], m[0], n);
-	}
-
-	BENCH_RUN("cp_mpss_gen") {
-		BENCH_ADD(cp_mpss_gen(u, v, h, x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpss_bct") {
-		BENCH_ADD(cp_mpss_bct(x, y));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpss_sig") {
-		BENCH_ADD(cp_mpss_sig(g, s, m, u, v, tri[0], tri[1]));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpss_ver") {
-		BENCH_ADD(cp_mpss_ver(r, g, s, m, h, x[0], y[0], tri[2], t));
-	} BENCH_DIV(2);
-
-	g1_get_ord(n);
-	pc_map_tri(t);
-	mt_gen(tri[0], n);
-	mt_gen(tri[1], n);
-	mt_gen(tri[2], n);
-
-	BENCH_RUN("cp_mpsb_gen") {
-		BENCH_ADD(cp_mpsb_gen(u, _v, h, x, _y, MSGS));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpsb_bct") {
-		BENCH_ADD(cp_mpsb_bct(x, _y, MSGS));
-	} BENCH_END;
-
-	BENCH_RUN("cp_mpsb_sig") {
-		BENCH_ADD(cp_mpsb_sig(g, s, ms, u, _v, tri[0], tri[1], MSGS));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpsb_ver") {
-		BENCH_ADD(cp_mpsb_ver(r, g, s, ms, h, x[0], _y, NULL, tri[2], t, MSGS));
-	} BENCH_DIV(2);
-
-	BENCH_RUN("cp_mpsb_ver (sk)") {
-		BENCH_ADD(cp_mpsb_ver(r, g, s, ms, h, x[0], _y, _v, tri[2], t, MSGS));
-	} BENCH_DIV(2);
-
-  	bn_free(n);
-	g1_free(g);
-	g2_free(h);
-	gt_free(r);
-	for (int i = 0; i < 2; i++) {
-		bn_free(m[i]);
-		bn_free(u[i]);
-		bn_free(v[i]);
-		g1_free(s[i]);
-		g2_free(x[i]);
-		g2_free(y[i]);
-		mt_free(tri[0][i]);
-		mt_free(tri[1][i]);
-		mt_free(tri[2][i]);
-		pt_free(t[i]);
-		for (int j = 0; j < MSGS; j++) {
-			bn_free(ms[j][i]);
-			bn_free(_v[j][i]);
-			g2_free(_y[j][i]);
-		}
-	}
-}
-
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	util_banner("Note: If you get a SIGSEGV, try to increase the stack size with ulimit.", 1);
-
-#if defined(WITH_PC)
-	if (pc_param_set_any() == RLC_OK) {
-#if defined(WITH_MPC)
-		util_banner("Tests for the PS signature and two-party PS protocol:\n", 0);
-		test_pss();
-		test_mpss();
-		util_banner("Benchmarks for the PS signature and two-party PS protocol:\n", 0);
-		bench_pss();
-		bench_mpss();
-#endif
-	} else {
-		RLC_THROW(ERR_NO_CURVE);
-	}
-#endif
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/demo/ers-etrs/Makefile b/src/dashbls/depends/relic/demo/ers-etrs/Makefile
deleted file mode 100644
index 7d02f50aabd5..000000000000
--- a/src/dashbls/depends/relic/demo/ers-etrs/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS=-O3 -march=native -mtune=native -ggdb
-RELIC_ROOT = ../..
-
-all: lib
-	gcc ${CFLAGS} -c test-bench.c -o test-bench.o -I ${RELIC_ROOT}/include -I target/include
-	gcc ${CFLAGS} -o test-bench test-bench.o target/lib/librelic_s.a -lgmp
-
-lib:
-	mkdir -p target
-	cd target; ${RELIC_ROOT}/../preset/x64-ecc-128.sh ${RELIC_ROOT}/../; cmake -DEP_METHD='JACOB;LWNAF;COMBS;INTER' -DBN_METHD=' COMBA;COMBA;MONTY;SLIDE;LEHME;BASIC' .; make
-
-clean:
-	rm -rf target *.o test-bench
diff --git a/src/dashbls/depends/relic/demo/ers-etrs/test-bench.c b/src/dashbls/depends/relic/demo/ers-etrs/test-bench.c
deleted file mode 100644
index 22ea4c4612c9..000000000000
--- a/src/dashbls/depends/relic/demo/ers-etrs/test-bench.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for cryptographic protocols.
- *
- * @version $Id$
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_bench.h"
-
-#define MAX_KEYS	2048
-
-#include "assert.h"
-
-static void ers(void) {
-	int size;
-	ec_t pp, pk[MAX_KEYS], *ptr;
-	bn_t sk[MAX_KEYS], td;
-	ers_t ring[MAX_KEYS];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(td);
-	ec_null(pp);
-
-	bn_new(td);
-	ec_new(pp);
-	for (int i = 0; i < MAX_KEYS; i++) {
-		bn_null(sk[i]);
-		bn_new(sk[i]);
-		ec_null(pk[i]);
-		ec_new(pk[i]);
-		ers_null(ring[i]);
-		ers_new(ring[i]);
-		cp_ers_gen_key(sk[i], pk[i]);
-	}
-
-	cp_ers_gen(pp);
-
-	bench_reset();
-	for (int j = 0; j < BENCH; j++)	{
-		BENCH_ADD(cp_ers_sig(td, ring[0], m, 5, sk[0], pk[0], pp));
-	}
-	bench_compute(BENCH * BENCH);
-	util_print("{\"1\": {\"time\": %lf, \"size\": null}", bench_total()/(double)1000000);
-
-	for (int j = 1; j < MAX_KEYS; j = j << 1) {
-		size = j;
-		bench_before();
-		for (int k = 0; k < j; k++) {
-			cp_ers_ext(td, ring, &size, m, 5, pk[size], pp);
-		}
-		bench_after();
-		bench_compute(1);
-		util_print(", \"%d\": {\"time\": %lf, \"size\": null}", size, bench_total()/(double)1000000);
-		assert(cp_ers_ver(td, ring, size, m, 5, pp));
-	}
-	util_print("}\n\n");
-
-	/* Recompute the signature for verification. */
-	cp_ers_sig(td, ring[0], m, 5, sk[0], pk[0], pp);
-	bench_reset();
-	for (int j = 0; j < BENCH; j++)	{
-		BENCH_ADD(assert(cp_ers_ver(td, ring, 1, m, 5, pp)));
-	}
-	bench_compute(BENCH * BENCH);
-	util_print("{\"1\": {\"time\": %lf, \"size\": %d}", bench_total()/(double)1000000, 9 * RLC_FP_BYTES);
-
-	for (int j = 1; j < MAX_KEYS; j = j << 1) {
-		size = j;
-		/* Recompute the signatures for verification. */
-		for (int k = 0; k < j; k++) {
-			assert(cp_ers_ext(td, ring, &size, m, 5, pk[size], pp) == RLC_OK);
-		}
-		assert(cp_ers_ver(td, ring, size, m, 5, pp));
-		bench_reset();
-		for (int i = 0; i < BENCH; i++)	{
-			BENCH_ADD(cp_ers_ver(td, ring, size, m, 5, pp));
-		}
-		bench_compute(BENCH * BENCH);
-		util_print(", \"%d\": {\"time\": %lf, \"size\": %d}", size, bench_total()/(double)1000000, size * 9 * RLC_FP_BYTES);
-	}
-	util_print("}");
-
-	bn_free(td);
-	ec_free(pp);
-	for (int i = 0; i < MAX_KEYS; i++) {
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		ers_free(ring[i])
-	}
-}
-
-#undef MAX_KEYS
-#define MAX_KEYS	2048
-#define MIN_KEYS	64
-
-static void etrs(void) {
-	int size;
-	ec_t pp, pk[MAX_KEYS], *ptr;
-	bn_t sk[MAX_KEYS], td[MAX_KEYS], y[MAX_KEYS];
-	etrs_t ring[MAX_KEYS];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	ec_null(pp);
-	ec_new(pp);
-	for (int i = 0; i < MAX_KEYS; i++) {
-		bn_null(y[i]);
-		bn_new(y[i]);
-		bn_null(td[i]);
-		bn_new(td[i]);
-		bn_null(sk[i]);
-		bn_new(sk[i]);
-		ec_null(pk[i]);
-		ec_new(pk[i]);
-		ers_null(ring[i]);
-		ers_new(ring[i]);
-		cp_etrs_gen_key(sk[i], pk[i]);
-	}
-
-	cp_ers_gen(pp);
-
-	util_print("{");
-	for (int j = 1; j <= MAX_KEYS; j = j << 1) {
-		bench_reset();
-		bench_before();
-		for (int i = 0; i < BENCH; i++)	{
-			cp_etrs_sig(td, y, j, ring[0], m, 5, sk[0], pk[0], pp);
-		}
-		bench_after();
-		bench_compute(BENCH);
-		util_print("\"%d\": {\"time\": %lf, \"size\": null}, ", j, bench_total()/(double)1000000);
-		assert(cp_etrs_ver(1, td, y, j, ring, 1, m, 5, pp));
-	}
-	util_print("}\n\n");
-
-	for (int l = 2; l <= 8; l = l << 1) {
-		for (int j = l; j <= MAX_KEYS; j = j << 1) {
-			bench_reset();
-			bench_before();
-			size = 1;
-			cp_etrs_sig(td, y, j, ring[0], m, 5, sk[0], pk[0], pp);
-			for (int k = 1; k < j; k++) {
-				cp_etrs_ext(td, y, j, ring, &size, m, 5, pk[size], pp);
-			}
-			bench_after();
-			bench_compute(1);
-			util_print("\"%d\": {\"time\": %lf, \"size\": null}, ", j, bench_total()/(double)1000000);
-			assert(cp_etrs_ver(1, td+size-1, y+size-1, j-size+1, ring, size, m, 5, pp));
-		}
-		util_print("}\n\n");
-	}
-
-	for (int l = 1; l <= 8; l = l << 1) {
-		for (int j = l; j <= MAX_KEYS; j = j << 1) {
-			size = 1;
-			cp_etrs_sig(td, y, j, ring[0], m, 5, sk[0], pk[0], pp);
-			for (int k = 0; k < l; k++) {
-				cp_etrs_ext(td, y, j, ring, &size, m, 5, pk[size], pp);
-			}
-			bench_reset();
-			bench_before();
-			for (int i = 0; i < BENCH; i++)	{
-				cp_etrs_ver(1, td+size-1, y+size-1, j-size+1, ring, size, m, 5, pp);
-			}
-			bench_after();
-			bench_compute(BENCH);
-			util_print(", \"%d\": {\"time\": %lf, \"size\": null}", j, bench_total()/(double)1000000);
-		}
-		util_print("}\n\n");
-	}
-
-	ec_free(pp);
-	for (int i = 0; i < MAX_KEYS; i++) {
-		bn_free(td[i]);
-		bn_free(y[i]);
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		etrs_free(ring[i])
-	}
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	conf_print();
-
-	if (ec_param_set_any() == RLC_OK) {
-		etrs();
-		ers();
-	} else {
-		RLC_THROW(ERR_NO_CURVE);
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/demo/general-paillier/Makefile b/src/dashbls/depends/relic/demo/general-paillier/Makefile
deleted file mode 100644
index dbbd14f19524..000000000000
--- a/src/dashbls/depends/relic/demo/general-paillier/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS=-O3 -march=native -mtune=native -ggdb
-RELIC_ROOT = ../..
-
-all: lib
-	gcc ${CFLAGS} -c test.c -o test.o -I ${RELIC_ROOT}/include -I target-gmp/include
-	gcc ${CFLAGS} -o test test.o target-gmp/lib/librelic_s.a -lgmp
-
-lib:
-	mkdir -p target-gmp
-	cd target-gmp; ${RELIC_ROOT}/../preset/gmp-paillier-4096.sh ${RELIC_ROOT}/../; make
-
-clean:
-	rm -rf target-gmp *.o test
diff --git a/src/dashbls/depends/relic/demo/general-paillier/test.c b/src/dashbls/depends/relic/demo/general-paillier/test.c
deleted file mode 100644
index d4bc201cc216..000000000000
--- a/src/dashbls/depends/relic/demo/general-paillier/test.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int paillier(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, s, pub, prv;
-	int result;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-
-	bn_null(pub);
-	bn_null(prv);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-
-		bn_new(pub);
-		bn_new(prv);
-
-		/* Generate 2048-bit public and private keys (both integers). */
-		result = cp_ghpe_gen(pub, prv, 2048);
-		assert(result == RLC_OK);
-
-		printf("Public key:\n");
-		bn_print(pub);
-		printf("Private key:\n");
-		bn_print(prv);
-
-		for (int s = 1; s <= 2; s++) {
-			util_print("Testing generalized paillier for (s = %d)\n", s);
-			/* Generate plaintext smaller than n^s. */
-			bn_rand(a, RLC_POS, s * (bn_bits(pub) - 1));
-			/* Encrypt, decrypt and check if the result is the same. */
-			assert(cp_ghpe_enc(c, a, pub, s) == RLC_OK);
-			assert(cp_ghpe_dec(b, c, pub, prv, s) == RLC_OK);
-			assert(bn_cmp(a, b) == RLC_EQ);
-
-			/* Generate new plaintexts smaller than n^s. */
-			bn_rand(a, RLC_POS, s * (bn_bits(pub) - 1));
-			bn_rand(b, RLC_POS, s * (bn_bits(pub) - 1));
-			/* Encrypt both plaintexts using the same public key. */
-			assert(cp_ghpe_enc(c, a, pub, s) == RLC_OK);
-			assert(cp_ghpe_enc(d, b, pub, s) == RLC_OK);
-
-			/* Now compute c = (b * c) mod n^(s + 1). */
-			bn_mul(c, c, d);
-			bn_sqr(d, pub);
-			if (s == 2) {
-				bn_mul(d, d, pub);
-			}
-			bn_mod(c, c, d);
-			/* Decrypt and check if result is (a + b) mod n^s. */
-			assert(cp_ghpe_dec(c, c, pub, prv, s) == RLC_OK);
-			bn_add(a, a, b);
-			bn_copy(d, pub);
-			if (s == 2) {
-				bn_mul(d, d, pub);
-			}
-			bn_mod(a, a, d);
-			assert(bn_cmp(a, c) == RLC_EQ);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-
-	bn_free(prv);
-	bn_free(pub);
-	return code;
-}
-
-int main(int argc, char *argv[]) {
-	core_init();
-	paillier();
-	core_clean();
-}
diff --git a/src/dashbls/depends/relic/demo/link-test/Makefile b/src/dashbls/depends/relic/demo/link-test/Makefile
deleted file mode 100644
index da9ef8a4155d..000000000000
--- a/src/dashbls/depends/relic/demo/link-test/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-RELIC_ROOT = ../../..
-
-all: type1 type3
-	gcc -c test1.c -o test1.o -I /usr/local/include/relic_type1
-	gcc -c test2.c -o test2.o -I /usr/local/include/relic_type3
-	gcc -o test test.c test1.o test2.o /usr/local/lib/librelic_s_*.a -lgmp
-
-type1:
-	mkdir -p target-type1
-	cd target-type1; cmake -DLABEL=type1 ${RELIC_ROOT}; ${RELIC_ROOT}/preset/gmp-pbc-ss1536.sh ${RELIC_ROOT}; make && make install
-
-type3:
-	mkdir -p target-type3
-	cd target-type3; cmake -DLABEL=type3 ${RELIC_ROOT}; ${RELIC_ROOT}/preset/x64-pbc-bls12-381.sh ${RELIC_ROOT}; make && make install
-
-clean:
-	rm -rf target-* *.o test
diff --git a/src/dashbls/depends/relic/demo/link-test/test.c b/src/dashbls/depends/relic/demo/link-test/test.c
deleted file mode 100644
index edfd8e224c5e..000000000000
--- a/src/dashbls/depends/relic/demo/link-test/test.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main() {
-	function1();
-	function2();
-}
diff --git a/src/dashbls/depends/relic/demo/link-test/test1.c b/src/dashbls/depends/relic/demo/link-test/test1.c
deleted file mode 100644
index f6e77f2a0592..000000000000
--- a/src/dashbls/depends/relic/demo/link-test/test1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <relic.h>
-
-void function1() {
-	g1_t p;
-	g2_t q;
-	gt_t e;
-
-	g1_null(p);
-	g2_null(q);
-	gt_null(e);
-
-	core_init();
-
-	RLC_TRY {
-		core_init();
-		pc_param_set_any();
-		pc_param_print();
-
-		g1_new(p);
-		g2_new(q);
-		gt_new(e);
-
-		g1_rand(p);
-		g2_rand(q);
-		pc_map(e, p, q);
-
-		gt_print(e);
-		printf("Is pairing symmetric? %d\n", pc_map_is_type1() == 1);
-		printf("Is pairing asymmetric? %d\n", pc_map_is_type3() == 1);
-	} RLC_CATCH_ANY {
-	} RLC_FINALLY {
-		g1_free(p);
-		g2_free(q);
-		gt_free(e);
-	}
-	core_clean();
-}
diff --git a/src/dashbls/depends/relic/demo/link-test/test2.c b/src/dashbls/depends/relic/demo/link-test/test2.c
deleted file mode 100644
index f15a6891b12d..000000000000
--- a/src/dashbls/depends/relic/demo/link-test/test2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <relic.h>
-
-void function2() {
-	g1_t p;
-	g2_t q;
-	gt_t e;
-
-	g1_null(p);
-	g2_null(q);
-	gt_null(e);
-
-	core_init();
-
-	RLC_TRY {
-		core_init();
-		pc_param_set_any();
-		pc_param_print();
-
-		g1_new(p);
-		g2_new(q);
-		gt_new(e);
-
-		g1_rand(p);
-		g2_rand(q);
-		pc_map(e, p, q);
-
-		gt_print(e);
-		printf("Is pairing symmetric? %d\n", pc_map_is_type1() == 1);
-		printf("Is pairing asymmetric? %d\n", pc_map_is_type3() == 1);
-	} RLC_CATCH_ANY {
-	} RLC_FINALLY {
-		g1_free(p);
-		g2_free(q);
-		gt_free(e);
-	}
-	core_clean();
-}
diff --git a/src/dashbls/depends/relic/demo/public-stats/Makefile b/src/dashbls/depends/relic/demo/public-stats/Makefile
deleted file mode 100644
index 81a4b72d5619..000000000000
--- a/src/dashbls/depends/relic/demo/public-stats/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-CFLAGS=-O3 -march=native -mtune=native -ggdb
-RELIC_ROOT = ../..
-
-all: lib data.csv
-	gcc ${CFLAGS} -c main.c -o main.o -I ${RELIC_ROOT}/include -I target/include
-	gcc ${CFLAGS} -c csv.c -o csv.o -I ${RELIC_ROOT}/include -I target/include
-	gcc ${CFLAGS} -o main csv.o main.o target/lib/librelic_s.a -lgmp
-
-lib:
-	mkdir -p target
-	cd target; ${RELIC_ROOT}/../preset/x64-pbc-bls12-381.sh ${RELIC_ROOT}/../; cmake -DEP_METHD='JACOB;LWNAF;COMBS;INTER' .; make
-
-data.csv: 
-	wget -c https://raw.githubusercontent.com/TheEconomist/covid-19-excess-deaths-tracker/master/source-data/spain/archive/spain_total_source_2020_04_13.csv
-	mv spain_total_source_2020_04_13.csv data_04_13.csv
-	wget -c https://momo.isciii.es/public/momo/data
-	mv data data.csv
-
-clean:
-	rm -rf target *.o main
diff --git a/src/dashbls/depends/relic/demo/public-stats/csv.c b/src/dashbls/depends/relic/demo/public-stats/csv.c
deleted file mode 100644
index 801201e26cea..000000000000
--- a/src/dashbls/depends/relic/demo/public-stats/csv.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright 2015 Samuel Alexander
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-void free_csv_line( char **parsed ) {
-    char **ptr;
-
-    for ( ptr = parsed; *ptr; ptr++ ) {
-        free( *ptr );
-    }
-
-    free( parsed );
-}
-
-static int count_fields( const char *line ) {
-    const char *ptr;
-    int cnt, fQuote;
-
-    for ( cnt = 1, fQuote = 0, ptr = line; *ptr; ptr++ ) {
-        if ( fQuote ) {
-            if ( *ptr == '\"' ) {
-                if ( ptr[1] == '\"' ) {
-                    ptr++;
-                    continue;
-                }
-                fQuote = 0;
-            }
-            continue;
-        }
-
-        switch( *ptr ) {
-            case '\"':
-                fQuote = 1;
-                continue;
-            case ',':
-                cnt++;
-                continue;
-            default:
-                continue;
-        }
-    }
-
-    if ( fQuote ) {
-        return -1;
-    }
-
-    return cnt;
-}
-
-/*
- *  Given a string containing no linebreaks, or containing line breaks
- *  which are escaped by "double quotes", extract a NULL-terminated
- *  array of strings, one for every cell in the row.
- */
-char **parse_csv( const char *line ) {
-    char **buf, **bptr, *tmp, *tptr;
-    const char *ptr;
-    int fieldcnt, fQuote, fEnd;
-
-    fieldcnt = count_fields( line );
-
-    if ( fieldcnt == -1 ) {
-        return NULL;
-    }
-
-    buf = malloc( sizeof(char*) * (fieldcnt+1) );
-
-    if ( !buf ) {
-        return NULL;
-    }
-
-    tmp = malloc( strlen(line) + 1 );
-
-    if ( !tmp ) {
-        free( buf );
-        return NULL;
-    }
-
-    bptr = buf;
-
-    for ( ptr = line, fQuote = 0, *tmp = '\0', tptr = tmp, fEnd = 0; ; ptr++ ) {
-        if ( fQuote ) {
-            if ( !*ptr ) {
-                break;
-            }
-
-            if ( *ptr == '\"' ) {
-                if ( ptr[1] == '\"' ) {
-                    *tptr++ = '\"';
-                    ptr++;
-                    continue;
-                }
-                fQuote = 0;
-            }
-            else {
-                *tptr++ = *ptr;
-            }
-
-            continue;
-        }
-
-        switch( *ptr ) {
-            case '\"':
-                fQuote = 1;
-                continue;
-            case '\0':
-                fEnd = 1;
-            case ',':
-                *tptr = '\0';
-                *bptr = strdup( tmp );
-
-                if ( !*bptr ) {
-                    for ( bptr--; bptr >= buf; bptr-- ) {
-                        free( *bptr );
-                    }
-                    free( buf );
-                    free( tmp );
-
-                    return NULL;
-                }
-
-                bptr++;
-                tptr = tmp;
-
-                if ( fEnd ) {
-                  break;
-                } else {
-                  continue;
-                }
-
-            default:
-                *tptr++ = *ptr;
-                continue;
-        }
-
-        if ( fEnd ) {
-            break;
-        }
-    }
-
-    *bptr = NULL;
-    free( tmp );
-    return buf;
-}
diff --git a/src/dashbls/depends/relic/demo/public-stats/csv.h b/src/dashbls/depends/relic/demo/public-stats/csv.h
deleted file mode 100644
index 18327eea9fb9..000000000000
--- a/src/dashbls/depends/relic/demo/public-stats/csv.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CSV_DOT_H_INCLUDE_GUARD
-#define CSV_DOT_H_INCLUDE_GUARD
-
-#define CSV_ERR_LONGLINE 0
-#define CSV_ERR_NO_MEMORY 1
-
-char **parse_csv( const char *line );
-void free_csv_line( char **parsed );
-char **split_on_unescaped_newlines(const char *txt);
-char *fread_csv_line(FILE *fp, int max_line_size, int *done, int *err);
-
-#endif
diff --git a/src/dashbls/depends/relic/demo/public-stats/main.c b/src/dashbls/depends/relic/demo/public-stats/main.c
deleted file mode 100644
index ae75fa1d7b68..000000000000
--- a/src/dashbls/depends/relic/demo/public-stats/main.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Benchmarks for cryptographic protocols.
- *
- * @version $Id$
- * @ingroup bench
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "csv.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <assert.h>
-
-#define STATES 		19
-#define GROUPS		3
-#define DAYS 		90
-#define FACTOR		(1000000)
-#define FIXED		((uint64_t)100000)
-#define DATABASE	"COVID19-Spain"
-#define BEG_2018	"27/03/2018"
-#define END_2018	"25/06/2018"
-#define BEG_2019	"27/03/2019"
-#define END_2019	"25/06/2019"
-#define BEG_2020	"2020-03-27"
-#define END_2020	"2020-06-25"
-
-/* First value is population in each of the autonomous communities in 2020. */
-uint64_t populations[STATES] = {
-	8405294, 1316064, 1024381, 1176627, 2188626, 580997, 2410819,
-	2030807, 7516544, 4948411, 1067272, 2699299, 6587711, 1479098, 646197,
-	2172591, 312719, 84913, 84667
-};
-
-/* Total population per age group in 2019. */
-uint64_t pyramid[GROUPS] = { 37643844, 4482743, 4566276 };
-
-char *acronyms[STATES] = {
-	"AN", "AR", "AS", "IB", "CN", "CB", "CL", "CM", "CT", "VC",
-	"EX", "GA", "MD", "MC", "NC", "PV", "RI", "CE", "ML"
-};
-
-char *acs[STATES] = {
-	"Andalusia", "Aragón", "Asturias", "Balearics", "Canary Islands",
-	"Cantabria", "Castile & León", "Castile-La Mancha", "Catalonia",
-	"Valencia", "Extremadura", "Galicia", "Madrid", "Murcia",
-	"Navarre", "Basque Country", "La Rioja", "Ceuta", "Melilla"
-};
-
-/* Population pyramids for autonomous communities, taken from countryeconomy.com */
-double pyramids[STATES][GROUPS] = {
-	{15.86 + 66.98, 9.06, 17.16 - 9.06},
-	{14.12 + 64.23, 10.26, 21.65 - 10.26},
-	{10.97 + 63.37, 12.82, 25.66 - 12.82},
-	{14.89 + 69.29, 8.62, 15.82 - 8.62},
-	{13.20 + 70.57, 8.91, 16.22 - 8.91},
-	{13.29 + 64.81, 11.11, 21.90 - 11.11},
-	{11.94 + 62.83, 11.41, 25.23 - 11.41},
-	{15.11 + 65.91, 8.80, 18.99 - 8.80},
-	{15.53 + 65.36, 9.69, 19.12 - 9.69},
-	{14.87 + 65.62, 10.15, 19.51 - 10.15},
-	{13.66 + 65.70, 9.78, 20.64 - 9.78},
-	{11.87 + 62.96, 11.90, 25.16 - 11.90},
-	{15.48 + 66.66, 9.13, 18.86 - 9.13},
-	{17.18 + 67.04, 8.19, 15.78 - 8.19},
-	{15.51 + 64.69, 9.88, 19.80 - 9.88},
-	{13.20 + 70.57, 8.91, 16.22 - 8.91},
-	{11.87 + 62.96, 11.90, 25.16 - 11.90},
-	{20.42 + 67.57, 6.58, 12.02 - 6.58},
-	{15.48 + 66.66, 9.13, 17.86 - 9.13},
-	//{80.55, 9.59, 9.77} //Spain
-};
-
-/* Read data from CSV in a given time interval. */
-void read_region(g1_t s[], char *l[], bn_t m[], int *counter,
-		uint64_t metric[3], const char *file, int region, char *start,
-		char *end, bn_t sk) {
-	FILE *stream = fopen(file, "r");
-	int found = 0;
-	char line[1024];
-	char str[3];
-	char label[100] = { 0 };
-	dig_t n;
-
-	found = 0;
-	sprintf(str, "%d", region);
-	while (fgets(line, 1024, stream)) {
-		if (strstr(line, start) != NULL) {
-			found = 1;
-		}
-		if (strstr(line, end) != NULL) {
-			found = 0;
-		}
-		char **tmp = parse_csv(line);
-		char **ptr = tmp;
-
-		if (found && !strcmp(ptr[2], str) && !strcmp(ptr[5], "todos") &&
-				strcmp(ptr[7], "todos")) {
-			n = atoi(ptr[9]);
-			//printf("%s\n", line);
-			if (strcmp(ptr[6], "menos_65") == 0) {
-				//printf("< 65 = %s\n", ptr[9]);
-				metric[0] += n;
-			}
-			if (strcmp(ptr[6], "65_74") == 0) {
-				//printf("65-74 = %s\n", ptr[9]);
-				metric[1] += n;
-			}
-			if (strcmp(ptr[6], "mas_74") == 0) {
-				//printf("> 74 = %s\n", ptr[9]);
-				metric[2] += n;
-			}
-
-			bn_set_dig(m[*counter], n);
-			l[*counter] = strdup(ptr[8]);
-			cp_mklhs_sig(s[*counter], m[*counter], DATABASE, acs[region - 1],
-				l[*counter], sk);
-			(*counter)++;
-		}
-
-		free_csv_line(tmp);
-	}
-	fclose(stream);
-}
-
-int main(int argc, char *argv[]) {
-	uint64_t baseline[GROUPS] = { 0, 0, 0 };
-	uint64_t mortality[GROUPS] = { 0, 0, 0 };
-	uint64_t expected[GROUPS] = { 0, 0, 0 };
-	uint64_t observed[STATES][GROUPS];
-	uint64_t ratios[STATES][GROUPS];
-	dig_t ft[STATES];
-	bn_t res, t[STATES], sk[STATES], m[STATES][3 * GROUPS * DAYS];
-	g1_t u, sig, sigs[STATES][3 * GROUPS * DAYS], cs[STATES];
-	g2_t pk[STATES];
-	char *l[STATES][3 * GROUPS * DAYS];
-	dig_t *f[STATES];
-	int flen[STATES];
-	int counter;
-	uint64_t total;
-	uint64_t excess;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (pc_param_set_any() != RLC_OK) {
-		core_clean;
-		return 1;
-	}
-
-	RLC_TRY {
-		/* Initialize and generate keys for signers. */
-		bn_null(res);
-		bn_new(res);
-		g1_null(u);
-		g1_new(u);
-		g1_null(sig);
-		g1_new(sig);
-		for (int i = 0; i < STATES; i++) {
-			f[i] = RLC_ALLOCA(dig_t, 2 * GROUPS * DAYS);
-			bn_null(t[i]);
-			bn_new(t[i]);
-			bn_null(sk[i]);
-			bn_new(sk[i]);
-			g1_null(cs[i]);
-			g1_new(cs[i]);
-			g2_null(sk[i]);
-			g2_new(sk[i]);
-			cp_mklhs_gen(sk[i], pk[i]);
-			for (int j = 0; j < GROUPS; j++) {
-				for (int k = 0; k < 3 * DAYS; k++) {
-					bn_null(m[i][j * 3 * DAYS + k]);
-					bn_new(m[i][j * 3 * DAYS + k]);
-					g1_null(sigs[i][j * 3 * DAYS + k]);
-					g1_new(sigs[i][j * 3 * DAYS + k]);
-					l[i][j * 3 * DAYS + k] = NULL;
-				}
-			}
-		}
-
-		/* Compute current population of every age group in each autonomous community. */
-		for (int i = 0; i < STATES; i++) {
-			for (int j = 0; j < GROUPS; j++) {
-				ratios[i][j] = pyramids[i][j] / 100.0 * populations[i];
-			}
-		}
-
-		for (int i = 0; i < STATES; i++) {
-			counter = 0;
-			observed[i][0] = observed[i][1] = observed[i][2] = 0;
-			read_region(sigs[i], l[i], m[i], &counter, baseline,
-					"data_04_13.csv", i + 1, BEG_2018, END_2018, sk[i]);
-			read_region(sigs[i], l[i], m[i], &counter, baseline,
-					"data_04_13.csv", i + 1, BEG_2019, END_2019, sk[i]);
-			read_region(sigs[i], l[i], m[i], &counter, observed[i], "data.csv",
-					i + 1, BEG_2020, END_2020, sk[i]);
-		}
-
-		for (int j = 0; j < GROUPS; j++) {
-			mortality[j] = FIXED * FACTOR / (2 * pyramid[j]) * baseline[j];
-		}
-
-		total = excess = 0;
-		for (int i = 0; i < STATES; i++) {
-			printf("%s -- %s:\n", acronyms[i], acs[i]);
-
-			for (int j = 0; j < GROUPS; j++) {
-				//expected[j] = (FIXED * ratios[i][j]/(2*pyramid[j])) * baseline[j];
-				expected[j] = mortality[j] * ratios[i][j] / (FIXED * FACTOR);
-			}
-
-			printf("\texpected : %lu %lu %lu\n", expected[0], expected[1],
-					expected[2]);
-			printf("\tobserved : %lu %lu %lu\n", observed[i][0], observed[i][1],
-					observed[i][2]);
-
-			printf("\ttotal expected: %lu\n",
-					(expected[0] + expected[1] + expected[2]) / FIXED);
-			printf("\ttotal observed: %lu\n",
-					observed[i][0] + observed[i][1] + observed[i][2]);
-
-			total += (expected[0] + expected[1] + expected[2]);
-			excess += (observed[i][0] + observed[i][1] + observed[i][2]);
-		}
-
-		util_banner("Plaintext computation:", 1);
-
-		printf("Baseline : %6lu %6lu %6lu\n", baseline[0] / 2, baseline[1] / 2,
-				baseline[2] / 2);
-		printf("Demograph: %6lu %6lu %6lu\n", pyramid[0] / FACTOR,
-				pyramid[1] / FACTOR, pyramid[2] / FACTOR);
-		printf("Mortality: %6lu %6lu %6lu\n", mortality[0] / FIXED,
-				mortality[1] / FIXED, mortality[2] / FIXED);
-		printf("Total Expected: %6lu\n", total);
-		printf("Total Observed: %6lu\n", excess);
-
-		util_banner("Authenticated computation:", 1);
-
-		bn_zero(res);
-		g1_set_infty(u);
-		g1_set_infty(sig);
-		for (int i = 0; i < STATES; i++) {
-			flen[i] = 2 * GROUPS * DAYS;
-			for (int j = 0; j < GROUPS; j++) {
-				total = 0;
-				for (int k = 0; k < STATES; k++) {
-					total += FIXED * ratios[k][j] / (2 * pyramid[j]);
-				}
-				for (int k = 0; k < DAYS; k++) {
-					f[i][j * DAYS + k] = f[i][j * DAYS + GROUPS * DAYS + k] =
-							total;
-				}
-			}
-			cp_mklhs_fun(t[i], m[i], f[i], 2 * GROUPS * DAYS);
-			cp_mklhs_evl(u, sigs[i], f[i], 2 * GROUPS * DAYS);
-			bn_add(res, res, t[i]);
-			g1_add(sig, sig, u);
-		}
-		g1_norm(sig, sig);
-		assert(cp_mklhs_ver(sig, res, t, DATABASE, acs, l[0], f, flen,
-			pk, STATES));
-
-		printf("Total Expected: %6lu\n", res->dp[0] / FIXED);
-
-		bn_zero(res);
-		g1_set_infty(u);
-		g1_set_infty(sig);
-		for (int i = 0; i < STATES; i++) {
-			flen[i] = GROUPS * DAYS;
-			for (int j = 0; j < GROUPS; j++) {
-				for (int k = 0; k < DAYS; k++) {
-					f[i][j * DAYS + k] = 1;
-				}
-			}
-			cp_mklhs_fun(t[i], &m[i][2 * GROUPS * DAYS], f[i], GROUPS * DAYS);
-			cp_mklhs_evl(u, &sigs[i][2 * GROUPS * DAYS], f[i], GROUPS * DAYS);
-			bn_add(res, res, t[i]);
-			g1_add(sig, sig, u);
-		}
-		g1_norm(sig, sig);
-
-		printf("Total Observed: %6lu\n", res->dp[0]);
-
-		assert(cp_mklhs_ver(sig, res, t, DATABASE, acs,
-				&l[0][2 * GROUPS * DAYS], f, flen, pk, STATES));
-		BENCH_ONE("Time elapsed", cp_mklhs_ver(sig, res, t, DATABASE, acs,
-				&l[0][2 * GROUPS * DAYS], f, flen, pk, STATES));
-
-		cp_mklhs_off(cs, ft, acs, &l[0][2 * GROUPS * DAYS], f, flen, STATES);
-		assert(cp_mklhs_onv(sig, res, t, DATABASE, acs, cs, ft, pk, STATES));
-		BENCH_ONE("Time with precomputation", cp_mklhs_onv(sig, res, t,
-			DATABASE, acs, cs, ft, pk, STATES));
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(res);
-		g1_free(u);
-		g1_free(sig);
-		for (int i = 0; i < STATES; i++) {
-			RLC_FREE(f[i]);
-			bn_free(t[i]);
-			bn_free(sk[i]);
-			g1_free(cs[i]);
-			g2_free(pk[i]);
-			for (int j = 0; j < GROUPS; j++) {
-				for (int k = 0; k < 3 * DAYS; k++) {
-					bn_free(m[i][j * 3 * DAYS + k]);
-					g1_free(sigs[i][j * 3 * DAYS + k]);
-					free(l[i][j * 3 * DAYS + k]);
-				}
-			}
-		}
-	}
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/demo/tweedledum/Makefile b/src/dashbls/depends/relic/demo/tweedledum/Makefile
deleted file mode 100644
index c5e31f030311..000000000000
--- a/src/dashbls/depends/relic/demo/tweedledum/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS=-O3 -march=native -mtune=native -ggdb
-RELIC_ROOT = ../..
-
-all: lib 
-	gcc ${CFLAGS} -c main.c -o main.o -I ${RELIC_ROOT}/include -I target/include
-	gcc ${CFLAGS} -o main main.o target/lib/librelic_s.a -lgmp
-
-lib:
-	mkdir -p target
-	cd target; ${RELIC_ROOT}/../preset/gmp-ecc-tweedledum.sh ${RELIC_ROOT}/../; cmake -DEP_METHD='JACOB;LWNAF;COMBS;INTER' .; make
-
-clean:
-	rm -rf target *.o main
diff --git a/src/dashbls/depends/relic/demo/tweedledum/main.c b/src/dashbls/depends/relic/demo/tweedledum/main.c
deleted file mode 100644
index 5d60db7e71a2..000000000000
--- a/src/dashbls/depends/relic/demo/tweedledum/main.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for the Elliptic Curve Cryptography module.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-int main(void) {
-	ec_t g, a, b;
-	bn_t l, r;
-
-	/* Initialize points. */
-	ec_new(g);
-	ec_new(a);
-	ec_new(b);
-	bn_new(l);
-	bn_new(r);
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the EC module:", 0);
-
-	/* Ask for curve to get Tweedledum. */
-	if (ec_param_set_any() == RLC_ERR) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	/* Print curve name to make sure it is the right one. */
-	ec_param_print();
-
-	/* Check that generator has the right order. */
-	ec_curve_get_gen(g);
-	ec_curve_get_ord(r);
-	ec_mul(g, g, r);
-	assert(ec_is_infty(g));
-
-	/* Generate some random point and exponents to illustrate scalar mult. */
-	ec_rand(a);
-	ec_rand(b);
-	bn_rand_mod(l, r);
-	ec_mul(a, a, l);
-	ec_print(a);
-
-	util_banner("All tests have passed.\n", 0);
-
-	ec_free(g);
-	ec_free(a);
-	ec_free(b);
-	bn_free(l);
-	bn_free(r);
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/doc/relic.doxygen.in b/src/dashbls/depends/relic/doc/relic.doxygen.in
deleted file mode 100644
index 09e39fa30a0d..000000000000
--- a/src/dashbls/depends/relic/doc/relic.doxygen.in
+++ /dev/null
@@ -1,2309 +0,0 @@
-# Doxyfile 1.8.6
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "@PROJECT_NAME@"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = @PROJECT_VERSION@
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = @CMAKE_CURRENT_SOURCE_DIR@/art/logo.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ./doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = YES
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = @CMAKE_CURRENT_BINARY_DIR@/ \
-                         @CMAKE_CURRENT_SOURCE_DIR@/
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    = @CMAKE_CURRENT_BINARY_DIR@/ \
-                         @CMAKE_CURRENT_SOURCE_DIR@/
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = YES
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text "
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = doxygen.log
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/src \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include \
-                         @CMAKE_CURRENT_BINARY_DIR@/include
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.h
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/src/low
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = @GENERATE_DOCSET@
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = @CMAKE_CURRENT_BINARY_DIR@/include \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/src/dashbls/depends/relic/include/low/relic_bn_low.h b/src/dashbls/depends/relic/include/low/relic_bn_low.h
deleted file mode 100644
index d8b4226e730b..000000000000
--- a/src/dashbls/depends/relic/include/low/relic_bn_low.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the low-level multiple precision integer arithmetic module.
- *
- * All functions assume that the destination has enough capacity to store
- * the result of the computation.
- *
- * @ingroup bn
- */
-
-#ifndef RLC_BN_LOW_H
-#define RLC_BN_LOW_H
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-#ifdef ASM
-
-#include "relic_conf.h"
-
-#if (BN_PRECI % WSIZE) > 0
-#define RLC_BN_DIGS		(BN_PRECI/WSIZE + 1)
-#else
-#define RLC_BN_DIGS		(BN_PRECI/WSIZE)
-#endif
-
-#if BN_MAGNI == DOUBLE
-#define RLC_BN_SIZE		(2 * RLC_BN_DIGS + 2)
-#elif BN_MAGNI == CARRY
-#define RLC_BN_SIZE		((RLC_BN_DIGS + 1)
-#elif BN_MAGNI == SINGLE
-#define RLC_BN_SIZE		(RLC_BN_DIGS)
-#endif
-
-#else
-
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Adds a digit to a digit vector. Computes c = a + digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] digit			- the digit to add.
- * @param[in] size			- the number of digits in the first operand.
- * @return the carry of the last digit addition.
- */
-dig_t bn_add1_low(dig_t *c, const dig_t *a, const dig_t digit, const int size);
-
-/**
- * Adds two digit vectors of the same size. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- * @param[in] size			- the number of digits to add.
- * @return the carry of the last digit addition.
- */
-dig_t bn_addn_low(dig_t *c, const dig_t *a, const dig_t *b, int size);
-
-/**
- * Subtracts a digit from a digit vector. Computes c = a - digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- * @param[in] digit			- the digit to subtract.
- * @param[in] size			- the number of digits in a.
- * @return the carry of the last digit subtraction.
- */
-dig_t bn_sub1_low(dig_t *c, const dig_t *a, dig_t digit, int size);
-
-/**
- * Subtracts a digit vector from another digit vector. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- * @param[in] b				- the digit vector to subtract.
- * @param[in] size			- the number of digits to subtract.
- * @return the carry of the last digit subtraction.
- */
-dig_t bn_subn_low(dig_t *c, const dig_t *a, const dig_t *b, int size);
-
-/**
- * Compares two digits.
- *
- * @param[in] a				- the first digit to compare.
- * @param[in] b				- the second digit to compare.
- * @return BN_LT if a < b, BN_EQ if a == b and BN_GT if a > b.
- */
-int bn_cmp1_low(dig_t a, dig_t b);
-
-/**
- * Compares two digit vectors of the same size.
- *
- * @param[in] a				- the first digit vector to compare.
- * @param[in] b				- the second digit vector to compare.
- * @param[in] size			- the number of digits to compare.
- * @return BN_LT if a < b, BN_EQ if a == b and BN_GT if a > b.
- */
-int bn_cmpn_low(const dig_t *a, const dig_t *b, int size);
-
-/**
- * Shifts a digit vector to the left by 1 bit. Computes c = a << 1.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @return the carry of the last digit shift.
- */
-dig_t bn_lsh1_low(dig_t *c, const dig_t *a, int size);
-
-/**
- * Shifts a digit vector to the left by an amount smaller than a digit. Computes
- * c = a << bits.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last digit shift.
- */
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits);
-
-/**
- * Shifts a digit vector to the right by 1 bit. Computes c = a >> 1.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @return the carry of the last digit shift.
- */
-dig_t bn_rsh1_low(dig_t *c, const dig_t *a, int size);
-
-/**
- * Shifts a digit vector to the right by an amount smaller than a digit.
- * Computes c = a >> bits.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last digit shift.
- */
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits);
-
-/**
- * Multiplies a digit vector by a digit and adds this result to another digit
- * vector. Computes c = c + a * digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to multiply.
- * @param[in] digit			- the digit to multiply.
- * @param[in] size			- the number of digits to multiply.
- * @return the carry of the last addition.
- */
-dig_t bn_mula_low(dig_t *c, const dig_t *a, dig_t digit, int size);
-
-/**
- * Multiplies a digit vector by a digit and stores this result in another digit
- * vector. Computes c = a * digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] digit			- the digit to multiply.
- * @param[in] size			- the number of digits to multiply.
- * @return the most significant digit.
- */
-dig_t bn_mul1_low(dig_t *c, const dig_t *a, dig_t digit, int size);
-
-/**
- * Multiplies two digit vectors of the same size. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- * @param[in] size			- the number of digits to multiply.
- */
-void bn_muln_low(dig_t *c, const dig_t *a, const dig_t *b, int size);
-
-/**
- * Multiplies two digit vectors of different sizes, with sa > sb. Computes
- * c = a * b. This function outputs as result only the digits between low and
- * high, inclusive, with high > sa and low < sb.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- * @param[in] sa			- the number of digits in the first operand.
- * @param[in] sb			- the number of digits in the second operand.
- * @param[in] low			- the first digit to compute.
- * @param[in] high			- the last digit to compute.
- */
-void bn_muld_low(dig_t *c, const dig_t *a, int sa, const dig_t *b, int sb,
-		int low, int high);
-
-/**
- * Squares a digit vector and adds this result to another digit vector.
- * Computes c = c + a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- * @param[in] size			- the number of digits to square.
- * @return the carry of the last addition.
- */
-dig_t bn_sqra_low(dig_t *c, const dig_t *a, int size);
-
-/**
- * Squares a digit vector. Computes c = a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- * @param[in] size			- the number of digits to square.
- */
-void bn_sqrn_low(dig_t *c, const dig_t *a, int size);
-
-/**
- * Divides a digit vector by another digit vector. Computes c = floor(a / b) and
- * d = a mod b. The dividend and divisor may be destroyed inside the function.
- *
- * @param[out] c			- the quotient.
- * @param[out] d			- the remainder.
- * @param[in,out] a			- the dividend.
- * @param[in] sa			- the size of the dividend.
- * @param[in,out] b			- the divisor.
- * @param[in] sb			- the size of the divisor.
- */
-void bn_divn_low(dig_t *c, dig_t *d, dig_t *a, int sa, dig_t *b, int sb);
-
-/**
- * Divides a digit vector by a digit. Computes c = floor(a / digit) and
- * d = a mod digit.
- *
- * @param[out] c			- the quotient.
- * @param[out] d			- the remainder.
- * @param[in] a				- the dividend.
- * @param[in] size			- the size of the dividend.
- * @param[in] digit			- the divisor.
- */
-void bn_div1_low(dig_t *c, dig_t *d, const dig_t *a, int size, dig_t digit);
-
-/**
- * Reduces a digit vector modulo m by Montgomery's algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- * @param[in] sa			- the number of digits to reduce
- * @param[in] m				- the modulus.
- * @param[in] sm			- the size of the modulus.
- * @param[in] u				- the reciprocal of the modulus.
- */
-void bn_modn_low(dig_t *c, const dig_t *a, int sa, const dig_t *m, int sm,
-	dig_t u);
-
-#endif /* !ASM */
-
-#endif /* !RLC_BN_LOW_H */
diff --git a/src/dashbls/depends/relic/include/low/relic_dv_low.h b/src/dashbls/depends/relic/include/low/relic_dv_low.h
deleted file mode 100644
index 647e03d2d051..000000000000
--- a/src/dashbls/depends/relic/include/low/relic_dv_low.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the low-level digit vector module.
- *
- * @ingroup dv
- */
-
-#ifndef RELIC_DV_LOW_H
-#define RELIC_DV_LOW_H
-
-#include "relic_bn_low.h"
-#include "relic_fb_low.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-#ifdef ASM
-
-/**
- * Size in digits of a squaring result in a prime field.
- */
-#ifdef WITH_FP
-#define DV_FP	(2 * FP_DIGS + 1)
-#else
-#define DV_FP	(0)
-#endif
-
-/**
- * Size in digits of a squaring result in a binary field.
- */
-#ifdef WITH_FB
-#define DV_FB	(2 * FB_DIGS)
-#else
-#define DV_FB	(0)
-#endif
-
-/**
- * Size in digits of a temporary vector.
- *
- * A temporary vector has enough size to store a multiplication/squaring/cubing
- * result in any finite field.
- */
-#if DV_FB > DV_FP
-#define RLC_DV_DIGS		DV_FB
-#else
-#define RLC_DV_DIGS		DV_FP
-#endif
-
-#if RLC_BN_SIZE > DV_DIGS
-#undef RLC_DV_DIGS
-#define RLC_DV_DIGS 	RLC_BN_SIZE
-#endif
-
-#endif /* ASM */
-
-#endif /* !RELIC_DV_LOW_H */
diff --git a/src/dashbls/depends/relic/include/low/relic_fb_low.h b/src/dashbls/depends/relic/include/low/relic_fb_low.h
deleted file mode 100644
index 323afcc84e53..000000000000
--- a/src/dashbls/depends/relic/include/low/relic_fb_low.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the low-level binary field arithmetic module.
- *
- * All functions assume a configured polynomial basis f(z) and that the
- * destination has enough capacity to store the result of the computation.
- *
- * @ingroup fb
- */
-
-#ifndef RLC_FB_LOW_H
-#define RLC_FB_LOW_H
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-#ifdef ASM
-
-#include "relic_conf.h"
-
-#undef RLC_FB_DIGS
-#if (FB_POLYN % WSIZE) > 0
-#define RLC_FB_DIGS		(FB_POLYN/WSIZE + 1)
-#else
-#define RLC_FB_DIGS		(FB_POLYN/WSIZE)
-#endif
-
-#else
-
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Adds a digit vector and a digit. Computes c = a + digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] digit			- the digit to add.
- */
-void fb_add1_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Adds two digit vectors of the same size. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- */
-void fb_addn_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Adds two digit vectors of the same size, with this size different than the
- * standard precision and specified in the last parameter. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- * @param[in] size			- the number of digits to add.
- */
-void fb_addd_low(dig_t *c, const dig_t *a, const dig_t *b, int size);
-
-/**
- * Shifts a digit vector to the left by 1 bit. Computes c = a * z.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @return the carry of the last digit shift.
- */
-dig_t fb_lsh1_low(dig_t *c, const dig_t *a);
-
-/**
- * Shifts a digit vector to the left by an amount smaller than a digit.
- * The shift amount must be bigger than 0 and smaller than RLC_DIG. Computes
- * c = a * z^bits.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] bits			- the shift ammount.
- * @return the carry of the last digit shift.
- */
-dig_t fb_lshb_low(dig_t *c, const dig_t *a, int bits);
-
-/**
- * Shifts a digit vector to the right by 1 bit. Computes c = a / z.
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @return the carry of the last digit shift.
- */
-dig_t fb_rsh1_low(dig_t *c, const dig_t *a);
-
-/**
- * Shifts a digit vector to the right by an amount smaller than a digit.
- * The shift amount must be bigger than 0 and smaller than RLC_DIG.
- * Computes c = a / (z^bits).
- *
- * @param[out] c			- the result
- * @param[in] a				- the digit vector to shift.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last digit shift.
- */
-dig_t fb_rshb_low(dig_t *c, const dig_t *a, int bits);
-
-/**
- * Adds a left-shifted digit vector to another digit vector.
- * The shift amount must be shorter than the digit size.
- * Computes c = c + (a * z^bits).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift and add.
- * @param[in] size			- the number of digits to add.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last shift.
- */
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size);
-
-/**
- * Multiplies a digit vector by a digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to multiply.
- * @param[in] digit			- the digit to multiply.
- */
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Multiplies two digit vectors of the same size.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- */
-void fb_muln_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Multiplies two digit vectors of the same size but smaller than the standard
- * precision.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- * @param[in] size			- the size of the digit vectors.
- */
-void fb_muld_low(dig_t *c, const dig_t *a, const dig_t *b, int size);
-
-/**
- * Multiplies two digit vectors of the same size with embedded modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- */
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Squares a digit vector using bit manipulation.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- */
-void fb_sqrn_low(dig_t *c, const dig_t *a);
-
-/**
- * Squares a digit vector using a lookup table.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- */
-void fb_sqrl_low(dig_t *c, const dig_t *a);
-
-/**
- * Squares a digit vector with embedded modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- */
-void fb_sqrm_low(dig_t *c, const dig_t *a);
-
-/**
- * Exponentiates consecutively a digit vector to a fixed power 2^k/2^-k given a
- * precomputed table.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- * @param[in] t				- the
- */
-void fb_itrn_low(dig_t *c, const dig_t *a, dig_t *t);
-
-/**
- * Extracts the square root of a digit vector.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to extract the square root.
- */
-void fb_srtn_low(dig_t *c, const dig_t *a);
-
-/**
- * Solves a quadratic equation for c^2 + c = a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- */
-void fb_slvn_low(dig_t *c, const dig_t *a);
-
-/**
- * Computes the trace of a digit vector.
- *
- * @param[in] a				- the digit vector.
- * @return the trace of the argument.
- */
-dig_t fb_trcn_low(const dig_t *a);
-
-/**
- * Reduces a digit vector modulo the configured irreducible polynomial.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- */
-void fb_rdcn_low(dig_t *c, dig_t *a);
-
-/**
- * Reduces the most significant bits of a digit vector modulo the configured
- * irreducible polynomial. The maximum number of bits to be reduced is equal
- * to the size of the digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- */
-void fb_rdc1_low(dig_t *c, dig_t *a);
-
-/**
- * Inverts a digit vector modulo the configured irreducible polynomial.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to invert.
- */
-void fb_invn_low(dig_t *c, const dig_t *a);
-
-#endif /* !ASM */
-
-#endif /* !RLC_FB_LOW_H */
diff --git a/src/dashbls/depends/relic/include/low/relic_fp_low.h b/src/dashbls/depends/relic/include/low/relic_fp_low.h
deleted file mode 100644
index cad9bb766836..000000000000
--- a/src/dashbls/depends/relic/include/low/relic_fp_low.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the low-level prime field arithmetic module.
- *
- * @ingroup fp
- */
-
-#ifndef RLC_FP_LOW_H
-#define RLC_FP_LOW_H
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-#ifdef ASM
-
-#include "relic_conf.h"
-#include "relic_label.h"
-
-#if (FP_PRIME % WSIZE) > 0
-#define RLC_FP_DIGS		(FP_PRIME/WSIZE + 1)
-#else
-#define RLC_FP_DIGS		(FP_PRIME/WSIZE)
-#endif
-#else
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Adds a digit vector and a digit. Computes c = a + digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to add.
- * @param[in] digit			- the digit to add.
- * @return the carry of the last digit addition.
- */
-dig_t fp_add1_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Adds two digit vectors of the same size. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- * @return the carry of the last digit addition.
- */
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Adds two digit vectors of the same size with integrated modular reduction.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- */
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Adds two double-length digit vectors. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- * @return the carry of the last digit addition.
- */
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Adds two double-length digit vectors and reduces modulo p * R. Computes
- * c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- */
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Subtracts a digit from a digit vector. Computes c = a - digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- * @param[in] digit			- the digit to subtract.
- * @return the carry of the last digit subtraction.
- */
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Subtracts a digit vector from another digit vector. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- * @param[in] b				- the digit vector to subtract.
- * @return the carry of the last digit subtraction.
- */
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Subtracts two digit vectors of the same size with integrated modular
- * reduction.
- * Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- */
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Subtracts a double-length digit vector from another digit vector.
- * Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- * @return the carry of the last digit subtraction.
- */
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Subtracts a double-length digit vector from another digit vector.
- * Computes c = a - b. This version of the function should handle possible
- * carries by adding p * R.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- * @param[in] b				- the second digit vector to add.
- */
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Negates a digit vector. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the prime field element to negate.
- */
-void fp_negm_low(dig_t *c, const dig_t *a);
-
-/**
- * Doubles a digit vector. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector.
- * @return the carry of the last digit doubling.
- */
-dig_t fp_dbln_low(dig_t *c, const dig_t *a);
-
-/**
- * Doubles a digit vector with integrated modular reduction.
- * Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to add.
- */
-void fp_dblm_low(dig_t *c, const dig_t *a);
-
-/**
- * Halves a digit vector with integrated modular reduction.
- * Computes c = a/2.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to halve.
- */
-void fp_hlvm_low(dig_t *c, const dig_t *a);
-
-/**
- * Halves a double-precision digit vector. Computes c = a/2.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to halve.
- */
-void fp_hlvd_low(dig_t *c, const dig_t *a);
-
-/**
- * Shifts a digit vector to the left by 1 bits. Computes c = a << 1.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @return the carry of the last digit shift.
- */
-dig_t fp_lsh1_low(dig_t *c, const dig_t *a);
-
-/**
- * Shifts a digit vector to the left by an amount smaller than a digit. Computes
- * c = a << bits.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last digit shift.
- */
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits);
-
-/**
- * Shifts a digit vector to the right by 1 bit. Computes c = a >> 1.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @return the carry of the last digit shift.
- */
-dig_t fp_rsh1_low(dig_t *c, const dig_t *a);
-
-/**
- * Shifts a digit vector to the right by an amount smaller than a digit.
- * Computes c = a >> bits.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @param[in] bits			- the shift amount.
- * @return the carry of the last digit shift.
- */
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits);
-
-/**
- * Multiplies a digit vector by a digit and adds this result to another digit
- * vector. Computes c = c + a * digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to multiply.
- * @param[in] digit			- the digit to multiply.
- * @return the carry of the addition.
- */
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Multiplies a digit vector by a digit and stores this result in another digit
- * vector. Computes c = a * digit.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to multiply.
- * @param[in] digit			- the digit to multiply.
- * @return the most significant digit.
- */
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit);
-
-/**
- * Multiplies two digit vectors of the same size. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- */
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Multiplies two digit vectors of the same size with embedded modular
- * reduction. Computes c = (a * b) mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first digit vector to multiply.
- * @param[in] b				- the second digit vector to multiply.
- */
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b);
-
-/**
- * Squares a digit vector. Computes c = a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- */
-void fp_sqrn_low(dig_t *c, const dig_t *a);
-
-/**
- * Squares a digit vector with embedded modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to square.
- */
-void fp_sqrm_low(dig_t *c, const dig_t *a);
-
-/**
- * Reduces a digit vector modulo m represented in special form.
- * Computes c = a mod m.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- * @param[in] m				- the modulus.
- */
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m);
-
-/**
- * Reduces a digit vector modulo the configured prime p. Computes c = a mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- */
-void fp_rdcn_low(dig_t *c, dig_t *a);
-
-/**
- * Inverts a digit vector modulo the configured prime.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to invert.
- */
-void fp_invm_low(dig_t *c, const dig_t *a);
-
-#endif /* ASM */
-
-#endif /* !RLC_FP_LOW_H */
diff --git a/src/dashbls/depends/relic/include/low/relic_fpx_low.h b/src/dashbls/depends/relic/include/low/relic_fpx_low.h
deleted file mode 100644
index 42cbf7b471a4..000000000000
--- a/src/dashbls/depends/relic/include/low/relic_fpx_low.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the low-level prime extension field arithmetic module.
- *
- * @ingroup fpx
- */
-
-#ifndef RLC_FPX_LOW_H
-#define RLC_FPX_LOW_H
-
-#include "relic_fpx.h"
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Adds two quadratic extension field elements of the same size.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_addn_low(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Adds two quadratic extension field elements of the same size with integrated
- * modular reduction. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_addm_low(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Adds two double-precision quadratic extension field elements of the same
- * size. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_addd_low(dv2_t c, dv2_t a, dv2_t b);
-
-/**
- * Adds two double-precision quadratic extension field elements of the same size
- * and corrects the result by conditionally adding 2^(RLC_FP_DIGS * WSIZE) * p.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_addc_low(dv2_t c, dv2_t a, dv2_t b);
-
-/**
- * Subtracts a quadratic extension field element from another of the same size.
- * Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element.
- * @param[in] b				- the field element to subtract.
- */
-void fp2_subn_low(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Subtracts a quadratic extension field element from another of the same size
- * with integrated modular reduction. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element.
- * @param[in] b				- the field element to subtract.
- */
-void fp2_subm_low(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Subtracts a double-precision quadratic extension field element from another
- * of the same size. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_subd_low(dv2_t c, dv2_t a, dv2_t b);
-
-/**
- * Subtracts a double-precision quadratic extension field element from another
- * of the same size and  corrects the result by conditionally adding
- * 2^(RLC_FP_DIGS * WSIZE) * p. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp2_subc_low(dv2_t c, dv2_t a, dv2_t b);
-
-/**
- * Doubles a quadratic extension field element. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- */
-void fp2_dbln_low(fp2_t c, fp2_t a);
-
-/**
- * Doubles a quadratic extension field element with integrated modular
- * reduction. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to double.
- */
-void fp2_dblm_low(fp2_t c, fp2_t a);
-
-/**
- * Multiplies a quadratic extension field element by the quadratic
- * non-residue. Computes c = a * E.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void fp2_norm_low(fp2_t c, fp2_t a);
-
-/**
- * Multiplies a double-precision quadratic extension field element by the
- * quadratic non-residue, reducing only half of the result. Computes
- * c = a * E.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void fp2_norh_low(dv2_t c, dv2_t a);
-
-/**
- * Multiplies a double-precision quadratic extension field element by the
- * quadratic non-residue. Computes c = a * E.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void fp2_nord_low(dv2_t c, dv2_t a);
-
-/**
- * Multiplies two quadratic extension field elements of the same size.
- * Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp2_muln_low(dv2_t c, fp2_t a, fp2_t b);
-
-/**
- * Multiplies two quadratic extension elements of the same size and corrects
- * the result by adding (2^(RLC_FP_DIGS * WSIZE) * p)/4. This function should
- * be used when the RLC_FP_ROOM optimization is detected. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp2_mulc_low(dv2_t c, fp2_t a, fp2_t b);
-
-/**
- * Multiplies two quadratic extension field elements of the same size with
- * embedded modular reduction. Computes c = (a * b) mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp2_mulm_low(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Squares a quadratic extension element. Computes c = a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to square.
- */
-void fp2_sqrn_low(dv2_t c, fp2_t a);
-
-/**
- * Squares a quadratic extension field element with integrated modular
- * reduction. Computes c = (a * a) mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to square.
- */
-void fp2_sqrm_low(fp2_t c, fp2_t a);
-
-/**
- * Reduces a quadratic extension element modulo the configured prime p.
- * Computes c = a mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- */
-void fp2_rdcn_low(fp2_t c, dv2_t a);
-
-/**
- * Adds two cubic extension field elements of the same size.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_addn_low(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Adds two cubic extension field elements of the same size with integrated
- * modular reduction. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_addm_low(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Adds two double-precision cubic extension field elements of the same
- * size. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_addd_low(dv3_t c, dv3_t a, dv3_t b);
-
-/**
- * Adds two double-precision cubic extension field elements of the same size
- * and corrects the result by conditionally adding 3^(RLC_FP_DIGS * WSIZE) * p.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_addc_low(dv3_t c, dv3_t a, dv3_t b);
-
-/**
- * Subtracts a cubic extension field element from another of the same size.
- * Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element.
- * @param[in] b				- the field element to subtract.
- */
-void fp3_subn_low(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Subtracts a cubic extension field element from another of the same size
- * with integrated modular reduction. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element.
- * @param[in] b				- the field element to subtract.
- */
-void fp3_subm_low(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Subtracts a double-precision cubic extension field element from another
- * of the same size. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_subd_low(dv3_t c, dv3_t a, dv3_t b);
-
-/**
- * Subtracts a double-precision cubic extension field element from another
- * of the same size and  corrects the result by conditionally adding
- * 3^(RLC_FP_DIGS * WSIZE) * p. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to add.
- * @param[in] b				- the second field element to add.
- */
-void fp3_subc_low(dv3_t c, dv3_t a, dv3_t b);
-
-/**
- * Doubles a cubic extension field element. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- */
-void fp3_dbln_low(fp3_t c, fp3_t a);
-
-/**
- * Doubles a cubic extension field element with integrated modular
- * reduction. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to double.
- */
-void fp3_dblm_low(fp3_t c, fp3_t a);
-
-/**
- * Multiplies a double-precision cubic extension field element by the
- * cubic non-residue. Computes c = a * E.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void fp3_nord_low(dv3_t c, dv3_t a);
-
-/**
- * Multiplies two cubic extension field elements of the same size.
- * Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp3_muln_low(dv3_t c, fp3_t a, fp3_t b);
-
-/**
- * Multiplies two cubic extension elements of the same size and corrects
- * the result by adding (2^(RLC_FP_DIGS * WSIZE) * p)/4. This function should
- * be used when the RLC_FP_ROOM optimization is detected. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp3_mulc_low(dv3_t c, fp3_t a, fp3_t b);
-
-/**
- * Multiplies two cubic extension field elements of the same size with
- * embedded modular reduction. Computes c = (a * b) mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first field element to multiply.
- * @param[in] b				- the second field element to multiply.
- */
-void fp3_mulm_low(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Squares a cubic extension element. Computes c = a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to square.
- */
-void fp3_sqrn_low(dv3_t c, fp3_t a);
-
-/**
- * Squares a cubic extension field element with integrated modular
- * reduction. Computes c = (a * a) mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to square.
- */
-void fp3_sqrm_low(fp3_t c, fp3_t a);
-
-/**
- * Reduces a cubic extension element modulo the configured prime p.
- * Computes c = a mod p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to reduce.
- */
-void fp3_rdcn_low(fp3_t c, dv3_t a);
-
-#endif /* !RLC_FPX_LOW_H */
diff --git a/src/dashbls/depends/relic/include/relic.h b/src/dashbls/depends/relic/include/relic.h
deleted file mode 100644
index e9ee1b443b7e..000000000000
--- a/src/dashbls/depends/relic/include/relic.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @mainpage
- *
- * RELIC is a modern cryptographic meta-toolkit with emphasis on efficiency and
- * flexibility. RELIC can be used to build efficient and usable cryptographic
- * toolkits tailored for specific security levels and algorithmic choices.
- *
- * @section goals_sec Goals
- *
- * RELIC is an ongoing project and features will be added on demand.
- * The focus is to provide:
- *
- * <ul>
- * <li> Ease of portability and inclusion of architecture-dependent code
- * <li> Simple experimentation with alternative implementations
- * <li> Tests and benchmarks for every implemented function
- * <li> Flexible configuration
- * <li> Maximum efficiency
- * </ul>
- *
- * @section algo_sec Algorithms
- *
- * RELIC implements to date:
- *
- * <ul>
- * <li> Multiple-precision integer arithmetic
- * <li> Prime and Binary field arithmetic
- * <li> Elliptic curves over prime and binary fields (NIST curves and
- * pairing-friendly curves)
- * <li> Bilinear maps and related extension fields
- * <li> Cryptographic protocols
- * </ul>
- *
- * @section lic_sec Licensing
- *
- * RELIC is dual-licensed under Apache 2.0 and LGPL 2.1-or-above to encourage
- * collaboration with other research groups and contributions from the industry.
- * You can choose between one of them.
- *
- * @section disc_sec Disclaimer
- *
- * RELIC is at most alpha-quality software. Implementations may not be correct
- * or secure and may include patented algorithms. There are many configuration
- * options which make the library horribly insecure. Backward API compatibility
- * with early versions may not necessarily be maintained. Use at your own risk.
- */
-
-/**
- * @file
- *
- * Library interface.
- *
- */
-
-#ifndef RELIC_H
-#define RELIC_H
-
-#include "relic_arch.h"
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_multi.h"
-#include "relic_types.h"
-#include "relic_bn.h"
-#include "relic_dv.h"
-#include "relic_fp.h"
-#include "relic_fpx.h"
-#include "relic_fb.h"
-#include "relic_fbx.h"
-#include "relic_ep.h"
-#include "relic_eb.h"
-#include "relic_ed.h"
-#include "relic_ec.h"
-#include "relic_pp.h"
-#include "relic_pc.h"
-#include "relic_cp.h"
-#include "relic_bc.h"
-#include "relic_md.h"
-#include "relic_mpc.h"
-#include "relic_err.h"
-#include "relic_rand.h"
-#include "relic_util.h"
-
-#endif /* !RELIC_H */
diff --git a/src/dashbls/depends/relic/include/relic_alloc.h b/src/dashbls/depends/relic/include/relic_alloc.h
deleted file mode 100644
index b0b759a6dd75..000000000000
--- a/src/dashbls/depends/relic/include/relic_alloc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2018 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the auxiliary memory allocation functions.
- *
- * @ingroup utils
- */
-
-#include "relic_conf.h"
-
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
-
-#include <malloc.h>
-
-/*
- * Dynamiclly allocates an array of "Type" with the specified size on the stack.
- * This memory will be automaticlly deallocated from the stack when the function
- * frame is returned from.
- * Note: This is the Windows specific implementation.
- *
- * @param[in] T                 - the type of each object.
- * @param[in] S                 - the number of obecs to allocate.
- */
-#if ALLOC == DYNAMIC
-#define RLC_ALLOCA(T, S)		(T*) calloc((S), sizeof(T))
-#else
-#define RLC_ALLOCA(T, S)		(T*) _alloca((S) * sizeof(T))
-#endif
-
-#else /* _MSC_VER */
-
-#if OPSYS == FREEBSD || OPSYS == NETBSD
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
-
-/*
- * Dynamiclly allocates an array of "Type" with the specified size on the stack.
- * This memory will be automaticlly deallocated from the stack when the function
- * frame is returned from.
- * Note: This is the POSIX specific implementation.
- *
- * @param[in] T                 - the type of each object.
- * @param[in] S                 - the number of obecs to allocate.
- */
-#if ALLOC == DYNAMIC
-#define RLC_ALLOCA(T, S)		(T*) malloc((S) * sizeof(T))
-#else
-#define RLC_ALLOCA(T, S)		(T*) alloca((S) * sizeof(T))
-#endif
-
-#endif
-
-/*
- * Free memory allocated with RLC_ALLOCA.
- *
- * @param[in] A					- the variable to free.
- */
-#if ALLOC == DYNAMIC
-#define RLC_FREE(A)															\
-	if (A != NULL) {														\
-		free((void *)A);													\
-		A = NULL;															\
-	}
-#else
-#define RLC_FREE(A)         	(void)A;
-#endif
diff --git a/src/dashbls/depends/relic/include/relic_arch.h b/src/dashbls/depends/relic/include/relic_arch.h
deleted file mode 100644
index ec00239c500b..000000000000
--- a/src/dashbls/depends/relic/include/relic_arch.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup arch Architecture-dependent utilities
- */
-
-/**
- * @file
- *
- * Interface of architecture-dependent functions.
- *
- * @ingroup arch
- */
-
-#ifndef RLC_ARCH_H
-#define RLC_ARCH_H
-
-#include "relic_types.h"
-#include "relic_label.h"
-
-#if ARCH == AVR
-#include <avr/pgmspace.h>
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Chooses a proper way to store a string in the target architecture.
- *
- * @param[in] S					- the string to store.
- */
-#if ARCH == AVR
-#define RLC_STR(S)				PSTR(S)
-#else
-#define RLC_STR(S)				S
-#endif
-
-/**
- * Fetches a constant string to be used by the library.
- *
- * @param[out] S			- the resulting prepared parameter.
- * @param[in] ID			- the parameter represented as a string.
- * @param[in] L				- the length of the string.
- */
-#if ARCH == AVR
-#define RLC_GET(S, ID, L)		arch_copy_rom(S, RLC_STR(ID), L);
-#else
-#define RLC_GET(S, ID, L)		memcpy(S, ID, L);
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Performs architecture-dependent initialization.
- */
-void arch_init(void);
-
-/**
- * Performs architecture-dependent finalization.
- */
-void arch_clean(void);
-
-/**
- * Return the number of elapsed cycles.
- */
-ull_t arch_cycles(void);
-
-/**
- * Return the number of leading zeros in an integer.
- */
-uint_t arch_lzcnt(dig_t);
-
-#if ARCH == AVR
-
-/**
- * Copies a string from the text section to the destination vector.
- *
- * @param[out] dest		- the destination vector.
- * @param[in] src		- the pointer to the string stored on the text section.
- * @param[in] len		- the length of the string.
- */
-void arch_copy_rom(char *dest, const char *src, int len);
-
-#endif
-
-#endif /* !RLC_ARCH_H */
diff --git a/src/dashbls/depends/relic/include/relic_bc.h b/src/dashbls/depends/relic/include/relic_bc.h
deleted file mode 100644
index 29196eb64cc0..000000000000
--- a/src/dashbls/depends/relic/include/relic_bc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup bc Block ciphers
- */
-
-/**
- * @file
- *
- * Interface of the module for encrypting with block ciphers.
- *
- * @ingroup bc
- */
-
-#ifndef RLC_BC_H
-#define RLC_BC_H
-
-#include "relic_conf.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Length in bytes of the default block cipher length.
- */
-#define RLC_BC_LEN					16
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Encrypts with AES in CBC mode.
- *
- * @param[out] out			- the resulting ciphertext.
- * @param[in,out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the bytes to be encrypted.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] key			- the key.
- * @param[in] key_len		- the key size in bytes.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int bc_aes_cbc_enc(uint8_t *out, int *out_len, uint8_t *in,
-		int in_len, uint8_t *key, int key_len, uint8_t *iv);
-
-/**
- * Decrypts with AES in CBC mode.
- *
- * @param[out] out			- the resulting plaintext.
- * @param[in,out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the bytes to be decrypted.
- * @param[in] in_len		- the number of bytes to decrypt.
- * @param[in] key			- the key.
- * @param[in] key_len		- the key size in bytes.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int bc_aes_cbc_dec(uint8_t *out, int *out_len, uint8_t *in,
-		int in_len, uint8_t *key, int key_len, uint8_t *iv);
-
-#endif /* !RLC_BC_H */
diff --git a/src/dashbls/depends/relic/include/relic_bench.h b/src/dashbls/depends/relic/include/relic_bench.h
deleted file mode 100644
index 5d51677068c8..000000000000
--- a/src/dashbls/depends/relic/include/relic_bench.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup bench Automated benchmarks
- */
-
-/**
- * @file
- *
- * Interface of useful routines for benchmarking.
- *
- * @ingroup bench
- */
-
-#ifndef RLC_BENCH_H
-#define RLC_BENCH_H
-
-#include "relic_conf.h"
-#include "relic_label.h"
-#include "relic_util.h"
-
-#if OPSYS == LINUX && TIMER == PERF
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-#include <linux/perf_event.h>
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Runs a new benchmark once.
- *
- * @param[in] LABEL			- the label for this benchmark.
- * @param[in] FUNCTION		- the function to benchmark.
- * @param[in] N				- the amortization factor.
- */
-#define BENCH_ONE(LABEL, FUNCTION, N)										\
-	bench_reset();															\
-	util_print("BENCH: " LABEL "%*c = ", (int)(32 - strlen(LABEL)), ' ');	\
-	bench_before();															\
-	FUNCTION;																\
-	bench_after();															\
-	bench_compute(N);														\
-	bench_print();															\
-
-/**
- * Runs a new benchmark a small number of times and prints the average timing
- * amortized by N.
- *
- * @param[in] LABEL			- the label for this benchmark.
- * @param[in] FUNCTION		- the function to benchmark.
- * @param[in] N				- the amortization factor.
- */
-#define BENCH_FEW(LABEL, FUNCTION, N)										\
-	bench_reset();															\
-	util_print("BENCH: " LABEL "%*c = ", (int)(32 - strlen(LABEL)), ' ');	\
-	bench_before();															\
-	for (int i = 0; i < BENCH; i++)	{										\
-		FUNCTION;															\
-	}																		\
-	bench_after();															\
-	bench_compute(BENCH * (N));												\
-	bench_print();															\
-
-/**
- * Runs a new benchmark.
- *
- * @param[in] LABEL			- the label for this benchmark.
- */
-#define BENCH_RUN(LABEL)													\
-	bench_reset();															\
-	util_print("BENCH: " LABEL "%*c = ", (int)(32 - strlen(LABEL)), ' ');	\
-	for (int _b = 0; _b < BENCH; _b++)	{									\
-
-/**
- * Prints the average timing of each execution in the chosen metric.
- */
-#define BENCH_END															\
-	}																		\
-	bench_compute(BENCH * BENCH);											\
-	bench_print()															\
-
-/**
- * Prints the average timing of each execution amortized by N.
- *
- * @param N				- the amortization factor.
- */
-#define BENCH_DIV(N)														\
-	}																		\
-	bench_compute(BENCH * BENCH * N);										\
-	bench_print()															\
-
-/**
- * Measures the time of one execution and adds it to the benchmark total.
- *
- * @param[in] FUNCTION		- the function executed.
- */
-#define BENCH_ADD(FUNCTION)													\
-	FUNCTION;																\
-	bench_before();															\
-	for (int _b = 0; _b < BENCH; _b++) {									\
-		FUNCTION;															\
-	}																		\
-	bench_after();															\
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Timer type.
- */
-#if OPSYS == DUINO && TIMER == HREAL
-
-typedef uint32_t ben_t;
-
-#elif TIMER == HREAL || TIMER == HPROC || TIMER == HTHRD
-
-#include <sys/time.h>
-#include <time.h>
-typedef struct timespec ben_t;
-
-#elif TIMER == ANSI
-
-#include <time.h>
-typedef clock_t ben_t;
-
-#elif TIMER == POSIX
-
-#include <sys/time.h>
-typedef struct timeval ben_t;
-
-#else /* TIMER == CYCLE || TIMER == PERF */
-
-typedef unsigned long long ben_t;
-
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the benchmarking module.
- */
-void bench_init(void);
-
-/**
- * Finalizes the benchmarking module.
- */
-void bench_clean(void);
-
-/**
- * Measures and prints benchmarking overhead.
- */
-void bench_overhead(void);
-
-/**
- * Resets the benchmark data.
- *
- * @param[in] label			- the benchmark label.
- */
-void bench_reset(void);
-
-/**
- * Measures the time before a benchmark is executed.
- */
-void bench_before(void);
-
-/**
- * Measures the time after a benchmark was started and adds it to the total.
- */
-void bench_after(void);
-
-/**
- * Computes the mean elapsed time between the start and the end of a benchmark.
- *
- * @param benches			- the number of executed benchmarks.
- */
-void bench_compute(int benches);
-
-/**
- * Prints the last benchmark.
- */
-void bench_print(void);
-
-/**
- * Returns the result of the last benchmark.
- *
- * @return the last benchmark.
- */
-ull_t bench_total(void);
-
-#endif /* !RLC_BENCH_H */
diff --git a/src/dashbls/depends/relic/include/relic_bn.h b/src/dashbls/depends/relic/include/relic_bn.h
deleted file mode 100644
index 6ab7e4f972c5..000000000000
--- a/src/dashbls/depends/relic/include/relic_bn.h
+++ /dev/null
@@ -1,1391 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup bn Multiple precision integer arithmetic
- */
-
-/**
- * @file
- *
- * Interface of the module for multiple precision integer arithmetic.
- *
- * @ingroup bn
- */
-
-#ifndef RLC_BN_H
-#define RLC_BN_H
-
-#include "relic_conf.h"
-#include "relic_util.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Precision in bits of a multiple precision integer.
- *
- * If the library is built with support for dynamic allocation, this constant
- * represents the size in bits of the memory block allocated each time a
- * multiple precision integer must grow. Otherwise, it represents the fixed
- * fixed precision.
- */
-#define RLC_BN_BITS 	((int)BN_PRECI)
-
-/**
- * Size in digits of a block sufficient to store the required precision.
- */
-#define RLC_BN_DIGS		((int)RLC_CEIL(BN_PRECI, RLC_DIG))
-
-/**
- * Size in digits of a block sufficient to store a multiple precision integer.
- */
-#if BN_MAGNI == DOUBLE
-#define RLC_BN_SIZE		((int)(2 * RLC_BN_DIGS + 2))
-#elif BN_MAGNI == CARRY
-#define RLC_BN_SIZE		((int)(RLC_BN_DIGS + 1))
-#elif BN_MAGNI == SINGLE
-#define RLC_BN_SIZE		((int)RLC_BN_DIGS)
-#endif
-
-/**
- * Positive sign of a multiple precision integer.
- */
-#define RLC_POS		0
-
-/**
- * Negative sign of a multiple precision integer.
- */
-#define RLC_NEG		1
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a multiple precision integer.
- *
- * The field dp points to a vector of digits. These digits are organized
- * in little-endian format, that is, the least significant digits are
- * stored in the first positions of the vector.
- */
-typedef struct {
-	/** The number of digits allocated to this multiple precision integer. */
-	int alloc;
-	/** The number of digits actually used. */
-	int used;
-	/** The sign of this multiple precision integer. */
-	int sign;
-#if ALLOC == DYNAMIC
-	/** The sequence of contiguous digits that forms this integer. */
-	dig_t *dp;
-#elif ALLOC == AUTO
-	/** The sequence of contiguous digits that forms this integer. */
-	rlc_align dig_t dp[RLC_BN_SIZE];
-#endif
-} bn_st;
-
-/**
- * Pointer to a multiple precision integer structure.
- */
-#if ALLOC == AUTO
-typedef bn_st bn_t[1];
-#elif ALLOC == DYNAMIC
-#ifdef CHECK
-typedef bn_st *volatile bn_t;
-#else
-typedef bn_st *bn_t;
-#endif
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a multiple precision integer with a null value.
- *
- * @param[out] A			- the multiple precision integer to initialize.
- */
-#if ALLOC == AUTO
-#define bn_null(A)			/* empty */
-#elif ALLOC == DYNAMIC
-#define bn_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate and initialize a multiple precision integer.
- *
- * @param[in,out] A			- the multiple precision integer to initialize.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define bn_new(A)															\
-	A = (bn_t)calloc(1, sizeof(bn_st));										\
-	if ((A) == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_make(A, RLC_BN_SIZE);												\
-
-#elif ALLOC == AUTO
-#define bn_new(A)															\
-	bn_make(A, RLC_BN_SIZE);												\
-
-#endif
-
-/**
- * Calls a function to allocate and initialize a multiple precision integer
- * with the required precision in digits.
- *
- * @param[in,out] A			- the multiple precision integer to initialize.
- * @param[in] D				- the precision in digits.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- * @throw ERR_PRECISION		- if the required precision cannot be represented
- * 							by the library.
- */
-#if ALLOC == DYNAMIC
-#define bn_new_size(A, D)													\
-	A = (bn_t)calloc(1, sizeof(bn_st));										\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_make(A, D);															\
-
-#elif ALLOC == AUTO
-#define bn_new_size(A, D)													\
-	bn_make(A, D);															\
-
-#endif
-
-/**
- * Calls a function to clean and free a multiple precision integer.
- *
- * @param[in,out] A			- the multiple precision integer to free.
- */
-#if ALLOC == DYNAMIC
-#define bn_free(A)															\
-	if (A != NULL) {														\
-		bn_clean(A);														\
-		free((void *)A);													\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define bn_free(A)			/* empty */										\
-
-#endif
-
-/**
- * Multiples two multiple precision integers. Computes c = a * b.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first multiple precision integer to multiply.
- * @param[in] B				- the second multiple precision integer to multiply.
- */
-#if BN_KARAT > 0
-#define bn_mul(C, A, B)		bn_mul_karat(C, A, B)
-#elif BN_MUL == BASIC
-#define bn_mul(C, A, B)		bn_mul_basic(C, A, B)
-#elif BN_MUL == COMBA
-#define bn_mul(C, A, B)		bn_mul_comba(C, A, B)
-#endif
-
-/**
- * Computes the square of a multiple precision integer. Computes c = a * a.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiple precision integer to square.
- */
-#if BN_KARAT > 0
-#define bn_sqr(C, A)		bn_sqr_karat(C, A)
-#elif BN_SQR == BASIC
-#define bn_sqr(C, A)		bn_sqr_basic(C, A)
-#elif BN_SQR == COMBA
-#define bn_sqr(C, A)		bn_sqr_comba(C, A)
-#elif BN_SQR == MULTP
-#define bn_sqr(C, A)		bn_mul(C, A, A)
-#endif
-
-/**
- * Computes the auxiliar value derived from the modulus to be used during
- * modular reduction.
- *
- * @param[out] U			- the result.
- * @param[in] M				- the modulus.
- */
-#if BN_MOD == BASIC
-#define bn_mod_pre(U, M)	(void)(U), (void)(M)
-#elif BN_MOD == BARRT
-#define bn_mod_pre(U, M)	bn_mod_pre_barrt(U, M)
-#elif BN_MOD == MONTY
-#define bn_mod_pre(U, M)	bn_mod_pre_monty(U, M)
-#elif BN_MOD == PMERS
-#define bn_mod_pre(U, M)	bn_mod_pre_pmers(U, M)
-#endif
-
-/**
- * Reduces a multiple precision integer modulo another integer. If the number
- * of arguments is 3, then simple division is used. If the number of arguments
- * is 4, then a modular reduction algorithm is used and the fourth argument
- * is an auxiliary value derived from the modulus. The variant with 4 arguments
- * should be used when several modular reductions are computed with the same
- * modulus. Computes c = a mod m.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiple precision integer to reduce.
- * @param[in] ...			- the modulus and an optional argument.
- */
-#define bn_mod(C, A, ...)	RLC_CAT(bn_mod, RLC_OPT(__VA_ARGS__))(C, A, __VA_ARGS__)
-
-/**
- * Reduces a multiple precision integer modulo another integer. This macro
- * should not be called directly. Use bn_mod with 4 arguments instead.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the the multiple precision integer to reduce.
- * @param[in] M				- the modulus.
- * @param[in] U				- the auxiliar value derived from the modulus.
- */
-#if BN_MOD == BASIC
-#define bn_mod_imp(C, A, M, U)	bn_mod_basic(C, A, M)
-#elif BN_MOD == BARRT
-#define bn_mod_imp(C, A, M, U)	bn_mod_barrt(C, A, M, U)
-#elif BN_MOD == MONTY
-#define bn_mod_imp(C, A, M, U)	bn_mod_monty(C, A, M, U)
-#elif BN_MOD == PMERS
-#define bn_mod_imp(C, A, M, U)	bn_mod_pmers(C, A, M, U)
-#endif
-
-/**
- * Reduces a multiple precision integer modulo a positive integer using
- * Montgomery reduction. Computes c = a * u^(-1) (mod m).
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiple precision integer to reduce.
- * @param[in] M				- the modulus.
- * @param[in] U				- the reciprocal of the modulus.
- */
-#if BN_MUL == BASIC
-#define bn_mod_monty(C, A, M, U)	bn_mod_monty_basic(C, A, M, U)
-#elif BN_MUL == COMBA
-#define bn_mod_monty(C, A, M, U)	bn_mod_monty_comba(C, A, M, U)
-#endif
-
-/**
- * Exponentiates a multiple precision integer modulo another multiple precision
- * integer. Computes c = a^b mod m. If Montgomery reduction is used, the basis
- * must not be in Montgomery form.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the basis.
- * @param[in] B				- the exponent.
- * @param[in] M				- the modulus.
- */
-#if BN_MXP == BASIC
-#define bn_mxp(C, A, B, M)	bn_mxp_basic(C, A, B, M)
-#elif BN_MXP == SLIDE
-#define bn_mxp(C, A, B, M)	bn_mxp_slide(C, A, B, M)
-#elif BN_MXP == MONTY
-#define bn_mxp(C, A, B, M)	bn_mxp_monty(C, A, B, M)
-#endif
-
-/**
- * Computes the greatest common divisor of two multiple precision integers.
- * Computes c = gcd(a, b).
- *
- * @param[out] C			- the result;
- * @param[in] A				- the first multiple precision integer.
- * @param[in] B				- the second multiple precision integer.
- */
-#if BN_GCD == BASIC
-#define bn_gcd(C, A, B)		bn_gcd_basic(C, A, B)
-#elif BN_GCD == LEHME
-#define bn_gcd(C, A, B)		bn_gcd_lehme(C, A, B)
-#elif BN_GCD == STEIN
-#define bn_gcd(C, A, B)		bn_gcd_stein(C, A, B)
-#endif
-
-/**
- * Computes the extended greatest common divisor of two multiple precision
- * integers. This function can be used to compute multiplicative inverses.
- * Computes c = gcd(a, b) and c = a * d + b * e.
- *
- * @param[out] C			- the result;
- * @param[out] D			- the cofactor of the first operand, cannot be NULL.
- * @param[out] E			- the cofactor of the second operand, can be NULL.
- * @param[in] A				- the first multiple precision integer.
- * @param[in] B				- the second multiple precision integer.
- */
-#if BN_GCD == BASIC
-#define bn_gcd_ext(C, D, E, A, B)		bn_gcd_ext_basic(C, D, E, A, B)
-#elif BN_GCD == LEHME
-#define bn_gcd_ext(C, D, E, A, B)		bn_gcd_ext_lehme(C, D, E, A, B)
-#elif BN_GCD == STEIN
-#define bn_gcd_ext(C, D, E, A, B)		bn_gcd_ext_stein(C, D, E, A, B)
-#endif
-
-/**
- * Generates a probable prime number.
- *
- * @param[out] A			- the result.
- * @param[in] B				- the length of the number in bits.
- */
-#if BN_GEN == BASIC
-#define bn_gen_prime(A, B)	bn_gen_prime_basic(A, B)
-#elif BN_GEN == SAFEP
-#define bn_gen_prime(A, B)	bn_gen_prime_safep(A, B)
-#elif BN_GEN == STRON
-#define bn_gen_prime(A, B)	bn_gen_prime_stron(A, B)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes a previously allocated multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer to initialize.
- * @param[in] digits		- the required precision in digits.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- * @throw ERR_PRECISION		- if the required precision cannot be represented
- * 							by the library.
- */
-void bn_make(bn_t a, int digits);
-
-/**
- * Cleans a multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer to free.
- */
-void bn_clean(bn_t a);
-
-/**
- * Checks the current precision of a multiple precision integer and optionally
- * expands its precision to a given size in digits.
- *
- * @param[out] a			- the multiple precision integer to expand.
- * @param[in] digits		- the number of digits to expand.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- * @throw ERR_PRECISION		- if the required precision cannot be represented
- * 							by the library.
- */
-void bn_grow(bn_t a, int digits);
-
-/**
- * Adjust the number of valid digits of a multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer to adjust.
- */
-void bn_trim(bn_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to copy.
- */
-void bn_copy(bn_t c, const bn_t a);
-
-/**
- * Returns the absolute value of a multiple precision integer.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the argument of the absolute function.
- */
-void bn_abs(bn_t c, const bn_t a);
-
-/**
- * Inverts the sign of a multiple precision integer.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the multiple precision integer to negate.
- */
-void bn_neg(bn_t c, const bn_t a);
-
-/**
- * Returns the sign of a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @return RLC_POS if the argument is positive and RLC_NEG otherwise.
- */
-int bn_sign(const bn_t a);
-
-/**
- * Assigns zero to a multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer to assign.
- */
-void bn_zero(bn_t a);
-
-/**
- * Tests if a multiple precision integer is zero or not.
- *
- * @param[in] a				- the multiple precision integer to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int bn_is_zero(const bn_t a);
-
-/**
- * Tests if a multiple precision integer is even or odd.
- *
- * @param[in] a				- the multiple precision integer to test.
- * @return 1 if the argument is even, 0 otherwise.
- */
-int bn_is_even(const bn_t a);
-
-/**
- * Returns the number of bits of a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @return number of bits.
- */
-int bn_bits(const bn_t a);
-
-/**
- * Returns the bit stored in the given position on a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @param[in] bit			- the bit position to read.
- * @return the bit value.
- */
-int bn_get_bit(const bn_t a, int bit);
-
-/**
- * Stores a bit in a given position on a multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer.
- * @param[in] bit			- the bit position to store.
- * @param[in] value			- the bit value.
- */
-void bn_set_bit(bn_t a, int bit, int value);
-
-/**
- * Returns the Hamming weight of a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @return the number of non-zero bits.
- */
-int bn_ham(const bn_t a);
-
-/**
- * Reads the first digit in a multiple precision integer.
- *
- * @param[out] digit		- the result.
- * @param[in] a				- the multiple precision integer.
- */
-void bn_get_dig(dig_t *digit, const bn_t a);
-
-/**
- * Assigns a small positive constant to a multiple precision integer.
- *
- * The constant must fit on a multiple precision digit, or dig_t type using
- * only the number of bits specified on RLC_DIG.
- *
- * @param[out] a			- the result.
- * @param[in] digit			- the constant to assign.
- */
-void bn_set_dig(bn_t a, dig_t digit);
-
-/**
- * Assigns a multiple precision integer to 2^b.
- *
- * @param[out] a			- the result.
- * @param[in] b				- the power of 2 to assign.
- */
-void bn_set_2b(bn_t a, int b);
-
-/**
- * Assigns a random value to a multiple precision integer.
- *
- * @param[out] a			- the multiple precision integer to assign.
- * @param[in] sign			- the sign to be assigned (RLC_NEG or RLC_POS).
- * @param[in] bits			- the number of bits.
- */
-void bn_rand(bn_t a, int sign, int bits);
-
-/**
- * Assigns a non-zero random value to a multiple precision integer with absolute
- * value smaller than a given modulus.
- *
- * @param[out] a			- the multiple precision integer to assign.
- * @param[in] b				- the modulus.
- */
-void bn_rand_mod(bn_t a, bn_t b);
-
-/**
- * Prints a multiple precision integer to standard output.
- *
- * @param[in] a				- the multiple precision integer to print.
- */
-void bn_print(const bn_t a);
-
-/**
- * Returns the number of digits in radix necessary to store a multiple precision
- * integer. The radix must be included in the interval [2, 64].
- *
- * @param[in] a				- the multiple precision integer.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- * @return the number of digits in the given radix.
- */
-int bn_size_str(const bn_t a, int radix);
-
-/**
- * Reads a multiple precision integer from a string in a given radix. The radix
- * must be included in the interval [2, 64].
- *
- * @param[out] a			- the result.
- * @param[in] str			- the string.
- * @param[in] len			- the size of the string.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- */
-void bn_read_str(bn_t a, const char *str, int len, int radix);
-
-/**
- * Writes a multiple precision integer to a string in a given radix. The radix
- * must be included in the interval [2, 64].
- *
- * @param[out] str			- the string.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the multiple integer to write.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- */
-void bn_write_str(char *str, int len, const bn_t a, int radix);
-
-/**
- * Returns the number of bytes necessary to store a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @return the number of bytes.
- */
-int bn_size_bin(const bn_t a);
-
-/**
- * Reads a positive multiple precision integer from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- */
-void bn_read_bin(bn_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a positive multiple precision integer to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the multiple integer to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_write_bin(uint8_t *bin, int len, const bn_t a);
-
-/**
- * Returns the number of digits necessary to store a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @return the number of digits.
- */
-int bn_size_raw(const bn_t a);
-
-/**
- * Reads a positive multiple precision integer from a digit vector.
- *
- * @param[out] a			- the result.
- * @param[in] raw			- the digit vector.
- * @param[in] len			- the size of the string.
- */
-void bn_read_raw(bn_t a, const dig_t *raw, int len);
-
-/**
- * Writes a positive multiple precision integer to a byte vector.
- *
- * @param[out] raw			- the digit vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the multiple integer to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_write_raw(dig_t *raw, int len, const bn_t a);
-
-/**
- * Returns the result of an unsigned comparison between two multiple precision
- * integers.
- *
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- * @return RLC_LT if a < b, RLC_EQ if a == b and RLC_GT if a > b.
- */
-int bn_cmp_abs(const bn_t a, const bn_t b);
-
-/**
- * Returns the result of a signed comparison between a multiple precision
- * integer and a digit.
- *
- * @param[in] a				- the multiple precision integer.
- * @param[in] b				- the digit.
- * @return RLC_LT if a < b, RLC_EQ if a == b and RLC_GT if a > b.
- */
-int bn_cmp_dig(const bn_t a, dig_t b);
-
-/**
- * Returns the result of a signed comparison between two multiple precision
- * integers.
- *
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- * @return RLC_LT if a < b, RLC_EQ if a == b and RLC_GT if a > b.
- */
-int bn_cmp(const bn_t a, const bn_t b);
-
-/**
- * Adds two multiple precision integers. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first multiple precision integer to add.
- * @param[in] b				- the second multiple precision integer to add.
- */
-void bn_add(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Adds a multiple precision integers and a digit. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to add.
- * @param[in] b				- the digit to add.
- */
-void bn_add_dig(bn_t c, const bn_t a, dig_t b);
-
-/**
- * Subtracts a multiple precision integer from another, that is, computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer.
- * @param[in] b				- the multiple precision integer to subtract.
- */
-void bn_sub(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Subtracts a digit from a multiple precision integer. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer.
- * @param[in] b				- the digit to subtract.
- */
-void bn_sub_dig(bn_t c, const bn_t a, const dig_t b);
-
-/**
- * Multiplies a multiple precision integer by a digit. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to multiply.
- * @param[in] b				- the digit to multiply.
- */
-void bn_mul_dig(bn_t c, const bn_t a, dig_t b);
-
-/**
- * Multiplies two multiple precision integers using Schoolbook multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first multiple precision integer to multiply.
- * @param[in] b				- the second multiple precision integer to multiply.
- */
-void bn_mul_basic(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Multiplies two multiple precision integers using Comba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first multiple precision integer to multiply.
- * @param[in] b				- the second multiple precision integer to multiply.
- */
-void bn_mul_comba(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Multiplies two multiple precision integers using Karatsuba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first multiple precision integer to multiply.
- * @param[in] b				- the second multiple precision integer to multiply.
- */
-void bn_mul_karat(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the square of a multiple precision integer using Schoolbook
- * squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to square.
- */
-void bn_sqr_basic(bn_t c, const bn_t a);
-
-/**
- * Computes the square of a multiple precision integer using Comba squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to square.
- */
-void bn_sqr_comba(bn_t c, const bn_t a);
-
-/**
- * Computes the square of a multiple precision integer using Karatsuba squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to square.
- */
-void bn_sqr_karat(bn_t c, const bn_t a);
-
-/**
- * Doubles a multiple precision. Computes c = a + a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to double.
- */
-void bn_dbl(bn_t c, const bn_t a);
-
-/**
- * Halves a multiple precision. Computes c = floor(a / 2)
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to halve.
- */
-void bn_hlv(bn_t c, const bn_t a);
-
-/**
- * Shifts a multiple precision number to the left. Computes c = a * 2^bits.
- * c = a * 2^bits.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void bn_lsh(bn_t c, const bn_t a, int bits);
-
-/**
- * Shifts a multiple precision number to the right. Computes
- * c = floor(a / 2^bits).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void bn_rsh(bn_t c, const bn_t a, int bits);
-
-/**
- * Divides a multiple precision integer by another multiple precision integer
- * without producing the positive remainder. Computes c = floor(a / b).
- *
- * @param[out] c			- the resulting quotient.
- * @param[in] a				- the dividend.
- * @param[in] b				- the divisor.
- * @throw ERR_NO_VALID		- if the divisor is zero.
- */
-void bn_div(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Divides a multiple precision integer by another multiple precision integer
- * and produces a positive remainder. Computes c = floor(a / b) and d = a mod b.
- *
- * @param[out] c			- the resulting quotient.
- * @param[out] d			- the positive remainder.
- * @param[in] a				- the dividend.
- * @param[in] b				- the divisor.
- * @throw ERR_NO_VALID		- if the divisor is zero.
- */
-void bn_div_rem(bn_t c, bn_t d, const bn_t a, const bn_t b);
-
-/**
- * Divides a multiple precision integers by a digit without computing the
- * remainder. Computes c = floor(a / b).
- *
- * @param[out] c			- the resulting quotient.
- * @param[out] d			- the remainder.
- * @param[in] a				- the dividend.
- * @param[in] b				- the divisor.
- * @throw ERR_NO_VALID		- if the divisor is zero.
- */
-void bn_div_dig(bn_t c, const bn_t a, dig_t b);
-
-/**
- * Divides a multiple precision integers by a digit. Computes c = floor(a / b)
- * and d = a mod b.
- *
- * @param[out] c			- the resulting quotient.
- * @param[out] d			- the remainder.
- * @param[in] a				- the dividend.
- * @param[in] b				- the divisor.
- * @throw ERR_NO_VALID		- if the divisor is zero.
- */
-void bn_div_rem_dig(bn_t c, dig_t *d, const bn_t a, const dig_t b);
-
-/**
- * Computes the modular inverse of a multiple precision integer. Computes c such
- * that a*c mod b = 1.
- *
- * @param[out] c 			- the result.
- * @param[in] a				- the element to invert.
- * param[in] b				- the modulus.
- *
- */
-void bn_mod_inv(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Reduces a multiple precision integer modulo a power of 2. Computes
- * c = a mod 2^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dividend.
- * @param[in] b				- the exponent of the divisor.
- */
-void bn_mod_2b(bn_t c, const bn_t a, int b);
-
-/**
- * Reduces a multiple precision integer modulo a digit. Computes c = a mod b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dividend.
- * @param[in] b				- the divisor.
- */
-void bn_mod_dig(dig_t *c, const bn_t a, dig_t b);
-
-/**
- * Reduces a multiple precision integer modulo an integer using straightforward
- * division.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to reduce.
- * @param[in] m				- the modulus.
- */
-void bn_mod_basic(bn_t c, const bn_t a, const bn_t m);
-
-/**
- * Computes the reciprocal of the modulus to be used in the Barrett modular
- * reduction algorithm.
- *
- * @param[out] u			- the result.
- * @param[in] m				- the modulus.
- */
-void bn_mod_pre_barrt(bn_t u, const bn_t m);
-
-/**
- * Reduces a multiple precision integer modulo a positive integer using Barrett
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the the multiple precision integer to reduce.
- * @param[in] m				- the modulus.
- * @param[in] u				- the reciprocal of the modulus.
- */
-void bn_mod_barrt(bn_t c, const bn_t a, const bn_t m, const bn_t u);
-
-/**
- * Computes the reciprocal of the modulus to be used in the Montgomery reduction
- * algorithm.
- *
- * @param[out] u			- the result.
- * @param[in] m				- the modulus.
- * @throw ERR_NO_VALID		- if the modulus is even.
- */
-void bn_mod_pre_monty(bn_t u, const bn_t m);
-
-/**
- * Converts a multiple precision integer to Montgomery form.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to convert.
- * @param[in] m				- the modulus.
- */
-void bn_mod_monty_conv(bn_t c, const bn_t a, const bn_t m);
-
-/**
- * Converts a multiple precision integer from Montgomery form.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to convert.
- * @param[in] m				- the modulus.
- */
-void bn_mod_monty_back(bn_t c, const bn_t a, const bn_t m);
-
-/**
- * Reduces a multiple precision integer modulo a positive integer using
- * Montgomery reduction with Schoolbook multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to reduce.
- * @param[in] m				- the modulus.
- * @param[in] u				- the reciprocal of the modulus.
- */
-void bn_mod_monty_basic(bn_t c, const bn_t a, const bn_t m, const bn_t u);
-
-/**
- * Reduces a multiple precision integer modulo a positive integer using
- * Montgomery reduction with Comba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to reduce.
- * @param[in] m				- the modulus.
- * @param[in] u				- the reciprocal of the modulus.
- */
-void bn_mod_monty_comba(bn_t c, const bn_t a, const bn_t m, const bn_t u);
-
-/**
- * Computes u if the modulus has the form 2^b - u.
- *
- * @param[out] u			- the result.
- * @param[in] m				- the modulus.
- */
-void bn_mod_pre_pmers(bn_t u, const bn_t m);
-
-/**
- * Reduces a multiple precision integer modulo a positive integer using
- * pseudo-Mersenne modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to reduce.
- * @param[in] m				- the modulus.
- * @param[in] u				- the auxiliar value derived from the modulus.
- */
-void bn_mod_pmers(bn_t c, const bn_t a, const bn_t m, const bn_t u);
-
-/**
- * Exponentiates a multiple precision integer modulo a positive integer using
- * the binary method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- * @param[in] m				- the modulus.
- */
-void bn_mxp_basic(bn_t c, const bn_t a, const bn_t b, const bn_t m);
-
-/**
- * Exponentiates a multiple precision integer modulo a positive integer using
- * the sliding window method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- * @param[in] m				- the modulus.
- */
-void bn_mxp_slide(bn_t c, const bn_t a, const bn_t b, const bn_t m);
-
-/**
- * Exponentiates a multiple precision integer modulo a positive integer using
- * the constant-time Montgomery powering ladder method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- * @param[in] m				- the modulus.
- */
-void bn_mxp_monty(bn_t c, const bn_t a, const bn_t b, const bn_t m);
-
-/**
- * Exponentiates a multiple precision integer by a small power modulo a positive
- * integer using the binary method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- * @param[in] m				- the modulus.
- */
-void bn_mxp_dig(bn_t c, const bn_t a, dig_t b, const bn_t m);
-
-/**
- * Extracts an approximate integer square-root of a multiple precision integer.
- *
- * @param[out] c 			- the result.
- * @param[in] a 			- the multiple precision integer to extract.
- *
- * @throw ERR_NO_VALID		- if the argument is negative.
- */
-void bn_srt(bn_t c, bn_t a);
-
-/**
- * Computes the greatest common divisor of two multiple precision integers
- * using the standard Euclidean algorithm.
- *
- * @param[out] c			- the result;
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_basic(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the greatest common divisor of two multiple precision integers
- * using Lehmer's GCD algorithm.
- *
- * @param[out] c			- the result;
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_lehme(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the greatest common divisor of two multiple precision integers
- * using Stein's binary GCD algorithm.
- *
- * @param[out] c			- the result;
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_stein(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the greatest common divisor of a multiple precision integer and a
- * digit.
- *
- * @param[out] c			- the result;
- * @param[in] a				- the multiple precision integer.
- * @param[in] b				- the digit.
- */
-void bn_gcd_dig(bn_t c, const bn_t a, dig_t b);
-
-/**
- * Computes the extended greatest common divisor of two multiple precision
- * integer using the Euclidean algorithm.
- *
- * @param[out] c			- the result.
- * @param[out] d			- the cofactor of the first operand, can be NULL.
- * @param[out] e			- the cofactor of the second operand, can be NULL.
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_ext_basic(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b);
-
-/**
- * Computes the greatest common divisor of two multiple precision integers
- * using Lehmer's algorithm.
- *
- * @param[out] c			- the result;
- * @param[out] d			- the cofactor of the first operand, can be NULL.
- * @param[out] e			- the cofactor of the second operand, can be NULL.
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_ext_lehme(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b);
-
-/**
- * Computes the greatest common divisor of two multiple precision integers
- * using Stein's binary algorithm.
- *
- * @param[out] c			- the result;
- * @param[out] d			- the cofactor of the first operand, can be NULL.
- * @param[out] e			- the cofactor of the second operand, can be NULL.
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_ext_stein(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b);
-
-/**
- * Computes the extended greatest common divisor of two multiple precision
- * integers halfway through the algorithm. Returns also two short vectors
- * v1 = (c, d), v2 = (-e, f) useful to decompose an integer k into k0, k1 such
- * that k = k_0 + k_1 * a (mod b).
- *
- * @param[out] c			- the first component of the first vector.
- * @param[out] d			- the second component of the first vector.
- * @param[out] e			- the first component of the second vector.
- * @param[out] f			- the second component of the second vector.
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- */
-void bn_gcd_ext_mid(bn_t c, bn_t d, bn_t e, bn_t f, const bn_t a, const bn_t b);
-
-/**
- * Computes the extended greatest common divisor of a multiple precision integer
- * and a digit.
- *
- * @param[out] c			- the result.
- * @param[out] d			- the cofactor of the first operand, can be NULL.
- * @param[out] e			- the cofactor of the second operand, can be NULL.
- * @param[in] a				- the multiple precision integer.
- * @param[in] b				- the digit.
- */
-void bn_gcd_ext_dig(bn_t c, bn_t d, bn_t e, const bn_t a, dig_t b);
-
-/**
- * Computes the last common multiple of two multiple precision integers.
- * Computes c = lcm(a, b).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first integer.
- * @param[in] b				- the second integer.
- */
-void bn_lcm(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the Legendre symbol c = (a|b), b prime.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first parameter.
- * @param[in] b				- the second parameter.
- */
-void bn_smb_leg(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Computes the Jacobi symbol c = (a|b).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first parameter.
- * @param[in] b				- the second parameter.
- */
-void bn_smb_jac(bn_t c, const bn_t a, const bn_t b);
-
-/**
- * Returns a small precomputed prime from a given position in the list of prime
- * numbers.
- *
- * @param[in] pos			- the position in the prime sequence.
- * @return a prime if the position is lower than 512, 0 otherwise.
- */
-dig_t bn_get_prime(int pos);
-
-/**
- * Tests if a number is a probable prime.
- *
- * @param[in] a				- the multiple precision integer to test.
- * @return 1 if a is prime, 0 otherwise.
- */
-int bn_is_prime(const bn_t a);
-
-/**
- * Tests if a number is prime using a series of trial divisions.
- *
- * @param[in] a				- the number to test.
- * @return 1 if a is a probable prime, 0 otherwise.
- */
-int bn_is_prime_basic(const bn_t a);
-
-/**
- * Tests if a number a > 2 is prime using the Miller-Rabin test with probability
- * 2^(-80) of error.
- *
- * @param[in] a				- the number to test.
- * @return 1 if a is a probable prime, 0 otherwise.
- */
-int bn_is_prime_rabin(const bn_t a);
-
-/**
- * Tests if a number a > 2 is prime using the Solovay-Strassen test with
- * probability 2^(-80) of error.
- *
- * @param[in] a				- the number to test.
- * @return 1 if a is a probable prime, 0 otherwise.
- */
-int bn_is_prime_solov(const bn_t a);
-
-/**
- * Generates a probable prime number.
- *
- * @param[out] a			- the result.
- * @param[in] bits			- the length of the number in bits.
- */
-void bn_gen_prime_basic(bn_t a, int bits);
-
-/**
- * Generates a probable prime number a with (a - 1)/2 also prime.
- *
- * @param[out] a			- the result.
- * @param[in] bits			- the length of the number in bits.
- */
-void bn_gen_prime_safep(bn_t a, int bits);
-
-/**
- * Generates a probable prime number with (a - 1)/2, (a + 1)/2 and
- * ((a - 1)/2 - 1)/2 also prime.
- *
- * @param[out] a			- the result.
- * @param[in] bits			- the length of the number in bits.
- */
-void bn_gen_prime_stron(bn_t a, int bits);
-
-/**
- * Tries to factorize an integer using Pollard (p - 1) factoring algorithm.
- * The maximum length of the returned factor is 16 bits.
- *
- * @param[out] c			- the resulting factor.
- * @param[in] a				- the integer to fatorize.
- * @return 1 if a factor is found and stored into c; 0 otherwise.
- */
-int bn_factor(bn_t c, const bn_t a);
-
-/**
- * Tests if an integer divides other integer.
- *
- * @param[in] c				- the factor.
- * @param[in] a				- the integer.
- * @return 1 if the first integer is a factor; 0 otherwise.
- */
-int bn_is_factor(bn_t c, const bn_t a);
-
-/**
- * Recodes a positive integer in window form. If a negative integer is given
- * instead, its absolute value is taken.
- *
- * @param[out] win			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_win(uint8_t *win, int *len, const bn_t k, int w);
-
-/**
- * Recodes a positive integer in sliding window form. If a negative integer is
- * given instead, its absolute value is taken.
- *
- * @param[out] win			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_slw(uint8_t *win, int *len, const bn_t k, int w);
-
-/**
- * Recodes a positive integer in width-w Non-Adjacent Form. If a negative
- * integer is given instead, its absolute value is taken.
- *
- * @param[out] naf			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_naf(int8_t *naf, int *len, const bn_t k, int w);
-
-/**
- * Recodes a positive integer in width-w \tau-NAF. If a negative integer is
- * given instead, its absolute value is taken.
- *
- * @param[out] tnaf			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] u				- the u curve parameter.
- * @param[in] m				- the extension degree of the binary field.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_tnaf(int8_t *tnaf, int *len, const bn_t k, int8_t u, int m, int w);
-
-/**
- * Recodes a positive integer in regular fixed-length width-w \tau-NAF.
- * If a negative integer is given instead, its absolute value is taken.
- *
- * @param[out] tnaf			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] u				- the u curve parameter.
- * @param[in] m				- the extension degree of the binary field.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_rtnaf(int8_t *tnaf, int *len, const bn_t k, int8_t u, int m, int w);
-
-/**
- * Write the constants needed for \tau-NAF recoding as a set of \alpha_u =
- * \beta_u + \gamma_u * \tau elements.
- *
- * @param[out] t 		- the integer corresponding to \tau.
- * @param[out] beta		- the first coefficients of the constants.
- * @param[out] gama		- the second coefficients of the constants.
- * @param[in] u 		- the u curve parameter.
- * @param[in] w 		- the window size in bits.
- */
-void bn_rec_tnaf_get(uint8_t *t, int8_t *beta, int8_t *gama, int8_t u, int w);
-
-/**
- * Computes the partial reduction k partmod d = r0 + r1 * t, where
- * d = (t^m - 1)/(t - 1).
- *
- * @param[out] r0		- the first half of the result.
- * @param[out] r1		- the second half of the result.
- * @param[in] k			- the number to reduce.
- * @param[in] u			- the u curve parameter.
- * @param[in] m			- the extension degree of the binary field.
- */
-void bn_rec_tnaf_mod(bn_t r0, bn_t r1, const bn_t k, int u, int m);
-
-/**
- * Recodes a positive integer in regular fixed-length width-w NAF. If a negative
- * integer is given instead, its absolute value is taken.
- *
- * @param[out] naf			- the recoded integer.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the integer to recode.
- * @param[in] n				- the length of the recoding.
- * @param[in] w				- the window size in bits.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_reg(int8_t *naf, int *len, const bn_t k, int n, int w);
-
-/**
- * Recodes of a pair of positive integers in Joint Sparse Form. If negative
- * integers are given instead, takes their absolute value.
- *
- * @param[out] jsf			- the recoded pair of integers.
- * @param[out] len			- the number of bytes written.
- * @param[in] k				- the first integer to recode.
- * @param[in] l				- the second integer to recode.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void bn_rec_jsf(int8_t *jsf, int *len, const bn_t k, const bn_t l);
-
-/**
- * Recodes a positive integer into two parts k0,k1 such that k = k0 + phi(k1),
- * where phi is an efficient curve endomorphism. If a negative integer is
- * given instead, its absolute value is taken.
- *
- * @param[out] k0			- the first part of the result.
- * @param[out] k1			- the second part of the result.
- * @param[in] k				- the integer to recode.
- * @param[in] n				- the group order.
- * @param[in] v1			- the set of parameters v1 for the GLV method.
- * @param[in] v2			- the set of parameters v2 for the GLV method.
- */
-void bn_rec_glv(bn_t k0, bn_t k1, const bn_t k, const bn_t n, const bn_t v1[],
-		const bn_t v2[]);
-
-/**
- * Recodes a scalar in subscalars according to Frobenius endomorphism.
- *
- * @param[out] ki			- the recoded subscalars.
- * @param[in] sub 			- the number of subscalars.
- * @param[in] k				- the scalar to recode.
- * @param[in] x 			- the elliptic curve parameter.
- * @param[in] n				- the elliptic curve group order.
- * @param[in] bls 			- flag to indicate if it is a BLS12 curve.
- */
-void bn_rec_frb(bn_t *ki, int sub, const bn_t k, const bn_t x, const bn_t n,
-	int bls);
-
-#endif /* !RLC_BN_H */
diff --git a/src/dashbls/depends/relic/include/relic_core.h b/src/dashbls/depends/relic/include/relic_core.h
deleted file mode 100644
index 544c37bb7c84..000000000000
--- a/src/dashbls/depends/relic/include/relic_core.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup relic Core functions
- */
-
-/**
- * @file
- *
- * Interface of the library core functions.
- *
- * @ingroup relic
- */
-
-#ifndef RLC_CORE_H
-#define RLC_CORE_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "relic_err.h"
-#include "relic_bn.h"
-#include "relic_eb.h"
-#include "relic_epx.h"
-#include "relic_ed.h"
-#include "relic_pc.h"
-#include "relic_conf.h"
-#include "relic_bench.h"
-#include "relic_rand.h"
-#include "relic_label.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Indicates that the function executed correctly.
- */
-#define RLC_OK			0
-
-/**
- * Indicates that an error occurred during the function execution.
- */
-#define RLC_ERR			1
-
-/**
- * Indicates that a comparison returned that the first argument was lesser than
- * the second argument.
- */
-#define RLC_LT			-1
-
-/**
- * Indicates that a comparison returned that the first argument was equal to
- * the second argument.
- */
-#define RLC_EQ			0
-
-/**
- * Indicates that a comparison returned that the first argument was greater than
- * the second argument.
- */
-#define RLC_GT			1
-
-/**
- * Indicates that two incomparable elements are not equal.
- */
-#define RLC_NE			2
-
-/**
- * Optimization identifer for the case where a coefficient is 0.
- */
-#define RLC_ZERO		0
-
-/**
- * Optimization identifer for the case where a coefficient is 1.
- */
-#define RLC_ONE			1
-
-/**
- * Optimization identifer for the case where a coefficient is 2.
- */
-#define RLC_TWO			2
-
-/**
- * Optimization identifier for the case where a coefficient is -3.
- */
-#define RLC_MIN3		3
-
-/**
- * Optimization identifer for the case where a coefficient is small.
- */
-#define RLC_TINY		4
-
-/**
- * Optimization identifier for the case where the coefficient is arbitrary.
- */
-#define RLC_HUGE		5
-
-/**
- * Maximum number of terms to describe a sparse object.
- */
-#define RLC_TERMS		16
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Library context.
- */
-typedef struct _ctx_t {
-	/** The value returned by the last call, can be RLC_OK or RLC_ERR. */
-	int code;
-
-#ifdef CHECK
-	/** The state of the last error caught. */
-	sts_t *last;
-	/** Error state to be used outside try-catch blocks. */
-	sts_t error;
-	/** Error number to be used outside try-catch blocks. */
-	err_t number;
-	/** The error message respective to the last error. */
-	char *reason[ERR_MAX];
-	/** A flag to indicate if the last error was already caught. */
-	int caught;
-#endif /* CHECK */
-
-#ifdef WITH_FB
-	/** Identifier of the currently configured binary field. */
-	int fb_id;
-	/** Irreducible binary polynomial. */
-	fb_st fb_poly;
-	/** Non-zero coefficients of a trinomial or pentanomial. */
-	int fb_pa, fb_pb, fb_pc;
-	/** Positions of the non-zero coefficients of trinomials or pentanomials. */
-	int fb_na, fb_nb, fb_nc;
-#if FB_TRC == QUICK || !defined(STRIP)
-	/** Powers of z with non-zero traces. */
-	int fb_ta, fb_tb, fb_tc;
-#endif /* FB_TRC == QUICK */
-#if FB_SLV == QUICK || !defined(STRIP)
-	/** Table of precomputed half-traces. */
-	fb_st fb_half[(RLC_DIG / 8 + 1) * RLC_FB_DIGS][16];
-#endif /* FB_SLV == QUICK */
-#if FB_SRT == QUICK || !defined(STRIP)
-	/** Square root of z. */
-	fb_st fb_srz;
-#ifdef FB_PRECO
-	/** Multiplication table for the polynomial z^(1/2). */
-	fb_st fb_tab_srz[256];
-#endif /* FB_PRECO */
-#endif /* FB_SRT == QUICK */
-#if FB_INV == ITOHT || !defined(STRIP)
-	/** Stores an addition chain for (RLC_FB_BITS - 1). */
-	int chain[RLC_TERMS + 1];
-	/** Stores the length of the addition chain. */
-	int chain_len;
-	/** Tables for repeated squarings. */
-	fb_st fb_tab_sqr[RLC_TERMS][RLC_FB_TABLE];
-#endif /* FB_INV == ITOHT */
-#endif /* WITH_FB */
-
-#ifdef WITH_EB
-	/** Identifier of the currently configured binary elliptic curve. */
-	int eb_id;
-	/** The a-coefficient of the elliptic curve. */
-	fb_st eb_a;
-	/** The b-coefficient of the elliptic curve. */
-	fb_st eb_b;
-	/** Optimization identifier for the a-coefficient. */
-	int eb_opt_a;
-	/** Optimization identifier for the b-coefficient. */
-	int eb_opt_b;
-	/** The generator of the elliptic curve. */
-	eb_st eb_g;
-	/** The order of the group of points in the elliptic curve. */
-	bn_st eb_r;
-	/** The cofactor of the group order in the elliptic curve. */
-	bn_st eb_h;
-	/** Flag that stores if the binary curve has efficient endomorphisms. */
-	int eb_is_kbltz;
-#ifdef EB_PRECO
-	/** Precomputation table for generator multiplication. */
-	eb_st eb_pre[RLC_EB_TABLE];
-	/** Array of pointers to the precomputation table. */
-	eb_st *eb_ptr[RLC_EB_TABLE];
-#endif /* EB_PRECO */
-#endif /* WITH_EB */
-
-#ifdef WITH_FP
-	/** Identifier of the currently configured prime field. */
-	int fp_id;
-	/** Prime modulus. */
-	bn_st prime;
-	/** Parameter for generating prime. */
-	bn_st par;
-	/** Parameter in sparse form. */
-	int par_sps[RLC_TERMS + 1];
-	/** Length of sparse prime representation. */
-	int par_len;
-#if FP_RDC == MONTY || !defined(STRIP)
-	/** Value (R^2 mod p) for converting small integers to Montgomery form. */
-	bn_st conv;
-	/** Value of constant one in Montgomery form. */
-	bn_st one;
-#endif /* FP_RDC == MONTY */
-	/** Prime modulus modulo 8. */
-	dig_t mod8;
-	/** Value derived from the prime used for modular reduction. */
-	dig_t u;
-	/** Quadratic non-residue. */
-	int qnr;
-	/** Cubic non-residue. */
-	int cnr;
-	/** 2-adicity. */
-	int ad2;
-#if FP_RDC == QUICK || !defined(STRIP)
-	/** Sparse representation of prime modulus. */
-	int sps[RLC_TERMS + 1];
-	/** Length of sparse prime representation. */
-	int sps_len;
-#endif /* FP_RDC == QUICK */
-#endif /* WITH_FP */
-
-#ifdef WITH_EP
-	/** Identifier of the currently configured prime elliptic curve. */
-	int ep_id;
-	/** The a-coefficient of the elliptic curve. */
-	fp_st ep_a;
-	/** The b-coefficient of the elliptic curve. */
-	fp_st ep_b;
-	/** The value 3b used in elliptic curve arithmetic. */
-	fp_st ep_b3;
-	/** The generator of the elliptic curve. */
-	ep_st ep_g;
-	/** The order of the group of points in the elliptic curve. */
-	bn_st ep_r;
-	/** The cofactor of the group order in the elliptic curve. */
-	bn_st ep_h;
-	/** The distinguished non-square used by the mapping function */
-	fp_st ep_map_u;
-	/** Precomputed constants for hashing. */
-	fp_st ep_map_c[4];
-#ifdef EP_ENDOM
-#if EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || EP_SIM == INTER || !defined(STRIP)
-	/** Parameters required by the GLV method. @{ */
-	fp_st beta;
-	bn_st ep_v1[3];
-	bn_st ep_v2[3];
-	/** @} */
-#endif /* EP_MUL */
-#endif /* EP_ENDOM */
-	/** Optimization identifier for the a-coefficient. */
-	int ep_opt_a;
-	/** Optimization identifier for the b-coefficient. */
-	int ep_opt_b;
-	/** Optimization identifier for the b3 value. */
-	int ep_opt_b3;
-	/** Flag that stores if the prime curve has efficient endomorphisms. */
-	int ep_is_endom;
-	/** Flag that stores if the prime curve is supersingular. */
-	int ep_is_super;
-	/** Flag that stores if the prime curve is pairing-friendly. */
-	int ep_is_pairf;
-	/** Flag that indicates whether this curve uses an isogeny for the SSWU mapping. */
-	int ep_is_ctmap;
-#ifdef EP_PRECO
-	/** Precomputation table for generator multiplication. */
-	ep_st ep_pre[RLC_EP_TABLE];
-	/** Array of pointers to the precomputation table. */
-	ep_st *ep_ptr[RLC_EP_TABLE];
-#endif /* EP_PRECO */
-#ifdef EP_CTMAP
-	/** The isogeny map coefficients for the SSWU mapping. */
-	iso_st ep_iso;
-#endif /* EP_CTMAP */
-#endif /* WITH_EP */
-
-#ifdef WITH_EPX
-	/** The generator of the elliptic curve. */
-	ep2_t ep2_g;
-	/** The 'a' coefficient of the curve. */
-	fp2_t ep2_a;
-	/** The 'b' coefficient of the curve. */
-	fp2_t ep2_b;
-	/** The order of the group of points in the elliptic curve. */
-	bn_st ep2_r;
-	/** The cofactor of the group order in the elliptic curve. */
-	bn_st ep2_h;
-	/** The distinguished non-square used by the mapping function */
-	fp2_t ep2_map_u;
-	/** The constants needed for hashing. */
-	fp2_t ep2_map_c[4];
-	/** The constants needed for Frobenius. */
-	fp2_t ep2_frb[2];
-	/** Optimization identifier for the a-coefficient. */
-	int ep2_opt_a;
-	/** Optimization identifier for the b-coefficient. */
-	int ep2_opt_b;
-	/** Flag that stores if the prime curve is a twist. */
-	int ep2_is_twist;
-	/** Flag that indicates whether this curve uses an isogeny for the SSWU mapping. */
-	int ep2_is_ctmap;
-#ifdef EP_PRECO
-	/** Precomputation table for generator multiplication.*/
-	ep2_st ep2_pre[RLC_EP_TABLE];
-	/** Array of pointers to the precomputation table. */
-	ep2_st *ep2_ptr[RLC_EP_TABLE];
-#endif /* EP_PRECO */
-#ifdef EP_CTMAP
-	/** The isogeny map coefficients for the SSWU mapping. */
-	iso2_st ep2_iso;
-#endif /* EP_CTMAP */
-	/** The generator of the elliptic curve. */
-	ep4_t ep4_g;
-	/** The 'a' coefficient of the curve. */
-	fp4_t ep4_a;
-	/** The 'b' coefficient of the curve. */
-	fp4_t ep4_b;
-	/** The order of the group of points in the elliptic curve. */
-	bn_st ep4_r;
-	/** The cofactor of the group order in the elliptic curve. */
-	bn_st ep4_h;
-	/** Optimization identifier for the a-coefficient. */
-	int ep4_opt_a;
-	/** Optimization identifier for the b-coefficient. */
-	int ep4_opt_b;
-	/** Flag that stores if the prime curve is a twist. */
-	int ep4_is_twist;
-#ifdef EP_PRECO
-	/** Precomputation table for generator multiplication.*/
-	ep4_st ep4_pre[RLC_EP_TABLE];
-	/** Array of pointers to the precomputation table. */
-	ep4_st *ep4_ptr[RLC_EP_TABLE];
-	#endif /* EP_PRECO */
-#endif /* WITH_EPX */
-
-#ifdef WITH_ED
-	/** Identifier of the currently configured Edwards elliptic curve. */
-	int ed_id;
-	/** The 'a' coefficient of the Edwards elliptic curve. */
-	fp_st ed_a;
-	/** The 'd' coefficient of the Edwards elliptic curve. */
-	fp_st ed_d;
-	/** Precomputed constants for hashing. */
-	fp_st ed_map_c[4];
-	/** The generator of the Edwards elliptic curve. */
-	ed_st ed_g;
-	/** The order of the group of points in the Edwards elliptic curve. */
-	bn_st ed_r;
-	/** The cofactor of the Edwards elliptic curve. */
-	bn_st ed_h;
-
-#ifdef ED_PRECO
-	/** Precomputation table for generator multiplication. */
-	ed_st ed_pre[RLC_ED_TABLE];
-	/** Array of pointers to the precomputation table. */
-	ed_st *ed_ptr[RLC_ED_TABLE];
-#endif /* ED_PRECO */
-#endif
-
-#if defined(WITH_FPX) || defined(WITH_PP)
-	/** Integer part of the quadratic non-residue. */
-	dis_t qnr2;
-	/** Constants for computing Frobenius maps in higher extensions. @{ */
-	fp2_st fp2_p1[5];
-	fp2_st fp2_p2[3];
-	fp2_st fp4_p1;
-	/** @} */
-	/** Constants for computing Frobenius maps in higher extensions. @{ */
-	int frb3[3];
-	fp_st fp3_p0[2];
-	fp_st fp3_p1[5];
-	fp_st fp3_p2[2];
-	/** @} */
-#endif /* WITH_PP */
-
-#if defined(WITH_PC)
-	gt_t gt_g;
-#endif
-
-#if BENCH > 0
-	/** Stores the time measured before the execution of the benchmark. */
-	ben_t before;
-	/** Stores the time measured after the execution of the benchmark. */
-	ben_t after;
-	/** Stores the sum of timings for the current benchmark. */
-	long long total;
-#ifdef OVERH
-	/** Benchmarking overhead to be measured and subtracted from benchmarks. */
-	long long over;
-#endif
-#endif
-
-#if RAND != CALL
-	/** Internal state of the PRNG. */
-	uint8_t rand[RLC_RAND_SIZE];
-#else
-	void (*rand_call)(uint8_t *, int, void *);
-	void *rand_args;
-#endif
-	/** Flag to indicate if PRNG is seed. */
-	int seeded;
-	/** Counter to keep track of number of calls since last seeding. */
-	int counter;
-
-#if TIMER == PERF
-	/** File descriptor for perf system call. */
-	int perf_fd;
-	/** Buffer for storing perf data, */
-	struct perf_event_mmap_page *perf_buf;
-#endif
-} ctx_t;
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the library.
- *
- * @return RLC_OK if no error occurs, RLC_ERR otherwise.
- */
-int core_init(void);
-
-/**
- * Finalizes the library with the current error condition.
- *
- * @return RLC_OK if no error has occurred, RLC_ERR otherwise.
- */
-int core_clean(void);
-
-/**
- * Returns a pointer to the current library context.
- *
- * @return a pointer to the library context.
- */
-ctx_t *core_get(void);
-
-/**
- * Switched the library context to a new context.
- *
- * @param[in] ctx					- the new library context.
- */
-void core_set(ctx_t *ctx);
-
-#if defined(MULTI)
-/**
- * Set an initializer function which is called when the context
- * is uninitialized. This function is called for every thread.
- *
- * @param[in] init function to call when the current context is not initialized
- * @param[in] init_ptr a pointer which is passed to the initialized
- */
-void core_set_thread_initializer(void (*init)(void *init_ptr), void *init_ptr);
-#endif
-
-#endif /* !RLC_CORE_H */
diff --git a/src/dashbls/depends/relic/include/relic_cp.h b/src/dashbls/depends/relic/include/relic_cp.h
deleted file mode 100644
index 1acb5b2e5529..000000000000
--- a/src/dashbls/depends/relic/include/relic_cp.h
+++ /dev/null
@@ -1,2356 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup cp Cryptographic protocols
- */
-
-/**
- * @file
- *
- * Interface of cryptographic protocols.
- *
- * @ingroup cp
- */
-
-#ifndef RLC_CP_H
-#define RLC_CP_H
-
-#include "relic_conf.h"
-#include "relic_types.h"
-#include "relic_util.h"
-#include "relic_bn.h"
-#include "relic_ec.h"
-#include "relic_pc.h"
-#include "relic_mpc.h"
-
-/*============================================================================*/
-/* Type definitions.                                                          */
-/*============================================================================*/
-
-/**
- * Represents a pair of moduli for using the Chinese Remainder Theorem (CRT).
- */
-typedef struct {
-	/** The modulus n = pq. */
-	bn_t n;
-	/** The first prime p. */
-	bn_t p;
-	/** The second prime q. */
-	bn_t q;
-	/** The precomputed costant for the first prime. */
-	bn_t dp;
-	/** The precomputed costant for the second prime. */
-	bn_t dq;
-	/** The inverse of q modulo p. */
-	bn_t qi;
-} crt_st;
-
-#if ALLOC == AUTO
-typedef crt_st crt_t[1];
-#else
-typedef crt_st *crt_t;
-#endif
-
-/**
- * Represents an RSA key pair.
- */
-typedef struct {
-	/** The private exponent. */
-	bn_t d;
-	/** The public exponent. */
-	bn_t e;
-	/** The pair of moduli. */
-	crt_t crt;
-} _rsa_st;
-
-/**
- * Pointer to an RSA key pair.
- */
-#if ALLOC == AUTO
-typedef _rsa_st rsa_t[1];
-#else
-typedef _rsa_st *rsa_t;
-#endif
-
-/**
- * Pointer to a Rabin key pair.
- */
-#if ALLOC == AUTO
-typedef crt_st rabin_t[1];
-#else
-typedef crt_st *rabin_t;
-#endif
-
-/**
- * Pointer to a Paillier's Homomorphic Probabilistic Encryption key pair.
- */
-#if ALLOC == AUTO
-typedef crt_st phpe_t[1];
-#else
-typedef crt_st *phpe_t;
-#endif
-
-/**
- * Represents a Benaloh's Dense Probabilistic Encryption key pair.
- */
-typedef struct {
-	/** The modulus n = pq. */
-	bn_t n;
-	/** The first prime p. */
-	bn_t p;
-	/** The second prime q. */
-	bn_t q;
-	/** The random element in {0, ..., n - 1}. */
-	bn_t y;
-	/** The divisor of (p-1) such that gcd(t, (p-1)/t) = gcd(t, q-1) = 1. */
-	dig_t t;
-} bdpe_st;
-
-/**
- * Pointer to a Benaloh's Dense Probabilistic Encryption key pair.
- */
-#if ALLOC == AUTO
-typedef bdpe_st bdpe_t[1];
-#else
-typedef bdpe_st *bdpe_t;
-#endif
-
-/**
- * Represents a SOKAKA key pair.
- */
-typedef struct _sokaka {
-	/** The private key in G_1. */
-	g1_t s1;
-	/** The private key in G_2. */
-	g2_t s2;
-} sokaka_st;
-
-/**
- * Pointer to SOKAKA key pair.
- */
-#if ALLOC == AUTO
-typedef sokaka_st sokaka_t[1];
-#else
-typedef sokaka_st *sokaka_t;
-#endif
-
-/**
- * Represents a Boneh-Goh-Nissim cryptosystem key pair.
- */
-typedef struct {
-	/** The first exponent. */
-	bn_t x;
-	/** The second exponent. */
-	bn_t y;
-	/** The third exponent. */
-	bn_t z;
-	/* The first element from the first group. */
-	g1_t gx;
-	/* The second element from the first group. */
-	g1_t gy;
-	/* The thirs element from the first group. */
-	g1_t gz;
-	/* The first element from the second group. */
-	g2_t hx;
-	/* The second element from the second group. */
-	g2_t hy;
-	/* The third element from the second group. */
-	g2_t hz;
-} bgn_st;
-
-/**
- * Pointer to a Boneh-Goh-Nissim cryptosystem key pair.
- */
-#if ALLOC == AUTO
-typedef bgn_st bgn_t[1];
-#else
-typedef bgn_st *bgn_t;
-#endif
-
-/**
- * Represents an extendable ring signature.
- */
-typedef struct _ers_st {
-	/** The ephemeral public key in the signature. */
-    ec_t h;
-	/** The public key associated to the signature. */
-	ec_t pk;
-	/** The first component of the signature of knowledge. */
-	bn_t c[2];
-	/** The second component of the signature of knowledge. */
-	bn_t r[2];
-} ers_st;
-
-/**
- * Pointer to an extendable ring signature.
- */
-/**
- * Pointer to a Boneh-Goh-Nissim cryptosystem key pair.
- */
-#if ALLOC == AUTO
-typedef ers_st ers_t[1];
-#else
-typedef ers_st *ers_t;
-#endif
-
-/**
- * Represents an extendable threshold ring signature.
- */
-typedef struct _etrs_st {
-	/** The secret. */
-	bn_t y;
-	/** The ephemeral public key in the signature. */
-    ec_t h;
-	/** The public key associated to the signature. */
-	ec_t pk;
-	/** The first component of the signature of knowledge. */
-	bn_t c[2];
-	/** The second component of the signature of knowledge. */
-	bn_t r[2];
-} etrs_st;
-
-/**
- * Pointer to an extendable ring signature.
- */
-/**
- * Pointer to a Boneh-Goh-Nissim cryptosystem key pair.
- */
-#if ALLOC == AUTO
-typedef etrs_st etrs_t[1];
-#else
-typedef etrs_st *etrs_t;
-#endif
-
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a CRT moduli set with a null value.
- *
- * @param[out] A			- the moduli to initialize.
- */
-#define crt_null(A)			RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a Rabin key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#if ALLOC == DYNAMIC
-#define crt_new(A)															\
-	A = (crt_t)calloc(1, sizeof(crt_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_new((A)->n);															\
-	bn_new((A)->dp);														\
-	bn_new((A)->dq);														\
-	bn_new((A)->p);															\
-	bn_new((A)->q);															\
-	bn_new((A)->qi);														\
-
-#elif ALLOC == AUTO
-#define crt_new(A)															\
-	bn_new((A)->n);															\
-	bn_new((A)->dp);														\
-	bn_new((A)->dq);														\
-	bn_new((A)->p);															\
-	bn_new((A)->q);															\
-	bn_new((A)->qi);														\
-
-#endif
-
-/**
- * Calls a function to clean and free a Rabin key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define crt_free(A)															\
-	if (A != NULL) {														\
-		bn_free((A)->n);													\
-		bn_free((A)->dp);													\
-		bn_free((A)->dq);													\
-		bn_free((A)->p);													\
-		bn_free((A)->q);													\
-		bn_free((A)->qi);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define crt_free(A)				/* empty */
-
-#endif
-
-/**
- * Initializes an RSA key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define rsa_null(A)			RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize an RSA key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#if ALLOC == DYNAMIC
-#define rsa_new(A)															\
-	A = (rsa_t)calloc(1, sizeof(_rsa_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_null((A)->d);														\
-	bn_null((A)->e);														\
-	bn_new((A)->d);															\
-	bn_new((A)->e);															\
-	crt_new((A)->crt);														\
-
-#elif ALLOC == AUTO
-#define rsa_new(A)															\
-	bn_new((A)->d);															\
-	bn_new((A)->e);															\
-	crt_new((A)->crt);														\
-
-#endif
-
-/**
- * Calls a function to clean and free an RSA key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define rsa_free(A)															\
-	if (A != NULL) {														\
-		bn_free((A)->d);													\
-		bn_free((A)->e);													\
-		crt_free((A)->crt);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define rsa_free(A)				/* empty */
-
-#endif
-
-/**
- * Initializes a Rabin key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define rabin_null(A)		RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a Rabin key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#define rabin_new(A)		crt_new(A)
-
-/**
- * Calls a function to clean and free a Rabin key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#define rabin_free(A)		crt_free(A)
-
-/**
- * Initializes a Paillier key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define phpe_null(A)		RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a Paillier key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#define phpe_new(A)			crt_new(A)
-
-/**
- * Calls a function to clean and free a Paillier key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#define phpe_free(A)		crt_free(A)
-
-/**
- * Initializes a Benaloh's key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define bdpe_null(A)		RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a Benaloh's key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#if ALLOC == DYNAMIC
-#define bdpe_new(A)															\
-	A = (bdpe_t)calloc(1, sizeof(bdpe_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_new((A)->n);															\
-	bn_new((A)->y);															\
-	bn_new((A)->p);															\
-	bn_new((A)->q);															\
-	(A)->t = 0;																\
-
-#elif ALLOC == AUTO
-#define bdpe_new(A)															\
-	bn_new((A)->n);															\
-	bn_new((A)->y);															\
-	bn_new((A)->p);															\
-	bn_new((A)->q);															\
-	(A)->t = 0;																\
-
-#endif
-
-/**
- * Calls a function to clean and free a Benaloh's key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define bdpe_free(A)														\
-	if (A != NULL) {														\
-		bn_free((A)->n);													\
-		bn_free((A)->y);													\
-		bn_free((A)->p);													\
-		bn_free((A)->q);													\
-		(A)->t = 0;															\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define bdpe_free(A)			/* empty */
-#endif
-
-/**
- * Initializes a SOKAKA key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define sokaka_null(A)		RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a SOKAKA key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#if ALLOC == DYNAMIC
-#define sokaka_new(A)														\
-	A = (sokaka_t)calloc(1, sizeof(sokaka_st));								\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	g1_new((A)->s1);														\
-	g2_new((A)->s2);														\
-
-#elif ALLOC == AUTO
-#define sokaka_new(A)			/* empty */
-#endif
-
-/**
- * Calls a function to clean and free a SOKAKA key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define sokaka_free(A)														\
-	if (A != NULL) {														\
-		g1_free((A)->s1);													\
-		g2_free((A)->s2);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define sokaka_free(A)			/* empty */
-#endif
-
-/**
- * Initializes a BGN key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define bgn_null(A)			RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize a BGN key pair.
- *
- * @param[out] A			- the new key pair.
- */
-#if ALLOC == DYNAMIC
-#define bgn_new(A)															\
-	A = (bgn_t)calloc(1, sizeof(bgn_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_new((A)->x);															\
-	bn_new((A)->y);															\
-	bn_new((A)->z);															\
-	g1_new((A)->gx);														\
-	g1_new((A)->gy);														\
-	g1_new((A)->gz);														\
-	g2_new((A)->hx);														\
-	g2_new((A)->hy);														\
-	g2_new((A)->hz);														\
-
-#elif ALLOC == AUTO
-#define bgn_new(A)				/* empty */
-#endif
-
-/**
- * Calls a function to clean and free a BGN key pair.
- *
- * @param[out] A			- the key pair to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define bgn_free(A)															\
-	if (A != NULL) {														\
-		bn_free((A)->x);													\
-		bn_free((A)->y);													\
-		bn_free((A)->z);													\
-		g1_free((A)->gx);													\
-		g1_free((A)->gy);													\
-		g1_free((A)->gz);													\
-		g2_free((A)->hx);													\
-		g2_free((A)->hy);													\
-		g2_free((A)->hz);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define bgn_free(A)				/* empty */
-#endif
-
-/**
- * Initializes a BGN key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define ers_null(A)			RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize an extendable signature ring.
- *
- * @param[out] A			- the new signature ring.
- */
-#if ALLOC == DYNAMIC
-#define ers_new(A)															\
-	A = (ers_t)calloc(1, sizeof(ers_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	ec_new((A)->h);															\
-	ec_new((A)->pk);														\
-	bn_new((A)->c[0]);														\
-	bn_new((A)->c[1]);														\
-	bn_new((A)->r[0]);														\
-	bn_new((A)->r[1]);														\
-
-#elif ALLOC == AUTO
-#define ers_new(A)				/* empty */
-#endif
-
-/**
- * Calls a function to clean and free an extendable signature ring.
- *
- * @param[out] A			- the signature ring to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define ers_free(A)															\
-	if (A != NULL) {														\
-		ec_free((A)->h);													\
-		ec_free((A)->pk);													\
-		bn_free((A)->c[0]);													\
-		bn_free((A)->c[1]);													\
-		bn_free((A)->r[0]);													\
-		bn_free((A)->r[1]);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define ers_free(A)				/* empty */
-#endif
-
-/**
- * Initializes a BGN key pair with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#define etrs_null(A)			RLC_NULL(A)
-
-/**
- * Calls a function to allocate and initialize an extendable signature ring.
- *
- * @param[out] A			- the new signature ring.
- */
-#if ALLOC == DYNAMIC
-#define etrs_new(A)															\
-	A = (etrs_t)calloc(1, sizeof(etrs_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_new((A)->y);															\
-	ec_new((A)->h);															\
-	ec_new((A)->pk);														\
-	bn_new((A)->c[0]);														\
-	bn_new((A)->c[1]);														\
-	bn_new((A)->r[0]);														\
-	bn_new((A)->r[1]);														\
-
-#elif ALLOC == AUTO
-#define etrs_new(A)				/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free an extendable signature ring.
- *
- * @param[out] A			- the signature ring to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define etrs_free(A)														\
-	if (A != NULL) {														\
-		bn_free((A)->y);													\
-		ec_free((A)->h);													\
-		ec_free((A)->pk);													\
-		bn_free((A)->c[0]);													\
-		bn_free((A)->c[1]);													\
-		bn_free((A)->r[0]);													\
-		bn_free((A)->r[1]);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define etrs_free(A)				/* empty */
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Generates a key pair for the RSA cryptosystem. Generates additional values
- * for the CRT optimization if CP_CRT is on.
- *
- * @param[out] pub			- the public key.
- * @param[out] prv			- the private key.
- * @param[in] bits			- the key length in bits.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rsa_gen(rsa_t pub, rsa_t prv, int bits);
-
-/**
- * Encrypts using the RSA cryptosystem.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] pub			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rsa_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len, rsa_t pub);
-
-/**
- * Decrypts using the RSA cryptosystem. Uses the CRT optimization if
- * CP_CRT is on.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to decrypt.
- * @param[in] prv			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rsa_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len, rsa_t prv);
-
-/**
- * Signs using the basic RSA signature algorithm. The flag must be non-zero if
- * the message being signed is already a hash value. Uses the CRT optimization
- * if CP_CRT is on.
- *
- * @param[out] sig			- the signature
- * @param[out] sig_len		- the number of bytes written in the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] msg_len		- the number of bytes to sign.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] prv			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rsa_sig(uint8_t *sig, int *sig_len, uint8_t *msg, int msg_len,
-		int hash, rsa_t prv);
-
-/**
- * Verifies an RSA signature. The flag must be non-zero if the message being
- * signed is already a hash value.
- *
- * @param[in] sig			- the signature to verify.
- * @param[in] sig_len		- the signature length in bytes.
- * @param[in] msg			- the signed message.
- * @param[in] msg_len		- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] pub			- the public key.
- * @return a boolean value indicating if the signature is valid.
- */
-int cp_rsa_ver(uint8_t *sig, int sig_len, uint8_t *msg, int msg_len, int hash,
-		rsa_t pub);
-
-/**
- * Generates a key pair for the Rabin cryptosystem.
- *
- * @param[out] pub			- the public key.
- * @param[out] prv			- the private key,
- * @param[in] bits			- the key length in bits.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rabin_gen(rabin_t pub, rabin_t prv, int bits);
-
-/**
- * Encrypts using the Rabin cryptosystem.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] pub			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rabin_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		rabin_t pub);
-
-/**
- * Decrypts using the Rabin cryptosystem.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to decrypt.
- * @param[in] prv			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_rabin_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		rabin_t prv);
-
-/**
- * Generates a key pair for Benaloh's Dense Probabilistic Encryption.
- *
- * @param[out] pub			- the public key.
- * @param[out] prv			- the private key.
- * @param[in] block			- the block size.
- * @param[in] bits			- the key length in bits.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bdpe_gen(bdpe_t pub, bdpe_t prv, dig_t block, int bits);
-
-/**
- * Encrypts using Benaloh's cryptosystem.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the plaintext as a small integer.
- * @param[in] pub			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bdpe_enc(uint8_t *out, int *out_len, dig_t in, bdpe_t pub);
-
-/**
- * Decrypts using Benaloh's cryptosystem.
- *
- * @param[out] out			- the decrypted small integer.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] prv			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bdpe_dec(dig_t *out, uint8_t *in, int in_len, bdpe_t prv);
-
-/**
- * Generates a key pair for Paillier's Homomorphic Probabilistic Encryption.
- *
- * @param[out] pub			- the public key.
- * @param[out] prv			- the private key.
- * @param[in] bits			- the key length in bits.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_phpe_gen(bn_t pub, phpe_t prv, int bits);
-
-/**
- * Encrypts using the Paillier cryptosystem.
- *
- * @param[out] c			- the ciphertex, represented as an integer.
- * @param[in] m				- the plaintext as an integer.
- * @param[in] pub			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_phpe_enc(bn_t c, bn_t m, bn_t pub);
-
-/**
- * Decrypts using the Paillier cryptosystem.
- *
- * @param[out] m			- the plaintext, represented as an integer.
- * @param[in] c				- the ciphertex as an integer.
- * @param[in] prv			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_phpe_dec(bn_t m, bn_t c, phpe_t prv);
-
-/**
- * Generates a key pair for Genealized Homomorphic Probabilistic Encryption.
- *
- * @param[out] pub			- the public key.
- * @param[out] prv			- the private key.
- * @param[in] bits			- the key length in bits.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ghpe_gen(bn_t pub, bn_t prv, int bits);
-
-/**
- * Encrypts using the Generalized Paillier cryptosystem.
- *
- * @param[out] c			- the ciphertext.
- * @param[in] m				- the plaintext.
- * @param[in] pub			- the public key.
- * @param[in] s 			- the block length parameter.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ghpe_enc(bn_t c, bn_t m, bn_t pub, int s);
-
-/**
- * Decrypts using the Generalized Paillier cryptosystem.
- *
- * @param[out] m			- the plaintext.
- * @param[in] c				- the ciphertext.
- * @param[in] pub			- the public key.
- * @param[in] s 			- the block length parameter.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ghpe_dec(bn_t m, bn_t c, bn_t pub, bn_t prv, int s);
-
-/**
- * Generates an ECDH key pair.
- *
- * @param[out] d			- the private key.
- * @param[in] q				- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecdh_gen(bn_t d, ec_t q);
-
-/**
- * Derives a shared secret using ECDH.
- *
- * @param[out] key			- the shared key.
- * @param[int] key_len		- the intended shared key length in bytes.
- * @param[in] d				- the private key.
- * @param[in] q				- the point received from the other party.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecdh_key(uint8_t *key, int key_len, bn_t d, ec_t q);
-
-/**
- * Generate an ECMQV key pair.
- *
- * Should also be used to generate the ephemeral key pair.
- *
- * @param[out] d			- the private key.
- * @param[out] q			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecmqv_gen(bn_t d, ec_t q);
-
-/**
- * Derives a shared secret using ECMQV.
- *
- * @param[out] key			- the shared key.
- * @param[int] key_len		- the intended shared key length in bytes.
- * @param[in] d1			- the private key.
- * @param[in] d2			- the ephemeral private key.
- * @param[in] q2u			- the ephemeral public key.
- * @param[in] q1v			- the point received from the other party.
- * @param[in] q2v			- the ephemeral point received from the party.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecmqv_key(uint8_t *key, int key_len, bn_t d1, bn_t d2, ec_t q2u,
-		ec_t q1v, ec_t q2v);
-
-/**
- * Generates an ECIES key pair.
- *
- * @param[out] d			- the private key.
- * @param[in] q				- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecies_gen(bn_t d, ec_t q);
-
-/**
- * Encrypts using the ECIES cryptosystem.
- *
- * @param[out] r 			- the resulting elliptic curve point.
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] iv 			- the block cipher initialization vector.
- * @param[in] q				- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecies_enc(ec_t r, uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		ec_t q);
-
-/**
- * Decrypts using the ECIES cryptosystem.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] iv 			- the block cipher initialization vector.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecies_dec(uint8_t *out, int *out_len, ec_t r, uint8_t *in, int in_len,
-		bn_t d);
-
-/**
- * Generates an ECDSA key pair.
- *
- * @param[out] d			- the private key.
- * @param[in] q				- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecdsa_gen(bn_t d, ec_t q);
-
-/**
- * Signs a message using ECDSA.
- *
- * @param[out] r			- the first component of the signature.
- * @param[out] s			- the second component of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecdsa_sig(bn_t r, bn_t s, uint8_t *msg, int len, int hash, bn_t d);
-
-/**
- * Verifies a message signed with ECDSA using the basic method.
- *
- * @param[out] r			- the first component of the signature.
- * @param[out] s			- the second component of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] q				- the public key.
- * @return a boolean value indicating if the signature is valid.
- */
-int cp_ecdsa_ver(bn_t r, bn_t s, uint8_t *msg, int len, int hash, ec_t q);
-
-/**
- * Generates an Elliptic Curve Schnorr Signature key pair.
- *
- * @param[out] d			- the private key.
- * @param[in] q				- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecss_gen(bn_t d, ec_t q);
-
-/**
- * Signs a message using the Elliptic Curve Schnorr Signature.
- *
- * @param[out] r			- the first component of the signature.
- * @param[out] s			- the second component of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ecss_sig(bn_t e, bn_t s, uint8_t *msg, int len, bn_t d);
-
-/**
- * Verifies a message signed with the Elliptic Curve Schnorr Signature using the
- * basic method.
- *
- * @param[out] r			- the first component of the signature.
- * @param[out] s			- the second component of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] q				- the public key.
- * @return a boolean value indicating if the signature is valid.
- */
-int cp_ecss_ver(bn_t e, bn_t s, uint8_t *msg, int len, ec_t q);
-
-/**
- * Generate parameters for the DCKKS pairing delegation protocol described at
- * "Secure and Efficient Delegationof Pairings with Online Inputs" (CARDIS 2020)
- *
- * @param[out] c 			- the challenge.
- * @param[out] r 			- the randomness.
- * @param[out] u1			- the U1 precomputed value in G_1.
- * @param[out] u2			- the U2 precomputed value in G_2.
- * @param[out] v2			- the image of the randomness in G_2.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdpub_gen(bn_t c, bn_t r, g1_t u1, g2_t u2, g2_t v2, gt_t e);
-
-/**
- * Execute the client-side request for the DCKKS pairing delegation protocol.
- *
- * @param[out] v1			- the blinded element in G_1.
- * @param[out] w2			- the blinded element in G_2.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the randomness.
- * @param[in] u1			- the U1 precomputed value in G_1.
- * @param[in] u2			- the U2 precomputed value in G_2.
- * @param[in] v2			- the image of the randomness in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdpub_ask(g1_t v1, g2_t w2, g1_t p, g2_t q, bn_t c, bn_t r, g1_t u1,
-		g2_t u2, g2_t v2);
-
-/**
- * Execute the server-side response for the DCKKS pairing delegation protocol.
- *
- * @param[out] g			- the group elements computed by the server.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] v1			- the blinded element in G_1.
- * @param[in] v2			- the image of the randomness in G_2.
- * @param[in] w2			- the blinded element in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdpub_ans(gt_t g[3], g1_t p, g2_t q, g1_t v1, g2_t v2, g2_t w2);
-
-/**
- * Verifies the result of the DCKKS pairing delegation protocol.
- *
- * @param[out] r			- the result of the computation.
- * @param[in] g				- the group elements returned by the server.
- * @param[in] c 			- the challenge.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return a boolean value indicating if the computation is correct.
- */
-int cp_pdpub_ver(gt_t r, gt_t g[3], bn_t c, gt_t e);
-
-/**
- * Generate parameters for the DCKKS pairing delegation protocol described at
- * "Secure and Efficient Delegationof Pairings with Online Inputs" (CARDIS 2020)
- *
- * @param[out] c 			- the challenge.
- * @param[out] r 			- the randomness.
- * @param[out] u1			- the U1 precomputed value in G_1.
- * @param[out] u2			- the U2 precomputed value in G_2.
- * @param[out] v2			- the image of the randomness in G_2.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdprv_gen(bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4],
-		gt_t e[2]);
-
-/**
- * Execute the client-side request for the DCKKS pairing delegation protocol.
- *
- * @param[out] v1			- the blinded element in G_1.
- * @param[out] w2			- the blinded element in G_2.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the randomness.
- * @param[in] u1			- the U1 precomputed value in G_1.
- * @param[in] u2			- the U2 precomputed value in G_2.
- * @param[in] v2			- the image of the randomness in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdprv_ask(g1_t v1[3], g2_t w2[4], g1_t p, g2_t q, bn_t c, bn_t r[3],
-		g1_t u1[2], g2_t u2[2], g2_t v2[4]);
-
-/**
- * Execute the server-side response for the DCKKS pairing delegation protocol.
- *
- * @param[out] g			- the group elements computed by the server.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] v1			- the blinded element in G_1.
- * @param[in] v2			- the image of the randomness in G_2.
- * @param[in] w2			- the blinded element in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pdprv_ans(gt_t g[4], g1_t v1[3], g2_t w2[4]);
-
-/**
- * Verifies the result of the DCKKS pairing delegation protocol.
- *
- * @param[out] r			- the result of the computation.
- * @param[in] g				- the group elements returned by the server.
- * @param[in] c 			- the challenge.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return a boolean value indicating if the computation is correct.
- */
-int cp_pdprv_ver(gt_t r, gt_t g[4], bn_t c, gt_t e[2]);
-
-/**
- * Generate parameters for the AMORE pairing delegation protocol with public
- * inputs.
- *
- * @param[out] r 			- the randomness.
- * @param[out] u1			- the U1 precomputed value in G_1.
- * @param[out] u2			- the U2 precomputed value in G_2.
- * @param[out] v2			- the image of the randomness in G_2.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvpub_gen(bn_t r, g1_t u1, g2_t u2, g2_t v2, gt_t e);
-
-/**
- * Execute the client-side request for the AMORE pairing delegation protocol.
- *
- * @param[out] c 			- the challenge.
- * @param[out] v1			- the blinded element in G_1.
- * @param[out] w2			- the blinded element in G_2.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the randomness.
- * @param[in] u1			- the U1 precomputed value in G_1.
- * @param[in] u2			- the U2 precomputed value in G_2.
- * @param[in] v2			- the image of the randomness in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvpub_ask(bn_t c, g1_t v1, g2_t w2, g1_t p, g2_t q, bn_t r, g1_t u1,
-		g2_t u2, g2_t v2);
-
-/**
- * Execute the server-side response for the AMORE pairing delegation protocol.
- *
- * @param[out] g			- the group elements computed by the server.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] v1			- the blinded element in G_1.
- * @param[in] v2			- the image of the randomness in G_2.
- * @param[in] w2			- the blinded element in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvpub_ans(gt_t g[2], g1_t p, g2_t q, g1_t v1, g2_t v2, g2_t w2);
-
-/**
- * Verifies the result of the AMORE pairing delegation protocol.
- *
- * @param[out] r			- the result of the computation.
- * @param[in] g				- the group elements returned by the server.
- * @param[in] c 			- the challenge.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return a boolean value indicating if the computation is correct.
- */
-int cp_lvpub_ver(gt_t r, gt_t g[2], bn_t c, gt_t e);
-
-/**
- * Generate parameters for the AMORE pairing delegation protocol with private
- * inputs.
- *
- * @param[out] c 			- the challenge.
- * @param[out] r 			- the randomness.
- * @param[out] u1			- the U1 precomputed value in G_1.
- * @param[out] u2			- the U2 precomputed value in G_2.
- * @param[out] v2			- the image of the randomness in G_2.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvprv_gen(bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4],
-		gt_t e[2]);
-
-/**
- * Execute the client-side request for the AMORE pairing delegation protocol.
- *
- * @param[out] v1			- the blinded element in G_1.
- * @param[out] w2			- the blinded element in G_2.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the randomness.
- * @param[in] u1			- the U1 precomputed value in G_1.
- * @param[in] u2			- the U2 precomputed value in G_2.
- * @param[in] v2			- the image of the randomness in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvprv_ask(g1_t v1[3], g2_t w2[4], g1_t p, g2_t q, bn_t c, bn_t r[3],
-		g1_t u1[2], g2_t u2[2], g2_t v2[4]);
-
-/**
- * Execute the server-side response for the AMORE pairing delegation protocol.
- *
- * @param[out] g			- the group elements computed by the server.
- * @param[in] p				- the first argument of the pairing.
- * @param[in] q				- the second argument of the pairing.
- * @param[in] v1			- the blinded element in G_1.
- * @param[in] v2			- the image of the randomness in G_2.
- * @param[in] w2			- the blinded element in G_2.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_lvprv_ans(gt_t g[4], g1_t v1[3], g2_t w2[4]);
-
-/**
- * Verifies the result of the AMORE pairing delegation protocol.
- *
- * @param[out] r			- the result of the computation.
- * @param[in] g				- the group elements returned by the server.
- * @param[in] c 			- the challenge.
- * @param[out] e			- the precomputed values e(U1, U2).
- * @return a boolean value indicating if the computation is correct.
- */
-int cp_lvprv_ver(gt_t r, gt_t g[4], bn_t c, gt_t e[2]);
-
-/**
- * Generates a master key for the SOKAKA identity-based non-interactive
- * authenticated key agreement protocol.
- *
- * @param[out] master			- the master key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_sokaka_gen(bn_t master);
-
-/**
- * Generates a private key for the SOKAKA protocol.
- *
- * @param[out] k			- the private key.
- * @param[in] id			- the identity.
- * @param[in] master		- the master key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_sokaka_gen_prv(sokaka_t k, char *id, bn_t master);
-
-/**
- * Computes a shared key between two entities.
- *
- * @param[out] key			- the shared key.
- * @param[int] key_len		- the intended shared key length in bytes.
- * @param[in] id1			- the first identity.
- * @param[in] k				- the private key of the first identity.
- * @param[in] id2			- the second identity.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_sokaka_key(uint8_t *key, unsigned int key_len, char *id1,
-		sokaka_t k, char *id2);
-
-/**
- * Generates a key pair for the Boneh-Go-Nissim (BGN) cryptosystem.
- *
- * @param[out] pub 			- the public key.
- * @param[out] prv 			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_gen(bgn_t pub, bgn_t prv);
-
-/**
- * Encrypts in G_1 using the BGN cryptosystem.
- *
- * @param[out] out 			- the ciphertext.
- * @param[in] in 			- the plaintext as a small integer.
- * @param[in] pub 			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_enc1(g1_t out[2], dig_t in, bgn_t pub);
-
-/**
- * Decrypts in G_1 using the BGN cryptosystem.
- *
- * @param[out] out 			- the decrypted small integer.
- * @param[in] in 			- the ciphertext.
- * @param[in] prv 			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_dec1(dig_t *out, g1_t in[2], bgn_t prv);
-
-/**
- * Encrypts in G_2 using the BGN cryptosystem.
- *
- * @param[out] c 			- the ciphertext.
- * @param[in] m 			- the plaintext as a small integer.
- * @param[in] pub 			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_enc2(g2_t out[2], dig_t in, bgn_t pub);
-
-/**
- * Decrypts in G_2 using the BGN cryptosystem.
- *
- * @param[out] out 			- the decrypted small integer.
- * @param[in] c 			- the ciphertext.
- * @param[in] prv 			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_dec2(dig_t *out, g2_t in[2], bgn_t prv);
-
-/**
- * Adds homomorphically two BGN ciphertexts in G_T.
- *
- * @param[out] e 			- the resulting ciphertext.
- * @param[in] c 			- the first ciphertext to add.
- * @param[in] d 			- the second ciphertext to add.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_add(gt_t e[4], gt_t c[4], gt_t d[4]);
-
-/**
- * Multiplies homomorphically two BGN ciphertexts in G_T.
- *
- * @param[out] e 			- the resulting ciphertext.
- * @param[in] c 			- the first ciphertext to add.
- * @param[in] d 			- the second ciphertext to add.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_mul(gt_t e[4], g1_t c[2], g2_t d[2]);
-
-/**
- * Decrypts in G_T using the BGN cryptosystem.
- *
- * @param[out] out 			- the decrypted small integer.
- * @param[in] c 			- the ciphertext.
- * @param[in] prv 			- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bgn_dec(dig_t *out, gt_t in[4], bgn_t prv);
-
-/**
- * Generates a master key for a Private Key Generator (PKG) in the
- * Boneh-Franklin Identity-Based Encryption (BF-IBE).
- *
- * @param[out] master		- the master key.
- * @param[out] pub 			- the public key of the private key generator.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ibe_gen(bn_t master, g1_t pub);
-
-/**
- * Generates a private key for a user in the BF-IBE protocol.
- *
- * @param[out] prv			- the private key.
- * @param[in] id			- the identity.
- * @param[in] s				- the master key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ibe_gen_prv(g2_t prv, char *id, bn_t master);
-
-/**
- * Encrypts a message using the BF-IBE protocol.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to encrypt.
- * @param[in] id			- the identity.
- * @param[in] pub			- the public key of the PKG.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ibe_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len, char *id,
-		g1_t pub);
-
-/**
- * Decrypts a message using the BF-IBE protocol.
- *
- * @param[out] out			- the output buffer.
- * @param[in, out] out_len	- the buffer capacity and number of bytes written.
- * @param[in] in			- the input buffer.
- * @param[in] in_len		- the number of bytes to decrypt.
- * @param[in] pub			- the private key of the user.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_ibe_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len, g2_t prv);
-
-/**
- * Generates a key pair for the Boneh-Lynn-Schacham (BLS) signature protocol.
- *
- * @param[out] d			- the private key.
- * @param[out] q			- the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bls_gen(bn_t d, g2_t q);
-
-/**
- * Signs a message using the BLS protocol.
- *
- * @param[out] s			- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bls_sig(g1_t s, uint8_t *msg, int len, bn_t d);
-
-/**
- * Verifies a message signed with BLS protocol.
- *
- * @param[out] s			- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] q				- the public key.
- * @return a boolean value indicating if the signature is valid.
- */
-int cp_bls_ver(g1_t s, uint8_t *msg, int len, g2_t q);
-
-/**
- * Generates a key pair for the Boneh-Boyen (BB) signature protocol.
- *
- * @param[out] d			- the private key.
- * @param[out] q			- the first component of the public key.
- * @param[out] z			- the second component of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bbs_gen(bn_t d, g2_t q, gt_t z);
-
-/**
- * Signs a message using the BB protocol.
- *
- * @param[out] s			- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_bbs_sig(g1_t s, uint8_t *msg, int len, int hash, bn_t d);
-
-/**
- * Verifies a message signed with the BB protocol.
- *
- * @param[in] s				- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[out] q			- the first component of the public key.
- * @param[out] z			- the second component of the public key.
- * @return a boolean value indicating the verification result.
- */
-int cp_bbs_ver(g1_t s, uint8_t *msg, int len, int hash, g2_t q, gt_t z);
-
-/**
- * Generates a key pair for the Camenisch-Lysyanskaya simple signature (CLS)
- * protocol.
- *
- * @param[out] u			- the first part of the private key.
- * @param[out] v			- the second part of the private key.
- * @param[out] x			- the first part of the public key.
- * @param[out] y			- the second part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cls_gen(bn_t u, bn_t v, g2_t x, g2_t y);
-
-/**
- * Signs a message using the CLS protocol.
- *
- * @param[out] a			- the first part of the signature.
- * @param[out] b			- the second part of the signature.
- * @param[out] c			- the third part of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] u				- the first part of the private key.
- * @param[in] v				- the second part of the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cls_sig(g1_t a, g1_t b, g1_t c, uint8_t *msg, int len, bn_t u, bn_t v);
-
-/**
- ** Verifies a signature using the CLS protocol.
- *
- * @param[in] a				- the first part of the signature.
- * @param[in] b				- the second part of the signature.
- * @param[in] c				- the third part of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] u				- the first part of the public key.
- * @param[in] v				- the second part of the public key.
- * @return a boolean value indicating the verification result.
- */
-int cp_cls_ver(g1_t a, g1_t b, g1_t c, uint8_t *msg, int len, g2_t x, g2_t y);
-
-/**
- * Generates a key pair for the Camenisch-Lysyanskaya message-independent (CLI)
- * signature protocol.
- *
- * @param[out] t			- the first part of the private key.
- * @param[out] u			- the second part of the private key.
- * @param[out] v			- the third part of the private key.
- * @param[out] x			- the first part of the public key.
- * @param[out] y			- the second part of the public key.
- * @param[out] z			- the third part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cli_gen(bn_t t, bn_t u, bn_t v, g2_t x, g2_t y, g2_t z);
-
-/**
- * Signs a message using the CLI protocol.
- *
- * @param[out] a			- one of the components of the signature.
- * @param[out] A			- one of the components of the signature.
- * @param[out] b			- one of the components of the signature.
- * @param[out] B			- one of the components of the signature.
- * @param[out] c			- one of the components of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] r				- the per-message randomness.
- * @param[in] t				- the first part of the private key.
- * @param[in] u				- the second part of the private key.
- * @param[in] v				- the third part of the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cli_sig(g1_t a, g1_t A, g1_t b, g1_t B, g1_t c, uint8_t *msg, int len,
-		bn_t r, bn_t t, bn_t u, bn_t v);
-
-/**
- * Verifies a message signed using the CLI protocol.
- *
- * @param[in] a				- one of the components of the signature.
- * @param[in] A				- one of the components of the signature.
- * @param[in] b				- one of the components of the signature.
- * @param[in] B				- one of the components of the signature.
- * @param[in] c				- one of the components of the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] r				- the per-message randomness.
- * @param[in] x				- the first part of the public key.
- * @param[in] y				- the second part of the public key.
- * @param[in] z				- the third part of the public key.
- * @return a boolean value indicating the verification result.
- */
-int cp_cli_ver(g1_t a, g1_t A, g1_t b, g1_t B, g1_t c, uint8_t *msg, int len,
-		bn_t r, g2_t x, g2_t y, g2_t z);
-
-/**
- * Generates a key pair for the Camenisch-Lysyanskaya message-block (CLB)
- * signature protocol.
- *
- * @param[out] t			- the first part of the private key.
- * @param[out] u			- the second part of the private key.
- * @param[out] v			- the remaining (l - 1) parts of the private key.
- * @param[out] x			- the first part of the public key.
- * @param[out] y			- the second part of the public key.
- * @param[out] z			- the remaining (l - 1) parts of the public key.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_clb_gen(bn_t t, bn_t u, bn_t v[], g2_t x, g2_t y, g2_t z[], int l);
-
-/**
- * Signs a block of messages using the CLB protocol.
- *
- * @param[out] a			- the first component of the signature.
- * @param[out] A			- the (l - 1) next components of the signature.
- * @param[out] b			- the next component of the signature.
- * @param[out] B			- the (l - 1) next components of the signature.
- * @param[out] c			- the last component of the signature.
- * @param[in] msgs			- the l messages to sign.
- * @param[in] lens			- the l message lengths in bytes.
- * @param[in] t				- the first part of the private key.
- * @param[in] u				- the second part of the private key.
- * @param[in] v				- the remaining (l - 1) parts of the private key.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_clb_sig(g1_t a, g1_t A[], g1_t b, g1_t B[], g1_t c, uint8_t *msgs[],
-		int lens[], bn_t t, bn_t u, bn_t v[], int l);
-
-/**
- * Verifies a block of messages signed using the CLB protocol.
- *
- * @param[out] a			- the first component of the signature.
- * @param[out] A			- the (l - 1) next components of the signature.
- * @param[out] b			- the next component of the signature.
- * @param[out] B			- the (l - 1) next components of the signature.
- * @param[out] c			- the last component of the signature.
- * @param[in] msgs			- the l messages to sign.
- * @param[in] lens			- the l message lengths in bytes.
- * @param[in] x				- the first part of the public key.
- * @param[in] y				- the second part of the public key.
- * @param[in] z			- the remaining (l - 1) parts of the public key.
- * @param[in] l 			- the number of messages to sign.
- * @return a boolean value indicating the verification result.
- */
-int cp_clb_ver(g1_t a, g1_t A[], g1_t b, g1_t B[], g1_t c, uint8_t *msgs[],
-		int lens[], g2_t x, g2_t y, g2_t z[], int l);
-
-/**
- * Generates a key pair for the Pointcheval-Sanders simple signature (PSS)
- * protocol.
- *
- * @param[out] u			- the first part of the private key.
- * @param[out] v			- the second part of the private key.
- * @param[out] g			- the first part of the public key.
- * @param[out] x			- the secpmd part of the public key.
- * @param[out] y			- the third part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pss_gen(bn_t u, bn_t v, g2_t g, g2_t x, g2_t y);
-
-/**
- * Signs a message using the PSS protocol.
- *
- * @param[out] a			- the first part of the signature.
- * @param[out] b			- the second part of the signature.
- * @param[in] m			- the message to sign.
- * @param[in] u				- the first part of the private key.
- * @param[in] v				- the second part of the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pss_sig(g1_t a, g1_t b, bn_t m, bn_t u, bn_t v);
-
-/**
- ** Verifies a signature using the PSS protocol.
- *
- * @param[in] a				- the first part of the signature.
- * @param[in] b				- the second part of the signature.
- * @param[in] m				- the message to sign.
- * @param[in] g				- the first part of the public key.
- * @param[in] u				- the second part of the public key.
- * @param[in] v				- the third part of the public key.
- * @return a boolean value indicating the verification result.
- */
-int cp_pss_ver(g1_t a, g1_t b, bn_t m, g2_t g, g2_t x, g2_t y);
-
-/**
- * Generates a key pair for the multi-part version of the Pointcheval-Sanders
- * simple signature (MPSS) protocol.
- *
- * @param[out] r			- the first part of the private key.
- * @param[out] s			- the second part of the private key.
- * @param[out] g			- the first part of the public key.
- * @param[out] x			- the second part of the public key.
- * @param[out] y			- the third part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpss_gen(bn_t r[2], bn_t s[2], g2_t g, g2_t x[2], g2_t y[2]);
-
-/**
- * Signs a message using the MPSS protocol operating over shares using triples.
- *
- * @param[out] a			- the first part of the signature.
- * @param[out] b			- the second part of the signature.
- * @param[in] m				- the message to sign.
- * @param[in] r				- the first part of the private key.
- * @param[in] s				- the second part of the private key.
- * @param[in] mul_tri 		- the triple for the multiplication.
- * @param[in] sm_tri 		- the triple for the scalar multiplication.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpss_sig(g1_t a, g1_t b[2], bn_t m[2], bn_t r[2], bn_t s[2],
-		mt_t mul_tri[2], mt_t sm_tri[2]);
-
-/**
- * Opens public values in the MPSS protocols, in this case public keys.
- *
- * @param[in,out] x			- the shares of the second part of the public key.
- * @param[in,out] y			- the shares of the third part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpss_bct(g2_t x[2], g2_t y[2]);
-
-/**
- * Verifies a signature using the MPSS protocol operating over shares using
- * triples.
- *
- * @param[out] e			- the result of the verification.
- * @param[in] a				- the first part of the signature.
- * @param[in] b				- the second part of the signature.
- * @param[in] m				- the message to sign.
- * @param[in] g				- the first part of the public key.
- * @param[in] x				- the second part of the public key.
- * @param[in] y				- the third part of the public key.
- * @param[in] sm_tri 		- the triple for the scalar multiplication.
- * @param[in] pc_tri 		- the triple for the pairing computation.
- * @return a boolean value indicating the verification result.
- */
-int cp_mpss_ver(gt_t e, g1_t a, g1_t b[2], bn_t m[2], g2_t h, g2_t x, g2_t y,
-		mt_t sm_tri[2], pt_t pc_tri[2]);
-
-/**
- * Generates a key pair for the Pointcheval-Sanders block signature (PSB)
- * protocol.
- *
- * @param[out] r			- the first part of the private key.
- * @param[out] s			- the second part of the private key.
- * @param[out] g			- the first part of the public key.
- * @param[out] x			- the secpmd part of the public key.
- * @param[out] y			- the third part of the public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_psb_gen(bn_t r, bn_t s[], g2_t g, g2_t x, g2_t y[], int l);
-
-/**
- * Signs a block of messages using the PSB protocol.
- *
- * @param[out] a			- the first component of the signature.
- * @param[out] b			- the second component of the signature.
- * @param[in] ms			- the l messages to sign.
- * @param[in] r				- the first part of the private key.
- * @param[in] s				- the remaining l part of the private key.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_psb_sig(g1_t a, g1_t b, bn_t ms[], bn_t r, bn_t s[], int l);
-
-/**
- * Verifies a block of messages signed using the PSB protocol.
- *
- * @param[out] a			- the first component of the signature.
- * @param[out] b			- the seconed component of the signature.
- * @param[in] ms			- the l messages to sign.
- * @param[in] g				- the first part of the public key.
- * @param[in] x				- the second part of the public key.
- * @param[in] y				- the remaining l parts of the public key.
- * @param[in] l 			- the number of messages to sign.
- * @return a boolean value indicating the verification result.
- */
-int cp_psb_ver(g1_t a, g1_t b, bn_t ms[], g2_t g, g2_t x, g2_t y[], int l);
-
-/**
- * Generates a key pair for the multi-part version of the Pointcheval-Sanders
- * simple signature (MPSS) protocol.
- *
- * @param[out] r			- the first part of the private key.
- * @param[out] s			- the second part of the private key.
- * @param[out] g			- the first part of the public key.
- * @param[out] x			- the second part of the public key.
- * @param[out] y			- the third part of the public key.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpsb_gen(bn_t r[2], bn_t s[][2], g2_t h, g2_t x[2], g2_t y[][2], int l);
-
-/**
- * Signs a message using the MPSS protocol operating over shares using triples.
- *
- * @param[out] a			- the first part of the signature.
- * @param[out] b			- the second part of the signature.
- * @param[in] m				- the messages to sign.
- * @param[in] r				- the first part of the private key.
- * @param[in] s				- the second parts of the private key.
- * @param[in] mul_tri 		- the triple for the multiplication.
- * @param[in] sm_tri 		- the triple for the scalar multiplication.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpsb_sig(g1_t a, g1_t b[2], bn_t m[][2], bn_t r[2], bn_t s[][2],
-		mt_t mul_tri[2], mt_t sm_tri[2], int l);
-
-/**
- * Opens public values in the MPSS protocols, in this case public keys.
- *
- * @param[in,out] x			- the shares of the second part of the public key.
- * @param[in,out] y			- the shares of the third part of the public key.
- * @param[in] l 			- the number of messages to sign.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mpsb_bct(g2_t x[2], g2_t y[][2], int l);
-
-/**
- * Verifies a signature using the MPSS protocol operating over shares using
- * triples.
- *
- * @param[out] e			- the result of the verification.
- * @param[in] a				- the first part of the signature.
- * @param[in] b				- the second part of the signature.
- * @param[in] m				- the messages to sign.
- * @param[in] g				- the first part of the public key.
- * @param[in] x				- the second part of the public key.
- * @param[in] y				- the third parts of the public key.
- * @param[in] sm_tri 		- the triple for the scalar multiplication.
- * @param[in] pc_tri 		- the triple for the pairing computation.
- * @param[in] v 			- the private keys, can be NULL.
- * @param[in] l 			- the number of messages to sign.
- * @return a boolean value indicating the verification result.
- */
-int cp_mpsb_ver(gt_t e, g1_t a, g1_t b[2], bn_t m[][2], g2_t h, g2_t x,
-		g2_t y[][2], bn_t v[][2], mt_t sm_tri[2], pt_t pc_tri[2], int l);
-
-/**
- * Generates a Zhang-Safavi-Naini-Susilo (ZSS) key pair.
- *
- * @param[out] d			- the private key.
- * @param[out] q			- the first component of the public key.
- * @param[out] z			- the second component of the public key.
- */
-int cp_zss_gen(bn_t d, g1_t q, gt_t z);
-
-/**
- * Signs a message using ZSS scheme.
- *
- * @param[out] s			- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[in] d				- the private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_zss_sig(g2_t s, uint8_t *msg, int len, int hash, bn_t d);
-
-/**
- * Verifies a message signed with ZSS scheme.
- *
- * @param[in] s				- the signature.
- * @param[in] msg			- the message to sign.
- * @param[in] len			- the message length in bytes.
- * @param[in] hash			- the flag to indicate the message format.
- * @param[out] q			- the first component of the public key.
- * @param[out] z			- the second component of the public key.
- * @return a boolean value indicating the verification result.
- */
-int cp_zss_ver(g2_t s, uint8_t *msg, int len, int hash, g1_t q, gt_t z);
-
-/**
- * Generates a vBNN-IBS key generation center (KGC).
- *
- * @param[out] msk 			- the KGC master key.
- * @param[out] mpk 			- the KGC public key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_vbnn_gen(bn_t msk, ec_t mpk);
-
-/**
- * Extract a user key from an identity and a vBNN-IBS key generation center.
- *
- * @param[out] sk 			- the extracted vBNN-IBS user private key.
- * @param[out] pk 			- the extracted vBNN-IBS user public key.
- * @param[in] msk 			- the KGC master key.
- * @param[in] id			- the identity used for extraction.
- * @param[in] id_len		- the identity length in bytes.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_vbnn_gen_prv(bn_t sk, ec_t pk, bn_t msk, uint8_t *id, int id_len);
-
-/**
- * Signs a message using the vBNN-IBS scheme.
- *
- * @param[out] r			- the R value of the signature.
- * @param[out] z 			- the z value of the signature.
- * @param[out] h 			- the h value of the signature.
- * @param[in] id 			- the identity buffer.
- * @param[in] id_len 		- the size of identity buffer.
- * @param[in] msg 			- the message buffer to sign.
- * @param[in] msg_len 		- the size of message buffer.
- * @param[in] sk 			- the signer private key.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_vbnn_sig(ec_t r, bn_t z, bn_t h, uint8_t *id, int id_len, uint8_t *msg,
-		int msg_len, bn_t sk, ec_t pk);
-
-/**
- * Verifies a signature and message using the vBNN-IBS scheme.
- *
- * @param[in] r				- the R value of the signature.
- * @param[in] z 			- the z value of the signature.
- * @param[in] h 			- the h value of the signature.
- * @param[in] id 			- the identity buffer.
- * @param[in] id_len 		- the size of identity buffer.
- * @param[in] msg 			- the message buffer to sign.
- * @param[in] msg_len 		- the size of message buffer.
- * @param[in] mpk			- the master public key of the generation center.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_vbnn_ver(ec_t r, bn_t z, bn_t h, uint8_t *id, int id_len, uint8_t *msg,
-		int msg_len, ec_t mpk);
-
-/**
- * Computes the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Proves that y = [x]G.
- *
- * @param[out] c 			- the challenge.
- * @param[out] r 			- the response.
- * @param[in] y 			- the elliptic curve point
- * @param[in] x 			- the discrete logarithm to prove.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pokdl_prv(bn_t c, bn_t r, ec_t y, bn_t x);
-
-/**
- * Verifies the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Verifies that y = [x]G.
- *
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the response.
- * @param[in] y 			- the elliptic curve point.
- * @return a boolean value indicating the verification result.
- */
-int cp_pokdl_ver(bn_t c, bn_t r, ec_t y);
-
-/**
- * Computes the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Proves that y0 = [x]G or y[1] = [x]G.
- *
- * @param[out] c 			- the challenges.
- * @param[out] r 			- the responses.
- * @param[in] y 			- the elliptic curve points.
- * @param[in] x 			- the discrete logarithm to prove.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_pokor_prv(bn_t c[2], bn_t r[2], ec_t y[2], bn_t x);
-
-/**
- * Verifies the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Verifies that y = [x]G.
- *
- * @param[in] c 			- the challenges.
- * @param[in] r 			- the responses.
- * @param[in] y 			- the elliptic curve points.
- * @return a boolean value indicating the verification result.
- */
-int cp_pokor_ver(bn_t c[2], bn_t r[2], ec_t y[2]);
-
-/**
- * Computes the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Proves that y = [x]G.
- *
- * @param[out] c 			- the challenge.
- * @param[out] r 			- the response.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the length of the message.
- * @param[in] y 			- the elliptic curve point
- * @param[in] x 			- the discrete logarithm to prove.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_sokdl_sig(bn_t c, bn_t r, uint8_t *msg, int len, ec_t y, bn_t x);
-
-/**
- * Verifies the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Verifies that y = [x]G.
- *
- * @param[in] c 			- the challenge.
- * @param[in] r 			- the response.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the length of the message.
- * @param[in] y 			- the elliptic curve point.
- * @return a boolean value indicating the verification result.
- */
-int cp_sokdl_ver(bn_t c, bn_t r, uint8_t *msg, int len, ec_t y);
-
-/**
- * Computes the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Proves that y0 = [x]G or y1 = [x]G.
- *
- * @param[out] c 			- the challenges.
- * @param[out] r 			- the responses.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the length of the message.
- * @param[in] y 			- the elliptic curve points.
- * @param[in] x 			- the discrete logarithm to prove.
- * @param[in] first 		- the flag to indicate the point fort which the
- *							  discrete logarithm is known.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_sokor_sig(bn_t c[2], bn_t r[2], uint8_t *msg, int len, ec_t y[2],
-	bn_t x, int first);
-
-/**
- * Verifies the proof of knowledge of a discrete logarithm of an elliptic curve
- * point to a generator. Verifies that y = [x]G.
- *
- * @param[in] c 			- the challenges.
- * @param[in] r 			- the responses.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the length of the message.
- * @param[in] y 			- the elliptic curve points.
- * @return a boolean value indicating the verification result.
- */
-int cp_sokor_ver(bn_t c[2], bn_t r[2], uint8_t *msg, int len, ec_t y[2]);
-
-/**
- * Generates the public parameters of the extendable ring signature.
- *
- * @åaram[out] pp 			- the public parameters.
- */
-int cp_ers_gen(ec_t pp);
-
-/**
- * Generates a key pair for the extendable ring signature.
- *
- * @åaram[out] sk 			- the private key.
- * @param[out] pk 			- the public key.
- */
-int cp_ers_gen_key(bn_t sk, ec_t pk);
-
-/**
- * Signs a message using the extendable ring signature scheme.
- *
- * @param[out] td 			- the signature trapdoor.
- * @param[out] p 			- the resulting signature.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] sk			- the signer's private key.
- * @param[in] pk			- the singer's public key.
- * @param[in] pp			- the public parameters.
- */
-int cp_ers_sig(bn_t td, ers_t p, uint8_t *msg, int len, bn_t sk, ec_t pk,
-		ec_t pp);
-
-/**
- * Verifies an extendable ring signature scheme over some messages.
- *
- * @param[in] td 			- the signature trapdoor.
- * @param[in] s 			- the ring of signatures.
- * @param[in] size 			- the number of signatures in the ring.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] pp			- the public parameters.
- */
-int cp_ers_ver(bn_t td, ers_t *s, int size, uint8_t *msg, int len, ec_t pp);
-
-/**
- * Extends an extendable ring signature with a new signature.
- *
- * @param[in] td 			- the signature trapdoor.
- * @param[in] p 			- the ring of signatures.
- * @param[in] size 			- the number of signatures in the ring.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] pk			- the singer's public key.
- * @param[in] pp			- the public parameters.
- */
-int cp_ers_ext(bn_t td, ers_t *p, int *size, uint8_t *msg, int len, ec_t pk,
-		ec_t pp);
-
-/**
- * Generates the public parameters of the extendable threshold ring signature.
- *
- * @åaram[out] pp 			- the public parameters.
- */
-int cp_etrs_gen(ec_t pp);
-
-/**
- * Generates a key pair for the extendable threshold ring signature.
- *
- * @åaram[out] sk 			- the private key.
- * @param[out] pk 			- the public key.
- */
-int cp_etrs_gen_key(bn_t sk, ec_t pk);
-
-/**
- * Signs a message using the extendable threshold ring signature scheme.
- *
- * @param[out] td 			- the signature trapdoors.
- * @param[out] y 			- the signature randomness.
- * @param[out] max	 		- the maximum number of extensions.
- * @param[out] p 			- the resulting signature.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] sk			- the signer's private key.
- * @param[in] pk			- the singer's public key.
- * @param[in] pp			- the public parametetrs.
- */
-int cp_etrs_sig(bn_t *td, bn_t *y, int max, etrs_t p, uint8_t *msg, int len,
-		bn_t sk, ec_t pk, ec_t pp);
-
-/**
- * Verifies an extendable threshold ring signature scheme over some messages.
- *
- * @param[in] thres 		- the specified threshold.
- * @param[in] td 			- the signature trapdoors.
- * @param[in] y 			- the signature randomness.
- * @param[in] max	 		- the maximum number of extensions.
- * @param[in] s 			- the ring of signatures.
- * @param[in] size 			- the number of signatures in the ring.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] pp			- the public parametetrs.
- */
-int cp_etrs_ver(int thres, bn_t *td, bn_t *y, int max, etrs_t *s, int size,
- 		uint8_t *msg, int len, ec_t pp);
-
-/**
- * Extends an extendable threshold ring signature with a new signature.
- *
- * @param[in] td 			- the signature trapdoors.
- * @param[in] y 			- the signature randomness.
- * @param[in] max	 		- the maximum number of extensions.
- * @param[in] p 			- the ring of signatures.
- * @param[in] size 			- the number of signatures in the ring.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] pk			- the singer's public key.
- * @param[in] pp			- the public parametetrs.
- */
-int cp_etrs_ext(bn_t *td, bn_t *y, int max, etrs_t *p, int *size, uint8_t *msg,
-		int len, ec_t pk, ec_t pp);
-/**
- * Joins an extendable threshold ring signature with a new signature.
- *
- * @param[in] thres 		- the specified threshold.
- * @param[in] td 			- the signature trapdoors.
- * @param[in] y 			- the signature randomness.
- * @param[in] max	 		- the maximum number of extensions.
- * @param[in] p 			- the ring of signatures.
- * @param[in] size 			- the number of signatures in the ring.
- * @param[in] msg 			- the message to sign.
- * @param[in] len 			- the message length.
- * @param[in] sk			- the signer's private key.
- * @param[in] pk			- the singer's public key.
- * @param[in] pp			- the public parametetrs.
- */
-int cp_etrs_uni(int thres, bn_t *td, bn_t *y, int max, etrs_t *p, int *size,
-		uint8_t *msg, int len, bn_t sk, ec_t pk, ec_t pp);
-/**
- * Initialize the Context-hiding Multi-key Homomorphic Signature scheme (CMLHS).
- * The scheme due to Schabhuser et al. signs a vector of messages.
- *
- * @param[out] h			- the random element (message as one component).
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cmlhs_init(g1_t h);
-
-/**
- * Generates a key pair for the CMLHS scheme using BLS as underlying signature.
- *
- * @param[out] x 			- the exponent values, one per label.
- * @param[out] hs 			- the hash values, one per label.
- * @param[in] len			- the number of possible labels.
- * @param[out] prf 			- the key for the pseudo-random function (PRF).
- * @param[out] plen 		- the PRF key length.
- * @param[out] sk 			- the private key for the BLS signature scheme.
- * @param[out] pk 			- the public key for the BLS signature scheme.
- * @param[out] d 			- the secret exponent.
- * @param[out] y 			- the corresponding public element.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cmlhs_gen(bn_t x[], gt_t hs[], int len, uint8_t prf[], int plen,
-		bn_t sk, g2_t pk, bn_t d, g2_t y);
-
-/**
- * Signs a message vector using the CMLHS.
- *
- * @param[out] sig 			- the resulting BLS signature.
- * @param[out] z 			- the power of the output of the PRF.
- * @param[out] a 			- the first component of the signature.
- * @param[out] c 			- the second component of the signature.
- * @param[out] r 			- the third component of the signature.
- * @param[out] s 			- the fourth component of the signature.
- * @param[in] msg 			- the message vector to sign (one component).
- * @param[in] data 			- the dataset identifier.
- * @param[in] label 		- the integer label.
- * @param[in] x 			- the exponent value for the label.
- * @param[in] h 			- the random value (message has one component).
- * @param[in] prf 			- the key for the pseudo-random function (PRF).
- * @param[in] plen 			- the PRF key length.
- * @param[in] sk 			- the private key for the BLS signature scheme.
- * @param[out] d 			- the secret exponent.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cmlhs_sig(g1_t sig, g2_t z, g1_t a, g1_t c, g1_t r, g2_t s, bn_t msg,
-		char *data, int label, bn_t x, g1_t h, uint8_t prf[], int plen,
-		bn_t sk, bn_t d);
-
-/**
- * Applies a function over a set of CMLHS signatures from the same user.
- *
- * @param[out] a			- the resulting first component of the signature.
- * @param[out] c			- the resulting second component of the signature.
- * @param[in] as			- the vector of first components of the signatures.
- * @param[in] cs			- the vector of second components of the signatures.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] len			- the number of coefficients.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cmlhs_fun(g1_t a, g1_t c, g1_t as[], g1_t cs[], dig_t f[], int len);
-
-/**
- * Evaluates a function over a set of CMLHS signatures.
- *
- * @param[out] r			- the resulting third component of the signature.
- * @param[out] s			- the resulting fourth component of the signature.
- * @param[in] rs			- the vector of third components of the signatures.
- * @param[in] ss			- the vector of fourth components of the signatures.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] len			- the number of coefficients.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_cmlhs_evl(g1_t r, g2_t s, g1_t rs[], g2_t ss[], dig_t f[], int len);
-
-/**
- * Verifies a CMLHS signature over a set of messages.
- *
- * @param[in] r 			- the first component of the homomorphic signature.
- * @param[in] s 			- the second component of the homomorphic signature.
- * @param[in] sig 			- the BLS signatures.
- * @param[in] z 			- the powers of the outputs of the PRF.
- * @param[in] a				- the vector of first components of the signatures.
- * @param[in] c				- the vector of second components of the signatures.
- * @param[in] msg 			- the combined message.
- * @param[in] data 			- the dataset identifier.
- * @param[in] h				- the random element (message has one component).
- * @param[in] label 		- the integer labels.
- * @param[in] hs 			- the hash values, one per label.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] flen			- the number of coefficients.
- * @param[in] y 			- the public elements of the users.
- * @param[in] pk 			- the public keys of the users.
- * @param[in] slen 			- the number of signatures.
- * @return a boolean value indicating the verification result.
- */
-int cp_cmlhs_ver(g1_t r, g2_t s, g1_t sig[], g2_t z[], g1_t a[], g1_t c[],
-		bn_t m, char *data, g1_t h, int label[], gt_t * hs[],
-		dig_t *f[], int flen[], g2_t y[], g2_t pk[], int slen);
-
-/**
- * Perform the offline verification of a CMLHS signature over a set of messages.
- *
- * @param[out] vk			- the verification key.
- * @param[in] h				- the random element (message has one component).
- * @param[in] label 		- the integer labels.
- * @param[in] hs 			- the hash values, one per label.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] flen			- the number of coefficients.
- * @param[in] y 			- the public elements of the users.
- * @param[in] pk 			- the public keys of the users.
- * @param[in] slen 			- the number of signatures.
- * @return a boolean value indicating the verification result.
- */
-void cp_cmlhs_off(gt_t vk, g1_t h, int label[], gt_t * hs[], dig_t *f[],
-		int flen[], g2_t y[], g2_t pk[], int slen);
-
-/**
- * Perform the online verification of a CMLHS signature over a set of messages.
- *
- * @param[in] r 			- the first component of the homomorphic signature.
- * @param[in] s 			- the second component of the homomorphic signature.
- * @param[in] sig 			- the BLS signatures.
- * @param[in] z 			- the powers of the outputs of the PRF.
- * @param[in] a				- the vector of first components of the signatures.
- * @param[in] c				- the vector of second components of the signatures.
- * @param[in] msg 			- the combined message.
- * @param[in] data 			- the dataset identifier.
- * @param[in] h				- the random element (message has one component).
- * @param[in] vk			- the verification key.
- * @return a boolean value indicating the verification result.
- */
-int cp_cmlhs_onv(g1_t r, g2_t s, g1_t sig[], g2_t z[], g1_t a[], g1_t c[],
-		bn_t msg, char *data, g1_t h, gt_t vk, g2_t y[], g2_t pk[], int slen);
-/**
- * Generates a key pair for the Multi-Key Homomorphic Signature (MKLHS) scheme.
- *
- * @param[out] sk 			- the private key for the signature scheme.
- * @param[out] pk 			- the public key for the signature scheme.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mklhs_gen(bn_t sk, g2_t pk);
-
-/**
- * Signs a message using the MKLHS.
- *
- * @param[out] s 			- the resulting signature.
- * @param[in] m 			- the message to sign.
- * @param[in] data 			- the dataset identifier.
- * @param[in] id 			- the identity.
- * @param[in] tag 			- the tag.
- * @param[in] sk 			- the private key for the signature scheme.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mklhs_sig(g1_t s, bn_t m, char *data, char *id, char *tag, bn_t sk);
-
-/**
- * Applies a function over a set of messages from the same user.
- *
- * @param[out] mu			- the combined message.
- * @param[in] m				- the vector of individual messages.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] len			- the number of coefficients.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mklhs_fun(bn_t mu, bn_t m[], dig_t f[], int len);
-
-/**
- * Evaluates a function over a set of MKLHS signatures.
- *
- * @param[out] sig			- the resulting signature.
- * @param[in] s				- the set of signatures.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] len			- the number of coefficients.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mklhs_evl(g1_t sig, g1_t s[], dig_t f[], int len);
-
-/**
- * Verifies a MKLHS signature over a set of messages.
- *
- * @param[in] sig 			- the homomorphic signature to verify.
- * @param[in] m 			- the signed message.
- * @param[in] mu			- the vector of signed messages per user.
- * @param[in] data 			- the dataset identifier.
- * @param[in] id 			- the vector of identities.
- * @param[in] tag	 		- the vector of tags.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] flen			- the number of coefficients.
- * @param[in] pk 			- the public keys of the users.
- * @param[in] slen 			- the number of signatures.
- * @return a boolean value indicating the verification result.
- */
-int cp_mklhs_ver(g1_t sig, bn_t m, bn_t mu[], char *data, char *id[],
-		char *tag[], dig_t *f[], int flen[], g2_t pk[], int slen);
-
-/**
- * Computes the offline part of veryfying a MKLHS signature over a set of
- * messages.
- *
- * @param[out] h 			- the hashes of labels
- * @param[out] ft 			- the precomputed linear coefficients.
- * @param[in] id 			- the vector of identities.
- * @param[in] tag 			- the vector of tags.
- * @param[in] f 			- the linear coefficients in the function.
- * @param[in] flen			- the number of coefficients.
- * @param[in] slen 			- the number of signatures.
- * @return RLC_OK if no errors occurred, RLC_ERR otherwise.
- */
-int cp_mklhs_off(g1_t h[], dig_t ft[], char *id[], char *tag[], dig_t *f[],
-		int flen[], int slen);
-
-/**
- * Computes the online part of veryfying a MKLHS signature over a set of
- * messages.
- *
- * @param[in] sig 			- the homomorphic signature to verify.
- * @param[in] m 			- the signed message.
- * @param[in] mu			- the vector of signed messages per user.
- * @param[in] data 			- the dataset identifier.
- * @param[in] id 			- the vector of identities.
- * @param[in] d 			- the hashes of labels.
- * @param[in] ft 			- the precomputed linear coefficients.
- * @param[in] pk 			- the public keys of the users.
- * @param[in] slen 			- the number of signatures.
- * @return a boolean value indicating the verification result.
- */
-int cp_mklhs_onv(g1_t sig, bn_t m, bn_t mu[], char *data, char *id[], g1_t h[],
-		dig_t ft[], g2_t pk[], int slen);
-
-#endif /* !RLC_CP_H */
diff --git a/src/dashbls/depends/relic/include/relic_dv.h b/src/dashbls/depends/relic/include/relic_dv.h
deleted file mode 100644
index 25204a064065..000000000000
--- a/src/dashbls/depends/relic/include/relic_dv.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup dv Digit vector handling
- */
-
-/**
- * @file
- *
- * Interface of the module for manipulating temporary double-precision digit
- * vectors.
- *
- * @ingroup dv
- */
-
-#ifndef RLC_DV_H
-#define RLC_DV_H
-
-#include "relic_bn.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-#include "relic_util.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Size in bits of the largest field element.
- */
-#ifdef WITH_FP
-
-#ifdef WITH_FB
-#define RLC_DV_MAX		(RLC_MAX(FP_PRIME, FB_POLYN))
-#else /* !WITH_FB */
-#define RLC_DV_MAX		(FP_PRIME)
-#endif
-
-#else /* !WITH_FP */
-
-#ifdef WITH_FB
-#define RLC_DV_MAX		(FB_POLYN)
-#else /* !WITH_FB */
-#define RLC_DV_MAX		(0)
-#endif
-
-#endif /* WITH_FP */
-
-/**
- * Size in digits of a temporary vector.
- *
- * A temporary vector has enough size to store a multiplication/squaring result
- * produced by any module.
- */
-#define RLC_DV_DIGS		(RLC_MAX(RLC_CEIL(RLC_DV_MAX, RLC_DIG), RLC_BN_SIZE))
-
-/**
- * Size in bytes of a temporary vector.
- */
-#define RLC_DV_BYTES	(RLC_DV_DIGS * (RLC_DIG / 8))
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a temporary double-precision digit vector.
- */
-#if ALLOC == AUTO
-typedef rlc_align dig_t dv_t[RLC_DV_DIGS + RLC_PAD(RLC_DV_BYTES)/(RLC_DIG / 8)];
-#else
-typedef dig_t *dv_t;
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a digit vector with a null value.
- *
- * @param[out] A			- the digit vector to initialize.
- */
-#if ALLOC == AUTO
-#define dv_null(A)			/* empty */
-#else
-#define dv_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate a temporary double-precision digit vector.
- *
- * @param[out] A			- the double-precision result.
- */
-#if ALLOC == DYNAMIC
-#define dv_new(A)			dv_new_dynam(&(A), RLC_DV_DIGS)
-#elif ALLOC == AUTO
-#define dv_new(A)			/* empty */
-#endif
-
-/**
- * Calls a function to clean and free a temporary double-precision digit vector.
- *
- * @param[out] A			- the temporary digit vector to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define dv_free(A)			dv_free_dynam(&(A))
-#elif ALLOC == AUTO
-#define dv_free(A)			(void)A
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Prints a temporary digit vector.
- *
- * @param[in] a				- the temporary digit vector to print.
- * @param[in] digits		- the number of digits to print.
- */
-void dv_print(dig_t *a, int digits);
-
-/**
- * Assigns zero to a temporary double-precision digit vector.
- *
- * @param[out] a			- the temporary digit vector to assign.
- * @param[in] digits		- the number of words to initialize with zero.
- */
-void dv_zero(dig_t *a, int digits);
-
-/**
- * Copies some digits from a digit vector to another digit vector.
- *
- * @param[out] c			- the destination.
- * @param[in] a				- the source.
- * @param[in] digits		- the number of digits to copy.
- */
-void dv_copy(dig_t *c, const dig_t *a, int digits);
-
-/**
- * Conditionally copies some digits from a digit vector to another digit vector.
- *
- * @param[out] c			- the destination.
- * @paraim[in] a			- the source.
- * @param[in] digits		- the number of digits to copy.
- * @param[in] cond			- the condition to evaluate.
- */
-void dv_copy_cond(dig_t *c, const dig_t *a, int digits, dig_t cond);
-
-/**
- * Conditionally swap two digit vectors.
- *
- * @param[in,out] c			- the destination.
- * @paraim[in,out] a		- the source.
- * @param[in] digits		- the number of digits to copy.
- * @param[in] cond			- the condition to evaluate.
- */
-void dv_swap_cond(dig_t *c, dig_t *a, int digits, dig_t cond);
-
-/**
- * Returns the result of a comparison between two digit vectors.
- *
- * @param[in] a				- the first digit vector.
- * @param[in] b				- the second digit vector.
- * @param[in] size			- the length in digits of the vectors.
- * @return RLC_LT if a < b, RLC_EQ if a == b and RLC_GT if a > b.
- */
-int dv_cmp(const dig_t *a, const dig_t *b, int size);
-
-/**
- * Compares two digit vectors in constant time.
- *
- * @param[in] a				- the first digit vector.
- * @param[in] b				- the second digit vector.
- * @param[in] size			- the length in digits of the vectors.
- * @return RLC_EQ if they are equal and RLC_NE otherwise.
- */
-int dv_cmp_const(const dig_t *a, const dig_t *b, int size);
-
-/**
- * Allocates and initializes a temporary double-precision digit vector.
- *
- * @param[out] a			- the new temporary digit vector.
- * @param[in] digits		- the required precision in digits.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- * @throw ERR_PRECISION		- if the required precision cannot be represented
- * 							by the library.
- */
-#if ALLOC == DYNAMIC
-void dv_new_dynam(dv_t *a, int digits);
-#endif
-
-/**
- * Cleans and frees a temporary double-precision digit vector.
- *
- * @param[out] a			- the temporary digit vector to clean and free.
- */
-#if ALLOC == DYNAMIC
-void dv_free_dynam(dv_t *a);
-#endif
-
-/**
- * Shifts a digit vector to the left by some digits.
- * Computes c = a << (digits * RLC_DIG).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @param[in] digits		- the shift amount.
- */
-void dv_lshd(dig_t *c, const dig_t *a, int size, int digits);
-
-/**
- * Shifts a digit vector to the right by some digits.
- * Computes c = a >> (digits * RLC_DIG).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit vector to shift.
- * @param[in] size			- the number of digits to shift.
- * @param[in] digits		- the shift amount.
- */
-void dv_rshd(dig_t *c, const dig_t *a, int size, int digits);
-
-#endif /* !RLC_DV_H */
diff --git a/src/dashbls/depends/relic/include/relic_eb.h b/src/dashbls/depends/relic/include/relic_eb.h
deleted file mode 100644
index b43650f1fb6d..000000000000
--- a/src/dashbls/depends/relic/include/relic_eb.h
+++ /dev/null
@@ -1,950 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup eb Elliptic curves over binary fields
- */
-
-/**
- * @file
- *
- * Interface of the module for arithmetic on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#ifndef RLC_EB_H
-#define RLC_EB_H
-
-#include "relic_fb.h"
-#include "relic_bn.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Binary elliptic curve identifiers.
- */
-enum {
-	/** NIST B-163 binary curve. */
-	NIST_B163 = 1,
-	/** NIST K-163 Koblitz curve. */
-	NIST_K163,
-	/** NIST B-133 binary curve. */
-	NIST_B233,
-	/** NIST K-233 Koblitz curve. */
-	NIST_K233,
-	/** Curve over 2^{251} used in eBATs. */
-	EBACS_B251,
-	/** Curve over 2^{257} good for halving. */
-	HALVE_B257,
-	/** SECG K-239 binary curve. */
-	SECG_K239,
-	/** NIST B-283 binary curve. */
-	NIST_B283,
-	/** NIST K-283 Koblitz curve. */
-	NIST_K283,
-	/** NIST B-409 binary curve. */
-	NIST_B409,
-	/** NIST K-409 Koblitz curve. */
-	NIST_K409,
-	/** NIST B-571 binary curve. */
-	NIST_B571,
-	/** NIST K-571 Koblitz curve. */
-	NIST_K571,
-};
-
-/**
- * Size of a precomputation table using the binary method.
- */
-#define RLC_EB_TABLE_BASIC		(RLC_FB_BITS)
-
-/**
- * Size of a precomputation table using the single-table comb method.
- */
-#define RLC_EB_TABLE_COMBS      (1 << EB_DEPTH)
-
-/**
- * Size of a precomputation table using the double-table comb method.
- */
-#define RLC_EB_TABLE_COMBD		(1 << (EB_DEPTH + 1))
-
-/**
- * Size of a precomputation table using the w-(T)NAF method.
- */
-#define RLC_EB_TABLE_LWNAF		(1 << (EB_DEPTH - 2))
-
-/**
- * Size of a precomputation table using the chosen algorithm.
- */
-#if EB_FIX == BASIC
-#define RLC_EB_TABLE			RLC_EB_TABLE_BASIC
-#elif EB_FIX == COMBS
-#define RLC_EB_TABLE			RLC_EB_TABLE_COMBS
-#elif EB_FIX == COMBD
-#define RLC_EB_TABLE			RLC_EB_TABLE_COMBD
-#elif EB_FIX == LWNAF
-#define RLC_EB_TABLE			RLC_EB_TABLE_LWNAF
-#endif
-
-/**
- * Maximum size of a precomputation table.
- */
-#ifdef STRIP
-#define RLC_EB_TABLE_MAX 		RLC_EB_TABLE
-#else
-#define RLC_EB_TABLE_MAX 		RLC_MAX(RLC_EB_TABLE_BASIC, RLC_EB_TABLE_COMBD)
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents an elliptic curve point over a binary field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fb_st x;
-	/** The second coordinate. */
-	fb_st y;
-	/** The third coordinate (projective representation). */
-	fb_st z;
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} eb_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef eb_st eb_t[1];
-#else
-#ifdef CHECK
-typedef eb_st *volatile eb_t;
-#else
-typedef eb_st *eb_t;
-#endif
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a point on a binary elliptic curve with a null value.
- *
- * @param[out] A			- the point to initialize.
- */
-#if ALLOC == AUTO
-#define eb_null(A)			/* empty */
-#else
-#define eb_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate a point on a binary elliptic curve.
- *
- * @param[out] A			- the new point.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define eb_new(A)															\
-	A = (eb_t)calloc(1, sizeof(eb_st));										\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-
-#elif ALLOC == AUTO
-#define eb_new(A)			/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a point on a binary elliptic curve.
- *
- * @param[out] A			- the point to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define eb_free(A)															\
-	if (A != NULL) {														\
-		free(A);															\
-		A = NULL;															\
-	}																		\
-
-#elif ALLOC == AUTO
-#define eb_free(A)			/* empty */
-
-#endif
-
-/**
- * Negates a binary elliptic curve point. Computes R = -P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to negate.
- */
-#if EB_ADD == BASIC
-#define eb_neg(R, P)		eb_neg_basic(R, P)
-#elif EB_ADD == PROJC
-#define eb_neg(R, P)		eb_neg_projc(R, P)
-#endif
-
-/**
- * Adds two binary elliptic curve points. Computes R = P + Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point to add.
- * @param[in] Q				- the second point to add.
- */
-#if EB_ADD == BASIC
-#define eb_add(R, P, Q)		eb_add_basic(R, P, Q);
-#elif EB_ADD == PROJC
-#define eb_add(R, P, Q)		eb_add_projc(R, P, Q);
-#endif
-
-/**
- * Subtracts a binary elliptic curve point from another. Computes R = P - Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point.
- * @param[in] Q				- the second point.
- */
-#if EB_ADD == BASIC
-#define eb_sub(R, P, Q)		eb_sub_basic(R, P, Q)
-#elif EB_ADD == PROJC
-#define eb_sub(R, P, Q)		eb_sub_projc(R, P, Q)
-#endif
-
-/**
- * Doubles a binary elliptic curve point. Computes R = 2P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to double.
- */
-#if EB_ADD == BASIC
-#define eb_dbl(R, P)		eb_dbl_basic(R, P);
-#elif EB_ADD == PROJC
-#define eb_dbl(R, P)		eb_dbl_projc(R, P);
-#endif
-
-
-/**
- * Multiplies a binary elliptic curve point by an integer. Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to multiply.
- * @param[in] K				- the integer.
- */
-#if EB_MUL == BASIC
-#define eb_mul(R, P, K)		eb_mul_basic(R, P, K)
-#elif EB_MUL == LODAH
-#define eb_mul(R, P, K)		eb_mul_lodah(R, P, K)
-#elif EB_MUL == HALVE
-#define eb_mul(R, P, K)		eb_mul_halve(R, P, K)
-#elif EB_MUL == LWNAF
-#define eb_mul(R, P, K)		eb_mul_lwnaf(R, P, K)
-#elif EB_MUL == RWNAF
-#define eb_mul(R, P, K)		eb_mul_rwnaf(R, P, K)
-#endif
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * point.
- *
- * @param[out] T			- the precomputation table.
- * @param[in] P				- the point to multiply.
- */
-#if EB_FIX == BASIC
-#define eb_mul_pre(T, P)	eb_mul_pre_basic(T, P)
-#elif EB_FIX == COMBS
-#define eb_mul_pre(T, P)	eb_mul_pre_combs(T, P)
-#elif EB_FIX == COMBD
-#define eb_mul_pre(T, P)	eb_mul_pre_combd(T, P)
-#elif EB_FIX == LWNAF
-#define eb_mul_pre(T, P)	eb_mul_pre_lwnaf(T, P)
-#endif
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] T				- the precomputation table.
- * @param[in] K				- the integer.
- */
-#if EB_FIX == BASIC
-#define eb_mul_fix(R, T, K)	eb_mul_fix_basic(R, T, K)
-#elif EB_FIX == COMBS
-#define eb_mul_fix(R, T, K)	eb_mul_fix_combs(R, T, K)
-#elif EB_FIX == COMBD
-#define eb_mul_fix(R, T, K)	eb_mul_fix_combd(R, T, K)
-#elif EB_FIX == LWNAF
-#define eb_mul_fix(R, T, K)	eb_mul_fix_lwnaf(R, T, K)
-#endif
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously. Computes
- * R = [k]P + [m]Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point to multiply.
- * @param[in] K				- the first integer.
- * @param[in] Q				- the second point to multiply.
- * @param[in] M				- the second integer,
- */
-#if EB_SIM == BASIC
-#define eb_mul_sim(R, P, K, Q, M)	eb_mul_sim_basic(R, P, K, Q, M)
-#elif EB_SIM == TRICK
-#define eb_mul_sim(R, P, K, Q, M)	eb_mul_sim_trick(R, P, K, Q, M)
-#elif EB_SIM == INTER
-#define eb_mul_sim(R, P, K, Q, M)	eb_mul_sim_inter(R, P, K, Q, M)
-#elif EB_SIM == JOINT
-#define eb_mul_sim(R, P, K, Q, M)	eb_mul_sim_joint(R, P, K, Q, M)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the binary elliptic curve arithmetic module.
- */
-void eb_curve_init(void);
-
-/**
- * Finalizes the binary elliptic curve arithmetic module.
- */
-void eb_curve_clean(void);
-
-/**
- * Returns the a-coefficient of the currently configured binary elliptic
- * curve.
- *
- * @return the a-coefficient of the elliptic curve.
- */
-dig_t *eb_curve_get_a(void);
-
-/**
- * Returns the b-coefficient of the currently configured binary elliptic
- * curve.
- *
- * @return the b-coefficient of the elliptic curve.
- */
-dig_t *eb_curve_get_b(void);
-
-/**
- * Returns a optimization identifier based on the a-coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int eb_curve_opt_a(void);
-
-/**
- * Returns a optimization identifier based on the b-coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int eb_curve_opt_b(void);
-
-/**
- * Tests if the configured binary elliptic curve is a Koblitz curve.
- *
- * @return 1 if the binary elliptic curve is a Koblitz curve, 0 otherwise.
- */
-int eb_curve_is_kbltz(void);
-
-/**
- * Returns the generator of the group of points in the binary elliptic curve.
- *
- * @param[out] g			- the returned generator.
- */
-void eb_curve_get_gen(eb_t g);
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-const eb_t *eb_curve_get_tab(void);
-
-/**
- * Returns the order of the group of points in the binary elliptic curve.
- *
- * @param[out] n			- the returned order.
- */
-void eb_curve_get_ord(bn_t n);
-
-/**
- * Returns the cofactor of the binary elliptic curve.
- *
- * @param[out] n			- the returned cofactor.
- */
-void eb_curve_get_cof(bn_t h);
-
-/**
- * Configures an ordinary binary elliptic curve by its coefficients and
- * generator.
- *
- * @param[in] a				- the a-coefficient of the curve.
- * @param[in] b				- the b-coefficient of the curve.
- * @param[in] g				- the generator.
- * @param[in] n				- the order of the generator.
- * @param[in] h				- the cofactor of the group order.
- */
-void eb_curve_set(const fb_t a, const fb_t b, const eb_t g, const bn_t n,
-		const bn_t h);
-
-/**
- * Configures a new binary elliptic curve by its parameter identifier.
- *
- * @param[in] param			- the parameters identifier.
- */
-void eb_param_set(int param);
-
-/**
- * Configures some set of curve parameters for the current security level.
- */
-int eb_param_set_any(void);
-
-/**
- * Configures a set of curve parameters without endormorphisms for the current
- * security level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int eb_param_set_any_plain(void);
-
-/**
- * Configures a set of Koblitz curve parameters for the current security level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int eb_param_set_any_kbltz(void);
-
-/**
- * Returns the parameter identifier of the currently configured binary elliptic
- * curve.
- *
- * @return the parameter identifier.
- */
-int eb_param_get(void);
-
-/**
- * Prints the current configured binary elliptic curve.
- */
-void eb_param_print(void);
-
-/**
- * Returns the current security level.
- */
-int eb_param_level(void);
-
-/**
- * Tests if a point on a binary elliptic curve is at the infinity.
- *
- * @param[in] p				- the point to test.
- * @return 1 if the point is at infinity, 0 otherise.
- */
-int eb_is_infty(const eb_t p);
-
-/**
- * Assigns a binary elliptic curve point to the point at infinity.
- *
- * @param[out] p			- the point to assign.
- */
-void eb_set_infty(eb_t p);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the binary elliptic curve point to copy.
- */
-void eb_copy(eb_t r, const eb_t p);
-
-/**
- * Compares two binary elliptic curve points.
- *
- * @param[in] p				- the first binary elliptic curve point.
- * @param[in] q				- the second binary elliptic curve point.
- * @return RLC_EQ if p == q and RLC_NE if p != q.
- */
-int eb_cmp(const eb_t p, const eb_t q);
-
-/**
- * Assigns a random value to a binary elliptic curve point.
- *
- * @param[out] p			- the binary elliptic curve point to assign.
- */
-void eb_rand(eb_t p);
-
-/**
- * Randomizes coordinates of a binary elliptic curve point.
- *
- * @param[out] r			- the blinded binary elliptic curve point.
- * @param[in] p				- the binary elliptic curve point to blind.
- */
-void eb_blind(eb_t r, const eb_t p);
-
-/**
- * Computes the right-hand side of the elliptic curve equation at a certain
- * elliptic curve point.
- *
- * @param[out] rhs			- the result.
- * @param[in] p				- the point.
- */
-void eb_rhs(fb_t rhs, const eb_t p);
-
-/** Tests if a point is in the curve.
- *
- * @param[in] p				- the point to test.
- */
-int eb_on_curve(const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a random binary elliptic point.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- * @param[in] w				- the window width.
- */
-void eb_tab(eb_t *t, const eb_t p, int w);
-
-/**
- * Prints a binary elliptic curve point.
- *
- * @param[in] p				- the binary elliptic curve point to print.
- */
-void eb_print(const eb_t p);
-
-/**
- * Returns the number of bytes necessary to store a binary elliptic curve point
- * with optional point compression.
- *
- * @param[in] a				- the binary field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int eb_size_bin(const eb_t a, int pack);
-
-/**
- * Reads a binary elliptic curve point from a byte vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_VALID		- if the encoded point is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void eb_read_bin(eb_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a binary field element to a byte vector in big-endian format with
- * optional point compression.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the binary elliptic curve point to write.
- * @param[in] pack			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void eb_write_bin(uint8_t *bin, int len, const eb_t a, int pack);
-
-/**
- * Negates a binary elliptic curve point represented by affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to negate.
- */
-void eb_neg_basic(eb_t r, const eb_t p);
-
-/**
- * Negates a binary elliptic curve point represented by projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to negate.
- */
-void eb_neg_projc(eb_t r, const eb_t p);
-
-/**
- * Adds two binary elliptic curve points represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void eb_add_basic(eb_t r, const eb_t p, const eb_t q);
-
-/**
- * Adds two binary elliptic curve points represented in projective coordinates.
- * Computes R = P + Q.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void eb_add_projc(eb_t r, const eb_t p, const eb_t q);
-
-/**
- * Subtracts a binary elliptic curve point from another, both points represented
- * by affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void eb_sub_basic(eb_t r, const eb_t p, const eb_t q);
-
-/**
- * Subtracts a binary elliptic curve point from another, both points represented
- * by projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void eb_sub_projc(eb_t r, const eb_t p, const eb_t q);
-
-/**
- * Doubles a binary elliptic curve point represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void eb_dbl_basic(eb_t r, const eb_t p);
-
-/**
- * Doubles a binary elliptic curve point represented in projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void eb_dbl_projc(eb_t r, const eb_t p);
-
-/**
- * Halves a point represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to halve.
- */
-void eb_hlv(eb_t r, const eb_t p);
-
-/**
- * Computes the Frobenius map of a binary elliptic curve point on a Koblitz
- * curve. Computes R = \tau(P) = \tau(x, y) = (x^2, y^2).
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point.
- */
-void eb_frb(eb_t r, const eb_t p);
-
-/**
- * Multiplies a binary elliptic point by an integer using the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_basic(eb_t r, const eb_t p, const bn_t k);
-
-/**
- * Multiplies a binary elliptic point by an integer using the constant-time
- * Lopez-Dahab point multiplication method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_lodah(eb_t r, const eb_t p, const bn_t k);
-
-/**
- * Multiplies a binary elliptic point by an integer using the left-to-right
- * w-NAF method. If the binary curve is a Koblitz curve, w-TNAF is used.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_lwnaf(eb_t r, const eb_t p, const bn_t k);
-
-/**
- * Multiplies a binary elliptic point by an integer using the right-to-left
- * w-NAF method. If the binary curve is a Koblitz curve, w-TNAF is used.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_rwnaf(eb_t r, const eb_t p, const bn_t k);
-
-/**
- * Multiplies a binary elliptic point by an integer using the halving method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_halve(eb_t r, const eb_t p, const bn_t k);
-
-/**
- * Multiplies the generator of a binary elliptic curve by an integer.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void eb_mul_gen(eb_t r, const bn_t k);
-
-/**
- * Multiplies a binary elliptic point by a small positive integer.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void eb_mul_dig(eb_t r, const eb_t p, const dig_t k);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using the binary method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_basic(eb_t *t, const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using Yao's windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_yaowi(eb_t *t, const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using the NAF windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_nafwi(eb_t *t, const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using the single-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_combs(eb_t *t, const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using the double-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_combd(eb_t *t, const eb_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed binary elliptic point
- * using the w-(T)NAF method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void eb_mul_pre_lwnaf(eb_t *t, const eb_t p);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_basic(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * Yao's windowing method
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_yaowi(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_nafwi(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * the single-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_combs(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * the double-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_combd(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed binary elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void eb_mul_fix_lwnaf(eb_t r, const eb_t *t, const bn_t k);
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously using
- * scalar multiplication and point addition.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void eb_mul_sim_basic(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously using
- * shamir's trick.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void eb_mul_sim_trick(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously using
- * interleaving of NAFs.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void eb_mul_sim_inter(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously using
- * Solinas' Joint Sparse Form.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void eb_mul_sim_joint(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds the generator and a binary elliptic curve point
- * simultaneously. Computes R = [k]G + [m]Q.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer.
- */
-void eb_mul_sim_gen(eb_t r, const bn_t k, const eb_t q, const bn_t m);
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to convert.
- */
-void eb_norm(eb_t r, const eb_t p);
-
-/**
- * Converts multiple points to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the points to convert.
- * @param[in] n				- the number of points.
- */
-void eb_norm_sim(eb_t *r, const eb_t *t, int n);
-
-/**
- * Maps a byte array to a point in a binary elliptic curve.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void eb_map(eb_t p, const uint8_t *msg, int len);
-
-/**
- * Compresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to compress.
- */
-void eb_pck(eb_t r, const eb_t p);
-
-/**
- * Decompresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to decompress.
- * @return if the decompression was successful
- */
-int eb_upk(eb_t r, const eb_t p);
-
-#endif /* !RLC_EB_H */
diff --git a/src/dashbls/depends/relic/include/relic_ec.h b/src/dashbls/depends/relic/include/relic_ec.h
deleted file mode 100644
index 5d1544e002c6..000000000000
--- a/src/dashbls/depends/relic/include/relic_ec.h
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup ec Elliptic curve cryptography
- */
-
-/**
- * @file
- *
- * Abstractions of elliptic curve arithmetic useful to protocol implementors.
- *
- * @ingroup ec
- */
-
-#ifndef RLC_EC_H
-#define RLC_EC_H
-
-#include "relic_ep.h"
-#include "relic_eb.h"
-#include "relic_ed.h"
-#include "relic_bn.h"
-#include "relic_util.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Prefix for mappings of functions.
- */
-#if EC_CUR == PRIME
-#define RLC_EC_LOWER			ep_
-#elif EC_CUR == CHAR2
-#define RLC_EC_LOWER			eb_
-#elif EC_CUR == EDDIE
-#define RLC_EC_LOWER      		ed_
-#endif
-
-/**
- * Prefix for mappings of constant definitions.
- */
-#if EC_CUR == PRIME
-#define RLC_EC_UPPER			EP_
-#elif EC_CUR == CHAR2
-#define RLC_EC_UPPER			EB_
-#elif EC_CUR == EDDIE
-#define RLC_EC_UPPER      		ED_
-#endif
-
-/**
- * Size of a precomputation table using the chosen algorithm.
- */
-#if EC_CUR == PRIME
-#define RLC_EC_TABLE			RLC_EP_TABLE
-#elif EC_CUR == CHAR2
-#define RLC_EC_TABLE			RLC_EB_TABLE
-#elif EC_CUR == EDDIE
-#define RLC_EC_TABLE			RLC_ED_TABLE
-#endif
-
-/**
- * Size of a field element in words.
- */
-#if EC_CUR == PRIME
-#define RLC_FC_DIGS				RLC_FP_DIGS
-#elif EC_CUR == CHAR2
-#define RLC_FC_DIGS				RLC_FB_DIGS
-#elif EC_CUR == EDDIE
-#define RLC_FC_DIGS				RLC_FP_DIGS
-#endif
-
-/**
- * Size of a field element in bits.
- */
-#if EC_CUR == PRIME
-#define RLC_FC_BITS				RLC_FP_BITS
-#elif EC_CUR == CHAR2
-#define RLC_FC_BITS				RLC_FB_BITS
-#elif EC_CUR == EDDIE
-#define RLC_FC_BITS				RLC_FP_BITS
-#endif
-
-/**
- * Size of a field element in bytes.
- */
-#if EC_CUR == PRIME
-#define RLC_FC_BYTES			RLC_FP_BYTES
-#elif EC_CUR == CHAR2
-#define RLC_FC_BYTES			RLC_FB_BYTES
-#elif EC_CUR == EDDIE
-#define RLC_FC_BYTES			RLC_FP_BYTES
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents an elliptic curve point.
- */
-typedef RLC_CAT(RLC_EC_LOWER, t) ec_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a point on an elliptic curve with a null value.
- *
- * @param[out] A				- the point to initialize.
- */
-#define ec_null(A)				RLC_CAT(RLC_EC_LOWER, null)(A)
-
-/**
- * Calls a function to allocate a point on an elliptic curve.
- *
- * @param[out] A				- the new point.
- * @throw ERR_NO_MEMORY			- if there is no available memory.
- */
-#define ec_new(A)				RLC_CAT(RLC_EC_LOWER, new)(A)
-
-/**
- * Calls a function to clean and free a point on an elliptic curve.
- *
- * @param[out] A				- the point to clean and free.
- */
-#define ec_free(A)				RLC_CAT(RLC_EC_LOWER, free)(A)
-
-/**
- * Returns the generator of the group of points in the elliptic curve.
- *
- * @param[out] G				- the returned generator.
- */
-#define ec_curve_get_gen(G)		RLC_CAT(RLC_EC_LOWER, curve_get_gen)(G)
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-#define ec_curve_get_tab()		RLC_CAT(RLC_EC_LOWER, curve_get_tab)()
-
-/**
- * Returns the order of the group of points in the elliptic curve.
- *
- * @param[out]	N			- the returned order.
- */
-#define ec_curve_get_ord(N)		RLC_CAT(RLC_EC_LOWER, curve_get_ord)(N)
-
-/**
- * Returns the cofactor of the group of points in the elliptic curve.
- *
- * @param[out]	H			- the returned order.
- */
-#define ec_curve_get_cof(H) 	RLC_CAT(RLC_EC_LOWER, curve_get_cof)(H)
-
-/**
- * Configures some set of curve parameters for the current security level.
- */
-#if EC_CUR == PRIME
-#if defined(EC_ENDOM)
-#define ec_param_set_any()		ep_param_set_any_endom()
-#else
-#define ec_param_set_any()		ep_param_set_any()
-#endif
-#elif EC_CUR == CHAR2
-#if defined(EC_ENDOM)
-#define ec_param_set_any()		eb_param_set_any_kbltz()
-#else
-#define ec_param_set_any()		eb_param_set_any()
-#endif
-#elif EC_CUR == EDDIE
-#define ec_param_set_any()  	ed_param_set_any()
-#endif
-
-/**
- * Prints the current configured elliptic curve.
- */
-#define ec_param_print()		RLC_CAT(RLC_EC_LOWER, param_print)()
-
- /**
-  * Returns the current configured elliptic curve.
-  */
-#define ec_param_get()			RLC_CAT(RLC_EC_LOWER, param_get)()
-
-/**
- * Returns the current security level.
- */
-#define ec_param_level()		RLC_CAT(RLC_EC_LOWER, param_level)()
-
-/**
- * Tests if a point on an elliptic curve is at the infinity.
- *
- * @param[in] P					- the point to test.
- * @return 1 if the point is at infinity, 0 otherwise.
- */
-#define ec_is_infty(P)			RLC_CAT(RLC_EC_LOWER, is_infty)(P)
-
-/**
- * Assigns an elliptic curve point to the point at infinity.
- *
- * @param[out] P				- the point to assign.
- */
-#define ec_set_infty(P)			RLC_CAT(RLC_EC_LOWER, set_infty)(P)
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the elliptic curve point to copy.
- */
-#define ec_copy(R, P)			RLC_CAT(RLC_EC_LOWER, copy)(R, P)
-
-/**
- * Compares two elliptic curve points.
- *
- * @param[in] P					- the first elliptic curve point.
- * @param[in] Q					- the second elliptic curve point.
- * @return RLC_EQ if P == Q and RLC_NE if P != Q.
- */
-#define ec_cmp(P, Q)			RLC_CAT(RLC_EC_LOWER, cmp)(P, Q)
-
-/**
- * Assigns a random value to an elliptic curve point.
- *
- * @param[out] P				- the elliptic curve point to assign.
- */
-#define ec_rand(P)				RLC_CAT(RLC_EC_LOWER, rand)(P)
-
-/**
- * Randomizes coordinates of an elliptic curve point.
- *
- * @param[out] R			- the blinded elliptic curve point.
- * @param[in] P				- the elliptic curve point to blind.
- */
-#define ec_blind(R, P)				RLC_CAT(RLC_EC_LOWER, blind)(R, P)
-
-/** Tests if a point is on the curve.
- *
- * @param[in] P					- the point to test.
- */
-#define ec_on_curve(P)			RLC_CAT(RLC_EC_LOWER, on_curve)(P)
-
-/**
- * Returns the number of bytes necessary to store an elliptic curve point with
- * optional point compression.
- *
- * @param[in] A					- the elliptic curve point.
- * @param[in] P					- the flag to indicate compression.
- */
-#define ec_size_bin(A, P)		RLC_CAT(RLC_EC_LOWER, size_bin)(A, P)
-
-/**
- * Reads an elliptic curve point from a byte vector in big-endian format.
- *
- * @param[out] A				- the result.
- * @param[in] B					- the byte vector.
- * @param[in] L					- the buffer capacity.
- */
-#define ec_read_bin(A, B, L)	RLC_CAT(RLC_EC_LOWER, read_bin)(A, B, L)
-
-/**
- * Writes an elliptic curve point to a byte vector in big-endian format with
- * optional point compression.
- *
- * @param[out] B				- the byte vector.
- * @param[in] L					- the buffer capacity.
- * @param[in] A					- the prime elliptic curve point to write.
- * @param[in] P					- the flag to indicate point compression.
- */
-#define ec_write_bin(B, L, A, P)	RLC_CAT(RLC_EC_LOWER, write_bin)(B, L, A, P)
-
-/**
- * Prints an elliptic curve point.
- *
- * @param[in] P					- the elliptic curve point to print.
- */
-#define ec_print(P)				RLC_CAT(RLC_EC_LOWER, print)(P)
-
-/**
- * Negates an elliptic curve point. Computes R = -P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to negate.
- */
-#define ec_neg(R, P)			RLC_CAT(RLC_EC_LOWER, neg)(R, P)
-
-/**
- * Adds two elliptic curve points. Computes R = P + Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to add.
- * @param[in] Q					- the second point to add.
- */
-#define ec_add(R, P, Q)			RLC_CAT(RLC_EC_LOWER, add)(R, P, Q)
-
-/**
- * Subtracts an elliptic curve point from another. Computes R = P - Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point.
- * @param[in] Q					- the second point.
- */
-#define ec_sub(R, P, Q)			RLC_CAT(RLC_EC_LOWER, sub)(R, P, Q)
-
-/**
- * Doubles an elliptic curve point. Computes R = 2P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to double.
- */
-#define ec_dbl(R, P)			RLC_CAT(RLC_EC_LOWER, dbl)(R, P)
-
-/**
- * Multiplies an elliptic curve point by an integer. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#define ec_mul(R, P, K)			RLC_CAT(RLC_EC_LOWER, mul)(R, P, K)
-
-/**
- * Multiplies the generator of a prime elliptic curve by an integer.
- *
- * @param[out] R				- the result.
- * @param[in] K					- the integer.
- */
-#define ec_mul_gen(R, K)		RLC_CAT(RLC_EC_LOWER, mul_gen)(R, K)
-
-/**
- * Multiplies an elliptic curve point by a small integer. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#define ec_mul_dig(R, P, K)		RLC_CAT(RLC_EC_LOWER, mul_dig)(R, P, K)
-
-/**
- * Builds a precomputation table for multiplying a fixed elliptic curve
- * point.
- *
- * @param[out] T				- the precomputation table.
- * @param[in] P					- the point to multiply.
- */
-#define ec_mul_pre(T, P)		RLC_CAT(RLC_EC_LOWER, mul_pre)(T, P)
-/**
- * Multiplies an elliptic point using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] T					- the precomputation table.
- * @param[in] K					- the integer.
- */
-#define ec_mul_fix(R, T, K)		RLC_CAT(RLC_EC_LOWER, mul_fix)(R, T, K)
-
-/**
- * Multiplies and adds two elliptic curve points simultaneously. Computes
- * R = [k]P + [l]Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to multiply.
- * @param[in] K					- the first integer.
- * @param[in] Q					- the second point to multiply.
- * @param[in] L					- the second integer,
- */
-#define ec_mul_sim(R, P, K, Q, L)	RLC_CAT(RLC_EC_LOWER, mul_sim)(R, P, K, Q, L)
-
-/**
- * Multiplies and adds two elliptic curve points simultaneously. Computes
- * R = [k]G + [l]Q.
- *
- * @param[out] R				- the result.
- * @param[in] K					- the first integer.
- * @param[in] Q					- the second point to multiply.
- * @param[in] L					- the second integer,
- */
-#define ec_mul_sim_gen(R, K, Q, L)	RLC_CAT(RLC_EC_LOWER, mul_sim_gen)(R, K, Q, L)
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to convert.
- */
-#define ec_norm(R, P)			RLC_CAT(RLC_EC_LOWER, norm)(R, P)
-
-/**
- * Maps a byte array to a point in an elliptic curve.
- *
- * @param[out] P				- the result.
- * @param[in] M					- the byte array to map.
- * @param[in] L					- the array length in bytes.
- */
-#define ec_map(P, M, L)			RLC_CAT(RLC_EC_LOWER, map)(P, M, L)
-
-/**
- * Compresses a point.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to compress.
- */
-#define ec_pck(R, P)			RLC_CAT(RLC_EC_LOWER, pck)(R, P)
-
-/**
- * Decompresses a point.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to decompress.
- */
-#define ec_upk(R, P)			RLC_CAT(RLC_EC_LOWER, upk)(R, P)
-
-/**
- * Returns the x-coordinate of an elliptic curve point represented as a
- * multiple precision integer.
- *
- * @param[out] X				- the x-coordinate.
- * @param[in] P					- the point to read.
- */
-#if EC_CUR == PRIME || EC_CUR == EDDIE
-#define ec_get_x(X, P)			fp_prime_back(X, P->x)
-#else
-#define ec_get_x(X, P)			bn_read_raw(X, P->x, RLC_FC_DIGS)
-#endif
-
-/**
-* Returns the y-coordinate of an elliptic curve point represented as a
-* multiple precision integer.
-*
-* @param[out] Y					- the y-coordinate.
-* @param[in] P					- the point to read.
-*/
-#if EC_CUR == PRIME || EC_CUR == EDDIE
-#define ec_get_y(Y, P)			fp_prime_back(Y, (P)->y)
-#else
-#define ec_get_y(Y, P)			bn_read_raw(Y, (P)->y, RLC_FC_DIGS)
-#endif
-
-#endif /* !RLC_EC_H */
diff --git a/src/dashbls/depends/relic/include/relic_ed.h b/src/dashbls/depends/relic/include/relic_ed.h
deleted file mode 100644
index 8f555cec1d2e..000000000000
--- a/src/dashbls/depends/relic/include/relic_ed.h
+++ /dev/null
@@ -1,910 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup ed Edwards curves over prime fields.
- */
-
-/**
- * @file
- *
- * Interface of the module for arithmetic on elliptic curves.
- *
- * @ingroup ed
- */
-
-#ifndef RLC_ED_H
-#define RLC_ED_H
-
-#include "relic_fp.h"
-#include "relic_bn.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions													   */
-/*============================================================================*/
-
-/**
- * Prime elliptic curve identifiers.
- */
-enum {
-	/** ED25519 Edwards curve. */
-	CURVE_ED25519 = 1
-};
-
-/*============================================================================*/
-/* Precomputaion table														*/
-/*============================================================================*/
-/**
- * Size of a precomputation table using the binary method.
- */
-#define RLC_ED_TABLE_BASIC	  (RLC_FP_BITS + 1)
-
-/**
- * Size of a precomputation table using the single-table comb method.
- */
-#define RLC_ED_TABLE_COMBS	  (1 << ED_DEPTH)
-
-/**
- * Size of a precomputation table using the double-table comb method.
- */
-#define RLC_ED_TABLE_COMBD	  (1 << (ED_DEPTH + 1))
-
-/**
- * Size of a precomputation table using the w-(T)NAF method.
- */
-#define RLC_ED_TABLE_LWNAF	  (1 << (ED_DEPTH - 2))
-
-/**
- * Size of a precomputation table using the chosen algorithm.
- */
-#if ED_FIX == BASIC
-#define RLC_ED__TABLE			RLC_ED_TABLE_BASIC
-#elif ED_FIX == COMBS
-#define RLC_ED_TABLE			RLC_ED_TABLE_COMBS
-#elif ED_FIX == COMBD
-#define RLC_ED_TABLE			RLC_ED_TABLE_COMBD
-#elif ED_FIX == LWNAF
-#define RLC_ED_TABLE			RLC_ED_TABLE_LWNAF
-#endif
-
-/**
- * Maximum size of a precomputation table.
- */
-#ifdef STRIP
-#define RLC_ED_TABLE_MAX		RLC_ED_TABLE
-#else
-#define RLC_ED_TABLE_MAX		RLC_MAX(RLC_ED_TABLE_BASIC, RLC_ED_TABLE_COMBD)
-#endif
-
-/*============================================================================*/
-/* Type definitions														   */
-/*============================================================================*/
-
-/**
- * Represents an elliptic curve point over an Edwards field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fp_st x;
-	/** The second coordinate. */
-	fp_st y;
-	/** The third coordinate (projective representation). */
-	fp_st z;
-#if ED_ADD == EXTND || !defined(STRIP)
-	/** The forth coordinate (extended coordinates) */
-	fp_st t;
-#endif
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} ed_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef ed_st ed_t[1];
-#else
-#ifdef CHECK
-typedef ed_st *volatile ed_t;
-#else
-typedef ed_st *ed_t;
-#endif
-#endif
-
-/*============================================================================*/
-/* Macro definitions														  */
-/*============================================================================*/
-
-/**
- * Initializes a point on an Edwards curve with a null value.
- *
- * @param[out] A			- the point to initialize.
- */
-#if ALLOC == AUTO
-#define ed_null(A)			/* empty */
-#else
-#define ed_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate a point on an Edwards curve.
- *
- * @param[out] A			- the new point.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define ed_new(A)															\
-	A = (ed_t)calloc(1, sizeof(ed_st));										\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}
-
-#elif ALLOC == AUTO
-#define ed_new(A)			/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a point on an Edwards curve.
- *
- * @param[out] A			- the point to free.
- */
-#if ALLOC == DYNAMIC
-#define ed_free(A)															\
-	if (A != NULL) {														\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define ed_free(A)			/* empty */
-
-#endif
-
-/**
- * Negates an Edwards elliptic curve point. Computes R = -P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to negate.
- */
-#if ED_ADD == BASIC
-#define ed_neg(R, P)		ed_neg_basic(R, P)
-#elif ED_ADD == PROJC || ED_ADD == EXTND
-#define ed_neg(R, P)		ed_neg_projc(R, P)
-#endif
-
-/**
- * Adds two Edwards elliptic curve points. Computes R = P + Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point to add.
- * @param[in] Q				- the second point to add.
- */
-#if ED_ADD == BASIC
-#define ed_add(R, P, Q)		ed_add_basic(R, P, Q)
-#elif ED_ADD == PROJC
-#define ed_add(R, P, Q)		ed_add_projc(R, P, Q)
-#elif ED_ADD == EXTND
-#define ed_add(R, P, Q)		ed_add_extnd(R, P, Q)
-#endif
-
-/**
- * Subtracts an Edwards elliptic curve point from another. Computes R = P - Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point.
- * @param[in] Q				- the second point.
- */
-#if ED_ADD == BASIC
-#define ed_sub(R, P, Q)		ed_sub_basic(R, P, Q)
-#elif ED_ADD == PROJC
-#define ed_sub(R, P, Q)		ed_sub_projc(R, P, Q)
-#elif ED_ADD == EXTND
-#define ed_sub(R, P, Q)		ed_sub_extnd(R, P, Q)
-#endif
-
-/**
- * Doubles an Edwards elliptic curve point. Computes R = 2P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to double.
- */
-#if ED_ADD == BASIC
-#define ed_dbl(R, P)		ed_dbl_basic(R, P)
-#elif ED_ADD == PROJC
-#define ed_dbl(R, P)		ed_dbl_projc(R, P)
-#elif ED_ADD == EXTND
-#define ed_dbl(R, P)		ed_dbl_extnd(R, P)
-#endif
-
-
-/**
- * Configures an Edwards curve by its parameter identifier.
- *
- * @param				   - the parameter identifier.
- */
-void ed_param_set(int param);
-
-/**
- * Configures some set of curve parameters for the current security level.
- */
-int ed_param_set_any(void);
-
-/**
- * Returns the parameter identifier of the currently configured Edwards elliptic
- * curve.
- *
- * @return the parameter identifier.
- */
-int ed_param_get(void);
-
-/**
- * Returns the order of the group of points in the Edwards curve.
- *
- * @param[out] r			- the returned order.
- */
-void ed_curve_get_ord(bn_t r);
-
-/**
- * Returns the generator of the group of points in the curve.
- *
- * @param[out] g			- the returned generator.
- */
-void ed_curve_get_gen(ed_t g);
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-const ed_t *ed_curve_get_tab(void);
-
-/**
- * Returns the cofactor of the Edwards elliptic curve.
- *
- * @param[out] n			- the returned cofactor.
- */
-void ed_curve_get_cof(bn_t h);
-
-/**
- * Prints the current configured Edwards elliptic curve.
- */
-void ed_param_print(void);
-
-/**
- * Returns the current security level.
- */
-int ed_param_level(void);
-
-#if ED_ADD == EXTND
-/**
- * Converts projective point into extended point.
- */
-void ed_projc_to_extnd(ed_t r, const fp_t x, const fp_t y, const fp_t z);
-#endif
-
-/**
- * Assigns a random value to an Edwards elliptic curve point.
- *
- * @param[out] p			- the Edwards elliptic curve point to assign.
- */
-void ed_rand(ed_t p);
-
-/**
- * Randomizes coordinates of a prime elliptic curve point.
- *
- * @param[out] r			- the blinded Edwards elliptic curve point.
- * @param[in] p				- the Edwards elliptic curve point to blind.
- */
-void ed_blind(ed_t r, const ed_t p);
-
-/**
- * Computes the right-hand side of the elliptic curve equation at a certain
- * Edwards elliptic curve point.
- *
- * @param[out] rhs			- the result.
- * @param[in] p				- the point.
- */
-void ed_rhs(fp_t rhs, const ed_t p);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] q		   - the result.
- * @param[in] p			   - the Edwards elliptic curve point to copy.
- */
-void ed_copy(ed_t r, const ed_t p);
-
-/**
- * Compares two Edwards elliptic curve points.
- *
- * @param[in] p			   - the first Edwards elliptic curve point.
- * @param[in] q			   - the second Edwards elliptic curve point.
- * @return RLC_EQ if p == q and RLC_NE if p != q.
- */
-int ed_cmp(const ed_t p, const ed_t q);
-
-/**
- * Assigns an Edwards elliptic curve point to the point at infinity.
- *
- * @param[out] p		   - the point to assign.
- */
-void ed_set_infty(ed_t p);
-
-/**
- * Tests if a point on an Edwards elliptic curve is at the infinity.
- *
- * @param[in] p			   - the point to test.
- * @return 1 if the point is at infinity, 0 otherise.
- */
-int ed_is_infty(const ed_t p);
-
-/**
- * Negates an Edwards elliptic curve point represented by affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to negate.
- */
-void ed_neg_basic(ed_t r, const ed_t p);
-
-/**
- * Negates an Edwards elliptic curve point represented by projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to negate.
- */
-void ed_neg_projc(ed_t r, const ed_t p);
-
-/**
- * Adds two Edwards elliptic curve points represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ed_add_basic(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Adds two Edwards elliptic curve points represented in projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ed_add_projc(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Adds two Edwards elliptic curve points represented in exteded coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ed_add_extnd(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Subtracts an Edwards elliptic curve point from another, both points represented
- * by affine coordinates..
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void ed_sub_basic(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Subtracts an Edwards elliptic curve point from another, both represented
- * by projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void ed_sub_projc(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Subtracts an Edwards elliptic curve point from another, both represented
- * by extended coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void ed_sub_extnd(ed_t r, const ed_t p, const ed_t q);
-
-/**
- * Doubles an Edwards elliptic curve point represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ed_dbl_basic(ed_t r, const ed_t p);
-
-/**
- * Doubles an Edwards elliptic curve point represented in projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ed_dbl_projc(ed_t r, const ed_t p);
-
-/**
- * Doubles an Edwards elliptic curve point represented in extended coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ed_dbl_extnd(ed_t r, const ed_t p);
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to convert.
- */
-void ed_norm(ed_t r, const ed_t p);
-
-/**
- * Converts multiple points to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the points to convert.
- * @param[in] n				- the number of points.
- */
-void ed_norm_sim(ed_t *r, const ed_t *t, int n);
-
-/**
- * Maps a byte array to a point in an Edwards elliptic curve.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void ed_map(ed_t p, const uint8_t *msg, int len);
-
-/**
- * Maps a byte array to a point in an Edwards elliptic curve using
- * an explicit domain separation tag.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- * @param[in] dst			- the domain separation tag.
- * @param[in] dst_len		- the domain separation tag length in bytes.
- */
-void ed_map_dst(ed_t p, const uint8_t *msg, int len, const uint8_t *dst, int dst_len);
-
-/**
- * Multiplies an Edwards elliptic curve point by an integer. Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to multiply.
- * @param[in] K				- the integer.
- */
-#if ED_MUL == BASIC
-#define ed_mul(R, P, K)   ed_mul_basic(R, P, K)
-#elif ED_MUL == SLIDE
-#define ed_mul(R, P, K)   ed_mul_slide(R, P, K)
-#elif ED_MUL == MONTY
-#define ed_mul(R, P, K)   ed_mul_monty(R, P, K)
-#elif ED_MUL == LWNAF
-#define ed_mul(R, P, K)   ed_mul_lwnaf(R, P, K)
-#elif ED_MUL == LWREG
-#define ed_mul(R, P, K)   ed_mul_lwreg(R, P, K)
-#endif
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point.
- *
- * @param[out] T			- the precomputation table.
- * @param[in] P			 	- the point to multiply.
- */
-#if ED_FIX == BASIC
-#define ed_mul_pre(T, P)	ed_mul_pre_basic(T, P)
-#elif ED_FIX == COMBS
-#define ed_mul_pre(T, P)	ed_mul_pre_combs(T, P)
-#elif ED_FIX == COMBD
-#define ed_mul_pre(T, P)	ed_mul_pre_combd(T, P)
-#elif ED_FIX == LWNAF
-#define ed_mul_pre(T, P)	ed_mul_pre_lwnaf(T, P)
-#endif
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] T			 	- the precomputation table.
- * @param[in] K			 	- the integer.
- */
-#if ED_FIX == BASIC
-#define ed_mul_fix(R, T, K) ed_mul_fix_basic(R, T, K)
-#elif ED_FIX == COMBS
-#define ed_mul_fix(R, T, K) ed_mul_fix_combs(R, T, K)
-#elif ED_FIX == COMBD
-#define ed_mul_fix(R, T, K) ed_mul_fix_combd(R, T, K)
-#elif ED_FIX == LWNAF
-#define ed_mul_fix(R, T, K) ed_mul_fix_lwnaf(R, T, K)
-#endif
-
- /**
- * Multiplies and adds two Edwards elliptic curve points simultaneously. Computes
- * R = [k]P + [m]Q.
- *
- * @param[out] R			- the result.
- * @param[in] P			 	- the first point to multiply.
- * @param[in] K			 	- the first integer.
- * @param[in] Q			 	- the second point to multiply.
- * @param[in] M			 	- the second integer,
- */
-#if ED_SIM == BASIC
-#define ed_mul_sim(R, P, K, Q, M) ed_mul_sim_basic(R, P, K, Q, M)
-#elif ED_SIM == TRICK
-#define ed_mul_sim(R, P, K, Q, M) ed_mul_sim_trick(R, P, K, Q, M)
-#elif ED_SIM == INTER
-#define ed_mul_sim(R, P, K, Q, M) ed_mul_sim_inter(R, P, K, Q, M)
-#elif ED_SIM == JOINT
-#define ed_mul_sim(R, P, K, Q, M) ed_mul_sim_joint(R, P, K, Q, M)
-#endif
-
-/*============================================================================*/
-/* Function prototypes														*/
-/*============================================================================*/
-
-/**
- * Initializes the Edwards elliptic curve arithmetic module.
- */
-void ed_curve_init(void);
-
-/**
- * Finalizes the Edwards elliptic curve arithmetic module.
- */
-void ed_curve_clean(void);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using the binary method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_basic(ed_t *t, const ed_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using Yao's windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_yaowi(ed_t *t, const ed_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using the NAF windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_nafwi(ed_t *t, const ed_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using the single-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_combs(ed_t *t, const ed_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using the double-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_combd(ed_t *t, const ed_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed Edwards elliptic point
- * using the w-(T)NAF method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ed_mul_pre_lwnaf(ed_t *t, const ed_t p);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_basic(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * Yao's windowing method
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_yaowi(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_nafwi(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the single-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_combs(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the double-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_combd(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ed_mul_fix_lwnaf(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed Edwards elliptic point using a precomputation table and
- * the w-(T)NAF mixed coordinate method.
- *
- * @param[out] r			- the result.
- * @param[in] t			 	- the precomputation table.
- * @param[in] k			 	- the integer.
- */
-void ed_mul_fix_lwnaf_mixed(ed_t r, const ed_t *t, const bn_t k);
-
-/**
- * Multiplies the generator of an Edwards elliptic curve by an integer.
- *
- * @param[out] r			- the result.
- * @param[in] k			 	- the integer.
- */
-void ed_mul_gen(ed_t r, const bn_t k);
-
-/**
- * Multiplies an Edwards elliptic curve point by a small positive integer.
- *
- * @param[out] r			- the result.
- * @param[in] p			 	- the point to multiply.
- * @param[in] k			 	- the integer.
- */
-void ed_mul_dig(ed_t r, const ed_t p, dig_t k);
-
-/**
- * Multiplies and adds two Edwards elliptic curve points simultaneously using
- * scalar multiplication and point addition.
- *
- * @param[out] r			- the result.
- * @param[in] p			 	- the first point to multiply.
- * @param[in] k			 	- the first integer.
- * @param[in] q			 	- the second point to multiply.
- * @param[in] m			 	- the second integer,
- */
-void ed_mul_sim_basic(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-	const bn_t m);
-
-/**
- * Multiplies and adds two Edwards elliptic curve points simultaneously using
- * shamir's trick.
- *
- * @param[out] r			- the result.
- * @param[in] p			 	- the first point to multiply.
- * @param[in] k			 	- the first integer.
- * @param[in] q			 	- the second point to multiply.
- * @param[in] m			 	- the second integer,
- */
-void ed_mul_sim_trick(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-	const bn_t m);
-
-/**
- * Multiplies and adds two Edwards elliptic curve points simultaneously using
- * interleaving of NAFs.
- *
- * @param[out] r			- the result.
- * @param[in] p			 	- the first point to multiply.
- * @param[in] k			 	- the first integer.
- * @param[in] q			 	- the second point to multiply.
- * @param[in] m			 	- the second integer,
- */
-void ed_mul_sim_inter(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-	const bn_t m);
-
-/**
- * Multiplies and adds two Edwards elliptic curve points simultaneously using
- * Solinas' Joint Sparse Form.
- *
- * @param[out] r			- the result.
- * @param[in] p			 	- the first point to multiply.
- * @param[in] k			 	- the first integer.
- * @param[in] q			 	- the second point to multiply.
- * @param[in] m			 	- the second integer,
- */
-void ed_mul_sim_joint(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-	const bn_t m);
-
-/**
- * Multiplies and adds the generator and an Edwards elliptic curve point
- * simultaneously. Computes R = [k]G + [m]Q.
- *
- * @param[out] r			- the result.
- * @param[in] k			 	- the first integer.
- * @param[in] q			 	- the second point to multiply.
- * @param[in] m			 	- the second integer.
- */
-void ed_mul_sim_gen(ed_t r, const bn_t k, const ed_t q, const bn_t m);
-
-/**
- * Builds a precomputation table for multiplying a random Edwards elliptic point.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- * @param[in] w				- the window width.
- */
-void ed_tab(ed_t *t, const ed_t p, int w);
-
-/**
- * Prints an Edwards elliptic curve point.
- *
- * @param[in] p			 	- the Edwards elliptic curve point to print.
- */
-void ed_print(const ed_t p);
-
-/**
- * Tests if a point is in the curve.
- *
- * @param[in] p			 	- the point to test.
- */
-int ed_on_curve(const ed_t p);
-
-/**
- * Returns the number of bytes necessary to store an Edwards elliptic curve point
- * with optional point compression.
- *
- * @param[in] a				- the Edwards field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int ed_size_bin(const ed_t a, int pack);
-
-/**
- * Reads an Edwards elliptic curve point from a byte vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_VALID		- if the encoded point is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ed_read_bin(ed_t a, const uint8_t *bin, int len);
-
-/**
- * Writes an Edwards elliptic curve point to a byte vector in big-endian format
- * with optional point compression.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the Edwards elliptic curve point to write.
- * @param[in] pack			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ed_write_bin(uint8_t *bin, int len, const ed_t a, int pack);
-
-/**
- * Multiplies an Edwards elliptic point by an integer using the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ed_mul_basic(ed_t r, const ed_t p, const bn_t k);
-
-/**
- * Multiplies an Edwards elliptic point by an integer using the sliding window
- * method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ed_mul_slide(ed_t r, const ed_t p, const bn_t k);
-
-/**
- * Multiplies an Edwards elliptic point by an integer using the constant-time
- * Montgomery ladder point multiplication method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ed_mul_monty(ed_t r, const ed_t p, const bn_t k);
-
-/**
- * Multiplies an Edwards elliptic point by an integer using the w-NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ed_mul_lwnaf(ed_t r, const ed_t p, const bn_t k);
-
-/**
- * Multiplies an Edwards elliptic point by an integer using a regular method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ed_mul_lwreg(ed_t r, const ed_t p, const bn_t k);
-
-/**
- * Compresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to compress.
- */
-void ed_pck(ed_t r, const ed_t p);
-
-/**
- * Decompresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to decompress.
- * @return if the decompression was successful
- */
-int ed_upk(ed_t r, const ed_t p);
-
-#endif
diff --git a/src/dashbls/depends/relic/include/relic_ep.h b/src/dashbls/depends/relic/include/relic_ep.h
deleted file mode 100644
index 4e66e0eff992..000000000000
--- a/src/dashbls/depends/relic/include/relic_ep.h
+++ /dev/null
@@ -1,1250 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup ep Elliptic curves over prime fields
- */
-
-/**
- * @file
- *
- * Interface of the module for arithmetic on prime elliptic curves.
- *
- * The scalar multiplication functions are only guaranteed to work
- * in the large prime order subgroup. If you need a generic scalar
- * multiplication function, use ep_mul_basic().
- *
- * @ingroup ep
- */
-
-#ifndef RLC_EP_H
-#define RLC_EP_H
-
-#include "relic_fp.h"
-#include "relic_bn.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Prime elliptic curve identifiers.
- */
-enum {
-	/** SECG P-160 prime curve. */
-	SECG_P160 = 1,
-	/** SECG K-160 prime curve. */
-	SECG_K160,
-	/** NIST P-192 prime curve. */
-	NIST_P192,
-	/** SECG K-192 prime curve. */
-	SECG_K192,
-	/** Curve22103 prime curve. */
-	CURVE_22103,
-	/** NIST P-224 prime curve. */
-	NIST_P224,
-	/** SECG K-224 prime curve. */
-	SECG_K224,
-	/** Curve4417 prime curve. */
-	CURVE_4417,
-	/** Curve1147 prime curve. */
-	CURVE_1174,
-	/** Curve25519 prime curve. */
-	CURVE_25519,
-	/** Curve Tweedledum given by Daira Hopwoord at https://github.com/daira/tweedle */
-	TWEEDLEDUM,
-	/** NIST P-256 prime curve. */
-	NIST_P256,
-	/** Brainpool P256r1 curve. */
-	BSI_P256,
-	/** SECG K-256 prime curve. */
-	SECG_K256,
-	/** Curve67254 prime curve. */
-	CURVE_67254,
-	/** Curve383187 prime curve. */
-	CURVE_383187,
-	/** NIST P-384 prime curve. */
-	NIST_P384,
-	/** Curve 511187 prime curve. */
-	CURVE_511187,
-	/** NIST P-521 prime curve. */
-	NIST_P521,
-	/** Barreto-Naehrig curve with positive x */
-	BN_P158,
-	/** Barreto-Naehrig curve with negative x (found by Nogami et al.). */
-	BN_P254,
-	/** Barreto-Naehrig curve with negative x. */
-	BN_P256,
-	/** Barreto-Naehrig curve standardized in China. */
-	SM9_P256,
-	/** Barreto-Lynn-Scott curve with embedding degree 12 (ZCash curve). */
-	B12_P381,
-	/** Barreto-Naehrig curve with negative x. */
-	BN_P382,
-	/** Barreto-Lynn-Scott curve with embedding degree 12 (GT-strong). */
-	B12_P383,
-	/** Barreto-Naehrig curve with embedding degree 12. */
-	BN_P446,
-	/** Barreto-Lynn-Scott curve with embedding degree 12. */
-	B12_P446,
-	/** Barreto-Lynn-Scott curve with embedding degree 12. */
-	B12_P455,
-	/** Kachisa-Schafer-Scott with negative x. */
-	KSS_P508,
-	/** Barreto-Lynn-Scott curve with embedding degree 24. */
-	B24_P509,
-	/** Optimal TNFS-secure curve with embedding degree 8. */
-	OT8_P511,
-	/** Cocks-pinch curve with embedding degree 8. */
-	GMT8_P544,
-	/** Kachisa-Scott-Schaefer curve with embedding degree 54. */
-	K54_P569,
-	/** Barreto-Lynn-Scott curve with embedding degree 48. */
-	B48_P575,
-	/** Barreto-Naehrig curve with positive x. */
-	BN_P638,
-	/** Barreto-Lynn-Scott curve with embedding degree 12. */
-	B12_P638,
-	/** 1536-bit supersingular curve. */
-	SS_P1536,
-	/** 3072-bit supersingular curve. */
-	SS_P3072,
-};
-
-/**
- * Pairing-friendly elliptic curve identifiers.
- */
-enum {
-	/** Supersingular curves with embedding degree 1. */
-	EP_SS1 = 1,
-	/** Supersingular curves with embedding degree 2. */
-	EP_SS2,
-	/** Barreto-Naehrig. */
-	EP_BN,
-	/* Optimal TNFS-secure. */
-	EP_OT8,
-	/* Cocks-Pinch curve. */
-	EP_GMT8,
-	/* Barreto-Lynn-Scott with embedding degree 12. */
-	EP_B12,
-	/* Kachisa-Schafer-Scott with embedding degree 16. */
-	EP_K16,
-	/* Barreto-Lynn-Scott with embedding degree 24. */
-	EP_B24,
-	/* Barreto-Lynn-Scott with embedding degree 48. */
-	EP_B48,
-	/** Kachisa-Scott-Schaefer curve with embedding degree 54. */
-	EP_K54,
-};
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Denotes a divisive twist.
- */
-#define RLC_EP_DTYPE			1
-
-/**
- * Denotes a multiplicative twist.
- */
-#define RLC_EP_MTYPE			2
-
-/**
- * Size of a precomputation table using the binary method.
- */
-#define RLC_EP_TABLE_BASIC		(RLC_FP_BITS + 1)
-
-/**
- * Size of a precomputation table using the single-table comb method.
- */
-#define RLC_EP_TABLE_COMBS      (1 << EP_DEPTH)
-
-/**
- * Size of a precomputation table using the double-table comb method.
- */
-#define RLC_EP_TABLE_COMBD		(1 << (EP_DEPTH + 1))
-
-/**
- * Size of a precomputation table using the w-(T)NAF method.
- */
-#define RLC_EP_TABLE_LWNAF		(1 << (EP_DEPTH - 2))
-
-/**
- * Size of a precomputation table using the chosen algorithm.
- */
-#if EP_FIX == BASIC
-#define RLC_EP_TABLE			RLC_EP_TABLE_BASIC
-#elif EP_FIX == COMBS
-#define RLC_EP_TABLE			RLC_EP_TABLE_COMBS
-#elif EP_FIX == COMBD
-#define RLC_EP_TABLE			RLC_EP_TABLE_COMBD
-#elif EP_FIX == LWNAF
-#define RLC_EP_TABLE			RLC_EP_TABLE_LWNAF
-#endif
-
-/**
- * Maximum size of a precomputation table.
- */
-#ifdef STRIP
-#define RLC_EP_TABLE_MAX 		RLC_EP_TABLE
-#else
-#define RLC_EP_TABLE_MAX 		RLC_MAX(RLC_EP_TABLE_BASIC, RLC_EP_TABLE_COMBD)
-#endif
-
-/**
- * Maximum number of coefficients of an isogeny map polynomial.
- * RLC_TERMS of value 16 is sufficient for a degree-11 isogeny polynomial.
- */
-#define RLC_EP_CTMAP_MAX		16
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents an elliptic curve point over a prime field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fp_st x;
-	/** The second coordinate. */
-	fp_st y;
-	/** The third coordinate (projective representation). */
-	fp_st z;
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} ep_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef ep_st ep_t[1];
-#else
-#ifdef CHECK
-typedef ep_st *volatile ep_t;
-#else
-typedef ep_st *ep_t;
-#endif
-#endif
-
-/**
- * Data structure representing an isogeny map.
- */
-typedef struct {
-	/** The a-coefficient of the isogenous curve used for SSWU mapping. */
-	fp_st a;
-	/** The b-coefficient of the isogenous curve used for SSWU mapping. */
-	fp_st b;
-	/** Degree of x numerator */
-	int deg_xn;
-	/** Degree of x denominator */
-	int deg_xd;
-	/** Degree of y numerator */
-	int deg_yn;
-	/** Degree of y denominator */
-	int deg_yd;
-	/** x numerator coefficients */
-	fp_st xn[RLC_EP_CTMAP_MAX];
-	/** x denominator coefficients */
-	fp_st xd[RLC_EP_CTMAP_MAX];
-	/** y numerator coefficients */
-	fp_st yn[RLC_EP_CTMAP_MAX];
-	/** y denominator coefficients */
-	fp_st yd[RLC_EP_CTMAP_MAX];
-} iso_st;
-
-/**
- * Pointer to isogeny map coefficients.
- */
-typedef iso_st *iso_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a point on a prime elliptic curve with a null value.
- *
- * @param[out] A			- the point to initialize.
- */
-#if ALLOC == AUTO
-#define ep_null(A)				/* empty */
-#else
-#define ep_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate a point on a prime elliptic curve.
- *
- * @param[out] A			- the new point.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define ep_new(A)															\
-	A = (ep_t)calloc(1, sizeof(ep_st));										\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-
-#elif ALLOC == AUTO
-#define ep_new(A)				/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a point on a prime elliptic curve.
- *
- * @param[out] A			- the point to free.
- */
-#if ALLOC == DYNAMIC
-#define ep_free(A)															\
-	if (A != NULL) {														\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define ep_free(A)				/* empty */
-
-#endif
-
-/**
- * Adds two prime elliptic curve points. Computes R = P + Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point to add.
- * @param[in] Q				- the second point to add.
- */
-#if EP_ADD == BASIC
-#define ep_add(R, P, Q)		ep_add_basic(R, P, Q)
-#elif EP_ADD == PROJC
-#define ep_add(R, P, Q)		ep_add_projc(R, P, Q)
-#elif EP_ADD == JACOB
-#define ep_add(R, P, Q)		ep_add_jacob(R, P, Q)
-#endif
-
-/**
- * Doubles a prime elliptic curve point. Computes R = 2P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to double.
- */
-#if EP_ADD == BASIC
-#define ep_dbl(R, P)		ep_dbl_basic(R, P)
-#elif EP_ADD == PROJC
-#define ep_dbl(R, P)		ep_dbl_projc(R, P)
-#elif EP_ADD == JACOB
-#define ep_dbl(R, P)		ep_dbl_jacob(R, P)
-#endif
-
-/**
- * Multiplies a prime elliptic curve point by an integer. Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the point to multiply.
- * @param[in] K				- the integer.
- */
-#if EP_MUL == BASIC
-#define ep_mul(R, P, K)		ep_mul_basic(R, P, K)
-#elif EP_MUL == SLIDE
-#define ep_mul(R, P, K)		ep_mul_slide(R, P, K)
-#elif EP_MUL == MONTY
-#define ep_mul(R, P, K)		ep_mul_monty(R, P, K)
-#elif EP_MUL == LWNAF
-#define ep_mul(R, P, K)		ep_mul_lwnaf(R, P, K)
-#elif EP_MUL == LWREG
-#define ep_mul(R, P, K)		ep_mul_lwreg(R, P, K)
-#endif
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point.
- *
- * @param[out] T			- the precomputation table.
- * @param[in] P				- the point to multiply.
- */
-#if EP_FIX == BASIC
-#define ep_mul_pre(T, P)	ep_mul_pre_basic(T, P)
-#elif EP_FIX == COMBS
-#define ep_mul_pre(T, P)	ep_mul_pre_combs(T, P)
-#elif EP_FIX == COMBD
-#define ep_mul_pre(T, P)	ep_mul_pre_combd(T, P)
-#elif EP_FIX == LWNAF
-#define ep_mul_pre(T, P)	ep_mul_pre_lwnaf(T, P)
-#endif
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] T					- the precomputation table.
- * @param[in] K					- the integer.
- */
-#if EP_FIX == BASIC
-#define ep_mul_fix(R, T, K)		ep_mul_fix_basic(R, T, K)
-#elif EP_FIX == COMBS
-#define ep_mul_fix(R, T, K)		ep_mul_fix_combs(R, T, K)
-#elif EP_FIX == COMBD
-#define ep_mul_fix(R, T, K)		ep_mul_fix_combd(R, T, K)
-#elif EP_FIX == LWNAF
-#define ep_mul_fix(R, T, K)		ep_mul_fix_lwnaf(R, T, K)
-#endif
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously.
- * Computes R = [k]P + [m]Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first point to multiply.
- * @param[in] K				- the first integer.
- * @param[in] Q				- the second point to multiply.
- * @param[in] M				- the second integer,
- */
-#if EP_SIM == BASIC
-#define ep_mul_sim(R, P, K, Q, M)	ep_mul_sim_basic(R, P, K, Q, M)
-#elif EP_SIM == TRICK
-#define ep_mul_sim(R, P, K, Q, M)	ep_mul_sim_trick(R, P, K, Q, M)
-#elif EP_SIM == INTER
-#define ep_mul_sim(R, P, K, Q, M)	ep_mul_sim_inter(R, P, K, Q, M)
-#elif EP_SIM == JOINT
-#define ep_mul_sim(R, P, K, Q, M)	ep_mul_sim_joint(R, P, K, Q, M)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the prime elliptic curve arithmetic module.
- */
-void ep_curve_init(void);
-
-/**
- * Finalizes the prime elliptic curve arithmetic module.
- */
-void ep_curve_clean(void);
-
-/**
- * Returns the a-coefficient of the currently configured prime elliptic curve.
- *
- * @return the a-coefficient of the elliptic curve.
- */
-dig_t *ep_curve_get_a(void);
-
-/**
- * Returns the b-coefficient of the currently configured prime elliptic curve.
- *
- * @return the b-coefficient of the elliptic curve.
- */
-dig_t *ep_curve_get_b(void);
-
-/**
- * Returns the b3 = 3*b value used in elliptic curve arithmetic.
- *
- * @return the value b3 used in elliptic curve arithmetic.
- */
-dig_t *ep_curve_get_b3(void);
-
-/**
- * Returns the efficient endormorphism associated with the prime curve.
- */
-dig_t *ep_curve_get_beta(void);
-
-/**
- * Returns the parameter V1 of the prime curve.
- */
-void ep_curve_get_v1(bn_t v[]);
-
-/**
- * Returns the parameter V2 of the prime curve.
- */
-void ep_curve_get_v2(bn_t v[]);
-
-/**
- * Returns a optimization identifier based on the a-coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep_curve_opt_a(void);
-
-/**
- * Returns a optimization identifier based on the b-coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep_curve_opt_b(void);
-
-/**
- * Returns a optimization identifier based on the b-coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep_curve_opt_b3(void);
-
-/**
- * Multiplies a field element by the a-coefficient of the curve.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void ep_curve_mul_a(fp_t c, const fp_t a);
-
-/**
- * Multiplies a field element by the b-coefficient of the curve.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void ep_curve_mul_b(fp_t c, const fp_t a);
-
-/**
- * Multiplies a field element by the b3 value of the curve.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- */
-void ep_curve_mul_b3(fp_t c, const fp_t a);
-/**
- * Tests if the configured prime elliptic curve is a Koblitz curve.
- *
- * @return 1 if the prime elliptic curve is a Koblitz curve, 0 otherwise.
- */
-int ep_curve_is_endom(void);
-
-/**
- * Tests if the configured prime elliptic curve is supersingular.
- *
- * @return 1 if the prime elliptic curve is supersingular, 0 otherwise.
- */
-int ep_curve_is_super(void);
-
-/**
- * Tests if the configured prime elliptic curve is pairing-friendly.
- *
- * @return 0 if the prime elliptic curve is not pairing-friendly, and the
- * family identifier otherwise.
- */
-int ep_curve_is_pairf(void);
-
-/**
- * Tests if the current curve should use an isogeny map for the SSWU map.
- *
- * @return 1 if the curve uses an isogeny, and 0 otherwise.
- */
-int ep_curve_is_ctmap(void);
-
-/**
- * Returns the generator of the group of points in the prime elliptic curve.
- *
- * @param[out] g			- the returned generator.
- */
-void ep_curve_get_gen(ep_t g);
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-const ep_t *ep_curve_get_tab(void);
-
-/**
- * Returns the order of the group of points in the prime elliptic curve.
- *
- * @param[out] r			- the returned order.
- */
-void ep_curve_get_ord(bn_t n);
-
-/**
- * Returns the cofactor of the binary elliptic curve.
- *
- * @param[out] n			- the returned cofactor.
- */
-void ep_curve_get_cof(bn_t h);
-
-/**
- * Returns the isogeny map coefficients for use with the SSWU map.
- */
-iso_t ep_curve_get_iso(void);
-
-/**
- * Configures a prime elliptic curve without endomorphisms by its coefficients
- * and generator.
- *
- * @param[in] a			- the a-coefficient of the curve.
- * @param[in] b			- the b-coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] h			- the cofactor of the group order.
- * @param[in] u			- the non-square used for hashing to this curve.
- * @param[in] ctmap	- true if this curve will use an isogeny for mapping.
- */
-void ep_curve_set_plain(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t u, int ctmap);
-
-/**
- * Configures a supersingular prime elliptic curve by its coefficients and
- * generator.
- *
- * @param[in] a			- the a-coefficient of the curve.
- * @param[in] b			- the b-coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] h			- the cofactor of the group order.
- * @param[in] u			- the non-square used for hashing to this curve.
- * @param[in] ctmap	- true if this curve will use an isogeny for mapping.
- */
-void ep_curve_set_super(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t u, int ctmap);
-
-/**
- * Configures a prime elliptic curve with endomorphisms by its coefficients and
- * generator.
- *
- * @param[in] a			- the a-coefficient of the curve.
- * @param[in] b			- the b-coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] beta		- the constant associated with the endomorphism.
- * @param[in] l			- the exponent corresponding to the endomorphism.
- * @param[in] h			- the cofactor of the group order.
- * @param[in] u			- the non-square used for hashing to this curve.
- * @param[in] ctmap	- true if this curve will use an isogeny for mapping.
- */
-void ep_curve_set_endom(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t beta, const bn_t l, const fp_t u, int ctmap);
-
-/**
- * Configures a prime elliptic curve by its parameter identifier.
- *
- * @param				- the parameter identifier.
- */
-void ep_param_set(int param);
-
-/**
- * Configures some set of curve parameters for the current security level.
- */
-int ep_param_set_any(void);
-
-/**
- * Configures some set of ordinary curve parameters for the current security
- * level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int ep_param_set_any_plain(void);
-
-/**
- * Configures some set of Koblitz curve parameters for the current security
- * level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int ep_param_set_any_endom(void);
-
-/**
- * Configures some set of supersingular curve parameters for the current
- * security level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int ep_param_set_any_super(void);
-
-/**
- * Configures some set of pairing-friendly curve parameters for the current
- * security level.
- *
- * @return RLC_OK if there is a curve at this security level, RLC_ERR otherwise.
- */
-int ep_param_set_any_pairf(void);
-
-/**
- * Returns the parameter identifier of the currently configured prime elliptic
- * curve.
- *
- * @return the parameter identifier.
- */
-int ep_param_get(void);
-
-/**
- * Prints the current configured prime elliptic curve.
- */
-void ep_param_print(void);
-
-/**
- * Returns the current security level.
- */
-int ep_param_level(void);
-
-/**
- * Returns the embedding degree of the currently configured elliptic curve.
- */
-int ep_param_embed(void);
-
-/**
- * Tests if a point on a prime elliptic curve is at the infinity.
- *
- * @param[in] p				- the point to test.
- * @return 1 if the point is at infinity, 0 otherise.
- */
-int ep_is_infty(const ep_t p);
-
-/**
- * Assigns a prime elliptic curve point to the point at infinity.
- *
- * @param[out] p			- the point to assign.
- */
-void ep_set_infty(ep_t p);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] q			- the result.
- * @param[in] p				- the prime elliptic curve point to copy.
- */
-void ep_copy(ep_t r, const ep_t p);
-
-/**
- * Compares two prime elliptic curve points.
- *
- * @param[in] p				- the first prime elliptic curve point.
- * @param[in] q				- the second prime elliptic curve point.
- * @return RLC_EQ if p == q and RLC_NE if p != q.
- */
-int ep_cmp(const ep_t p, const ep_t q);
-
-/**
- * Assigns a random value to a prime elliptic curve point.
- *
- * @param[out] p			- the prime elliptic curve point to assign.
- */
-void ep_rand(ep_t p);
-
-/**
- * Randomizes coordinates of a prime elliptic curve point.
- *
- * @param[out] r			- the blinded prime elliptic curve point.
- * @param[in] p				- the prime elliptic curve point to blind.
- */
-void ep_blind(ep_t r, const ep_t p);
-
-/**
- * Computes the right-hand side of the elliptic curve equation at a certain
- * prime elliptic curve point.
- *
- * @param[out] rhs			- the result.
- * @param[in] p				- the point.
- */
-void ep_rhs(fp_t rhs, const ep_t p);
-
-/**
- * Tests if a point is in the curve.
- *
- * @param[in] p				- the point to test.
- */
-int ep_on_curve(const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a random prime elliptic point.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- * @param[in] w				- the window width.
- */
-void ep_tab(ep_t *t, const ep_t p, int w);
-
-/**
- * Prints a prime elliptic curve point.
- *
- * @param[in] p				- the prime elliptic curve point to print.
- */
-void ep_print(const ep_t p);
-
-/**
- * Returns the number of bytes necessary to store a prime elliptic curve point
- * with optional point compression.
- *
- * @param[in] a				- the prime field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int ep_size_bin(const ep_t a, int pack);
-
-/**
- * Reads a prime elliptic curve point from a byte vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_VALID		- if the encoded point is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep_read_bin(ep_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a prime elliptic curve point to a byte vector in big-endian format
- * with optional point compression.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the prime elliptic curve point to write.
- * @param[in] pack			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep_write_bin(uint8_t *bin, int len, const ep_t a, int pack);
-
-/**
- * Negates a prime elliptic curve point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to negate.
- */
-void ep_neg(ep_t r, const ep_t p);
-
-/**
- * Adds two prime elliptic curve points represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep_add_basic(ep_t r, const ep_t p, const ep_t q);
-
-/**
- * Adds two prime elliptic curve points represented in affine coordinates and
- * returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep_add_slp_basic(ep_t r, fp_t s, const ep_t p, const ep_t q);
-
-/**
- * Adds two prime elliptic curve points represented in projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep_add_projc(ep_t r, const ep_t p, const ep_t q);
-
-/**
- * Adds two prime elliptic curve points represented in Jacobian coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep_add_jacob(ep_t r, const ep_t p, const ep_t q);
-
-/**
- * Subtracts a prime elliptic curve point from another.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point.
- * @param[in] q				- the second point.
- */
-void ep_sub(ep_t r, const ep_t p, const ep_t q);
-
-/**
- * Doubles a prime elliptic curve point represented in affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ep_dbl_basic(ep_t r, const ep_t p);
-
-/**
- * Doubles a prime elliptic curve point represented in affine coordinates and
- * returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the point to double.
- */
-void ep_dbl_slp_basic(ep_t r, fp_t s, const ep_t p);
-
-/**
- * Doubles a prime elliptic curve point represented in projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ep_dbl_projc(ep_t r, const ep_t p);
-
-/**
- * Doubles a prime elliptic curve point represented in Jacobian projective
- * coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ep_dbl_jacob(ep_t r, const ep_t p);
-
-/**
- * Computes the endomorphism map of a prime elliptic curve point.
- * Computes R = \psi(P).
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point.
- */
-void ep_psi(ep_t r, const ep_t p);
-
-/**
- * Multiplies a prime elliptic point by an integer using the binary method.
- * There is no restriction on the scalar.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_basic(ep_t r, const ep_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the sliding window
- * method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_slide(ep_t r, const ep_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the constant-time
- * Montgomery ladder point multiplication method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_monty(ep_t r, const ep_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the w-NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_lwnaf(ep_t r, const ep_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using a regular method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_lwreg(ep_t r, const ep_t p, const bn_t k);
-
-/**
- * Multiplies the generator of a prime elliptic curve by an integer.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void ep_mul_gen(ep_t r, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by a small positive integer.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep_mul_dig(ep_t r, const ep_t p, dig_t k);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the binary method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_basic(ep_t *t, const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using Yao's windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_yaowi(ep_t *t, const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the NAF windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_nafwi(ep_t *t, const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the single-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_combs(ep_t *t, const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the double-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_combd(ep_t *t, const ep_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the w-(T)NAF method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep_mul_pre_lwnaf(ep_t *t, const ep_t p);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_basic(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * Yao's windowing method
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_yaowi(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_nafwi(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the single-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_combs(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the double-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_combd(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep_mul_fix_lwnaf(ep_t r, const ep_t *t, const bn_t k);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * scalar multiplication and point addition.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep_mul_sim_basic(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * shamir's trick.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep_mul_sim_trick(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * interleaving of NAFs.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep_mul_sim_inter(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * Solinas' Joint Sparse Form.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep_mul_sim_joint(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m);
-
-/**
- * Multiplies simultaneously elements from G_2. Computes R = \Sum_i=0..n k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[out] p			- the G_2 elements to multiply.
- * @param[out] k			- the integer scalars.
- * @param[out] n			- the number of elements to multiply.
- */
-void ep_mul_sim_lot(ep_t r, ep_t p[], const bn_t k[], int n);
-
-/**
- * Multiplies and adds the generator and a prime elliptic curve point
- * simultaneously. Computes R = [k]G + [m]Q.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer.
- */
-void ep_mul_sim_gen(ep_t r, const bn_t k, const ep_t q, const bn_t m);
-
-/**
- * Multiplies prime elliptic curve points by small scalars.
- * Computes R = \sum k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the points to multiply.
- * @param[in] k				- the small scalars.
- * @param[in] len			- the number of points to multiply.
- */
-void ep_mul_sim_dig(ep_t r, const ep_t p[], const dig_t k[], int len);
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to convert.
- */
-void ep_norm(ep_t r, const ep_t p);
-
-/**
- * Converts multiple points to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the points to convert.
- * @param[in] n				- the number of points.
- */
-void ep_norm_sim(ep_t *r, const ep_t *t, int n);
-
-/**
- * Maps an array of uniformly random bytes to a point in a prime elliptic
- * curve.
- * That array is expected to have a length suitable for two field elements plus
- * extra bytes for uniformity.
-  *
- * @param[out] p			- the result.
- * @param[in] uniform_bytes		- the array of uniform bytes to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep_map_from_field(ep_t p, const uint8_t *uniform_bytes, int len);
-
-/**
- * Maps a byte array to a point in a prime elliptic curve.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep_map(ep_t p, const uint8_t *msg, int len);
-
-/**
- * Maps a byte array to a point in a prime elliptic curve with specified
- * domain separation tag (aka personalization string).
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- * @param[in] dst			- the domain separation tag.
- * @param[in] dst_len		- the domain separation tag length in bytes.
- */
-void ep_map_dst(ep_t p, const uint8_t *msg, int len, const uint8_t *dst,
-		int dst_len);
-
-/**
- * Compresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to compress.
- */
-void ep_pck(ep_t r, const ep_t p);
-
-/**
- * Decompresses a point.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to decompress.
- * @return a boolean value indicating if the decompression was successful.
- */
-int ep_upk(ep_t r, const ep_t p);
-
-#endif /* !RLC_EP_H */
diff --git a/src/dashbls/depends/relic/include/relic_epx.h b/src/dashbls/depends/relic/include/relic_epx.h
deleted file mode 100644
index f51f3ec7e87c..000000000000
--- a/src/dashbls/depends/relic/include/relic_epx.h
+++ /dev/null
@@ -1,1819 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup epx Elliptic curves defined over extensions of prime fields.
- */
-
-/**
- * @file
- *
- * Interface of the module for arithmetic on prime elliptic curves defined over
- * extension fields.
-
- * The scalar multiplication functions are only guaranteed to work
- * in the prime order subgroup used by pairings. If you need a generic scalar
- * multiplication function, use \sa ep2_mul_big().
- *
- * @ingroup epx
- */
-
-#ifndef RLC_EPX_H
-#define RLC_EPX_H
-
-#include "relic_fpx.h"
-#include "relic_ep.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Size of a precomputation table using the binary method.
- */
-#define RLC_EPX_TABLE_BASIC		(2 * RLC_FP_BITS + 1)
-
-/**
- * Size of a precomputation table using the single-table comb method.
- */
-#define RLC_EPX_TABLE_COMBS      (1 << EP_DEPTH)
-
-/**
- * Size of a precomputation table using the double-table comb method.
- */
-#define RLC_EPX_TABLE_COMBD		(1 << (EP_DEPTH + 1))
-
-/**
- * Size of a precomputation table using the w-(T)NAF method.
- */
-#define RLC_EPX_TABLE_LWNAF		(1 << (EP_DEPTH - 2))
-
-/**
- * Size of a precomputation table using the chosen algorithm.
- */
-#if EP_FIX == BASIC
-#define RLC_EPX_TABLE			RLC_EPX_TABLE_BASIC
-#elif EP_FIX == COMBS
-#define RLC_EPX_TABLE			RLC_EPX_TABLE_COMBS
-#elif EP_FIX == COMBD
-#define RLC_EPX_TABLE			RLC_EPX_TABLE_COMBD
-#elif EP_FIX == LWNAF
-#define RLC_EPX_TABLE			RLC_EPX_TABLE_LWNAF
-#endif
-
-/**
- * Maximum size of a precomputation table.
- */
-#ifdef STRIP
-#define RLC_EPX_TABLE_MAX 	RLC_EPX_TABLE
-#else
-#define RLC_EPX_TABLE_MAX 	RLC_MAX(RLC_EPX_TABLE_BASIC, RLC_EPX_TABLE_COMBD)
-#endif
-
-/**
- * Maximum number of coefficients of an isogeny map polynomial.
- * 4 is sufficient for a degree-3 isogeny polynomial.
- */
-#define RLC_EPX_CTMAP_MAX	4
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents an elliptic curve point over a quadratic extension over a prime
- * field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fp2_t x;
-	/** The second coordinate. */
-	fp2_t y;
-	/** The third coordinate (projective representation). */
-	fp2_t z;
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} ep2_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef ep2_st ep2_t[1];
-#else
-typedef ep2_st *ep2_t;
-#endif
-
-/**
- * Represents an elliptic curve point over a cubic extension over a prime
- * field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fp3_t x;
-	/** The second coordinate. */
-	fp3_t y;
-	/** The third coordinate (projective representation). */
-	fp3_t z;
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} ep3_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef ep3_st ep3_t[1];
-#else
-typedef ep3_st *ep3_t;
-#endif
-
-/**
- * Represents an elliptic curve point over a quartic extension over a prime
- * field.
- */
-typedef struct {
-	/** The first coordinate. */
-	fp4_t x;
-	/** The second coordinate. */
-	fp4_t y;
-	/** The third coordinate (projective representation). */
-	fp4_t z;
-	/** Flag to indicate the coordinate system of this point. */
-	int coord;
-} ep4_st;
-
-/**
- * Pointer to an elliptic curve point.
- */
-#if ALLOC == AUTO
-typedef ep4_st ep4_t[1];
-#else
-typedef ep4_st *ep4_t;
-#endif
-
-/**
- * Coefficients of an isogeny map for a curve over a quadratic extension.
- */
-typedef struct {
-	/** The a-coefficient of the isogenous curve used for SSWU mapping. */
-	fp2_t a;
-	/** The b-coefficient of the isogenous curve used for SSWU mapping. */
-	fp2_t b;
-	/** Degree of x numerator */
-	int deg_xn;
-	/** Degree of x denominator */
-	int deg_xd;
-	/** Degree of y numerator */
-	int deg_yn;
-	/** Degree of y denominator */
-	int deg_yd;
-	/** x numerator coefficients */
-	fp2_t xn[RLC_EPX_CTMAP_MAX];
-	/** x denominator coefficients */
-	fp2_t xd[RLC_EPX_CTMAP_MAX];
-	/** y numerator coefficients */
-	fp2_t yn[RLC_EPX_CTMAP_MAX];
-	/** y denominator coefficients */
-	fp2_t yd[RLC_EPX_CTMAP_MAX];
-} iso2_st;
-
-/**
- * Pointer to isogeny map coefficients.
- */
-typedef iso2_st *iso2_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a point on an elliptic curve with a null value.
- *
- * @param[out] A				- the point to initialize.
- */
-#define ep2_null(A)				RLC_NULL(A)
-
-/**
- * Calls a function to allocate a point on an elliptic curve.
- *
- * @param[out] A				- the new point.
- * @throw ERR_NO_MEMORY			- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define ep2_new(A)															\
-	A = (ep2_t)calloc(1, sizeof(ep2_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	fp2_null((A)->x);														\
-	fp2_null((A)->y);														\
-	fp2_null((A)->z);														\
-	fp2_new((A)->x);														\
-	fp2_new((A)->y);														\
-	fp2_new((A)->z);														\
-
-#elif ALLOC == AUTO
-#define ep2_new(A)				/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a point on an elliptic curve.
- *
- * @param[out] A				- the point to free.
- */
-#if ALLOC == DYNAMIC
-#define ep2_free(A)															\
-	if (A != NULL) {														\
-		fp2_free((A)->x);													\
-		fp2_free((A)->y);													\
-		fp2_free((A)->z);													\
-		free(A);															\
-		A = NULL;															\
-	}																		\
-
-#elif ALLOC == AUTO
-#define ep2_free(A)				/* empty */
-#endif
-
-/**
- * Initializes a point on an elliptic curve with a null value.
- *
- * @param[out] A				- the point to initialize.
- */
-#define ep4_null(A)				RLC_NULL(A)
-
-/**
- * Calls a function to allocate a point on an elliptic curve.
- *
- * @param[out] A				- the new point.
- * @throw ERR_NO_MEMORY			- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define ep4_new(A)															\
-	A = (ep4_t)calloc(1, sizeof(ep4_st));									\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	fp4_null((A)->x);														\
-	fp4_null((A)->y);														\
-	fp4_null((A)->z);														\
-	fp4_new((A)->x);														\
-	fp4_new((A)->y);														\
-	fp4_new((A)->z);														\
-
-#elif ALLOC == AUTO
-#define ep4_new(A)				/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a point on an elliptic curve.
- *
- * @param[out] A				- the point to free.
- */
-#if ALLOC == DYNAMIC
-#define ep4_free(A)															\
-	if (A != NULL) {														\
-		fp4_free((A)->x);													\
-		fp4_free((A)->y);													\
-		fp4_free((A)->z);													\
-		free(A);															\
-		A = NULL;															\
-	}																		\
-
-#elif ALLOC == AUTO
-#define ep4_free(A)				/* empty */
-#endif
-
-/**
- * Adds two points in an elliptic curve over a quadratic extension field.
- * Computes R = P + Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to add.
- * @param[in] Q					- the second point to add.
- */
-#if EP_ADD == BASIC
-#define ep2_add(R, P, Q)		ep2_add_basic(R, P, Q);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-#define ep2_add(R, P, Q)		ep2_add_projc(R, P, Q);
-#endif
-
-/**
- * Doubles a point in an elliptic curve over a quadratic extension field.
- * Computes R = 2P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to double.
- */
-#if EP_ADD == BASIC
-#define ep2_dbl(R, P)			ep2_dbl_basic(R, P);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-#define ep2_dbl(R, P)			ep2_dbl_projc(R, P);
-#endif
-
-/**
- * Multiplies a point in an elliptic curve over a quadratic extension field by
- * an unrestricted integer scalar. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#define ep2_mul_big(R, P, K)	ep2_mul_basic(R, P, K)
-
-/**
- * Multiplies a point in an elliptic curve over a quadratic extension field.
- * Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#if EP_MUL == BASIC
-#define ep2_mul(R, P, K)		ep2_mul_basic(R, P, K)
-#elif EP_MUL == SLIDE
-#define ep2_mul(R, P, K)		ep2_mul_slide(R, P, K)
-#elif EP_MUL == MONTY
-#define ep2_mul(R, P, K)		ep2_mul_monty(R, P, K)
-#elif EP_MUL == LWNAF || EP_MUL == LWREG
-#define ep2_mul(R, P, K)		ep2_mul_lwnaf(R, P, K)
-#endif
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * over a quadratic extension.
- *
- * @param[out] T				- the precomputation table.
- * @param[in] P					- the point to multiply.
- */
-#if EP_FIX == BASIC
-#define ep2_mul_pre(T, P)		ep2_mul_pre_basic(T, P)
-#elif EP_FIX == COMBS
-#define ep2_mul_pre(T, P)		ep2_mul_pre_combs(T, P)
-#elif EP_FIX == COMBD
-#define ep2_mul_pre(T, P)		ep2_mul_pre_combd(T, P)
-#elif EP_FIX == LWNAF
-//TODO: implement ep2_mul_pre_glv
-#define ep2_mul_pre(T, P)		ep2_mul_pre_lwnaf(T, P)
-#endif
-
-/**
- * Multiplies a fixed prime elliptic point over a quadratic extension using a
- * precomputation table. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] T					- the precomputation table.
- * @param[in] K					- the integer.
- */
-#if EP_FIX == BASIC
-#define ep2_mul_fix(R, T, K)	ep2_mul_fix_basic(R, T, K)
-#elif EP_FIX == COMBS
-#define ep2_mul_fix(R, T, K)	ep2_mul_fix_combs(R, T, K)
-#elif EP_FIX == COMBD
-#define ep2_mul_fix(R, T, K)	ep2_mul_fix_combd(R, T, K)
-#elif EP_FIX == LWNAF
-//TODO: implement ep2_mul_fix_glv
-#define ep2_mul_fix(R, T, K)	ep2_mul_fix_lwnaf(R, T, K)
-#endif
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously. Computes
- * R = [k]P + [l]Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to multiply.
- * @param[in] K					- the first integer.
- * @param[in] Q					- the second point to multiply.
- * @param[in] M					- the second integer,
- */
-#if EP_SIM == BASIC
-#define ep2_mul_sim(R, P, K, Q, M)	ep2_mul_sim_basic(R, P, K, Q, M)
-#elif EP_SIM == TRICK
-#define ep2_mul_sim(R, P, K, Q, M)	ep2_mul_sim_trick(R, P, K, Q, M)
-#elif EP_SIM == INTER
-#define ep2_mul_sim(R, P, K, Q, M)	ep2_mul_sim_inter(R, P, K, Q, M)
-#elif EP_SIM == JOINT
-#define ep2_mul_sim(R, P, K, Q, M)	ep2_mul_sim_joint(R, P, K, Q, M)
-#endif
-
-/**
- * Adds two points in an elliptic curve over a quadratic extension field.
- * Computes R = P + Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to add.
- * @param[in] Q					- the second point to add.
- */
-#if EP_ADD == BASIC
-#define ep4_add(R, P, Q)		ep4_add_basic(R, P, Q);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-#define ep4_add(R, P, Q)		ep4_add_projc(R, P, Q);
-#endif
-
-/**
- * Doubles a point in an elliptic curve over a quadratic extension field.
- * Computes R = 2P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to double.
- */
-#if EP_ADD == BASIC
-#define ep4_dbl(R, P)			ep4_dbl_basic(R, P);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-#define ep4_dbl(R, P)			ep4_dbl_projc(R, P);
-#endif
-
-/**
- * Multiplies a point in an elliptic curve over a quadratic extension field by
- * an unrestricted integer scalar. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#define ep4_mul_big(R, P, K)	ep4_mul_basic(R, P, K)
-
-/**
- * Multiplies a point in an elliptic curve over a quadratic extension field.
- * Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- * @param[in] K					- the integer.
- */
-#if EP_MUL == BASIC
-#define ep4_mul(R, P, K)		ep4_mul_basic(R, P, K)
-#elif EP_MUL == SLIDE
-#define ep4_mul(R, P, K)		ep4_mul_slide(R, P, K)
-#elif EP_MUL == MONTY
-#define ep4_mul(R, P, K)		ep4_mul_monty(R, P, K)
-#elif EP_MUL == LWNAF || EP_MUL == LWREG
-#define ep4_mul(R, P, K)		ep4_mul_lwnaf(R, P, K)
-#endif
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * over a quadratic extension.
- *
- * @param[out] T				- the precomputation table.
- * @param[in] P					- the point to multiply.
- */
-#if EP_FIX == BASIC
-#define ep4_mul_pre(T, P)		ep4_mul_pre_basic(T, P)
-#elif EP_FIX == COMBS
-#define ep4_mul_pre(T, P)		ep4_mul_pre_combs(T, P)
-#elif EP_FIX == COMBD
-#define ep4_mul_pre(T, P)		ep4_mul_pre_combd(T, P)
-#elif EP_FIX == LWNAF
-//TODO: implement ep4_mul_pre_glv
-#define ep4_mul_pre(T, P)		ep4_mul_pre_lwnaf(T, P)
-#endif
-
-/**
- * Multiplies a fixed prime elliptic point over a quadratic extension using a
- * precomputation table. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] T					- the precomputation table.
- * @param[in] K					- the integer.
- */
-#if EP_FIX == BASIC
-#define ep4_mul_fix(R, T, K)	ep4_mul_fix_basic(R, T, K)
-#elif EP_FIX == COMBS
-#define ep4_mul_fix(R, T, K)	ep4_mul_fix_combs(R, T, K)
-#elif EP_FIX == COMBD
-#define ep4_mul_fix(R, T, K)	ep4_mul_fix_combd(R, T, K)
-#elif EP_FIX == LWNAF
-//TODO: implement ep4_mul_fix_glv
-#define ep4_mul_fix(R, T, K)	ep4_mul_fix_lwnaf(R, T, K)
-#endif
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously. Computes
- * R = [k]P + [l]Q.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the first point to multiply.
- * @param[in] K					- the first integer.
- * @param[in] Q					- the second point to multiply.
- * @param[in] M					- the second integer,
- */
-#if EP_SIM == BASIC
-#define ep4_mul_sim(R, P, K, Q, M)	ep4_mul_sim_basic(R, P, K, Q, M)
-#elif EP_SIM == TRICK
-#define ep4_mul_sim(R, P, K, Q, M)	ep4_mul_sim_trick(R, P, K, Q, M)
-#elif EP_SIM == INTER
-#define ep4_mul_sim(R, P, K, Q, M)	ep4_mul_sim_inter(R, P, K, Q, M)
-#elif EP_SIM == JOINT
-#define ep4_mul_sim(R, P, K, Q, M)	ep4_mul_sim_joint(R, P, K, Q, M)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the elliptic curve over quadratic extension.
- */
-void ep2_curve_init(void);
-
-/**
- * Finalizes the elliptic curve over quadratic extension.
- */
-void ep2_curve_clean(void);
-
-/**
- * Returns the 'a' coefficient of the currently configured elliptic curve.
- *
- * @return the 'a' coefficient of the elliptic curve.
- */
-fp_t *ep2_curve_get_a(void);
-
-/**
- * Returns the 'b' coefficient of the currently configured elliptic curve.
- *
- * @param[out] b			- the 'b' coefficient of the elliptic curve.
- */
-fp_t *ep2_curve_get_b(void);
-
-/**
- * Returns the vector of coefficients required to perform GLV method.
- *
- * @param[out] b			- the vector of coefficients.
- */
-void ep2_curve_get_vs(bn_t *v);
-
-/**
- * Returns a optimization identifier based on the 'a' coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep2_curve_opt_a(void);
-
-/**
- * Returns b optimization identifier based on the 'b' coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep2_curve_opt_b(void);
-
-/**
- * Tests if the configured elliptic curve is a twist.
- *
- * @return the type of the elliptic curve twist, 0 if non-twisted curve.
- */
-int ep2_curve_is_twist(void);
-
-/**
- * Tests if the current curve should use an isogeny map for the SSWU map.
- *
- * @return 1 if the curve uses an isogeny, and 0 otherwise.
- */
-int ep2_curve_is_ctmap(void);
-
-/**
- * Returns the generator of the group of points in the elliptic curve.
- *
- * @param[out] g			- the returned generator.
- */
-void ep2_curve_get_gen(ep2_t g);
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-ep2_t *ep2_curve_get_tab(void);
-
-/**
- * Returns the order of the group of points in the elliptic curve.
- *
- * @param[out] n			- the returned order.
- */
-void ep2_curve_get_ord(bn_t n);
-
-/**
- * Returns the cofactor of the group order in the elliptic curve.
- *
- * @param[out] h			- the returned cofactor.
- */
-void ep2_curve_get_cof(bn_t h);
-
-/**
- * Returns the isogeny map coefficients for use with the SSWU map.
- */
-iso2_t ep2_curve_get_iso(void);
-
-/**
- * Configures an elliptic curve over a quadratic extension by its coefficients.
- *
- * @param[in] a			- the 'a' coefficient of the curve.
- * @param[in] b			- the 'b' coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] h			- the cofactor of the group order.
- */
-void ep2_curve_set(fp2_t a, fp2_t b, ep2_t g, bn_t r, bn_t h);
-
-/**
- * Configures an elliptic curve by twisting the curve over the base prime field.
- *
- *  @param				- the type of twist (multiplicative or divisive)
- */
-void ep2_curve_set_twist(int type);
-
-/**
- * Tests if a point on an elliptic curve is at the infinity.
- *
- * @param[in] p				- the point to test.
- * @return 1 if the point is at infinity, 0 otherise.
- */
-int ep2_is_infty(ep2_t p);
-
-/**
- * Assigns an elliptic curve point to the point at infinity.
- *
- * @param[out] p			- the point to assign.
- */
-void ep2_set_infty(ep2_t p);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] q			- the result.
- * @param[in] p				- the elliptic curve point to copy.
- */
-void ep2_copy(ep2_t r, ep2_t p);
-
-/**
- * Compares two elliptic curve points.
- *
- * @param[in] p				- the first elliptic curve point.
- * @param[in] q				- the second elliptic curve point.
- * @return RLC_EQ if p == q and RLC_NE if p != q.
- */
-int ep2_cmp(ep2_t p, ep2_t q);
-
-/**
- * Assigns a random value to an elliptic curve point.
- *
- * @param[out] p			- the elliptic curve point to assign.
- */
-void ep2_rand(ep2_t p);
-
-/**
- * Randomizes coordinates of an elliptic curve point.
- *
- * @param[out] r			- the blinded prime elliptic curve point.
- * @param[in] p				- the prime elliptic curve point to blind.
- */
-void ep2_blind(ep2_t r, ep2_t p);
-
-/**
- * Computes the right-hand side of the elliptic curve equation at a certain
- * elliptic curve point.
- *
- * @param[out] rhs			- the result.
- * @param[in] p				- the point.
- */
-void ep2_rhs(fp2_t rhs, ep2_t p);
-
-/**
- * Tests if a point is in the curve.
- *
- * @param[in] p				- the point to test.
- */
-int ep2_on_curve(ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a random prime elliptic point.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- * @param[in] w				- the window width.
- */
-void ep2_tab(ep2_t *t, ep2_t p, int w);
-
-/**
- * Prints an elliptic curve point.
- *
- * @param[in] p				- the elliptic curve point to print.
- */
-void ep2_print(ep2_t p);
-
-/**
- * Returns the number of bytes necessary to store a prime elliptic curve point
- * over a quadratic extension with optional point compression.
- *
- * @param[in] a				- the prime field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int ep2_size_bin(ep2_t a, int pack);
-
-/**
- * Reads a prime elliptic curve point over a quadratic extension from a byte
- * vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_VALID		- if the encoded point is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep2_read_bin(ep2_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a prime elliptic curve pointer over a quadratic extension to a byte
- * vector in big-endian format with optional point compression.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the prime elliptic curve point to write.
- * @param[in] pack			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep2_write_bin(uint8_t *bin, int len, ep2_t a, int pack);
-
-/**
- * Negates a point represented in affine coordinates in an elliptic curve over
- * a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[out] p			- the point to negate.
- */
-void ep2_neg(ep2_t r, ep2_t p);
-
-/**
- * Adds to points represented in affine coordinates in an elliptic curve over a
- * quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep2_add_basic(ep2_t r, ep2_t p, ep2_t q);
-
-/**
- * Adds to points represented in affine coordinates in an elliptic curve over a
- * quadratic extension and returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep2_add_slp_basic(ep2_t r, fp2_t s, ep2_t p, ep2_t q);
-
-/**
- * Adds two points represented in projective coordinates in an elliptic curve
- * over a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep2_add_projc(ep2_t r, ep2_t p, ep2_t q);
-
- /**
-  * Subtracts a point i an elliptic curve over a quadratic extension from
-  * another.
-  *
-  * @param[out] r			- the result.
-  * @param[in] p			- the first point.
-  * @param[in] q			- the point to subtract.
-  */
-void ep2_sub(ep2_t r, ep2_t p, ep2_t q);
-
-/**
- * Doubles a points represented in affine coordinates in an elliptic curve over
- * a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[int] p			- the point to double.
- */
-void ep2_dbl_basic(ep2_t r, ep2_t p);
-
-/**
- * Doubles a points represented in affine coordinates in an elliptic curve over
- * a quadratic extension and returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the point to double.
- */
-void ep2_dbl_slp_basic(ep2_t r, fp2_t s, ep2_t p);
-
-/**
- * Doubles a points represented in projective coordinates in an elliptic curve
- * over a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ep2_dbl_projc(ep2_t r, ep2_t p);
-
-/**
- * Multiplies a prime elliptic point by an integer using the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_basic(ep2_t r, ep2_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the sliding window
- * method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_slide(ep2_t r, ep2_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the constant-time
- * Montgomery ladder point multiplication method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_monty(ep2_t r, ep2_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the w-NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_lwnaf(ep2_t r, ep2_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using a regular method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_lwreg(ep2_t r, ep2_t p, const bn_t k);
-
-/**
- * Multiplies the generator of an elliptic curve over a qaudratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void ep2_mul_gen(ep2_t r, bn_t k);
-
-/**
- * Multiplies a prime elliptic point by a small integer.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep2_mul_dig(ep2_t r, ep2_t p, dig_t k);
-
-
-/**
- * Multiplies a point in an elliptic curve over a quadratic extension field by
- * the curve cofactor or a small multiple for which a short vector exists.
- * In short, it takes a point in the curve to the large prime-order subgroup.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- */
-void ep2_mul_cof(ep2_t r, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the binary method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_basic(ep2_t *t, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using Yao's windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_yaowi(ep2_t *t, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the NAF windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_nafwi(ep2_t *t, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the single-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_combs(ep2_t *t, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the double-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_combd(ep2_t *t, ep2_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the w-(T)NAF method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep2_mul_pre_lwnaf(ep2_t *t, ep2_t p);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_basic(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * Yao's windowing method
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_yaowi(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_nafwi(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the single-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_combs(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the double-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_combd(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep2_mul_fix_lwnaf(ep2_t r, ep2_t *t, bn_t k);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * scalar multiplication and point addition.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep2_mul_sim_basic(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * shamir's trick.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep2_mul_sim_trick(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * interleaving of NAFs.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep2_mul_sim_inter(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * Solinas' Joint Sparse Form.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep2_mul_sim_joint(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m);
-
-/**
- * Multiplies simultaneously elements from a prime elliptic curve.
- * Computes R = \Sum_i=0..n k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[out] p			- the points to multiply.
- * @param[out] k			- the integer scalars.
- * @param[out] n			- the number of elements to multiply.
- */
-void ep2_mul_sim_lot(ep2_t r, ep2_t p[], const bn_t k[], int n);
-
-/**
- * Multiplies and adds the generator and a prime elliptic curve point
- * simultaneously. Computes R = [k]G + [l]Q.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep2_mul_sim_gen(ep2_t r, bn_t k, ep2_t q, bn_t m);
-
-/**
- * Multiplies prime elliptic curve points by small scalars.
- * Computes R = \sum k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the points to multiply.
- * @param[in] k				- the small scalars.
- * @param[in] len			- the number of points to multiply.
- */
-void ep2_mul_sim_dig(ep2_t r, ep2_t p[], dig_t k[], int len);
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to convert.
- */
-void ep2_norm(ep2_t r, ep2_t p);
-
-/**
- * Converts multiple points to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the points to convert.
- * @param[in] n				- the number of points.
- */
-void ep2_norm_sim(ep2_t *r, ep2_t *t, int n);
-
-/**
- * Maps an array of uniformly random bytes to a point in a prime elliptic
- * curve.
- * That array is expected to have a length suitable for four field elements plus
- * extra bytes for uniformity.
-  *
- * @param[out] p			- the result.
- * @param[in] uniform_bytes		- the array of uniform bytes to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep2_map_from_field(ep2_t p, const uint8_t *uniform_bytes, int len);
-
-/**
- * Maps a byte array to a point in an elliptic curve over a quadratic extension.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep2_map(ep2_t p, const uint8_t *msg, int len);
-
-/**
- * Maps a byte array to a point in an elliptic curve over a quadratic extension
- * using an explicit domain separation tag.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- * @param[in] dst			- the domain separatoin tag.
- * @param[in] dst_len		- the domain separation tag length in bytes.
- */
-void ep2_map_dst(ep2_t p, const uint8_t *msg, int len, const uint8_t *dst, int dst_len);
-
-/**
- * Computes a power of the Gailbraith-Lin-Scott homomorphism of a point
- * represented in affine coordinates on a twisted elliptic curve over a
- * quadratic exension. That is, Psi^i(P) = Twist(P)(Frob^i(unTwist(P)).
- * On the trace-zero group of a quadratic twist, consists of a power of the
- * Frobenius map of a point represented in affine coordinates in an elliptic
- * curve over a quadratic exension. Computes Frob^i(P) = (p^i)P.
- *
- * @param[out] r			- the result in affine coordinates.
- * @param[in] p				- a point in affine coordinates.
- * @param[in] i				- the power of the Frobenius map.
- */
-void ep2_frb(ep2_t r, ep2_t p, int i);
-
-/**
- * Compresses a point in an elliptic curve over a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to compress.
- */
-void ep2_pck(ep2_t r, ep2_t p);
-
-/**
- * Decompresses a point in an elliptic curve over a quadratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to decompress.
- * @return if the decompression was successful
- */
-int ep2_upk(ep2_t r, ep2_t p);
-
-/**
- * Initializes the elliptic curve over quartic extension.
- */
-void ep4_curve_init(void);
-
-/**
- * Finalizes the elliptic curve over quartic extension.
- */
-void ep4_curve_clean(void);
-
-/**
- * Returns the 'a' coefficient of the currently configured elliptic curve.
- *
- * @return the 'a' coefficient of the elliptic curve.
- */
-void ep4_curve_get_a(fp4_t a);
-
-/**
- * Returns the 'b' coefficient of the currently configured elliptic curve.
- *
- * @param[out] b			- the 'b' coefficient of the elliptic curve.
- */
-void ep4_curve_get_b(fp4_t b);
-
-/**
- * Returns the vector of coefficients required to perform GLV method.
- *
- * @param[out] b			- the vector of coefficients.
- */
-void ep4_curve_get_vs(bn_t *v);
-
-/**
- * Returns a optimization identifier based on the 'a' coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep4_curve_opt_a(void);
-
-/**
- * Returns b optimization identifier based on the 'b' coefficient of the curve.
- *
- * @return the optimization identifier.
- */
-int ep4_curve_opt_b(void);
-
-/**
- * Tests if the configured elliptic curve is a twist.
- *
- * @return the type of the elliptic curve twist, 0 if non-twisted curve.
- */
-int ep4_curve_is_twist(void);
-
-/**
- * Returns the generator of the group of points in the elliptic curve.
- *
- * @param[out] g			- the returned generator.
- */
-void ep4_curve_get_gen(ep4_t g);
-
-/**
- * Returns the precomputation table for the generator.
- *
- * @return the table.
- */
-ep4_t *ep4_curve_get_tab(void);
-
-/**
- * Returns the order of the group of points in the elliptic curve.
- *
- * @param[out] n			- the returned order.
- */
-void ep4_curve_get_ord(bn_t n);
-
-/**
- * Returns the cofactor of the group order in the elliptic curve.
- *
- * @param[out] h			- the returned cofactor.
- */
-void ep4_curve_get_cof(bn_t h);
-
-/**
- * Configures an elliptic curve over a quartic extension by its coefficients.
- *
- * @param[in] a			- the 'a' coefficient of the curve.
- * @param[in] b			- the 'b' coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] h			- the cofactor of the group order.
- */
-void ep4_curve_set(fp4_t a, fp4_t b, ep4_t g, bn_t r, bn_t h);
-
-/**
- * Configures an elliptic curve by twisting the curve over the base prime field.
- *
- *  @param				- the type of twist (multiplicative or divisive)
- */
-void ep4_curve_set_twist(int type);
-
-/**
- * Tests if a point on an elliptic curve is at the infinity.
- *
- * @param[in] p				- the point to test.
- * @return 1 if the point is at infinity, 0 otherise.
- */
-int ep4_is_infty(ep4_t p);
-
-/**
- * Assigns an elliptic curve point to the point at infinity.
- *
- * @param[out] p			- the point to assign.
- */
-void ep4_set_infty(ep4_t p);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] q			- the result.
- * @param[in] p				- the elliptic curve point to copy.
- */
-void ep4_copy(ep4_t r, ep4_t p);
-
-/**
- * Compares two elliptic curve points.
- *
- * @param[in] p				- the first elliptic curve point.
- * @param[in] q				- the second elliptic curve point.
- * @return RLC_EQ if p == q and RLC_NE if p != q.
- */
-int ep4_cmp(ep4_t p, ep4_t q);
-
-/**
- * Assigns a random value to an elliptic curve point.
- *
- * @param[out] p			- the elliptic curve point to assign.
- */
-void ep4_rand(ep4_t p);
-
-/**
- * Randomizes coordinates of an elliptic curve point.
- *
- * @param[out] r			- the blinded prime elliptic curve point.
- * @param[in] p				- the prime elliptic curve point to blind.
- */
-void ep4_blind(ep4_t r, ep4_t p);
-
-/**
- * Computes the right-hand side of the elliptic curve equation at a certain
- * elliptic curve point.
- *
- * @param[out] rhs			- the result.
- * @param[in] p				- the point.
- */
-void ep4_rhs(fp4_t rhs, ep4_t p);
-
-/**
- * Tests if a point is in the curve.
- *
- * @param[in] p				- the point to test.
- */
-int ep4_on_curve(ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a random prime elliptic point.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- * @param[in] w				- the window width.
- */
-void ep4_tab(ep4_t *t, ep4_t p, int w);
-
-/**
- * Prints an elliptic curve point.
- *
- * @param[in] p				- the elliptic curve point to print.
- */
-void ep4_print(ep4_t p);
-
-/**
- * Returns the number of bytes necessary to store a prime elliptic curve point
- * over a quartic extension with optional point compression.
- *
- * @param[in] a				- the prime field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int ep4_size_bin(ep4_t a, int pack);
-
-/**
- * Reads a prime elliptic curve point over a quartic extension from a byte
- * vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_VALID		- if the encoded point is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep4_read_bin(ep4_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a prime elliptic curve pointer over a quartic extension to a byte
- * vector in big-endian format with optional point compression.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the prime elliptic curve point to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is invalid.
- */
-void ep4_write_bin(uint8_t *bin, int len, ep4_t a, int pack);
-
-/**
- * Negates a point represented in affine coordinates in an elliptic curve over
- * a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[out] p			- the point to negate.
- */
-void ep4_neg(ep4_t r, ep4_t p);
-
-/**
- * Adds to points represented in affine coordinates in an elliptic curve over a
- * quartic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep4_add_basic(ep4_t r, ep4_t p, ep4_t q);
-
-/**
- * Adds to points represented in affine coordinates in an elliptic curve over a
- * quartic extension and returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep4_add_slp_basic(ep4_t r, fp4_t s, ep4_t p, ep4_t q);
-
-/**
- * Adds two points represented in projective coordinates in an elliptic curve
- * over a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-void ep4_add_projc(ep4_t r, ep4_t p, ep4_t q);
-
- /**
-  * Subtracts a point i an elliptic curve over a quartic extension from
-  * another.
-  *
-  * @param[out] r			- the result.
-  * @param[in] p			- the first point.
-  * @param[in] q			- the point to subtract.
-  */
-void ep4_sub(ep4_t r, ep4_t p, ep4_t q);
-
-/**
- * Doubles a points represented in affine coordinates in an elliptic curve over
- * a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[int] p			- the point to double.
- */
-void ep4_dbl_basic(ep4_t r, ep4_t p);
-
-/**
- * Doubles a points represented in affine coordinates in an elliptic curve over
- * a quartic extension and returns the computed slope.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the point to double.
- */
-void ep4_dbl_slp_basic(ep4_t r, fp4_t s, ep4_t p);
-
-/**
- * Doubles a points represented in projective coordinates in an elliptic curve
- * over a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to double.
- */
-void ep4_dbl_projc(ep4_t r, ep4_t p);
-
-/**
- * Multiplies a prime elliptic point by an integer using the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_basic(ep4_t r, ep4_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the sliding window
- * method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_slide(ep4_t r, ep4_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the constant-time
- * Montgomery ladder point multiplication method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_monty(ep4_t r, ep4_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using the w-NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_lwnaf(ep4_t r, ep4_t p, const bn_t k);
-
-/**
- * Multiplies a prime elliptic point by an integer using a regular method.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_lwreg(ep4_t r, ep4_t p, const bn_t k);
-
-/**
- * Multiplies the generator of an elliptic curve over a qaudratic extension.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void ep4_mul_gen(ep4_t r, bn_t k);
-
-/**
- * Multiplies a prime elliptic point by a small integer.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- * @param[in] k				- the integer.
- */
-void ep4_mul_dig(ep4_t r, ep4_t p, dig_t k);
-
-
-/**
- * Multiplies a point in an elliptic curve over a quartic extension field by
- * the curve cofactor or a small multiple for which a short vector exists.
- * In short, it takes a point in the curve to the large prime-order subgroup.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the point to multiply.
- */
-void ep4_mul_cof(ep4_t r, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the binary method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_basic(ep4_t *t, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using Yao's windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_yaowi(ep4_t *t, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the NAF windowing method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_nafwi(ep4_t *t, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the single-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_combs(ep4_t *t, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the double-table comb method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_combd(ep4_t *t, ep4_t p);
-
-/**
- * Builds a precomputation table for multiplying a fixed prime elliptic point
- * using the w-(T)NAF method.
- *
- * @param[out] t			- the precomputation table.
- * @param[in] p				- the point to multiply.
- */
-void ep4_mul_pre_lwnaf(ep4_t *t, ep4_t p);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the binary method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_basic(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * Yao's windowing method
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_yaowi(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_nafwi(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the single-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_combs(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the double-table comb method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_combd(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies a fixed prime elliptic point using a precomputation table and
- * the w-(T)NAF method.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the precomputation table.
- * @param[in] k				- the integer.
- */
-void ep4_mul_fix_lwnaf(ep4_t r, ep4_t *t, bn_t k);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * scalar multiplication and point addition.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep4_mul_sim_basic(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * shamir's trick.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep4_mul_sim_trick(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * interleaving of NAFs.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep4_mul_sim_inter(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m);
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously using
- * Solinas' Joint Sparse Form.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to multiply.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep4_mul_sim_joint(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m);
-
-/**
- * Multiplies simultaneously elements from a prime elliptic curve.
- * Computes R = \Sum_i=0..n k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[out] p			- the points to multiply.
- * @param[out] k			- the integer scalars.
- * @param[out] n			- the number of elements to multiply.
- */
-void ep4_mul_sim_lot(ep4_t r, ep4_t p[], const bn_t k[], int n);
-
-/**
- * Multiplies and adds the generator and a prime elliptic curve point
- * simultaneously. Computes R = [k]G + [l]Q.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the first integer.
- * @param[in] q				- the second point to multiply.
- * @param[in] m				- the second integer,
- */
-void ep4_mul_sim_gen(ep4_t r, bn_t k, ep4_t q, bn_t m);
-
-/**
- * Multiplies prime elliptic curve points by small scalars.
- * Computes R = \sum k_iP_i.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the points to multiply.
- * @param[in] k				- the small scalars.
- * @param[in] len			- the number of points to multiply.
- */
-void ep4_mul_sim_dig(ep4_t r, ep4_t p[], dig_t k[], int len);
-
-/**
- * Converts a point to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to convert.
- */
-void ep4_norm(ep4_t r, ep4_t p);
-
-/**
- * Converts multiple points to affine coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] t				- the points to convert.
- * @param[in] n				- the number of points.
- */
-void ep4_norm_sim(ep4_t *r, ep4_t *t, int n);
-
-/**
- * Maps a byte array to a point in an elliptic curve over a quartic extension.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep4_map(ep4_t p, const uint8_t *msg, int len);
-
-/**
- * Maps a byte array to a point in an elliptic curve over a quartic extension
- * using an explicit domain separation tag.
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- * @param[in] dst			- the domain separatoin tag.
- * @param[in] dst_len		- the domain separation tag length in bytes.
- */
-void ep4_map_dst(ep4_t p, const uint8_t *msg, int len, const uint8_t *dst, int dst_len);
-
-/**
- * Computes a power of the Gailbraith-Lin-Scott homomorphism of a point
- * represented in affine coordinates on a twisted elliptic curve over a
- * quartic exension. That is, Psi^i(P) = Twist(P)(Frob^i(unTwist(P)).
- * On the trace-zero group of a quartic twist, consists of a power of the
- * Frobenius map of a point represented in affine coordinates in an elliptic
- * curve over a quartic exension. Computes Frob^i(P) = (p^i)P.
- *
- * @param[out] r			- the result in affine coordinates.
- * @param[in] p				- a point in affine coordinates.
- * @param[in] i				- the power of the Frobenius map.
- */
-void ep4_frb(ep4_t r, ep4_t p, int i);
-
-/**
- * Compresses a point in an elliptic curve over a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to compress.
- */
-void ep4_pck(ep4_t r, ep4_t p);
-
-/**
- * Decompresses a point in an elliptic curve over a quartic extension.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to decompress.
- * @return if the decompression was successful
- */
-int ep4_upk(ep4_t r, ep4_t p);
-
-#endif /* !RLC_EPX_H */
diff --git a/src/dashbls/depends/relic/include/relic_err.h b/src/dashbls/depends/relic/include/relic_err.h
deleted file mode 100644
index e16f71fe07f8..000000000000
--- a/src/dashbls/depends/relic/include/relic_err.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Interface of the error-handling functions.
- *
- * @ingroup relic
- */
-
-#ifndef RLC_ERR_H
-#define RLC_ERR_H
-
-#include <stdint.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_util.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * List of possible errors generated by the library.
- */
-enum errors {
-	/** Constant to indicate the first an error already catched. */
-	ERR_CAUGHT = 1,
-	/** Occurs when memory-allocating functions fail. */
-	ERR_NO_MEMORY,
-	/** Occcurs when the library precision is not sufficient. */
-	ERR_NO_PRECI,
-	/** Occurs when a file is not found. */
-	ERR_NO_FILE,
-	/** Occurs when the specified number of bytes cannot be read from source. */
-	ERR_NO_READ,
-	/** Occurs when an invalid value is passed as input. */
-	ERR_NO_VALID,
-	/** Occurs when a buffer capacity is insufficient. */
-	ERR_NO_BUFFER,
-	/** Occurs when there is not a supported field in the security level. */
-	ERR_NO_FIELD,
-	/** Occurs when there is not a supported curve in the security level. */
-	ERR_NO_CURVE,
-	/** Occurs when the library configuration is incorrect. */
-	ERR_NO_CONFIG,
-	/** Occurs when the PRNG is stuck at one value. */
-	ERR_NO_RAND,
-	/** Constant to indicate the number of errors. */
-	ERR_MAX
-};
-
-/** Truncate file name if verbosity is turned off. */
-#ifdef VERBS
-#define RLC_FILE	RLC_STR(__FILE__)
-#else
-#define RLC_FILE															\
-	((strrchr(RLC_STR(__FILE__), '/') ? : RLC_STR(__FILE__) - 1) + 1)
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Type that represents an error.
- */
-typedef int err_t;
-
-/**
- * Type that describes an error status, including the error code and the program
- * location where the error occurred.
- */
-typedef struct _sts_t {
-	/** Error occurred. */
-	err_t *error;
-	/** Pointer to the program location where the error occurred. */
-	jmp_buf addr;
-	/** Flag to tell if there is a surrounding try-catch block. */
-	int block;
-} sts_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Implements the TRY clause of the error-handling routines.
- *
- * This macro copies the last error from the current library context to
- * a temporary variable and handles the current error. The loop is used so
- * the CATCH facility is called first to store the address of the error
- * being caught. The setjmp() function is then called to store the current
- * program location in the current error field. The program block can now be
- * executed. If an error is thrown inside the program block, the setjmp()
- * function is called again and the return value is non-zero.
- */
-#define RLC_ERR_TRY														\
-	{																	\
-		sts_t *_last, _this;											\
-		ctx_t *_ctx = core_get();										\
-		_last = _ctx->last; 											\
-		_this.block = 1;												\
-		_ctx->last = &_this; 											\
-		for (int _z = 0; ; _z = 1) 										\
-			if (_z) { 													\
-				if (setjmp(_this.addr) == 0) { 							\
-					if (1)												\
-
-/**
- * Implements the CATCH clause of the error-handling routines.
- *
- * First, the address of the error is stored and the execution resumes
- * on the RLC_ERR_TRY macro. If an error is thrown inside the program block,
- * the caught flag is updated and the last error is restored. If some error
- * was caught, the execution is resumed inside the RLC_CATCH block.
- *
- * @param[in] ADDR	- the address of the exception being caught
- */
-#define RLC_ERR_CATCH(ADDR)												\
-					else { } 											\
-					_ctx->caught = 0; 									\
-				} else {												\
-					_ctx->caught = 1; 									\
-				}														\
-				_ctx->last = _last;										\
-				break; 													\
-			} else {													\
-				_this.error = ADDR; 									\
-			}															\
-	} 																	\
-	for (int _z = 0; _z < 2; _z++) 										\
-		if (_z == 1 && core_get()->caught) 								\
-
-/**
- * Implements the THROW clause of the error-handling routines.
- *
- * First we make sure that the error pointer is NULL (new exception) or
- * there is a surrounding try-catch block (block = 1). If this is not the case,
- * then it is the second exception thrown in sequence without handling.
- *
- * If the error pointer is NULL, the error was thrown outside of a TRY-CATCH
- * block. An error message is printed and the function returns.
- *
- * If the error pointer is valid, the longjmp() function is called to return to
- * the program location where setjmp() was last called. An error message
- * respective to the error is then printed and the current error pointer is
- * updated to store the error.
- *
- * @param[in] E		- the exception being caught.
- */
-#define RLC_ERR_THROW(E)												\
-	{																	\
-		ctx_t *_ctx = core_get();										\
-		_ctx->code = RLC_ERR;											\
-		if (_ctx->last == NULL || _ctx->last->block == 1) {				\
-			if (_ctx->last == NULL) {									\
-				_ctx->last = &(_ctx->error);							\
-				_ctx->error.error = &(_ctx->number);					\
-				_ctx->error.block = 0;									\
-				_ctx->number = E;										\
-				RLC_ERR_PRINT(E);										\
-			} else {													\
-				for (; ; longjmp(_ctx->last->addr, 1)) {				\
-					RLC_ERR_PRINT(E);									\
-					if (_ctx->last->error) {							\
-						if (E != ERR_CAUGHT) {							\
-							*(_ctx->last->error) = E;					\
-						}												\
-					}													\
-				}														\
-			}															\
-		}																\
-	}																	\
-
-#ifdef CHECK
-/**
- * Implements a TRY clause.
- */
-#define RLC_TRY					RLC_ERR_TRY
-#else
-/**
- * Stub for the TRY clause.
- */
-#define RLC_TRY					if (1)
-#endif
-
-#ifdef CHECK
-/**
- * Implements a CATCH clause.
- */
-#define RLC_CATCH(E)			RLC_ERR_CATCH(&(E))
-#else
-/**
- * Stub for the CATCH clause.
- */
-#define RLC_CATCH(E)			else
-#endif
-
-#ifdef CHECK
-/**
- * Implements a CATCH clause for any possible error.
- *
- * If this macro is used the error type is not available inside the CATCH
- * block.
- */
-#define RLC_CATCH_ANY			RLC_ERR_CATCH(NULL)
-#else
-/**
- * Stub for the RLC_CATCH_ANY clause.
- */
-#define RLC_CATCH_ANY			if (0)
-#endif
-
-#ifdef CHECK
-/**
- * Implements the RLC_FINALLY clause.
- */
-#define RLC_FINALLY				else if (_z == 0)
-#else
-#define RLC_FINALLY				if (1)
-#endif
-
-#ifdef CHECK
-/**
- * Implements a THROW clause.
- */
-#define RLC_THROW				RLC_ERR_THROW
-#else
-/**
- * Stub for the THROW clause.
- */
-#ifdef QUIET
-#define RLC_THROW(E)			core_get()->code = RLC_ERR;
-#else
-#define RLC_THROW(E)														\
-	core_get()->code = RLC_ERR; 											\
-	util_print("ERROR THROWN in %s:%d\n", RLC_FILE, __LINE__);				\
-
-#endif
-#endif
-
-/**
- * Treats an error jumping to the argument.
- *
- * @param[in] LABEL				- the label to jump
- */
-#define RLC_ERROR(LABEL)		goto LABEL
-
-#ifdef QUIET
-
-/**
- * Stub for the error printing function.
- *
- * @param[in] ERROR				- the error code.
- */
-#define RLC_ERR_PRINT(ERROR)	/* empty */
-
-#else
-
-#ifdef VERBS
-
-/**
- * Prints the current error message in a complete format.
- *
- * @param[in] ERROR			- the error code.
- */
-#define RLC_ERR_PRINT(ERROR)												\
-	err_full_msg(__func__, RLC_FILE, __LINE__, ERROR)						\
-
-#else /* VERBS */
-
-/**
- * Prints the current error message.
- *
- * @param[in] ERROR			- the error code.
- */
-#define RLC_ERR_PRINT(ERROR)												\
-	err_simple_msg(ERROR)													\
-
-#endif /* VERBS */
-#endif /* QUIET */
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-#ifdef CHECK
-
-/**
- * Prints the error message with little information.
- *
- * @param[in] error    		- the error code.
- */
-void err_simple_msg(int error);
-
-/**
- * Prints the error message with detailed information.
- *
- * @param[in] function  	- the function where the error occurred.
- * @param[in] file      	- the source file where the error occurred.
- * @param[in] line      	- the line in the file where the error occurred.
- * @param[in] error	    	- the error code.
- */
-void err_full_msg(const char *function, const char *file,
-		int line, int error);
-
-/**
- * Prints the error message respective to an error code.
- *
- * @param[out] e			- the error occurred.
- * @param[out] msg			- the error message.
- */
-void err_get_msg(err_t *e, char **msg);
-
-#endif
-
-/**
- * Returns the code returned by the last function call and resets the current
- * code.
- *
- * @returns ERR_OK if no errors occurred in the function, ERR_ERR otherwise.
- */
-int err_get_code(void);
-
-#endif /* !RLC_ERR_H */
diff --git a/src/dashbls/depends/relic/include/relic_fb.h b/src/dashbls/depends/relic/include/relic_fb.h
deleted file mode 100644
index 48fe45b80e02..000000000000
--- a/src/dashbls/depends/relic/include/relic_fb.h
+++ /dev/null
@@ -1,988 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup fb Binary field arithmetic
- */
-
-/**
- * @file
- *
- * Interface of module for binary field arithmetic.
- *
- * @ingroup fb
- */
-
-#ifndef RLC_FB_H
-#define RLC_FB_H
-
-#include "relic_bn.h"
-#include "relic_dv.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Precision in bits of a binary field element.
- */
-#define RLC_FB_BITS 	((int)FB_POLYN)
-
-/**
- * Size in digits of a block sufficient to store a binary field element.
- */
-#define RLC_FB_DIGS		((int)RLC_CEIL(RLC_FB_BITS, RLC_DIG))
-
-/**
- * Size in bytes of a block sufficient to store a binary field element.
- */
-#define RLC_FB_BYTES 	((int)RLC_CEIL(RLC_FB_BITS, 8))
-
-/**
- * Finite field identifiers.
- */
-enum {
-	/** AES pentaonimal. */
-	PENTA_8 = 1,
-	/** Toy pentanomial. */
-	PENTA_64,
-	/** Hankerson's trinomial for GLS curves. */
-	TRINO_113,
-	/** Hankerson's trinomial for GLS curves. */
-	TRINO_127,
-	/** GCM pentanomial */
-	PENTA_128,
-	/** Pentanomial for ECC2K-130 challenge. */
-	PENTA_131,
-	/** NIST 163-bit fast reduction polynomial. */
-	NIST_163,
-	/** Square-root friendly 163-bit polynomial. */
-	SQRT_163,
-	/** Example with 193 bits for Itoh-Tsuji. */
-	TRINO_193,
-	/** NIST 233-bit fast reduction polynomial. */
-	NIST_233,
-	/** Square-root friendly 233-bit polynomial. */
-	SQRT_233,
-	/** SECG 239-bit fast reduction polynomial. */
-	SECG_239,
-	/** Square-root friendly 239-bit polynomial. */
-	SQRT_239,
-	/** Square-root friendly 251-bit polynomial. */
-	SQRT_251,
-	/** eBATS curve_2_251 pentanomial. */
-	PENTA_251,
-	/** Hankerson's trinomial for halving curve. */
-	TRINO_257,
-	/** Scott's 271-bit pairing-friendly trinomial. */
-	TRINO_271,
-	/** Scott's 271-bit pairing-friendly pentanomial. */
-	PENTA_271,
-	/** NIST 283-bit fast reduction polynomial. */
-	NIST_283,
-	/** Square-root friendly 283-bit polynomial. */
-	SQRT_283,
-	/** Scott's 271-bit pairing-friendly trinomial. */
-	TRINO_353,
-	/** Detrey's trinomial for genus 2 curves. */
-	TRINO_367,
-	/** NIST 409-bit fast reduction polynomial. */
-	NIST_409,
-	/** Hankerson's trinomial for genus 2 curves. */
-	TRINO_439,
-	/** NIST 571-bit fast reduction polynomial. */
-	NIST_571,
-	/** Square-root friendly 571-bit polynomial. */
-	SQRT_571,
-	/** Scott's 1223-bit pairing-friendly trinomial. */
-	TRINO_1223
-};
-
-/**
- * Size of a precomputation table for repeated squaring/square-root using the
- * trivial approach.
- */
-#define RLC_FB_TABLE_BASIC		(1)
-
-/**
- * Size of a precomputation table for repeated squaring/square-root using the
- * faster approach.
- */
-#define RLC_FB_TABLE_QUICK      ((RLC_DIG / 4) * RLC_FB_DIGS * 16)
-
-/**
- * Size of a precomputation table for repeated squaring/square-root using the
- * chosen algorithm.
- */
-#if FB_ITR == BASIC
-#define RLC_FB_TABLE 			RLC_FB_TABLE_BASIC
-#else
-#define RLC_FB_TABLE			RLC_FB_TABLE_QUICK
-#endif
-
-/**
- * Maximum size of a precomputation table.
- */
-#ifdef STRIP
-#define RLC_FB_TABLE_MAX 		RLC_FB_TABLE
-#else
-#define RLC_FB_TABLE_MAX 		RLC_FB_TABLE_QUICK
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a binary field element.
- */
-#if ALLOC == AUTO
-typedef rlc_align dig_t fb_t[RLC_FB_DIGS + RLC_PAD(RLC_FB_BYTES) / (RLC_DIG / 8)];
-#else
-typedef dig_t *fb_t;
-#endif
-
-/**
- * Represents a binary field element with automatic memory allocation.
- */
-typedef rlc_align dig_t fb_st[RLC_FB_DIGS + RLC_PAD(RLC_FB_BYTES) / (RLC_DIG / 8)];
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a binary field element with a null value.
- *
- * @param[out] A			- the binary field element to initialize.
- */
-#if ALLOC == AUTO
-#define fb_null(A)			/* empty */
-#else
-#define fb_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate a binary field element.
- *
- * @param[out] A			- the new binary field element.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define fb_new(A)			dv_new_dynam((dv_t *)&(A), RLC_FB_DIGS)
-#elif ALLOC == AUTO
-#define fb_new(A)			/* empty */
-#endif
-
-/**
- * Calls a function to free a binary field element.
- *
- * @param[out] A			- the binary field element to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define fb_free(A)			dv_free_dynam((dv_t *)&(A))
-#elif ALLOC == AUTO
-#define fb_free(A)			/* empty */
-#endif
-
-/**
- * Multiples two binary field elements. Computes c = a * b.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first binary field element to multiply.
- * @param[in] B				- the second binary field element to multiply.
- */
-#if FB_KARAT > 0
-#define fb_mul(C, A, B)		fb_mul_karat(C, A, B)
-#elif FB_MUL == BASIC
-#define fb_mul(C, A, B)		fb_mul_basic(C, A, B)
-#elif FB_MUL == INTEG
-#define fb_mul(C, A, B)		fb_mul_integ(C, A, B)
-#elif FB_MUL == LODAH
-#define fb_mul(C, A, B)		fb_mul_lodah(C, A, B)
-#endif
-
-/**
- * Squares a binary field element. Computes c = a * a.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the binary field element to square.
- */
-#if FB_SQR == BASIC
-#define fb_sqr(C, A)		fb_sqr_basic(C, A)
-#elif FB_SQR == QUICK
-#define fb_sqr(C, A)		fb_sqr_quick(C, A)
-#elif FB_SQR == INTEG
-#define fb_sqr(C, A)		fb_sqr_integ(C, A)
-#endif
-
-/**
- * Extracts the square root of a binary field element. Computes c = a^(1/2).
- *
- * @param[out] C			- the result.
- * @param[in] A				- the binary field element.
- */
-#if FB_SRT == BASIC
-#define fb_srt(C, A)		fb_srt_basic(C, A)
-#elif FB_SRT == QUICK
-#define fb_srt(C, A)		fb_srt_quick(C, A)
-#endif
-
-/**
- * Reduces a multiplication result modulo a binary irreducible polynomial.
- * Computes c = a mod f(z).
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiplication result to reduce.
- */
-#if FB_RDC == BASIC
-#define fb_rdc(C, A)		fb_rdc_basic(C, A)
-#elif FB_RDC == QUICK
-#define fb_rdc(C, A)		fb_rdc_quick(C, A)
-#endif
-
-/**
- * Compute the trace of a binary field element. Computes c = Tr(a).
- *
- * @param[in] A				- the binary field element.
- * @return the trace of the binary field element.
- */
-#if FB_TRC == BASIC
-#define fb_trc(A)			fb_trc_basic(A)
-#elif FB_TRC == QUICK
-#define fb_trc(A)			fb_trc_quick(A)
-#endif
-
-/**
- * Solves a quadratic equation for c, Tr(a) = 0. Computes c such that
- * c^2 + c = a.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the binary field element.
- */
-#if FB_SLV == BASIC
-#define fb_slv(C, A)		fb_slv_basic(C, A)
-#elif FB_SLV == QUICK
-#define fb_slv(C, A)		fb_slv_quick(C, A)
-#endif
-
-/**
- * Inverts a binary field element. Computes c = a^{-1}.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the binary field element to invert.
- */
-#if FB_INV == BASIC
-#define fb_inv(C, A)		fb_inv_basic(C, A)
-#elif FB_INV == BINAR
-#define fb_inv(C, A)		fb_inv_binar(C, A)
-#elif FB_INV == EXGCD
-#define fb_inv(C, A)		fb_inv_exgcd(C, A)
-#elif FB_INV == ALMOS
-#define fb_inv(C, A)		fb_inv_almos(C, A)
-#elif FB_INV == ITOHT
-#define fb_inv(C, A)		fb_inv_itoht(C, A)
-#elif FB_INV == BRUCH
-#define fb_inv(C, A)		fb_inv_bruch(C, A)
-#elif FB_INV == CTAIA
-#define fb_inv(C, A)		fb_inv_ctaia(C, A)
-#elif FB_INV == LOWER
-#define fb_inv(C, A)		fb_inv_lower(C, A)
-#endif
-
-/**
- * Exponentiates a binary field element. Computes c = a^b.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the basis.
- * @param[in] B				- the exponent.
- */
-#if FB_EXP == BASIC
-#define fb_exp(C, A, B)		fb_exp_basic(C, A, B)
-#elif FB_EXP == SLIDE
-#define fb_exp(C, A, B)		fb_exp_slide(C, A, B)
-#elif FB_EXP == MONTY
-#define fb_exp(C, A, B)		fb_exp_monty(C, A, B)
-#endif
-
-/**
- * Precomputed the table for repeated squaring/square-root.
- *
- * @param[out] T			- the table.
- * @param[in] B				- the exponent.
- */
-#if FB_ITR == BASIC
-#define fb_itr_pre(T, B)	(void)(T), (void)(B)
-#elif FB_ITR == QUICK
-#define fb_itr_pre(T, B)	fb_itr_pre_quick(T, B)
-#endif
-
-/**
- * Computes the repeated Frobenius (squaring) or inverse Frobenius (square-root)
- * of a binary field element. If the number of arguments is 3, then simple
- * consecutive squaring/square-root is used. If the number of arguments if 4,
- * then a table-based method is used and the fourth argument is
- * a pointer fo the precomputed table. The variant with 4 arguments
- * should be used when several 2^k/2^-k powers are computed with the same
- * k. Computes c = a^(2^b), where b can be positive or negative.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the binary field element to exponentiate.
- * @param[in] B				- the exponent.
- * @param[in] ...			- the modulus and an optional argument.
- */
-#define fb_itr(C, A, ...)	RLC_CAT(fb_itr, RLC_OPT(__VA_ARGS__)) (C, A, __VA_ARGS__)
-
-/**
- * Reduces a multiple precision integer modulo another integer. This macro
- * should not be called directly. Use bn_mod() with 4 arguments instead.
- *
- * @param[out] C				- the result.
- * @param[in] A					- the binary field element to exponentiate.
- * @param[in] B					- the exponent.
- * @param[in] T					- the precomputed table for the exponent.
- */
-#if FB_ITR == BASIC
-#define fb_itr_imp(C, A, B, T)		fb_itr_basic(C, A, B)
-#elif FB_ITR == QUICK
-#define fb_itr_imp(C, A, B, T)		fb_itr_quick(C, A, T)
-#endif
-/*============================================================================*/
-		/* Function prototypes                                                        */
-/*============================================================================*/
-/**
- * Initializes the binary field arithmetic layer.
- */
-void fb_poly_init(void);
-
-/**
- * Finalizes the binary field arithmetic layer.
- */
-void fb_poly_clean(void);
-
-/**
- * Returns the irreducible polynomial f(z) configured for the binary field.
- *
- * @return the irreducible polynomial.
- */
-dig_t *fb_poly_get(void);
-
-/**
- * Configures the irreducible polynomial of the binary field as a dense
- * polynomial.
- *
- * @param[in] f				- the new irreducible polynomial.
- */
-void fb_poly_set_dense(const fb_t f);
-
-/**
- * Configures a trinomial as the irreducible polynomial by its non-zero
- * coefficients. The other coefficients are RLC_FB_BITS and 0.
- *
- * @param[in] a				- the second coefficient.
- */
-void fb_poly_set_trino(int a);
-
-/**
- * Configures a pentanomial as the binary field modulo by its non-zero
- * coefficients. The other coefficients are RLC_FB_BITS and 0.
- *
- * @param[in] a				- the second coefficient.
- * @param[in] b				- the third coefficient.
- * @param[in] c				- the fourth coefficient.
- */
-void fb_poly_set_penta(int a, int b, int c);
-
-/**
- * Returns the square root of z.
- *
- * @return the square root of z.
- */
-dig_t *fb_poly_get_srz(void);
-
-/**
- * Returns sqrt(z) * (i represented as a polynomial).
- *
- * @return the precomputed result.
- */
-const dig_t *fb_poly_tab_srz(int i);
-
-/**
- * Returns a table for accelerating repeated squarings.
- *
- * @param the number of the table.
- * @return the precomputed result.
- */
-const fb_st *fb_poly_tab_sqr(int i);
-
-/**
- * Returns an addition chain for (RLC_FB_BITS - 1).
- *
- * @param[out] len			- the number of elements in the addition chain.
- *
- * @return a pointer to the addition chain.
- */
-const int *fb_poly_get_chain(int *len);
-
-/**
- * Returns the non-zero coefficients of the configured trinomial or pentanomial.
- * If b is -1, the irreducible polynomial configured is a trinomial.
- * The other coefficients are RLC_FB_BITS and 0.
- *
- * @param[out] a			- the second coefficient.
- * @param[out] b			- the third coefficient.
- * @param[out] c			- the fourth coefficient.
- */
-void fb_poly_get_rdc(int *a, int *b, int *c);
-
-/**
- * Returns the non-zero bits used to compute the trace function. The -1
- * coefficient is the last coefficient.
- *
- * @param[out] a			- the first coefficient.
- * @param[out] b			- the second coefficient.
- * @param[out] c			- the third coefficient.
- */
-void fb_poly_get_trc(int *a, int *b, int *c);
-
-/**
- * Returns the table of precomputed half-traces.
- *
- * @return the table of half-traces.
- */
-const dig_t *fb_poly_get_slv(void);
-
-/**
- * Assigns a standard irreducible polynomial as modulo of the binary field.
- *
- * @param[in] param			- the standardized polynomial identifier.
- */
-void fb_param_set(int param);
-
-/**
- * Configures some finite field parameters for the current security level.
- */
-void fb_param_set_any(void);
-
-/**
- * Prints the currently configured irreducible polynomial.
- */
-void fb_param_print(void);
-
-/**
- * Adds a binary field element and the irreducible polynomial. Computes
- * c = a + f(z).
- *
- * @param[out] c			- the destination.
- * @param[in] a				- the binary field element.
- */
-void fb_poly_add(fb_t c, const fb_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to copy.
- */
-void fb_copy(fb_t c, const fb_t a);
-
-/**
- * Negates a binary field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the binary field element to negate.
- */
-void fb_neg(fb_t c, const fb_t a);
-
-/**
- * Assigns zero to a binary field element.
- *
- * @param[out] a			- the binary field element to assign.
- */
-void fb_zero(fb_t a);
-
-/**
- * Tests if a binary field element is zero or not.
- *
- * @param[in] a				- the binary field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fb_is_zero(const fb_t a);
-
-/**
- * Reads the bit stored in the given position on a binary field element.
- *
- * @param[in] a				- the binary field element.
- * @param[in] bit			- the bit position.
- * @return the bit value.
- */
-int fb_get_bit(const fb_t a, int bit);
-
-/**
- * Stores a bit in a given position on a binary field element.
- *
- * @param[out] a			- the binary field element.
- * @param[in] bit			- the bit position.
- * @param[in] value			- the bit value.
- */
-void fb_set_bit(fb_t a, int bit, int value);
-
-/**
- * Assigns a small positive polynomial to a binary field element.
- *
- * The degree of the polynomial must be smaller than RLC_DIG.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the small polynomial to assign.
- */
-void fb_set_dig(fb_t c, dig_t a);
-
-/**
- * Returns the number of bits of a binary field element.
- *
- * @param[in] a				- the binary field element.
- * @return the number of bits.
- */
-int fb_bits(const fb_t a);
-
-/**
- * Assigns a random value to a binary field element.
- *
- * @param[out] a			- the binary field element to assign.
- */
-void fb_rand(fb_t a);
-
-/**
- * Prints a binary field element to standard output.
- *
- * @param[in] a				- the binary field element to print.
- */
-void fb_print(const fb_t a);
-
-/**
- * Returns the number of digits in radix necessary to store a binary field
- * element. The radix must be a power of 2 included in the interval [2, 64].
- *
- * @param[in] a				- the binary field element.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- * @return the number of digits in the given radix.
- */
-int fb_size_str(const fb_t a, int radix);
-
-/**
- * Reads a binary field element from a string in a given radix. The radix must
- * be a power of 2 included in the interval [2, 64].
- *
- * @param[out] a			- the result.
- * @param[in] str			- the string.
- * @param[in] len			- the size of the string.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- * @throw ERR_NO_BUFFER		- if the string is too long.
- */
-void fb_read_str(fb_t a, const char *str, int len, int radix);
-
-/**
- * Writes a binary field element to a string in a given radix. The radix must
- * be a power of 2 included in the interval [2, 64].
- *
- * @param[out] str			- the string.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the binary field element to write.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- */
-void fb_write_str(char *str, int len, const fb_t a, int radix);
-
-/**
- * Reads a binary field element from a byte vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not RLC_FP_BYTES.
- */
-void fb_read_bin(fb_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a binary field element to a byte vector in big-endian format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the binary field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not RLC_FP_BYTES.
- */
-void fb_write_bin(uint8_t *bin, int len, const fb_t a);
-
-/**
- * Returns the result of a comparison between two binary field elements.
- *
- * @param[in] a				- the first binary field element.
- * @param[in] b				- the second binary field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fb_cmp(const fb_t a, const fb_t b);
-
-/**
- * Returns the result of a comparison between a binary field element
- * and a small binary field element.
- *
- * @param[in] a				- the binary field element.
- * @param[in] b				- the small binary field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fb_cmp_dig(const fb_t a, dig_t b);
-
-/**
- * Adds two binary field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element to add.
- * @param[in] b				- the second binary field element to add.
- */
-void fb_add(fb_t c, const fb_t a, const fb_t b);
-
-/**
- * Adds a binary field element and a small binary field element.
- * Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to add.
- * @param[in] b				- the small binary field element to add.
- */
-void fb_add_dig(fb_t c, const fb_t a, dig_t b);
-
-/**
- * Multiples two binary field elements using Shift-and-add multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element to multiply.
- * @param[in] b				- the second binary field element to multiply.
- */
-void fb_mul_basic(fb_t c, const fb_t a, const fb_t b);
-
-/**
- * Multiples two binary field elements using multiplication integrated with
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element to multiply.
- * @param[in] b				- the second binary field element to multiply.
- */
-void fb_mul_integ(fb_t c, const fb_t a, const fb_t b);
-
-/**
- * Multiples two binary field elements using Lopez-Dahab multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element to multiply.
- * @param[in] b				- the second binary field element to multiply.
- */
-void fb_mul_lodah(fb_t c, const fb_t a, const fb_t b);
-
-/**
- * Multiplies a binary field element by a small binary field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element.
- * @param[in] b				- the small binary field element to multiply.
- */
-void fb_mul_dig(fb_t c, const fb_t a, dig_t b);
-
-/**
- * Multiples two binary field elements using Karatsuba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element.
- * @param[in] b				- the second binary field element.
- */
-void fb_mul_karat(fb_t c, const fb_t a, const fb_t b);
-
-/**
- * Squares a binary field element using bit-manipulation squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to square.
- */
-void fb_sqr_basic(fb_t c, const fb_t a);
-
-/**
- * Squares a binary field element with integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to square.
- */
-void fb_sqr_integ(fb_t c, const fb_t a);
-
-/**
- * Squares a binary field element using table-based squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to square.
- */
-void fb_sqr_quick(fb_t c, const fb_t a);
-
-/**
- * Shifts a binary field element to the left. Computes c = a * z^bits mod f(z).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void fb_lsh(fb_t c, const fb_t a, int bits);
-
-/**
-* Shifts a binary field element to the right. Computes c = a / (z^bits).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void fb_rsh(fb_t c, const fb_t a, int bits);
-
-/**
- * Reduces a multiplication result modulo an irreducible polynomial using
- * shift-and-add modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fb_rdc_basic(fb_t c, dv_t a);
-
-/**
- * Reduces a multiplication result modulo a trinomial or pentanomial.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fb_rdc_quick(fb_t c, dv_t a);
-
-/**
- * Extracts the square root of a binary field element using repeated squaring.
- * Computes c = a^{1/2}.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to take a square root.
- */
-void fb_srt_basic(fb_t c, const fb_t a);
-
-/**
- * Extracts the square root of a binary field element using a fast square root
- * extraction algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to take a square root.
- */
-void fb_srt_quick(fb_t c, const fb_t a);
-
-/**
- * Computes the trace of a binary field element using repeated squaring.
- * Returns Tr(a).
- *
- * @param[in] a				- the binary field element.
- * @return the trace of the binary field element.
- */
-dig_t fb_trc_basic(const fb_t a);
-
-/**
- * Computes the trace of a binary field element using a fast trace computation
- * algorithm. Returns Tr(a).
- *
- * @param[in] a				- the binary field element.
- * @return the trace of the binary field element.
- */
-dig_t fb_trc_quick(const fb_t a);
-
-/**
- * Inverts a binary field element using Fermat's Little Theorem.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_basic(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using the binary method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_binar(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using the Extended Euclidean algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_exgcd(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using the Almost Inverse algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_almos(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using Itoh-Tsuji inversion.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_itoht(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using the hardware-friendly
- * Brunner-Curiger-Hofstetter algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_bruch(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element in constant-time using
- * the Wu-Wu-Shieh-Hwang algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_ctaia(fb_t c, const fb_t a);
-
-/**
- * Inverts a binary field element using a direct call to the lower layer.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fb_inv_lower(fb_t c, const fb_t a);
-
-/**
- * Inverts multiple binary field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fb_inv_sim(fb_t *c, const fb_t *a, int n);
-
-/**
- * Exponentiates a binary field element through consecutive squaring. Computes
- * c = a^(2^b).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fb_exp_2b(fb_t c, const fb_t a, int b);
-
-/**
- * Exponentiates a binary field element using the binary
- * method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fb_exp_basic(fb_t c, const fb_t a, const bn_t b);
-
-/**
- * Exponentiates a binary field element using the sliding window method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fb_exp_slide(fb_t c, const fb_t a, const bn_t b);
-
-/**
- * Exponentiates a binary field element using the constant-time Montgomery
- * powering ladder method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fb_exp_monty(fb_t c, const fb_t a, const bn_t b);
-
-/**
- * Solves a quadratic equation for a, Tr(a) = 0 by repeated squarings and
- * additions.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to solve.
- */
-void fb_slv_basic(fb_t c, const fb_t a);
-
-/**
- * Solves a quadratic equation for a, Tr(a) = 0 with precomputed half-traces.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to solve.
- */
-void fb_slv_quick(fb_t c, const fb_t a);
-
-/**
- * Computes the iterated squaring/square-root of a binary field element by
- * consecutive squaring/square-root. Computes c = a^(2^b).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fb_itr_basic(fb_t c, const fb_t a, int b);
-
-/**
- * Precomputes a table for iterated squaring/square-root of a binary field
- * element.
- *
- * @param[out] t			- the precomputed table.
- * @param[in] b				- the exponent.
- */
-void fb_itr_pre_quick(fb_st *t, int b);
-
-/**
- * Computes the iterated squaring/square-root of a binary field element by
- * a table based method. Computes c = a^(2^b).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] t				- the precomputed table.
- */
-void fb_itr_quick(fb_t c, const fb_t a, const fb_st *t);
-
-#endif /* !RLC_FB_H */
diff --git a/src/dashbls/depends/relic/include/relic_fbx.h b/src/dashbls/depends/relic/include/relic_fbx.h
deleted file mode 100644
index 54d7d6c6334c..000000000000
--- a/src/dashbls/depends/relic/include/relic_fbx.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup fbx Binary field extensions.
- */
-
-/**
- * @file
- *
- * Interface of the module for extension field arithmetic over binary fields.
- *
- * @ingroup fbx
- */
-
-#ifndef RLC_FBX_H
-#define RLC_FBX_H
-
-#include "relic_fb.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a quadratic extension binary field element.
- *
- * This extension field is constructed with the basis {1, s}, where s is a
- * quadratic non-residue in the binary field.
- */
-typedef fb_t fb2_t[2];
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a quadratic extension binary field with a null value.
- *
- * @param[out] A			- the quadratic extension element to initialize.
- */
-#define fb2_null(A)															\
-		fb_null(A[0]); fb_null(A[1]);										\
-
-/**
- * Calls a function to allocate a quadratic extension binary field element.
- *
- * @param[out] A			- the new quadratic extension field element.
- */
-#define fb2_new(A)															\
-		fb_new(A[0]); fb_new(A[1]);											\
-
-/**
- * Calls a function to free a quadratic extension binary field element.
- *
- * @param[out] A			- the quadratic extension field element to free.
- */
-#define fb2_free(A)															\
-		fb_free(A[0]); fb_free(A[1]); 										\
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the quadratic extension field element to copy.
- */
-#define fb2_copy(C, A)														\
-		fb_copy(C[0], A[0]); fb_copy(C[1], A[1]); 							\
-
-/**
- * Negates a quadratic extension field element.
- *
- * f@param[out] C			- the result.
- * @param[out] A			- the quadratic extension field element to negate.
- */
-#define fb2_neg(C, A)														\
-		fb_neg(C[0], A[0]); fb_neg(C[1], A[1]); 							\
-
-/**
- * Assigns zero to a quadratic extension field element.
- *
- * @param[out] A			- the quadratic extension field element to zero.
- */
-#define fb2_zero(A)															\
-		fb_zero(A[0]); fb_zero(A[1]); 										\
-
-/**
- * Tests if a quadratic extension field element is zero or not.
- *
- * @param[in] A				- the quadratic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-#define fb2_is_zero(A)														\
-		(fb_is_zero(A[0]) && fb_is_zero(A[1]))								\
-
-/**
- * Assigns a random value to a quadratic extension field element.
- *
- * @param[out] A			- the quadratic extension field element to assign.
- */
-#define fb2_rand(A)															\
-		fb_rand(A[0]); fb_rand(A[1]);										\
-
-/**
- * Prints a quadratic extension field element to standard output.
- *
- * @param[in] A				- the quadratic extension field element to print.
- */
-#define fb2_print(A)														\
-		fb_print(A[0]); fb_print(A[1]);										\
-
-/**
- * Returns the result of a comparison between two quadratic extension field
- * elements
- *
- * @param[in] A				- the first quadratic extension field element.
- * @param[in] B				- the second quadratic extension field element.
- * @return RLC_NE if a != b, RLC_EQ if a == b.
- */
-#define fb2_cmp(A, B)														\
-		((fb_cmp(A[0], B[0]) == RLC_EQ) && (fb_cmp(A[1], B[1]) == RLC_EQ)	\
-		? RLC_EQ : RLC_NE)													\
-
-/**
- * Adds two quadratic extension field elements. Computes c = a + b.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first quadratic extension field element.
- * @param[in] B				- the second quadratic extension field element.
- */
-#define fb2_add(C, A, B)													\
-		fb_add(C[0], A[0], B[0]); fb_add(C[1], A[1], B[1]);					\
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Multiples two quadratic extension field elements. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension binary field element.
- * @param[in] b				- the quadratic extension binary field element.
- */
-void fb2_mul(fb2_t c, fb2_t a, fb2_t b);
-
- /**
-  * Multiples a quadratic extension field element by a quadratic non-residue.
-  * Computes c = a * s.
-  *
-  * @param[out] c			- the result.
-  * @param[in] a				- the quadratic extension binary field element.
-  * @param[in] b				- the quadratic extension binary field element.
-  */
- void fb2_mul_nor(fb2_t c, fb2_t a);
-
-/**
- * Computes the square of a quadratic extension field element. Computes
- * c = a * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to square.
- */
-void fb2_sqr(fb2_t c, fb2_t a);
-
-/**
- * Solves a quadratic equation for c, Tr(a) = 0. Computes c such that
- * c^2 + c = a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- */
-void fb2_slv(fb2_t c, fb2_t a);
-
-/**
- * Inverts a quadratic extension field element. Computes c = a^{-1}.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to invert.
- */
-void fb2_inv(fb2_t c, fb2_t a);
-
-#endif /* !RLC_FBX_H */
diff --git a/src/dashbls/depends/relic/include/relic_fp.h b/src/dashbls/depends/relic/include/relic_fp.h
deleted file mode 100644
index 3dcb38180153..000000000000
--- a/src/dashbls/depends/relic/include/relic_fp.h
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup fp Prime field arithmetic
- */
-
-/**
- * @file
- *
- * Interface of the module for prime field arithmetic.
- *
- * @ingroup fp
- */
-
-#ifndef RLC_FP_H
-#define RLC_FP_H
-
-#include "relic_dv.h"
-#include "relic_bn.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Precision in bits of a prime field element.
- */
-#define RLC_FP_BITS 	((int)FP_PRIME)
-
-/**
- * Size in digits of a block sufficient to store a prime field element.
- */
-#define RLC_FP_DIGS 	((int)RLC_CEIL(RLC_FP_BITS, RLC_DIG))
-
-/**
- * Size in bytes of a block sufficient to store a binary field element.
- */
-#define RLC_FP_BYTES 	((int)RLC_CEIL(RLC_FP_BITS, 8))
-
-/*
- * Finite field identifiers.
- */
-enum {
-	/** SECG 160-bit fast reduction prime. */
-	SECG_160 = 1,
-	/** SECG 160-bit denser reduction prime. */
-	SECG_160D,
-	/** NIST 192-bit fast reduction prime. */
-	NIST_192,
-	/** SECG 192-bit denser reduction prime. */
-	SECG_192,
-	/** Curve22103 221-bit prime modulus. */
-	PRIME_22103,
-	/** NIST 224-bit fast reduction polynomial. */
-	NIST_224,
-	/** SECG 224-bit denser reduction prime. */
-	SECG_224,
-	/** Curve4417 226-bit prime modulus. */
-	PRIME_22605,
-	/* Curve1174 251-bit prime modulus. */
-	PRIME_25109,
-	/** Prime with high 2-adicity for curve Tweedledum. */
-	PRIME_H2ADC,
-	/** Curve25519 255-bit prime modulus. */
-	PRIME_25519,
-	/** NIST 256-bit fast reduction polynomial. */
-	NIST_256,
-	/** Brainpool random 256-bit prime. */
-	BSI_256,
-	/** SECG 256-bit denser reduction prime. */
-	SECG_256,
-	/** Curve67254 382-bit prime modulus. */
-	PRIME_382105,
-	/** Curve383187 383-bit prime modulus. */
-	PRIME_383187,
-	/** NIST 384-bit fast reduction polynomial. */
-	NIST_384,
-	/** Curve448 prime. */
-	PRIME_448,
-	/** Curve511187 511-bit prime modulus. */
-	PRIME_511187,
-	/** NIST 521-bit fast reduction polynomial. */
-	NIST_521,
-	/** 158-bit prime for BN curve. */
-	BN_158,
-	/** 254-bit prime provided in Nogami et al. for BN curves. */
-	BN_254,
-	/** 256-bit prime provided in Barreto et al. for BN curves. */
-	BN_256,
-	/** 256-bit prime provided for BN curve standardized in China. */
-	SM9_256,
-	/** 381-bit prime for BLS curve of embedding degree 12 (Zcash). */
-	B12_381,
-	/** 382-bit prime provided by Barreto for BN curve. */
-	BN_382,
-	/** 383-bit prime for GT-strong BLS curve of embedding degree 12. */
-	B12_383,
-	/** 446-bit prime provided by Barreto for BN curve. */
-	BN_446,
-	/** 446-bit prime for BLS curve of embedding degree 12. */
-	B12_446,
-	/** 455-bit prime for BLS curve of embedding degree 12. */
-	B12_455,
-	/** 477-bit prime for BLS curve of embedding degree 24. */
-	B24_509,
-	/** 508-bit prime for KSS16 curve. */
-	KSS_508,
-	/** 511-bit prime for Optimal TNFS-secure curve. */
-	OT_511,
-	/** Random 544-bit prime for Cocks-Pinch curve with embedding degree 8. */
-	GMT8_544,
-	/** 569-bit prime for KSS curve with embedding degree 54. */
-	K54_569,
-	/** 575-bit prime for BLS curve with embedding degree 48. */
-	B48_575,
-	/** 638-bit prime provided in Barreto et al. for BN curve. */
-	BN_638,
-	/** 638-bit prime for BLS curve with embedding degree 12. */
-	B12_638,
-	/** 1536-bit prime for supersingular curve with embedding degree k = 2. */
-	SS_1536,
-	/** 3072-bit prime for supersingular curve with embedding degree k = 1. */
-	SS_3072,
-};
-
-/**
- * Constant used to indicate that there's some room left in the storage of
- * prime field elements. This can be used to avoid carries.
- */
-#if ((FP_PRIME % WSIZE) != 0) && ((FP_PRIME % WSIZE) <= (WSIZE - 2))
-#if ((2 * FP_PRIME % WSIZE) != 0) && ((2 * FP_PRIME % WSIZE) <= (WSIZE - 2))
-#define RLC_FP_ROOM
-#else
-#undef RLC_FP_ROOM
-#endif
-#else
-#undef RLC_FP_ROOM
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a prime field element.
- *
- * A field element is represented as a digit vector. These digits are organized
- * in little-endian format, that is, the least significant digits are
- * stored in the first positions of the vector.
- */
-#if ALLOC == AUTO
-typedef rlc_align dig_t fp_t[RLC_FP_DIGS + RLC_PAD(RLC_FP_BYTES)/(RLC_DIG / 8)];
-#else
-typedef dig_t *fp_t;
-#endif
-
-/**
- * Represents a prime field element with automatic memory allocation.
- */
-typedef rlc_align dig_t fp_st[RLC_FP_DIGS + RLC_PAD(RLC_FP_BYTES)/(RLC_DIG / 8)];
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a binary field element with a null value.
- *
- * @param[out] A			- the binary field element to initialize.
- */
-#if ALLOC == AUTO
-#define fp_null(A)			/* empty */
-#else
-#define fp_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate and initialize a prime field element.
- *
- * @param[out] A			- the new prime field element.
- */
-#if ALLOC == DYNAMIC
-#define fp_new(A)			dv_new_dynam((dv_t *)&(A), RLC_FP_DIGS)
-#elif ALLOC == AUTO
-#define fp_new(A)			/* empty */
-#endif
-
-/**
- * Calls a function to clean and free a prime field element.
- *
- * @param[out] A			- the prime field element to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define fp_free(A)			dv_free_dynam((dv_t *)&(A))
-#elif ALLOC == AUTO
-#define fp_free(A)			/* empty */
-#endif
-
-/**
- * Adds two prime field elements. Computes c = a + b.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first prime field element.
- * @param[in] B				- the second prime field element.
- */
-#if FP_ADD == BASIC
-#define fp_add(C, A, B)		fp_add_basic(C, A, B)
-#elif FP_ADD == INTEG
-#define fp_add(C, A, B)		fp_add_integ(C, A, B)
-#endif
-
-/**
- * Subtracts a prime field element from another. Computes C = A - B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first prime field element.
- * @param[in] B				- the second prime field element.
- */
-#if FP_ADD == BASIC
-#define fp_sub(C, A, B)		fp_sub_basic(C, A, B)
-#elif FP_ADD == INTEG
-#define fp_sub(C, A, B)		fp_sub_integ(C, A, B)
-#endif
-
-/**
- * Negates a prime field element from another. Computes C = -A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the prime field element to negate.
- */
-#if FP_ADD == BASIC
-#define fp_neg(C, A)		fp_neg_basic(C, A)
-#elif FP_ADD == INTEG
-#define fp_neg(C, A)		fp_neg_integ(C, A)
-#endif
-
-/**
- * Doubles a prime field element. Computes C = A + A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first prime field element.
- */
-#if FP_ADD == BASIC
-#define fp_dbl(C, A)		fp_dbl_basic(C, A)
-#elif FP_ADD == INTEG
-#define fp_dbl(C, A)		fp_dbl_integ(C, A)
-#endif
-
-/**
- * Halves a prime field element. Computes C = A/2.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first prime field element.
- */
-#if FP_ADD == BASIC
-#define fp_hlv(C, A)		fp_hlv_basic(C, A)
-#elif FP_ADD == INTEG
-#define fp_hlv(C, A)		fp_hlv_integ(C, A)
-#endif
-
-/**
- * Multiples two prime field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first prime field element.
- * @param[in] B				- the second prime field element.
- */
-#if FP_KARAT > 0
-#define fp_mul(C, A, B)		fp_mul_karat(C, A, B)
-#elif FP_MUL == BASIC
-#define fp_mul(C, A, B)		fp_mul_basic(C, A, B)
-#elif FP_MUL == COMBA
-#define fp_mul(C, A, B)		fp_mul_comba(C, A, B)
-#elif FP_MUL == INTEG
-#define fp_mul(C, A, B)		fp_mul_integ(C, A, B)
-#endif
-
-/**
- * Squares a prime field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the prime field element to square.
- */
-#if FP_KARAT > 0
-#define fp_sqr(C, A)		fp_sqr_karat(C, A)
-#elif FP_SQR == BASIC
-#define fp_sqr(C, A)		fp_sqr_basic(C, A)
-#elif FP_SQR == COMBA
-#define fp_sqr(C, A)		fp_sqr_comba(C, A)
-#elif FP_SQR == MULTP
-#define fp_sqr(C, A)		fp_mul(C, A, A)
-#elif FP_SQR == INTEG
-#define fp_sqr(C, A)		fp_sqr_integ(C, A)
-#endif
-
-/**
- * Reduces a multiplication result modulo a prime field order. Computes
- * C = A mod p.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiplication result to reduce.
- */
-#if FP_RDC == BASIC
-#define fp_rdc(C, A)		fp_rdc_basic(C, A)
-#elif FP_RDC == MONTY
-#define fp_rdc(C, A)		fp_rdc_monty(C, A)
-#elif FP_RDC == QUICK
-#define fp_rdc(C, A)		fp_rdc_quick(C, A)
-#endif
-
-/**
- * Reduces a multiplication result modulo a prime field order using Montgomery
- * modular reduction.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the multiplication result to reduce.
- */
-#if FP_MUL == BASIC
-#define fp_rdc_monty(C, A)	fp_rdc_monty_basic(C, A)
-#else
-#define fp_rdc_monty(C, A)	fp_rdc_monty_comba(C, A)
-#endif
-
-/**
- * Inverts a prime field element. Computes C = A^{-1}.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the prime field element to invert.
- */
-#if FP_INV == BASIC
-#define fp_inv(C, A)	fp_inv_basic(C, A)
-#elif FP_INV == BINAR
-#define fp_inv(C, A)	fp_inv_binar(C, A)
-#elif FP_INV == MONTY
-#define fp_inv(C, A)	fp_inv_monty(C, A)
-#elif FP_INV == EXGCD
-#define fp_inv(C, A)	fp_inv_exgcd(C, A)
-#elif FP_INV == DIVST
-#define fp_inv(C, A)	fp_inv_divst(C, A)
-#elif FP_INV == LOWER
-#define fp_inv(C, A)	fp_inv_lower(C, A)
-#endif
-
-/**
- * Exponentiates a prime field element. Computes C = A^B (mod p).
- *
- * @param[out] C			- the result.
- * @param[in] A				- the basis.
- * @param[in] B				- the exponent.
- */
-#if FP_EXP == BASIC
-#define fp_exp(C, A, B)		fp_exp_basic(C, A, B)
-#elif FP_EXP == SLIDE
-#define fp_exp(C, A, B)		fp_exp_slide(C, A, B)
-#elif FP_EXP == MONTY
-#define fp_exp(C, A, B)		fp_exp_monty(C, A, B)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the prime field arithmetic layer.
- */
-void fp_prime_init(void);
-
-/**
- * Finalizes the prime field arithmetic layer.
- */
-void fp_prime_clean(void);
-
-/**
- * Returns the order of the prime field.
- *
- * @return the order of the prime field.
- */
-const dig_t *fp_prime_get(void);
-
-/**
- * Returns the additional value used for modular reduction.
- *
- * @return the additional value used for modular reduction.
- */
-const dig_t *fp_prime_get_rdc(void);
-
-/**
- * Returns the additional value used for conversion from multiple precision
- * integer to prime field element.
- *
- * @return the additional value used for importing integers.
- */
-const dig_t *fp_prime_get_conv(void);
-
-/**
- * Returns the result of prime order mod 8.
- *
- * @return the result of prime order mod 8.
- */
-dig_t fp_prime_get_mod8(void);
-
-/**
- * Returns the prime stored in special form. The most significant bit is
- * RLC_FP_BITS.
- *
- * @param[out] len		- the number of returned bits, can be NULL.
- *
- * @return the prime represented by it non-zero bits.
- */
-const int *fp_prime_get_sps(int *len);
-
-/**
- * Returns a non-quadratic residue in the prime field.
- *
- * @return the non-quadratic residue.
- */
-int fp_prime_get_qnr(void);
-
-/**
- * Returns a non-cubic residue in the prime field.
- *
- * @return the non-cubic residue.
- */
-int fp_prime_get_cnr(void);
-
-/**
- * Returns the 2-adicity of the prime modulus.
- *
- * @return the 2-adicity of the modulus.
- */
-int fp_prime_get_2ad(void);
-
-/**
- * Returns the prime field parameter identifier.
- *
- * @return the parameter identifier.
- */
-int fp_param_get(void);
-
-/**
- * Assigns the prime field modulus to a non-sparse prime.
- *
- * @param[in] p			- the new prime field modulus.
- */
-void fp_prime_set_dense(const bn_t p);
-
-/**
- * Assigns the prime field modulus to a special form sparse prime.
- *
- * @param[in] spars		- the list of powers of 2 describing the prime.
- * @param[in] len		- the number of powers.
- */
-void fp_prime_set_pmers(const int *spars, int len);
-
-/**
-* Assigns the prime field modulus to a parametrization from a family of
- * pairing-friendly curves.
- */
-void fp_prime_set_pairf(const bn_t x, int pairf);
-
-/**
- * Computes the constants needed for evaluating Frobenius maps in higher
- * extension fields.
- */
-void fp_prime_calc(void);
-
-/**
- * Imports a multiple precision integer as a prime field element, doing the
- * necessary conversion.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to import.
- */
-void fp_prime_conv(fp_t c, const bn_t a);
-
-/**
- * Imports a single digit as a prime field element, doing the necessary
- * conversion.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the digit to import.
- */
-void fp_prime_conv_dig(fp_t c, dig_t a);
-
-/**
- * Exports a prime field element as a multiple precision integer, doing the
- * necessary conversion.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to export.
- */
-void fp_prime_back(bn_t c, const fp_t a);
-
-/**
- * Assigns a prime modulus based on its identifier.
- */
-void fp_param_set(int param);
-
-/**
- * Assigns any pre-defined parameter as the prime modulus.
- *
- * @return RLC_OK if no errors occurred; RLC_ERR otherwise.
- */
-int fp_param_set_any(void);
-
-/**
- * Assigns the order of the prime field to any non-sparse prime.
- *
- * @return RLC_OK if no errors occurred; RLC_ERR otherwise.
- */
-int fp_param_set_any_dense(void);
-
-/**
- * Assigns the order of the prime field to any sparse prime.
- *
- * @return RLC_OK if no errors occurred; RLC_ERR otherwise.
- */
-int fp_param_set_any_pmers(void);
-
-/**
- * Assigns the order of the prime field to any towering-friendly prime.
- *
- * @return RLC_OK if no errors occurred; RLC_ERR otherwise.
- */
-int fp_param_set_any_tower(void);
-
-/**
- * Assigns the order of the prime field to a prime with high 2-adicity..
- *
- * @return RLC_OK if no errors occurred; RLC_ERR otherwise.
- */
-int fp_param_set_any_h2adc(void);
-
-/**
- * Prints the currently configured prime modulus.
- */
-void fp_param_print(void);
-
-/**
- * Returns the variable used to parametrize the given prime modulus.
- *
- * @param[out] x			- the integer parameter.
- */
-void fp_prime_get_par(bn_t x);
-
-/**
- * Returns the absolute value of the variable used to parameterize the given
- * prime modulus in sparse form.
- *
- * @param[out] len			- the length of the representation.
- */
-const int *fp_prime_get_par_sps(int *len);
-
-/**
- * Returns the absolute value of the variable used to parameterize the currently
- * configured prime modulus in sparse form. The first argument must be an array
- * of size (RLC_TERMS + 1).
- *
- * @param[out] s			- the parameter in sparse form.
- * @param[out] len			- the length of the parameter in sparse form.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is insufficient.
- * @throw ERR_NO_VALID		- if the current configuration is invalid.
- * @return the integer parameter in sparse form.
- */
-void fp_param_get_sps(int *s, int *len);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to copy.
- */
-void fp_copy(fp_t c, const fp_t a);
-
-/**
- * Assigns zero to a prime field element.
- *
- * @param[out] a			- the prime field element to asign.
- */
-void fp_zero(fp_t a);
-
-/**
- * Tests if a prime field element is zero or not.
- *
- * @param[in] a				- the prime field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp_is_zero(const fp_t a);
-
-/**
- * Tests if a prime field element is even or odd.
- *
- * @param[in] a				- the prime field element to test.
- * @return 1 if the argument is even, 0 otherwise.
- */
-int fp_is_even(const fp_t a);
-
-/**
- * Reads the bit stored in the given position on a prime field element.
- *
- * @param[in] a				- the prime field element.
- * @param[in] bit			- the bit position.
- * @return the bit value.
- */
-int fp_get_bit(const fp_t a, int bit);
-
-/**
- * Stores a bit in a given position on a prime field element.
- *
- * @param[out] a			- the prime field element.
- * @param[in] bit			- the bit position.
- * @param[in] value			- the bit value.
- */
-void fp_set_bit(fp_t a, int bit, int value);
-
-/**
- * Assigns a small positive constant to a prime field element.
- *
- * The constant must fit on a multiple precision digit, or dig_t type using
- * only the number of bits specified on RLC_DIG.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the constant to assign.
- */
-void fp_set_dig(fp_t c, dig_t a);
-
-/**
- * Returns the number of bits of a prime field element.
- *
- * @param[in] a				- the prime field element.
- * @return the number of bits.
- */
-int fp_bits(const fp_t a);
-
-/**
- * Assigns a random value to a prime field element.
- *
- * @param[out] a			- the prime field element to assign.
- */
-void fp_rand(fp_t a);
-
-/**
- * Prints a prime field element to standard output.
- *
- * @param[in] a				- the prime field element to print.
- */
-void fp_print(const fp_t a);
-
-/**
- * Returns the number of digits in radix necessary to store a multiple precision
- * integer. The radix must be a power of 2 included in the interval [2, 64].
- *
- * @param[in] a				- the prime field element.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- * @return the number of digits in the given radix.
- */
-int fp_size_str(const fp_t a, int radix);
-
-/**
- * Reads a prime field element from a string in a given radix. The radix must
- * be a power of 2 included in the interval [2, 64].
- *
- * @param[out] a			- the result.
- * @param[in] str			- the string.
- * @param[in] len			- the size of the string.
- * @param[in] radix			- the radix.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- */
-void fp_read_str(fp_t a, const char *str, int len, int radix);
-
-/**
- * Writes a prime field element to a string in a given radix. The radix must
- * be a power of 2 included in the interval [2, 64].
- *
- * @param[out] str			- the string.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the prime field element to write.
- * @param[in] radix			- the radix.
- * @throw ERR_BUFFER		- if the buffer capacity is insufficient.
- * @throw ERR_NO_VALID		- if the radix is invalid.
- */
-void fp_write_str(char *str, int len, const fp_t a, int radix);
-
-/**
- * Reads a prime field element from a byte vector in big-endian format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not RLC_FP_BYTES.
- */
-void fp_read_bin(fp_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a prime field element to a byte vector in big-endian format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the prime field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not RLC_FP_BYTES.
- */
-void fp_write_bin(uint8_t *bin, int len, const fp_t a);
-
-/**
- * Returns the result of a comparison between two prime field elements.
- *
- * @param[in] a				- the first prime field element.
- * @param[in] b				- the second prime field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp_cmp(const fp_t a, const fp_t b);
-
-/**
- * Returns the result of a signed comparison between a prime field element
- * and a digit.
- *
- * @param[in] a				- the prime field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp_cmp_dig(const fp_t a, dig_t b);
-
-/**
- * Adds two prime field elements using basic addition. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to add.
- * @param[in] b				- the second prime field element to add.
- */
-void fp_add_basic(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Adds two prime field elements with integrated modular reduction. Computes
- * c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to add.
- * @param[in] b				- the second prime field element to add.
- */
-void fp_add_integ(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Adds a prime field element and a digit. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to add.
- * @param[in] b				- the digit to add.
- */
-void fp_add_dig(fp_t c, const fp_t a, dig_t b);
-
-/**
- * Subtracts a prime field element from another using basic subtraction.
- * Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element.
- * @param[in] b				- the prime field element to subtract.
- */
-void fp_sub_basic(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Subtracts a prime field element from another with integrated modular
- * reduction. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element.
- * @param[in] b				- the prime field element to subtract.
- */
-void fp_sub_integ(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Subtracts a digit from a prime field element. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element.
- * @param[in] b				- the digit to subtract.
- */
-void fp_sub_dig(fp_t c, const fp_t a, dig_t b);
-
-/**
- * Negates a prime field element using basic negation.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the prime field element to negate.
- */
-void fp_neg_basic(fp_t c, const fp_t a);
-
-/**
- * Negates a prime field element using integrated negation.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the prime field element to negate.
- */
-void fp_neg_integ(fp_t c, const fp_t a);
-
-/**
- * Doubles a prime field element using basic addition.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to add.
- */
-void fp_dbl_basic(fp_t c, const fp_t a);
-
-/**
- * Doubles a prime field element with integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to add.
- */
-void fp_dbl_integ(fp_t c, const fp_t a);
-
-/**
- * Halves a prime field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to halve.
- */
-void fp_hlv_basic(fp_t c, const fp_t a);
-
-/**
- * Halves a prime field element with integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to halve.
- */
-void fp_hlv_integ(fp_t c, const fp_t a);
-
-/**
- * Multiples two prime field elements using Schoolbook multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to multiply.
- * @param[in] b				- the second prime field element to multiply.
- */
-void fp_mul_basic(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Multiples two prime field elements using Comba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to multiply.
- * @param[in] b				- the second prime field element to multiply.
- */
-void fp_mul_comba(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Multiples two prime field elements using multiplication integrated with
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to multiply.
- * @param[in] b				- the second prime field element to multiply.
- */
-void fp_mul_integ(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Multiples two prime field elements using Karatsuba multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element to multiply.
- * @param[in] b				- the second prime field element to multiply.
- */
-void fp_mul_karat(fp_t c, const fp_t a, const fp_t b);
-
-/**
- * Multiplies a prime field element by a digit. Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element.
- * @param[in] b				- the digit to multiply.
- */
-void fp_mul_dig(fp_t c, const fp_t a, dig_t b);
-
-/**
- * Squares a prime field element using Schoolbook squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to square.
- */
-void fp_sqr_basic(fp_t c, const fp_t a);
-
-/**
- * Squares a prime field element using Comba squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to square.
- */
-void fp_sqr_comba(fp_t c, const fp_t a);
-
-/**
- * Squares two prime field elements using squaring integrated with
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the binary field element to square.
- */
-void fp_sqr_integ(fp_t c, const fp_t a);
-
-/**
- * Squares a prime field element using Karatsuba squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to square.
- */
-void fp_sqr_karat(fp_t c, const fp_t a);
-
-/**
- * Shifts a prime field element number to the left. Computes
- * c = a * 2^bits.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void fp_lsh(fp_t c, const fp_t a, int bits);
-
-/**
- * Shifts a prime field element to the right. Computes c = floor(a / 2^bits).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to shift.
- * @param[in] bits			- the number of bits to shift.
- */
-void fp_rsh(fp_t c, const fp_t a, int bits);
-
-/**
- * Reduces a multiplication result modulo the prime field modulo using
- * division-based reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fp_rdc_basic(fp_t c, dv_t a);
-
-/**
- * Reduces a multiplication result modulo the prime field order using Shoolbook
- * Montgomery reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fp_rdc_monty_basic(fp_t c, dv_t a);
-
-/**
- * Reduces a multiplication result modulo the prime field order using Comba
- * Montgomery reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fp_rdc_monty_comba(fp_t c, dv_t a);
-
-/**
- * Reduces a multiplication result modulo the prime field modulo using
- * fast reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiplication result to reduce.
- */
-void fp_rdc_quick(fp_t c, dv_t a);
-
-/**
- * Inverts a prime field element using Fermat's Little Theorem.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_basic(fp_t c, const fp_t a);
-
-/**
- * Inverts a prime field element using the binary method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_binar(fp_t c, const fp_t a);
-
-/**
- * Inverts a prime field element using Montgomery inversion.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_monty(fp_t c, const fp_t a);
-
-/**
- * Inverts a prime field element using the Euclidean Extended Algorithm.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_exgcd(fp_t c, const fp_t a);
-
-/**
- * Inverts a prime field element using the constant-time division step approach
- * by Bernstein and Bo-Yin Yang.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_divst(fp_t c, const fp_t a);
-
-/**
- * Inverts a prime field element using a direct call to the lower layer.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @throw ERR_NO_VALID		- if the field element is not invertible.
- */
-void fp_inv_lower(fp_t c, const fp_t a);
-
-/**
- * Inverts multiple prime field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp_inv_sim(fp_t *c, const fp_t *a, int n);
-
-/**
- * Exponentiates a prime field element using the binary
- * method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp_exp_basic(fp_t c, const fp_t a, const bn_t b);
-
-/**
- * Exponentiates a prime field element using the sliding window method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp_exp_slide(fp_t c, const fp_t a, const bn_t b);
-
-/**
- * Exponentiates a prime field element using the constant-time Montgomery
- * powering ladder method.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp_exp_monty(fp_t c, const fp_t a, const bn_t b);
-
-/**
- * Extracts the square root of a prime field element. Computes c = sqrt(a). The
- * other square root is the negation of c.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element.
- * @return					- 1 if there is a square root, 0 otherwise.
- */
-int fp_srt(fp_t c, const fp_t a);
-
-#endif /* !RLC_FP_H */
diff --git a/src/dashbls/depends/relic/include/relic_fpx.h b/src/dashbls/depends/relic/include/relic_fpx.h
deleted file mode 100644
index 7125f2b36fb5..000000000000
--- a/src/dashbls/depends/relic/include/relic_fpx.h
+++ /dev/null
@@ -1,4703 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup fpx Prime field extensions.
- */
-
-/**
- * @file
- *
- * Interface of the module for prime extension field arithmetic.
- *
- * @ingroup fpx
- */
-
-#ifndef RLC_FPX_H
-#define RLC_FPX_H
-
-#include "relic_fp.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a quadratic extension prime field element.
- *
- * This extension is constructed with the basis {1, i}, where i is an adjoined
- * square root in the prime field.
- */
-typedef fp_t fp2_t[2];
-
-/**
- * Represents a double-precision quadratic extension field element.
- */
-typedef dv_t dv2_t[2];
-
-/**
- * Represents a quadratic extension field element with automatic memory
- * allocation.
- */
-typedef fp_st fp2_st[2];
-
-/**
- * Represents a cubic extension prime field element.
- *
- * This extension is constructed with the basis {1, j, j^2}, where j is an
- * adjoined cube root in the prime field.
- */
-typedef fp_t fp3_t[3];
-
-/**
- * Represents a double-precision cubic extension field element.
- */
-typedef dv_t dv3_t[3];
-
-/**
- * Represents a cubic extension field element with automatic memory
- * allocation.
- */
-typedef fp_st fp3_st[3];
-
-/**
- * Represents a quartic extension prime field element.
- *
- * This extension is constructed with the basis {1, s}, where s^2 = E is an
- * adjoined root in the underlying quadratic extension.
- */
-typedef fp2_t fp4_t[2];
-
-/**
- * Represents a double-precision quartic extension field element.
- */
-typedef dv2_t dv4_t[2];
-
-/**
- * Represents a quartic extension field element with automatic memory
- * allocation.
- */
-typedef fp2_st fp4_st[2];
-
-/**
- * Represents a sextic extension field element.
- *
- * This extension is constructed with the basis {1, v, v^2}, where v^3 = E is an
- * adjoined root in the underlying quadratic extension.
- */
-typedef fp2_t fp6_t[3];
-
-/**
- * Represents a double-precision sextic extension field element.
- */
-typedef dv2_t dv6_t[3];
-
-/**
- * Represents a sextic extension field element with automatic memory allocation.
- */
-typedef fp2_st fp6_st[3];
-
-/**
- * Represents an octic extension prime field element.
- *
- * This extension is constructed with the basis {1, v}, where v^2 = s is an
- * adjoined root in the underlying quadratic extension.
- */
-typedef fp4_t fp8_t[2];
-
-/**
- * Represents a double-precision octic extension field element.
- */
-typedef dv4_t dv8_t[2];
-
-/**
- * Represents an octic extension field element with automatic memory
- * allocation.
- */
-typedef fp4_st fp8_st[2];
-
-/**
- * Represents an octic extension prime field element.
- *
- * This extension is constructed with the basis {1, v, v^2}, where v^3 = j is an
- * adjoined root in the underlying quadratic extension.
- */
-typedef fp3_t fp9_t[3];
-
-/**
- * Represents a double-precision octic extension field element.
- */
-typedef dv3_t dv9_t[3];
-
-/**
- * Represents an octic extension field element with automatic memory
- * allocation.
- */
-typedef fp3_st fp9_st[3];
-
-/**
- * Represents a dodecic extension field element.
- *
- * This extension is constructed with the basis {1, w}, where w^2 = v is an
- * adjoined root in the underlying sextic extension.
- */
-typedef fp6_t fp12_t[2];
-
-/**
- * Represents a double-precision dodecic extension field element.
- */
-typedef dv6_t dv12_t[2];
-
-/**
- * Represents an octdecic extension field element.
- *
- * This extension is constructed with the basis {1, w}, where w^2 = v is an
- * adjoined root in the underlying sextic extension.
- */
-typedef fp9_t fp18_t[2];
-
-/**
- * Represents a double-precision octdecic extension field element.
- */
-typedef dv9_t dv18_t[2];
-
-/**
- * Represents a 24-degree extension field element.
- *
- * This extension is constructed with the basis {1, t, t^2}, where t^3 = w is an
- * adjoined root in the underlying dodecic extension.
- */
-typedef fp8_t fp24_t[3];
-
-/**
- * Represents a double-precision 24-degree extension field element.
- */
-typedef dv8_t dv24_t[3];
-
-/**
- * Represents a 48-degree extension field element.
- *
- * This extension is constructed with the basis {1, u}, where u^2 = t is an
- * adjoined root in the underlying dodecic extension.
- */
-typedef fp24_t fp48_t[2];
-
-/**
- * Represents a 54-degree extension field element.
- *
- * This extension is constructed with the basis {1, u, u^2}, where u^3 = t is an
- * adjoined root in the underlying dodecic extension.
- */
-typedef fp18_t fp54_t[3];
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a double-precision quadratic extension field element with null.
- *
-* @param[out] A			- the quadratic extension element to initialize.
- */
-#define dv2_null(A)															\
-		dv_null(A[0]); dv_null(A[1]);										\
-
-
-/**
- * Allocates a double-precision quadratic extension field element.
- *
- * @param[out] A			- the new quadratic extension field element.
- */
-#define dv2_new(A)															\
-		dv_new(A[0]); dv_new(A[1]);											\
-
-/**
- * Frees a double-precision quadratic extension field element.
- *
- * @param[out] A			- the quadratic extension field element to free.
- */
-#define dv2_free(A)															\
-		dv_free(A[0]); dv_free(A[1]); 										\
-
-/**
- * Initializes a quadratic extension field element with null.
- *
-* @param[out] A			- the quadratic extension element to initialize.
- */
-#define fp2_null(A)															\
-		fp_null(A[0]); fp_null(A[1]);										\
-
-/**
- * Allocates a quadratic extension field element.
- *
- * @param[out] A			- the new quadratic extension field element.
- */
-#define fp2_new(A)															\
-		fp_new(A[0]); fp_new(A[1]);											\
-
-/**
- * Frees a quadratic extension field element.
- *
- * @param[out] A			- the quadratic extension field element to free.
- */
-#define fp2_free(A)															\
-		fp_free(A[0]); fp_free(A[1]); 										\
-
-/**
- * Adds two quadratic extension field elements. Computes C = A + B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first quadratic extension field element.
- * @param[in] B				- the second quadratic extension field element.
- */
-#if FPX_QDR == BASIC
-#define fp2_add(C, A, B)	fp2_add_basic(C, A, B)
-#elif FPX_QDR == INTEG
-#define fp2_add(C, A, B)	fp2_add_integ(C, A, B)
-#endif
-
-/**
- * Subtracts a quadratic extension field element from another.
- * Computes C = A - B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first quadratic extension field element.
- * @param[in] B				- the second quadratic extension field element.
- */
-#if FPX_QDR == BASIC
-#define fp2_sub(C, A, B)	fp2_sub_basic(C, A, B)
-#elif FPX_QDR == INTEG
-#define fp2_sub(C, A, B)	fp2_sub_integ(C, A, B)
-#endif
-
-/**
- * Doubles a quadratic extension field element. Computes C = A + A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the quadratic extension field element.
- */
-#if FPX_QDR == BASIC
-#define fp2_dbl(C, A)		fp2_dbl_basic(C, A)
-#elif FPX_QDR == INTEG
-#define fp2_dbl(C, A)		fp2_dbl_integ(C, A)
-#endif
-
-/**
- * Adds a quadratic extension field element and a digit. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- * @param[in] b				- the digit to add.
- */
-void fp2_add_dig(fp2_t c, const fp2_t a, dig_t b);
-
-/**
- * Subtracts a quadratic extension field element and a digit. Computes c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- * @param[in] b				- the digit to subtract.
- */
-void fp2_sub_dig(fp2_t c, const fp2_t a, dig_t b);
-
-/**
- * Multiplies two quadratic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first quadratic extension field element.
- * @param[in] B				- the second quadratic extension field element.
- */
-#if FPX_QDR == BASIC
-#define fp2_mul(C, A, B)	fp2_mul_basic(C, A, B)
-#elif FPX_QDR == INTEG
-#define fp2_mul(C, A, B)	fp2_mul_integ(C, A, B)
-#endif
-
-/**
- * Multiplies a quadratic extension field by the quadratic/cubic non-residue.
- * Computes C = A * E, where E is a non-square/non-cube in the quadratic
- * extension.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the quadratic extension field element to multiply.
- */
-#if FPX_QDR == BASIC
-#define fp2_mul_nor(C, A)	fp2_mul_nor_basic(C, A)
-#elif FPX_QDR == INTEG
-#define fp2_mul_nor(C, A)	fp2_mul_nor_integ(C, A)
-#endif
-
-/**
- * Squares a quadratic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the quadratic extension field element to square.
- */
-#if FPX_QDR == BASIC
-#define fp2_sqr(C, A)		fp2_sqr_basic(C, A)
-#elif FPX_QDR == INTEG
-#define fp2_sqr(C, A)		fp2_sqr_integ(C, A)
-#endif
-
-/**
- * Initializes a double-precision cubic extension field element with a null
- * value.
- *
-* @param[out] A			- the cubic extension element to initialize.
- */
-#define dv3_null(A)															\
-		dv_null(A[0]); dv_null(A[1]); dv_null(A[2]);						\
-
-/**
- * Allocates a double-precision cubic extension field element.
- *
- * @param[out] A			- the new cubic extension field element.
- */
-#define dv3_new(A)															\
-		dv_new(A[0]); dv_new(A[1]);	dv_new(A[2]);							\
-
-/**
- * Frees a double-precision cubic extension field element.
- *
- * @param[out] A			- the cubic extension field element to free.
- */
-#define dv3_free(A)															\
-		dv_free(A[0]); dv_free(A[1]); dv_free(A[2]);						\
-
-/**
- * Initializes a cubic extension field element with null.
- *
-* @param[out] A			- the cubic extension element to initialize.
- */
-#define fp3_null(A)															\
-		fp_null(A[0]); fp_null(A[1]); fp_null(A[2]);						\
-
-/**
- * Allocates a cubic extension field element.
- *
- * @param[out] A			- the new cubic extension field element.
- */
-#define fp3_new(A)															\
-		fp_new(A[0]); fp_new(A[1]);	fp_new(A[2]);							\
-
-/**
- * Frees a cubic extension field element.
- *
- * @param[out] A			- the cubic extension field element to free.
- */
-#define fp3_free(A)															\
-		fp_free(A[0]); fp_free(A[1]); fp_free(A[2]);						\
-
-/**
- * Adds two cubic extension field elements. Computes C = A + B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first cubic extension field element.
- * @param[in] B				- the second cubic extension field element.
- */
-#if FPX_CBC == BASIC
-#define fp3_add(C, A, B)	fp3_add_basic(C, A, B)
-#elif FPX_CBC == INTEG
-#define fp3_add(C, A, B)	fp3_add_integ(C, A, B)
-#endif
-
-/**
- * Subtracts a cubic extension field element from another.
- * Computes C = A - B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first cubic extension field element.
- * @param[in] B				- the second cubic extension field element.
- */
-#if FPX_CBC == BASIC
-#define fp3_sub(C, A, B)	fp3_sub_basic(C, A, B)
-#elif FPX_CBC == INTEG
-#define fp3_sub(C, A, B)	fp3_sub_integ(C, A, B)
-#endif
-
-/**
- * Doubles a cubic extension field element. Computes C = A + A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the cubic extension field element.
- */
-#if FPX_CBC == BASIC
-#define fp3_dbl(C, A)		fp3_dbl_basic(C, A)
-#elif FPX_CBC == INTEG
-#define fp3_dbl(C, A)		fp3_dbl_integ(C, A)
-#endif
-
-/**
- * Multiplies two cubic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first cubic extension field element.
- * @param[in] B				- the second cubic extension field element.
- */
-#if FPX_CBC == BASIC
-#define fp3_mul(C, A, B)	fp3_mul_basic(C, A, B)
-#elif FPX_CBC == INTEG
-#define fp3_mul(C, A, B)	fp3_mul_integ(C, A, B)
-#endif
-
-/**
- * Squares a cubic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the cubic extension field element to square.
- */
-#if FPX_CBC == BASIC
-#define fp3_sqr(C, A)		fp3_sqr_basic(C, A)
-#elif FPX_CBC == INTEG
-#define fp3_sqr(C, A)		fp3_sqr_integ(C, A)
-#endif
-
-/**
- * Initializes a double-precision quartic extension field with null.
- *
- * @param[out] A			- the quartic extension element to initialize.
- */
-#define dv4_null(A)															\
-		dv2_null(A[0]); dv2_null(A[1]);										\
-
-/**
- * Allocates a double-precision quartic extension field element.
- *
- * @param[out] A			- the new quartic extension field element.
- */
-#define dv4_new(A)															\
-		dv2_new(A[0]); dv2_new(A[1]);										\
-
-/**
- * Frees a double-precision quartic extension field element.
- *
- * @param[out] A			- the quartic extension field element to free.
- */
-#define dv4_free(A)															\
-		dv2_free(A[0]); dv2_free(A[1]);										\
-
-/**
- * Initializes a quartic extension field with null.
- *
- * @param[out] A			- the quartic extension element to initialize.
- */
-#define fp4_null(A)															\
-		fp2_null(A[0]); fp2_null(A[1]);										\
-
-/**
- * Allocates a quartic extension field element.
- *
- * @param[out] A			- the new quartic extension field element.
- */
-#define fp4_new(A)															\
-		fp2_new(A[0]); fp2_new(A[1]);										\
-
-/**
- * Frees a quartic extension field element.
- *
- * @param[out] A			- the quartic extension field element to free.
- */
-#define fp4_free(A)															\
-		fp2_free(A[0]); fp2_free(A[1]);										\
-
-/**
- * Multiplies two quartic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first quartic extension field element.
- * @param[in] B				- the second quartic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp4_mul(C, A, B)	fp4_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp4_mul(C, A, B)	fp4_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a quartic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the quartic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp4_sqr(C, A)		fp4_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp4_sqr(C, A)		fp4_sqr_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision sextic extension field with null.
- *
- * @param[out] A			- the sextic extension element to initialize.
- */
-#define dv6_null(A)															\
-		dv2_null(A[0]); dv2_null(A[1]); dv2_null(A[2]);						\
-
-/**
- * Allocates a double-precision sextic extension field element.
- *
- * @param[out] A			- the new sextic extension field element.
- */
-#define dv6_new(A)															\
-		dv2_new(A[0]); dv2_new(A[1]); dv2_new(A[2]);						\
-
-/**
- * Frees a double-precision sextic extension field element.
- *
- * @param[out] A			- the sextic extension field element to free.
- */
-#define dv6_free(A)															\
-		dv2_free(A[0]); dv2_free(A[1]); dv2_free(A[2]); 					\
-
-/**
- * Initializes a sextic extension field with null.
- *
- * @param[out] A			- the sextic extension element to initialize.
- */
-#define fp6_null(A)															\
-		fp2_null(A[0]); fp2_null(A[1]); fp2_null(A[2]);						\
-
-/**
- * Allocates a sextic extension field element.
- *
- * @param[out] A			- the new sextic extension field element.
- */
-#define fp6_new(A)															\
-		fp2_new(A[0]); fp2_new(A[1]); fp2_new(A[2]);						\
-
-/**
- * Frees a sextic extension field element.
- *
- * @param[out] A			- the sextic extension field element to free.
- */
-#define fp6_free(A)															\
-		fp2_free(A[0]); fp2_free(A[1]); fp2_free(A[2]); 					\
-
-/**
- * Multiplies two sextic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first sextic extension field element.
- * @param[in] B				- the second sextic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp6_mul(C, A, B)	fp6_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp6_mul(C, A, B)	fp6_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a sextic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the sextic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp6_sqr(C, A)		fp6_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp6_sqr(C, A)		fp6_sqr_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision octic extension field with null.
- *
- * @param[out] A			- the octic extension element to initialize.
- */
-#define dv8_null(A)															\
-		dv4_null(A[0]); dv4_null(A[1]);										\
-
-/**
- * Allocates a double-precision octic extension field element.
- *
- * @param[out] A			- the new octic extension field element.
- */
-#define dv8_new(A)															\
-		dv4_new(A[0]); dv4_new(A[1]);										\
-
-/**
- * Frees a double-precision octic extension field element.
- *
- * @param[out] A			- the octic extension field element to free.
- */
-#define dv8_free(A)															\
-		dv4_free(A[0]); dv4_free(A[1]);										\
-
-/**
- * Initializes an octic extension field with null.
- *
- * @param[out] A			- the octic extension element to initialize.
- */
-#define fp8_null(A)															\
-		fp4_null(A[0]); fp4_null(A[1]);										\
-
-/**
- * Allocates an octic extension field element.
- *
- * @param[out] A			- the new octic extension field element.
- */
-#define fp8_new(A)															\
-		fp4_new(A[0]); fp4_new(A[1]);										\
-
-/**
- * Frees an octic extension field element.
- *
- * @param[out] A			- the octic extension field element to free.
- */
-#define fp8_free(A)															\
-		fp4_free(A[0]); fp4_free(A[1]);										\
-
-/**
- * Multiplies two octic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first octic extension field element.
- * @param[in] B				- the second octic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp8_mul(C, A, B)	fp8_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp8_mul(C, A, B)	fp8_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares an octic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the octic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp8_sqr(C, A)		fp8_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp8_sqr(C, A)		fp8_sqr_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision nonic extension field with null.
- *
- * @param[out] A			- the octic extension element to initialize.
- */
-#define dv9_null(A)															\
-		dv3_null(A[0]); dv3_null(A[1]);	dv3_null(A[2]);						\
-
-/**
- * Allocates a double-precision nonic extension field element.
- *
- * @param[out] A			- the new nonic extension field element.
- */
-#define dv9_new(A)															\
-		dv3_new(A[0]); dv3_new(A[1]); dv3_new(A[2]);						\
-
-/**
- * Frees a double-precision nonic extension field element.
- *
- * @param[out] A			- the nonic extension field element to free.
- */
-#define dv9_free(A)															\
-		dv3_free(A[0]); dv3_free(A[1]); dv3_free(A[2]);						\
-
-/**
- * Initializes a nonic extension field with null.
- *
- * @param[out] A			- the nonic extension element to initialize.
- */
-#define fp9_null(A)															\
-		fp3_null(A[0]); fp3_null(A[1]); fp3_null(A[2]);						\
-
-/**
- * Allocates a nonic extension field element.
- *
- * @param[out] A			- the new nonic extension field element.
- */
-#define fp9_new(A)															\
-		fp3_new(A[0]); fp3_new(A[1]); fp3_new(A[2]);						\
-
-/**
- * Frees a nonic extension field element.
- *
- * @param[out] A			- the nonic extension field element to free.
- */
-#define fp9_free(A)															\
-		fp3_free(A[0]); fp3_free(A[1]); fp3_free(A[2]);						\
-
-/**
- * Multiplies two nonic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first nonic extension field element.
- * @param[in] B				- the second nonic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp9_mul(C, A, B)	fp9_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp9_mul(C, A, B)	fp9_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a nonic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the nonic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp9_sqr(C, A)		fp9_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp9_sqr(C, A)		fp9_sqr_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision dodecic extension field with null.
- *
- * @param[out] A			- the dodecic extension element to initialize.
- */
-#define dv12_null(A)														\
-		dv6_null(A[0]); dv6_null(A[1]);										\
-
-/**
- * Allocates a double-precision dodecic extension field element.
- *
- * @param[out] A			- the new dodecic extension field element.
- */
-#define dv12_new(A)															\
-		dv6_new(A[0]); dv6_new(A[1]);										\
-
-/**
- * Frees a double-precision dodecic extension field element.
- *
- * @param[out] A			- the dodecic extension field element to free.
- */
-#define dv12_free(A)														\
-		dv6_free(A[0]); dv6_free(A[1]);										\
-
-/**
- * Initializes a dodecic extension field with null.
- *
- * @param[out] A			- the dodecic extension element to initialize.
- */
-#define fp12_null(A)														\
-		fp6_null(A[0]); fp6_null(A[1]);										\
-
-/**
- * Allocates a dodecic extension field element.
- *
- * @param[out] A			- the new dodecic extension field element.
- */
-#define fp12_new(A)															\
-		fp6_new(A[0]); fp6_new(A[1]);										\
-
-/**
- * Frees a dodecic extension field element.
- *
- * @param[out] A			- the dodecic extension field element to free.
- */
-#define fp12_free(A)														\
-		fp6_free(A[0]); fp6_free(A[1]); 									\
-
-/**
- * Multiplies two dodecic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first dodecic extension field element.
- * @param[in] B				- the second dodecic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp12_mul(C, A, B)		fp12_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp12_mul(C, A, B)		fp12_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Multiplies a dense and a sparse dodecic extension field elements. Computes
- * C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the dense dodecic extension field element.
- * @param[in] B				- the sparse dodecic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp12_mul_dxs(C, A, B)	fp12_mul_dxs_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp12_mul_dxs(C, A, B)	fp12_mul_dxs_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a dodecic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the dodecic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp12_sqr(C, A)			fp12_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp12_sqr(C, A)			fp12_sqr_lazyr(C, A)
-#endif
-
-/**
- * Squares a dodecic extension field element in the cyclotomic subgroup.
- * Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the dodecic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp12_sqr_cyc(C, A)		fp12_sqr_cyc_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp12_sqr_cyc(C, A)		fp12_sqr_cyc_lazyr(C, A)
-#endif
-
-/**
- * Squares a dodecic extension field element in the cyclotomic subgroup in
- * compressed form. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the dodecic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp12_sqr_pck(C, A)		fp12_sqr_pck_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp12_sqr_pck(C, A)		fp12_sqr_pck_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision sextic extension field with null.
- *
- * @param[out] A			- the sextic extension element to initialize.
- */
-#define dv18_null(A)														\
-		dv9_null(A[0]); dv9_null(A[1]);										\
-
-/**
- * Allocates a double-precision sextic extension field element.
- *
- * @param[out] A			- the new sextic extension field element.
- */
-#define dv18_new(A)															\
-		dv9_new(A[0]); dv9_new(A[1]);										\
-
-/**
- * Frees a double-precision sextic extension field element.
- *
- * @param[out] A			- the sextic extension field element to free.
- */
-#define dv18_free(A)														\
-		dv9_free(A[0]); dv9_free(A[1]);										\
-
-/**
- * Initializes an octdecic extension field with null.
- *
- * @param[out] A			- the octdecic extension element to initialize.
- */
-#define fp18_null(A)														\
-		fp9_null(A[0]); fp9_null(A[1]);										\
-
-/**
- * Allocates an octdecic extension field element.
- *
- * @param[out] A			- the new octdecic extension field element.
- */
-#define fp18_new(A)															\
-		fp9_new(A[0]); fp9_new(A[1]);										\
-
-/**
- * Frees an octdecic extension field element.
- *
- * @param[out] A			- the octdecic extension field element to free.
- */
-#define fp18_free(A)														\
-		fp9_free(A[0]); fp9_free(A[1]);										\
-
-/**
- * Multiplies two octdecic extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first octdecic extension field element.
- * @param[in] B				- the second octdecic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp18_mul(C, A, B)		fp18_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp18_mul(C, A, B)		fp18_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Multiplies a dense and a sparse octdecic extension field elements. Computes
- * C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the dense octdecic extension field element.
- * @param[in] B				- the sparse octdecic extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp18_mul_dxs(C, A, B)	fp18_mul_dxs_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp18_mul_dxs(C, A, B)	fp18_mul_dxs_lazyr(C, A, B)
-#endif
-
-/**
- * Squares an octdecic extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the octdecic extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp18_sqr(C, A)			fp18_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp18_sqr(C, A)			fp18_sqr_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision 24-degree extension field with null.
- *
- * @param[out] A			- the 24-degree extension element to initialize.
- */
-#define dv24_null(A)														\
-		dv8_null(A[0]); dv8_null(A[1]); dv8_null(A[2]);						\
-
-/**
- * Allocates a double-precision 24-degree extension field element.
- *
- * @param[out] A			- the new 24-degree extension field element.
- */
-#define dv24_new(A)															\
-		dv8_new(A[0]); dv8_new(A[1]); dv8_new(A[2]);						\
-
-/**
- * Frees a double-precision 24-degree extension field element.
- *
- * @param[out] A			- the 24-degree extension field element to free.
- */
-#define dv24_free(A)														\
-		dv8_free(A[0]); dv8_free(A[1]); dv8_free(A[2]); 					\
-
-/**
- * Initializes a 24-degree extension field with null.
- *
- * @param[out] A			- the 24-degree extension element to initialize.
- */
-#define fp24_null(A)														\
-		fp8_null(A[0]); fp8_null(A[1]); fp8_null(A[2]);						\
-
-/**
- * Allocates a 24-degree extension field element.
- *
- * @param[out] A			- the new 24-degree extension field element.
- */
-#define fp24_new(A)															\
-		fp8_new(A[0]); fp8_new(A[1]); fp8_new(A[2]);						\
-
-/**
- * Frees a 24-degree extension field element.
- *
- * @param[out] A			- the 24-degree extension field element to free.
- */
-#define fp24_free(A)														\
-		fp8_free(A[0]); fp8_free(A[1]); fp8_free(A[2]); 					\
-
-/**
- * Multiplies two 24-degree extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first 24-degree extension field element.
- * @param[in] B				- the second 24-degree extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp24_mul(C, A, B)		fp24_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp24_mul(C, A, B)		fp24_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a 24-degree extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 24-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp24_sqr(C, A)			fp24_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp24_sqr(C, A)			fp24_sqr_lazyr(C, A)
-#endif
-
-/**
- * Squares a 24-degree extension field element in the cyclotomic subgroup.
- * Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 24-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp24_sqr_cyc(C, A)		fp24_sqr_cyc_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp24_sqr_cyc(C, A)		fp24_sqr_cyc_lazyr(C, A)
-#endif
-
-/**
- * Squares a 24-degree extension field element in the cyclotomic subgroup in
- * compressed form. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 24-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp24_sqr_pck(C, A)		fp24_sqr_pck_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp24_sqr_pck(C, A)		fp24_sqr_pck_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision 48-degree extension field with null.
- *
- * @param[out] A			- the 48-degree extension element to initialize.
- */
-#define dv48_null(A)														\
-		dv24_null(A[0]); dv24_null(A[1]);									\
-
-/**
- * Allocates a double-precision 48-degree extension field element.
- *
- * @param[out] A			- the new 48-degree extension field element.
- */
-#define dv48_new(A)															\
-		dv24_new(A[0]); dv24_new(A[1]);										\
-
-/**
- * Frees a double-precision 48-degree extension field element.
- *
- * @param[out] A			- the 48-degree extension field element to free.
- */
-#define dv48_free(A)														\
-		dv24_free(A[0]); dv24_free(A[1]);									\
-
-/**
- * Initializes a 48-degree extension field with null.
- *
- * @param[out] A			- the 48-degree extension element to initialize.
- */
-#define fp48_null(A)														\
-		fp24_null(A[0]); fp24_null(A[1]);									\
-
-/**
- * Allocates a 48-degree extension field element.
- *
- * @param[out] A			- the new 48-degree extension field element.
- */
-#define fp48_new(A)															\
-		fp24_new(A[0]); fp24_new(A[1]);										\
-
-/**
- * Frees a 48-degree extension field element.
- *
- * @param[out] A			- the 48-degree extension field element to free.
- */
-#define fp48_free(A)														\
-		fp24_free(A[0]); fp24_free(A[1]); 									\
-
-/**
- * Multiplies two 48-degree extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first 48-degree extension field element.
- * @param[in] B				- the second 48-degree extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp48_mul(C, A, B)		fp48_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp48_mul(C, A, B)		fp48_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a 48-degree extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 48-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp48_sqr(C, A)			fp48_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp48_sqr(C, A)			fp48_sqr_lazyr(C, A)
-#endif
-
-/**
- * Squares a 48-degree extension field element in the cyclotomic subgroup.
- * Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 48-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp48_sqr_cyc(C, A)		fp48_sqr_cyc_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp48_sqr_cyc(C, A)		fp48_sqr_cyc_lazyr(C, A)
-#endif
-
-/**
- * Squares a 48-degree extension field element in the cyclotomic subgroup in
- * compressed form. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 48-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp48_sqr_pck(C, A)		fp48_sqr_pck_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp48_sqr_pck(C, A)		fp48_sqr_pck_lazyr(C, A)
-#endif
-
-/**
- * Initializes a double-precision 54-degree extension field with null.
- *
- * @param[out] A			- the 54-degree extension element to initialize.
- */
-#define dv54_null(A)														\
-		dv18_null(A[0]); dv18_null(A[1]); dv18_null(A[2]);					\
-
-/**
- * Allocates a double-precision 54-degree extension field element.
- *
- * @param[out] A			- the new 54-degree extension field element.
- */
-#define dv54_new(A)															\
-		dv18_new(A[0]); dv18_new(A[1]);	dv18_new(A[2]);						\
-
-/**
- * Frees a double-precision 54-degree extension field element.
- *
- * @param[out] A			- the 54-degree extension field element to free.
- */
-#define dv54_free(A)														\
-		dv18_free(A[0]); dv18_free(A[1]); dv18_free(A[2]);					\
-
-/**
- * Initializes a 54-degree extension field with null.
- *
- * @param[out] A			- the 54-degree extension element to initialize.
- */
-#define fp54_null(A)														\
-		fp18_null(A[0]); fp18_null(A[1]); fp18_null(A[2]);					\
-
-/**
- * Allocates a 54-degree extension field element.
- *
- * @param[out] A			- the new 54-degree extension field element.
- */
-#define fp54_new(A)															\
-		fp18_new(A[0]); fp18_new(A[1]);	fp18_new(A[2]);						\
-
-/**
- * Frees a 54-degree extension field element.
- *
- * @param[out] A			- the 54-degree extension field element to free.
- */
-#define fp54_free(A)														\
-		fp18_free(A[0]); fp18_free(A[1]); fp18_free(A[2]);					\
-
-/**
- * Multiplies two 54-degree extension field elements. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first 54-degree extension field element.
- * @param[in] B				- the second 54-degree extension field element.
- */
-#if FPX_RDC == BASIC
-#define fp54_mul(C, A, B)		fp54_mul_basic(C, A, B)
-#elif FPX_RDC == LAZYR
-#define fp54_mul(C, A, B)		fp54_mul_lazyr(C, A, B)
-#endif
-
-/**
- * Squares a 54-degree extension field element. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 54-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp54_sqr(C, A)			fp54_sqr_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp54_sqr(C, A)			fp54_sqr_lazyr(C, A)
-#endif
-
-/**
- * Squares a 54-degree extension field element in the cyclotomic subgroup.
- * Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 54-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp54_sqr_cyc(C, A)		fp54_sqr_cyc_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp54_sqr_cyc(C, A)		fp54_sqr_cyc_lazyr(C, A)
-#endif
-
-/**
- * Squares a 54-degree extension field element in the cyclotomic subgroup in
- * compressed form. Computes C = A * A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the 54-degree extension field element to square.
- */
-#if FPX_RDC == BASIC
-#define fp54_sqr_pck(C, A)		fp54_sqr_pck_basic(C, A)
-#elif FPX_RDC == LAZYR
-#define fp54_sqr_pck(C, A)		fp54_sqr_pck_lazyr(C, A)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the quadratic extension field arithmetic module.
- */
-void fp2_field_init(void);
-
-/**
- * Return the integer part (u) of the quadratic non-residue (i + u).
- */
-int fp2_field_get_qnr(void);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to copy.
- */
-void fp2_copy(fp2_t c, fp2_t a);
-
-/**
- * Assigns zero to a quadratic extension field element.
- *
- * @param[out] a			- the quadratic extension field element to zero.
- */
-void fp2_zero(fp2_t a);
-
-/**
- * Tests if a quadratic extension field element is zero or not.
- *
- * @param[in] a				- the quadratic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp2_is_zero(fp2_t a);
-
-/**
- * Assigns a random value to a quadratic extension field element.
- *
- * @param[out] a			- the quadratic extension field element to assign.
- */
-void fp2_rand(fp2_t a);
-
-/**
- * Prints a quadratic extension field element to standard output.
- *
- * @param[in] a				- the quadratic extension field element to print.
- */
-void fp2_print(fp2_t a);
-
-/**
- * Returns the number of bytes necessary to store a quadratic extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp2_size_bin(fp2_t a, int pack);
-
-/**
- * Reads a quadratic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp2_read_bin(fp2_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a quadratic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp2_write_bin(uint8_t *bin, int len, fp2_t a, int pack);
-
-/**
- * Returns the result of a comparison between two quadratic extension field
- * elements.
- *
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp2_cmp(fp2_t a, fp2_t b);
-
-/**
- * Returns the result of a signed comparison between a quadratic extension field
- * element and a digit.
- *
- * @param[in] a				- the quadratic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp2_cmp_dig(fp2_t a, dig_t b);
-
-/**
- * Assigns a quadratic extension field element to a digit.
- *
- * @param[in] a				- the quadratic extension field element.
- * @param[in] b				- the digit.
- */
-void fp2_set_dig(fp2_t a, dig_t b);
-
-/**
- * Adds two quadratic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_add_basic(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Adds two quadratic extension field elements using integrated modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_add_integ(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Subtracts a quadratic extension field element from another using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_sub_basic(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Subtracts a quadratic extension field element from another using integrated
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_sub_integ(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Negates a quadratic extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the quadratic extension field element to negate.
- */
-void fp2_neg(fp2_t c, fp2_t a);
-
-/**
- * Doubles a quadratic extension field element using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to double.
- */
-void fp2_dbl_basic(fp2_t c, fp2_t a);
-
-/**
- * Doubles a quadratic extension field element using integrated modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to double.
- */
-void fp2_dbl_integ(fp2_t c, fp2_t a);
-
-/**
- * Multiples two quadratic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_mul_basic(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Multiples two quadratic extension field elements using integrated modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quadratic extension field element.
- * @param[in] b				- the second quadratic extension field element.
- */
-void fp2_mul_integ(fp2_t c, fp2_t a, fp2_t b);
-
-/**
- * Multiplies a quadratic extension field element by the adjoined root.
- * Computes c = a * i.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to multiply.
- */
-void fp2_mul_art(fp2_t c, fp2_t a);
-
-/**
- * Multiplies a quadratic extension field element by a quadratic/cubic
- * non-residue.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to multiply.
- */
-void fp2_mul_nor_basic(fp2_t c, fp2_t a);
-
-/**
- * Multiplies a quadratic extension field element by a quadratic/cubic
- * non-residue using integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to multiply.
- */
-void fp2_mul_nor_integ(fp2_t c, fp2_t a);
-
-/**
- * Multiplies a quadratic extension field element by a power of the constant
- * needed to compute a power of the Frobenius map.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- * @param[in] i				- the power of the Frobenius map.
- * @param[in] j				- the power of the constant.
- */
-void fp2_mul_frb(fp2_t c, fp2_t a, int i, int j);
-
-/**
- * Multiplies a quadratic extension field element by a digit.
- * Computes c = a * b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- * @param[in] b				- the digit to multiply.
- */
-void fp2_mul_dig(fp2_t c, const fp2_t a, dig_t b);
-
-/**
- * Computes the square of a quadratic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to square.
- */
-void fp2_sqr_basic(fp2_t c, fp2_t a);
-
-/**
- * Computes the square of a quadratic extension field element using integrated
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to square.
- */
-void fp2_sqr_integ(fp2_t c, fp2_t a);
-
-/**
- * Inverts a quadratic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to invert.
- */
-void fp2_inv(fp2_t c, fp2_t a);
-
-/**
- * Computes the inverse of a cyclotomic quadratic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element to invert.
- */
-void fp2_inv_cyc(fp2_t c, fp2_t a);
-
-/**
- * Inverts multiple quadratic extension field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp2_inv_sim(fp2_t *c, fp2_t *a, int n);
-
-/**
- * Tests if a quadratic extension field element is cyclotomic.
- *
- * @param[in] a				- the quadratic extension field element to test.
- * @return 1 if the extension field element is cyclotomic, 0 otherwise.
- */
-int fp2_test_cyc(fp2_t a);
-
-/**
- * Converts a quadratic extension field element to a cyclotomic element.
- * Computes c = a^(p - 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- */
-void fp2_conv_cyc(fp2_t c, fp2_t a);
-
-/**
- * Computes a power of a quadratic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp2_exp(fp2_t c, fp2_t a, bn_t b);
-
-/**
- * Computes a power of a quadratic extension field element by a small exponent.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp2_exp_dig(fp2_t c, fp2_t a, dig_t b);
-
-/**
- * Computes a power of a cyclotomic quadratic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp2_exp_cyc(fp2_t c, fp2_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius map of a quadratic extension field element.
- * When i is odd, this is the same as computing the conjugate of the extension
- * field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension element to conjugate.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp2_frb(fp2_t c, fp2_t a, int i);
-
-/**
- * Extracts the square root of a quadratic extension field element. Computes
- * c = sqrt(a). The other square root is the negation of c.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element.
- * @return					- 1 if there is a square root, 0 otherwise.
- */
-int fp2_srt(fp2_t c, fp2_t a);
-
-/**
- * Compresses an extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to compress.
- */
-void fp2_pck(fp2_t c, fp2_t a);
-
-/**
- * Decompresses a quadratic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quadratic extension field element.
- * @return if the decompression was successful
- */
-int fp2_upk(fp2_t c, fp2_t a);
-
-/**
- * Initializes the cubic extension field arithmetic module.
- */
-void fp3_field_init(void);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to copy.
- */
-void fp3_copy(fp3_t c, fp3_t a);
-
-/**
- * Assigns zero to a cubic extension field element.
- *
- * @param[out] a			- the cubic extension field element to zero.
- */
-void fp3_zero(fp3_t a);
-
-/**
- * Tests if a cubic extension field element is zero or not.
- *
- * @param[in] a				- the cubic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp3_is_zero(fp3_t a);
-
-/**
- * Assigns a random value to a cubic extension field element.
- *
- * @param[out] a			- the cubic extension field element to assign.
- */
-void fp3_rand(fp3_t a);
-
-/**
- * Prints a cubic extension field element to standard output.
- *
- * @param[in] a				- the cubic extension field element to print.
- */
-void fp3_print(fp3_t a);
-
-/**
- * Returns the number of bytes necessary to store a cubic extension field
- * element.
- *
- * @param[out] size			- the result.
- * @param[in] a				- the extension field element.
- */
-int fp3_size_bin(fp3_t a);
-
-/**
- * Reads a cubic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp3_read_bin(fp3_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a cubic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp3_write_bin(uint8_t *bin, int len, fp3_t a);
-
-/**
- * Returns the result of a comparison between two cubic extension field
- * elements.
- *
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp3_cmp(fp3_t a, fp3_t b);
-
-/**
- * Returns the result of a signed comparison between a cubic extension field
- * element and a digit.
- *
- * @param[in] a				- the cubic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp3_cmp_dig(fp3_t a, dig_t b);
-
-/**
- * Assigns a cubic extension field element to a digit.
- *
- * @param[in] a				- the cubic extension field element.
- * @param[in] b				- the digit.
- */
-void fp3_set_dig(fp3_t a, dig_t b);
-
-/**
- * Adds two cubic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_add_basic(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Adds two cubic extension field elements using integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_add_integ(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Subtracts a cubic extension field element from another using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_sub_basic(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Subtracts a cubic extension field element from another using integrated
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_sub_integ(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Negates a cubic extension field element. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the cubic extension field element to negate.
- */
-void fp3_neg(fp3_t c, fp3_t a);
-
-/**
- * Doubles a cubic extension field element using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to double.
- */
-void fp3_dbl_basic(fp3_t c, fp3_t a);
-
-/**
- * Doubles a cubic extension field element using integrated modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to double.
- */
-void fp3_dbl_integ(fp3_t c, fp3_t a);
-
-/**
- * Multiples two cubic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_mul_basic(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Multiples two cubic extension field elements using integrated modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first cubic extension field element.
- * @param[in] b				- the second cubic extension field element.
- */
-void fp3_mul_integ(fp3_t c, fp3_t a, fp3_t b);
-
-/**
- * Multiplies a cubic extension field element by a cubic non-residue.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to multiply.
- */
-void fp3_mul_nor(fp3_t c, fp3_t a);
-
-/**
- * Multiplies a cubic extension field element by a power of the constant
- * needed to compute a power of the Frobenius map. If the flag is zero, the map
- * is computed on the cubic extension directly; otherwise the map is computed on
- * a higher extension.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- * @param[in] i				- the power of the Frobenius map.
- * @param[in] j				- the power of the constant.
- */
-void fp3_mul_frb(fp3_t c, fp3_t a, int i, int j);
-
-/**
- * Computes the square of a cubic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to square.
- */
-void fp3_sqr_basic(fp3_t c, fp3_t a);
-
-/**
- * Computes the square of a cubic extension field element using integrated
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to square.
- */
-void fp3_sqr_integ(fp3_t c, fp3_t a);
-
-/**
- * Inverts a cubic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field element to invert.
- */
-void fp3_inv(fp3_t c, fp3_t a);
-
-/**
- * Inverts multiple cubic extension field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp3_inv_sim(fp3_t *c, fp3_t *a, int n);
-
-/**
- * Computes a power of a cubic extension field element. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp3_exp(fp3_t c, fp3_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius map of a cubic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cubic extension element to exponentiate.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp3_frb(fp3_t c, fp3_t a, int i);
-
-/**
- * Extracts the square root of a cubic extension field element. Computes
- * c = sqrt(a). The other square root is the negation of c.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element.
- * @return					- 1 if there is a square root, 0 otherwise.
- */
-int fp3_srt(fp3_t c, fp3_t a);
-
-/**
- * Initializes the quartic extension field arithmetic module.
- */
-void fp4_field_init(void);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to copy.
- */
-void fp4_copy(fp4_t c, fp4_t a);
-
-/**
- * Assigns zero to a quartic extension field element.
- *
- * @param[out] a			- the quartic extension field element to zero.
- */
-void fp4_zero(fp4_t a);
-
-/**
- * Tests if a quartic extension field element is zero or not.
- *
- * @param[in] a				- the quartic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp4_is_zero(fp4_t a);
-
-/**
- * Assigns a random value to a quartic extension field element.
- *
- * @param[out] a			- the quartic extension field element to assign.
- */
-void fp4_rand(fp4_t a);
-
-/**
- * Prints a quartic extension field element to standard output.
- *
- * @param[in] a				- the quartic extension field element to print.
- */
-void fp4_print(fp4_t a);
-
-/**
- * Returns the number of bytes necessary to store a quartic extension field
- * element.
- *
- * @param[out] size			- the result.
- * @param[in] a				- the extension field element.
- */
-int fp4_size_bin(fp4_t a);
-
-/**
- * Reads a quartic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp4_read_bin(fp4_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a quartic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp4_write_bin(uint8_t *bin, int len, fp4_t a);
-
-/**
- * Returns the result of a comparison between two quartic extension field
- * elements.
- *
- * @param[in] a				- the first quartic extension field element.
- * @param[in] b				- the second quartic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp4_cmp(fp4_t a, fp4_t b);
-
-/**
- * Returns the result of a signed comparison between a quartic extension field
- * element and a digit.
- *
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp4_cmp_dig(fp4_t a, dig_t b);
-
-/**
- * Assigns a quartic extension field element to a digit.
- *
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the digit.
- */
-void fp4_set_dig(fp4_t a, dig_t b);
-
-/**
- * Adds two quartic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first quartic extension field element.
- * @param[in] b				- the second quartic extension field element.
- */
-void fp4_add(fp4_t c, fp4_t a, fp4_t b);
-
-/**
- * Subtracts a quartic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the quartic extension field element.
- */
-void fp4_sub(fp4_t c, fp4_t a, fp4_t b);
-
-/**
- * Negates a quartic extension field element. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the quartic extension field element to negate.
- */
-void fp4_neg(fp4_t c, fp4_t a);
-
-/**
- * Doubles a quartic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to double.
- */
-void fp4_dbl(fp4_t c, fp4_t a);
-
-/**
- * Multiples two quartic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the quartic extension field element.
- */
-void fp4_mul_unr(dv4_t c, fp4_t a, fp4_t b);
-
-/**
- * Multiples two quartic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the quartic extension field element.
- */
-void fp4_mul_basic(fp4_t c, fp4_t a, fp4_t b);
-
-/**
- * Multiples two quartic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element.
- * @param[in] b				- the quartic extension field element.
- */
-void fp4_mul_lazyr(fp4_t c, fp4_t a, fp4_t b);
-
-/**
- * Multiplies a quartic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to multiply.
- */
-void fp4_mul_art(fp4_t c, fp4_t a);
-
-/**
- * Multiplies a quartic extension field element by a power of the constant
- * needed to compute a power of the Frobenius map.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the field element to multiply.
- * @param[in] i				- the power of the Frobenius map.
- * @param[in] j				- the power of the constant.
- */
-void fp4_mul_frb(fp4_t c, fp4_t a, int i, int j);
-
-/**
- * Multiples a dense quartic extension field element by a sparse element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a quartic extension field element.
- * @param[in] b				- a sparse quartic extension field element.
- */
-void fp4_mul_dxs(fp4_t c, fp4_t a, fp4_t b);
-
-/**
- * Computes the square of a quartic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to square.
- */
-void fp4_sqr_unr(dv4_t c, fp4_t a);
-
-/**
- * Computes the squares of a quartic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to square.
- */
-void fp4_sqr_basic(fp4_t c, fp4_t a);
-
-/**
- * Computes the square of a quartic extension field element using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to square.
- */
-void fp4_sqr_lazyr(fp4_t c, fp4_t a);
-
-/**
- * Inverts a quartic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field element to invert.
- */
-void fp4_inv(fp4_t c, fp4_t a);
-
-/**
- * Inverts multiple quartic extension field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp4_inv_sim(fp4_t *c, fp4_t *a, int n);
-
-/**
- * Computes the inverse of a cyclotomic quartic extension field element.
- *
- * For cyclotomic elements, this is equivalent to computing the conjugate.
- * A cyclotomic element is one previously raised to the (p^2 - 1)-th power.
- *
- * @param[out] c                        - the result.
- * @param[in] a                         - the quartic extension field element to invert.
- */
-void fp4_inv_cyc(fp4_t c, fp4_t a);
-
-/**
- * Computes a power of a quartic extension field element. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the quartic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp4_exp(fp4_t c, fp4_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius endomorphism of a quartic extension field
- * element. Computes c = a^p^i.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a quartic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp4_frb(fp4_t c, fp4_t a, int i);
-
-/**
- * Extracts the square root of a quartic extension field element. Computes
- * c = sqrt(a). The other square root is the negation of c.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element.
- * @return					- 1 if there is a square root, 0 otherwise.
- */
-int fp4_srt(fp4_t c, fp4_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to copy.
- */
-void fp6_copy(fp6_t c, fp6_t a);
-
-/**
- * Assigns zero to a sextic extension field element.
- *
- * @param[out] a			- the sextic extension field element to zero.
- */
-void fp6_zero(fp6_t a);
-
-/**
- * Tests if a sextic extension field element is zero or not.
- *
- * @param[in] a				- the sextic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp6_is_zero(fp6_t a);
-
-/**
- * Assigns a random value to a sextic extension field element.
- *
- * @param[out] a			- the sextic extension field element to assign.
- */
-void fp6_rand(fp6_t a);
-
-/**
- * Prints a sextic extension field element to standard output.
- *
- * @param[in] a				- the sextic extension field element to print.
- */
-void fp6_print(fp6_t a);
-
-/**
- * Returns the number of bytes necessary to store a quadratic extension field
- * element.
- *
- * @param[out] size			- the result.
- * @param[in] a				- the extension field element.
- */
-int fp6_size_bin(fp6_t a);
-
-/**
- * Reads a quadratic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp6_read_bin(fp6_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a sextic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp6_write_bin(uint8_t *bin, int len, fp6_t a);
-
-/**
- * Returns the result of a comparison between two sextic extension field
- * elements.
- *
- * @param[in] a				- the first sextic extension field element.
- * @param[in] b				- the second sextic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp6_cmp(fp6_t a, fp6_t b);
-
-/**
- * Returns the result of a signed comparison between a sextic extension field
- * element and a digit.
- *
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp6_cmp_dig(fp6_t a, dig_t b);
-
-/**
- * Assigns a sextic extension field element to a digit.
- *
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the digit.
- */
-void fp6_set_dig(fp6_t a, dig_t b);
-
-/**
- * Adds two sextic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first sextic extension field element.
- * @param[in] b				- the second sextic extension field element.
- */
-void fp6_add(fp6_t c, fp6_t a, fp6_t b);
-
-/**
- * Subtracts a sextic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the sextic extension field element.
- */
-void fp6_sub(fp6_t c, fp6_t a, fp6_t b);
-
-/**
- * Negates a sextic extension field element. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the sextic extension field element to negate.
- */
-void fp6_neg(fp6_t c, fp6_t a);
-
-/**
- * Doubles a sextic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to double.
- */
-void fp6_dbl(fp6_t c, fp6_t a);
-
-/**
- * Multiples two sextic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the sextic extension field element.
- */
-void fp6_mul_unr(dv6_t c, fp6_t a, fp6_t b);
-
-/**
- * Multiples two sextic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the sextic extension field element.
- */
-void fp6_mul_basic(fp6_t c, fp6_t a, fp6_t b);
-
-/**
- * Multiples two sextic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element.
- * @param[in] b				- the sextic extension field element.
- */
-void fp6_mul_lazyr(fp6_t c, fp6_t a, fp6_t b);
-
-/**
- * Multiplies a sextic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to multiply.
- */
-void fp6_mul_art(fp6_t c, fp6_t a);
-
-/**
- * Multiples a dense sextic extension field element by a sparse element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a sextic extension field element.
- * @param[in] b				- a sparse sextic extension field element.
- */
-void fp6_mul_dxs(fp6_t c, fp6_t a, fp6_t b);
-
-/**
- * Computes the square of a sextic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to square.
- */
-void fp6_sqr_unr(dv6_t c, fp6_t a);
-
-/**
- * Computes the squares of a sextic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to square.
- */
-void fp6_sqr_basic(fp6_t c, fp6_t a);
-
-/**
- * Computes the square of a sextic extension field element using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to square.
- */
-void fp6_sqr_lazyr(fp6_t c, fp6_t a);
-
-/**
- * Inverts a sextic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension field element to invert.
- */
-void fp6_inv(fp6_t c, fp6_t a);
-
-/**
- * Computes a power of a sextic extension field element. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the sextic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp6_exp(fp6_t c, fp6_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius endomorphism of a sextic extension field
- * element. Computes c = a^p^i.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a sextic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp6_frb(fp6_t c, fp6_t a, int i);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to copy.
- */
-void fp8_copy(fp8_t c, fp8_t a);
-
-/**
- * Assigns zero to an octic extension field element.
- *
- * @param[out] a			- the octic extension field element to zero.
- */
-void fp8_zero(fp8_t a);
-
-/**
- * Tests if an octic extension field element is zero or not.
- *
- * @param[in] a				- the octic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp8_is_zero(fp8_t a);
-
-/**
- * Assigns a random value to an octic extension field element.
- *
- * @param[out] a			- the octic extension field element to assign.
- */
-void fp8_rand(fp8_t a);
-
-/**
- * Prints an octic extension field element to standard output.
- *
- * @param[in] a				- the octic extension field element to print.
- */
-void fp8_print(fp8_t a);
-
-/**
- * Returns the number of bytes necessary to store an octic extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp8_size_bin(fp8_t a, int pack);
-
-/**
- * Reads an octic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp8_read_bin(fp8_t a, const uint8_t *bin, int len);
-
-/**
- * Writes an octic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp8_write_bin(uint8_t *bin, int len, fp8_t a);
-
-/**
- * Returns the result of a comparison between two octic extension field
- * elements.
- *
- * @param[in] a				- the first octic extension field element.
- * @param[in] b				- the second octic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp8_cmp(fp8_t a, fp8_t b);
-
-/**
- * Returns the result of a signed comparison between an octic extension field
- * element and a digit.
- *
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp8_cmp_dig(fp8_t a, dig_t b);
-
-/**
- * Assigns an octic extension field element to a digit.
- *
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the digit.
- */
-void fp8_set_dig(fp8_t a, dig_t b);
-
-/**
- * Adds two octic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first octic extension field element.
- * @param[in] b				- the second octic extension field element.
- */
-void fp8_add(fp8_t c, fp8_t a, fp8_t b);
-
-/**
- * Subtracts an octic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the octic extension field element.
- */
-void fp8_sub(fp8_t c, fp8_t a, fp8_t b);
-
-/**
- * Negates an octic extension field element. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the octic extension field element to negate.
- */
-void fp8_neg(fp8_t c, fp8_t a);
-
-/**
- * Doubles an octic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to double.
- */
-void fp8_dbl(fp8_t c, fp8_t a);
-
-/**
- * Multiples two octic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the octic extension field element.
- */
-void fp8_mul_unr(dv8_t c, fp8_t a, fp8_t b);
-
-/**
- * Multiples two octic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the octic extension field element.
- */
-void fp8_mul_basic(fp8_t c, fp8_t a, fp8_t b);
-
-/**
- * Multiples two octic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element.
- * @param[in] b				- the octic extension field element.
- */
-void fp8_mul_lazyr(fp8_t c, fp8_t a, fp8_t b);
-
-/**
- * Multiplies an octic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to multiply.
- */
-void fp8_mul_art(fp8_t c, fp8_t a);
-
-/**
- * Multiples a dense octic extension field element by a sparse element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- an octic extension field element.
- * @param[in] b				- a sparse octic extension field element.
- */
-void fp8_mul_dxs(fp8_t c, fp8_t a, fp8_t b);
-
-/**
- * Computes the square of an octic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to square.
- */
-void fp8_sqr_unr(dv8_t c, fp8_t a);
-
-/**
- * Computes the squares of an octic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to square.
- */
-void fp8_sqr_basic(fp8_t c, fp8_t a);
-
-/**
- * Computes the square of an octic extension field element using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to square.
- */
-void fp8_sqr_lazyr(fp8_t c, fp8_t a);
-
-/**
- * Computes the square of a cyclotomic octic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp8_sqr_cyc(fp8_t c, fp8_t a);
-
-/**
- * Inverts an octic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to invert.
- */
-void fp8_inv(fp8_t c, fp8_t a);
-
-/**
- * Computes the inverse of a cyclotomic octic extension field element.
- *
- * For cyclotomic elements, this is equivalent to computing the conjugate.
- * A cyclotomic element is one previously raised to the (p^4 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to invert.
- */
-void fp8_inv_cyc(fp8_t c, fp8_t a);
-
-/**
- * Inverts multiple octic extension field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp8_inv_sim(fp8_t *c, fp8_t *a, int n);
-
-/**
- * Tests if an octic extension field element is cyclotomic.
- *
- * @param[in] a				- the octic extension field element to test.
- * @return 1 if the extension field element is cyclotomic, 0 otherwise.
- */
-int fp8_test_cyc(fp8_t a);
-
-/**
- * Converts an octic extension field element to a cyclotomic element. Computes
- * c = a^(p^4 - 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element.
- */
-void fp8_conv_cyc(fp8_t c, fp8_t a);
-
-/**
- * Computes a power of an octic extension field element. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp8_exp(fp8_t c, fp8_t a, bn_t b);
-
-/**
- * Computes a power of a cyclotomic octic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp8_exp_cyc(fp8_t c, fp8_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius endomorphism of an octic extension field
- * element. Computes c = a^p^i.
- *
- * @param[out] c			- the result.
- * @param[in] a				- an octic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp8_frb(fp8_t c, fp8_t a, int i);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to copy.
- */
-void fp9_copy(fp9_t c, fp9_t a);
-
-/**
- * Assigns zero to a nonic extension field element.
- *
- * @param[out] a			- the nonic extension field element to zero.
- */
-void fp9_zero(fp9_t a);
-
-/**
- * Tests if a nonic extension field element is zero or not.
- *
- * @param[in] a				- the nonic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp9_is_zero(fp9_t a);
-
-/**
- * Assigns a random value to a nonic extension field element.
- *
- * @param[out] a			- the nonic extension field element to assign.
- */
-void fp9_rand(fp9_t a);
-
-/**
- * Prints a nonic extension field element to standard output.
- *
- * @param[in] a				- the nonic extension field element to print.
- */
-void fp9_print(fp9_t a);
-
-/**
- * Returns the number of bytes necessary to store a quadratic extension field
- * element.
- *
- * @param[out] size			- the result.
- * @param[in] a				- the extension field element.
- */
-int fp9_size_bin(fp9_t a);
-
-/**
- * Reads a quadratic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp9_read_bin(fp9_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a nonic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp9_write_bin(uint8_t *bin, int len, fp9_t a);
-
-/**
- * Returns the result of a comparison between two nonic extension field
- * elements.
- *
- * @param[in] a				- the first nonic extension field element.
- * @param[in] b				- the second nonic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp9_cmp(fp9_t a, fp9_t b);
-
-/**
- * Returns the result of a signed comparison between a nonic extension field
- * element and a digit.
- *
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp9_cmp_dig(fp9_t a, dig_t b);
-
-/**
- * Assigns a nonic extension field element to a digit.
- *
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the digit.
- */
-void fp9_set_dig(fp9_t a, dig_t b);
-
-/**
- * Adds two nonic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first nonic extension field element.
- * @param[in] b				- the second nonic extension field element.
- */
-void fp9_add(fp9_t c, fp9_t a, fp9_t b);
-
-/**
- * Subtracts a nonic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the nonic extension field element.
- */
-void fp9_sub(fp9_t c, fp9_t a, fp9_t b);
-
-/**
- * Negates a nonic extension field element. Computes c = -a.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the nonic extension field element to negate.
- */
-void fp9_neg(fp9_t c, fp9_t a);
-
-/**
- * Doubles a nonic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to double.
- */
-void fp9_dbl(fp9_t c, fp9_t a);
-
-/**
- * Multiples two nonic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the nonic extension field element.
- */
-void fp9_mul_unr(dv9_t c, fp9_t a, fp9_t b);
-
-/**
- * Multiples two nonic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the nonic extension field element.
- */
-void fp9_mul_basic(fp9_t c, fp9_t a, fp9_t b);
-
-/**
- * Multiples two nonic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element.
- * @param[in] b				- the nonic extension field element.
- */
-void fp9_mul_lazyr(fp9_t c, fp9_t a, fp9_t b);
-
-/**
- * Multiplies a nonic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to multiply.
- */
-void fp9_mul_art(fp9_t c, fp9_t a);
-
-/**
- * Multiples a dense nonic extension field element by a sparse element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a nonic extension field element.
- * @param[in] b				- a sparse nonic extension field element.
- */
-void fp9_mul_dxs(fp9_t c, fp9_t a, fp9_t b);
-
-/**
- * Computes the square of a nonic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to square.
- */
-void fp9_sqr_unr(dv9_t c, fp9_t a);
-
-/**
- * Computes the squares of a nonic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to square.
- */
-void fp9_sqr_basic(fp9_t c, fp9_t a);
-
-/**
- * Computes the square of a nonic extension field element using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to square.
- */
-void fp9_sqr_lazyr(fp9_t c, fp9_t a);
-
-/**
- * Inverts a nonic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field element to invert.
- */
-void fp9_inv(fp9_t c, fp9_t a);
-
-/**
- * Inverts multiple noinc extension field elements simultaneously.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension field elements to invert.
- * @param[in] n				- the number of elements.
- */
-void fp9_inv_sim(fp9_t *c, fp9_t *a, int n);
-
-/**
- * Computes a power of a nonic extension field element. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the nonic extension element to exponentiate.
- * @param[in] b				- the exponent.
- */
-void fp9_exp(fp9_t c, fp9_t a, bn_t b);
-
-/**
- * Computes a power of the Frobenius endomorphism of a nonic extension field
- * element. Computes c = a^p^i.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a nonic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp9_frb(fp9_t c, fp9_t a, int i);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to copy.
- */
-void fp12_copy(fp12_t c, fp12_t a);
-
-/**
- * Assigns zero to a dodecic extension field element.
- *
- * @param[out] a			- the dodecic extension field element to zero.
- */
-void fp12_zero(fp12_t a);
-
-/**
- * Tests if a dodecic extension field element is zero or not.
- *
- * @param[in] a				- the dodecic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp12_is_zero(fp12_t a);
-
-/**
- * Assigns a random value to a dodecic extension field element.
- *
- * @param[out] a			- the dodecic extension field element to assign.
- */
-void fp12_rand(fp12_t a);
-
-/**
- * Prints a dodecic extension field element to standard output.
- *
- * @param[in] a				- the dodecic extension field element to print.
- */
-void fp12_print(fp12_t a);
-
-/**
- * Returns the number of bytes necessary to store a dodecic extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp12_size_bin(fp12_t a, int pack);
-
-/**
- * Reads a dodecic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp12_read_bin(fp12_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a dodecic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp12_write_bin(uint8_t *bin, int len, fp12_t a, int pack);
-
-/**
- * Returns the result of a comparison between two dodecic extension field
- * elements.
- *
- * @param[in] a				- the first dodecic extension field element.
- * @param[in] b				- the second dodecic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp12_cmp(fp12_t a, fp12_t b);
-
-/**
- * Returns the result of a signed comparison between a dodecic extension field
- * element and a digit.
- *
- * @param[in] a				- the dodecic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp12_cmp_dig(fp12_t a, dig_t b);
-
-/**
- * Assigns a dodecic extension field element to a digit.
- *
- * @param[in] a				- the dodecic extension field element.
- * @param[in] b				- the digit.
- */
-void fp12_set_dig(fp12_t a, dig_t b);
-
-/**
- * Adds two dodecic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first dodecic extension field element.
- * @param[in] b				- the second dodecic extension field element.
- */
-void fp12_add(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Subtracts a dodecic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first dodecic extension field element.
- * @param[in] b				- the second dodecic extension field element.
- */
-void fp12_sub(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Negates a dodecic extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the dodecic extension field element to negate.
- */
-void fp12_neg(fp12_t c, fp12_t a);
-
-/**
- * Doubles a dodecic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to double.
- */
-void fp12_dbl(fp12_t c, fp12_t a);
-
-/**
- * Multiples two dodecic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element.
- * @param[in] b				- the dodecic extension field element.
- */
-void fp12_mul_unr(dv12_t c, fp12_t a, fp12_t b);
-
-/**
- * Multiples two dodecic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element.
- * @param[in] b				- the dodecic extension field element.
- */
-void fp12_mul_basic(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Multiples two dodecic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element.
- * @param[in] b				- the dodecic extension field element.
- */
-void fp12_mul_lazyr(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Multiplies a dodecic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to multiply.
- */
-void fp12_mul_art(fp12_t c, fp12_t a);
-
-/**
- * Multiples a dense dodecic extension field element by a sparse element using
- * basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense dodecic extension field element.
- * @param[in] b				- the sparse dodecic extension field element.
- */
-void fp12_mul_dxs_basic(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Multiples a dense dodecic extension field element by a sparse element using
- * lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense dodecic extension field element.
- * @param[in] b				- the sparse dodecic extension field element.
- */
-void fp12_mul_dxs_lazyr(fp12_t c, fp12_t a, fp12_t b);
-
-/**
- * Computes the square of a dodecic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to square.
- */
-void fp12_sqr_unr(dv12_t c, fp12_t a);
-
-/**
- * Computes the square of a dodecic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to square.
- */
-void fp12_sqr_basic(fp12_t c, fp12_t a);
-
-/**
- * Computes the square of a dodecic extension field element using lazy
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to square.
- */
-void fp12_sqr_lazyr(fp12_t c, fp12_t a);
-
-/**
- * Computes the square of a cyclotomic dodecic extension field element using
- * basic arithmetic.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp12_sqr_cyc_basic(fp12_t c, fp12_t a);
-
-/**
- * Computes the square of a cyclotomic dodecic extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp12_sqr_cyc_lazyr(fp12_t c, fp12_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp12_sqr_pck_basic(fp12_t c, fp12_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp12_sqr_pck_lazyr(fp12_t c, fp12_t a);
-
-/**
- * Tests if a dodecic extension field element belongs to the cyclotomic
- * subgroup.
- *
- * @param[in] a				- the dodecic extension field element to test.
- * @return 1 if the extension field element is in the subgroup, 0 otherwise.
- */
-int fp12_test_cyc(fp12_t a);
-
-/**
- * Converts a dodecic extension field element to a cyclotomic element.
- * Computes c = a^(p^6 - 1)*(p^2 + 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- a dodecic extension field element.
- */
-void fp12_conv_cyc(fp12_t c, fp12_t a);
-
-/**
- * Decompresses a compressed cyclotomic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to decompress.
- */
-void fp12_back_cyc(fp12_t c, fp12_t a);
-
-/**
- * Decompresses multiple compressed cyclotomic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic field elements to decompress.
- * @param[in] n				- the number of field elements to decompress.
- */
-void fp12_back_cyc_sim(fp12_t *c, fp12_t *a, int n);
-
-/**
- * Inverts a dodecic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to invert.
- */
-void fp12_inv(fp12_t c, fp12_t a);
-
-/**
- * Computes the inverse of a cyclotomic dodecic extension field element.
- * For unitary elements, this is equivalent to computing the conjugate.
- * A unitary element is one previously raised to the (p^6 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to invert.
- */
-void fp12_inv_cyc(fp12_t c, fp12_t a);
-
-/**
- * Computes the Frobenius endomorphism of a dodecic extension element.
- * Computes c = a^p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a dodecic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp12_frb(fp12_t c, fp12_t a, int i);
-
-/**
- * Computes a power of a dodecic extension field element.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp12_exp(fp12_t c, fp12_t a, bn_t b);
-
-/**
- * Computes a power of a dodecic extension field element by a small exponent.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp12_exp_dig(fp12_t c, fp12_t a, dig_t b);
-
-/**
- * Computes a power of a cyclotomic dodecic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp12_exp_cyc(fp12_t c, fp12_t a, bn_t b);
-
-/**
- * Computes a power of a cyclotomic quadratic extension field element.
- *
- * @param[out] e			- the result.
- * @param[in] a				- the first element to exponentiate.
- * @param[in] b				- the first exponent.
- * @param[in] c				- the second element to exponentiate.
- * @param[in] d				- the second exponent.
- */
-void fp2_exp_cyc_sim(fp2_t e, fp2_t a, bn_t b, fp2_t c, bn_t d);
-
-/**
- * Computes a power of a cyclotomic dodecic extension field element.
- *
- * @param[out] e			- the result.
- * @param[in] a				- the first element to exponentiate.
- * @param[in] b				- the first exponent.
- * @param[in] c				- the second element to exponentiate.
- * @param[in] d				- the second exponent.
- */
-void fp12_exp_cyc_sim(fp12_t e, fp12_t a, bn_t b, fp12_t c, bn_t d);
-
-/**
- * Computes a power of a cyclotomic dodecic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent in sparse form.
- * @param[in] l				- the length of the exponent in sparse form.
- * @param[in] s				- the sign of the exponent.
- */
-void fp12_exp_cyc_sps(fp12_t c, fp12_t a, const int *b, int l, int s);
-
-/**
- * Compresses a dodecic extension field element.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the dodecic extension field element to compress.
- */
-void fp12_pck(fp12_t c, fp12_t a);
-
-/**
- * Decompresses a dodecic extension field element.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the dodecic extension field element to decompress.
- * @return if the decompression was successful
- */
-int fp12_upk(fp12_t c, fp12_t a);
-
-/**
- * Compresses a dodecic extension field element at the maximum rate.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the dodecic extension field element to compress.
- */
-void fp12_pck_max(fp12_t c, fp12_t a);
-
-/**
- * Decompresses a dodecic extension field element at the maximum rate.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the dodecic extension field element to decompress.
- * @return if the decompression was successful
- */
-int fp12_upk_max(fp12_t c, fp12_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to copy.
- */
-void fp18_copy(fp18_t c, fp18_t a);
-
-/**
- * Assigns zero to an octdecic extension field element.
- *
- * @param[out] a			- the octdecic extension field element to zero.
- */
-void fp18_zero(fp18_t a);
-
-/**
- * Tests if an octdecic extension field element is zero or not.
- *
- * @param[in] a				- the octdecic extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp18_is_zero(fp18_t a);
-
-/**
- * Assigns a random value to an octdecic extension field element.
- *
- * @param[out] a			- the octdecic extension field element to assign.
- */
-void fp18_rand(fp18_t a);
-
-/**
- * Prints an octdecic extension field element to standard output.
- *
- * @param[in] A				- the octdecic extension field element to print.
- */
-void fp18_print(fp18_t a);
-
-/**
- * Returns the number of bytes necessary to store an octdecic extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @return the number of bytes.
- */
-int fp18_size_bin(fp18_t a);
-
-/**
- * Reads an octdecic extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp18_read_bin(fp18_t a, const uint8_t *bin, int len);
-
-/**
- * Writes an octdecic extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp18_write_bin(uint8_t *bin, int len, fp18_t a);
-
-/**
- * Returns the result of a comparison between two octdecic extension field
- * elements.
- *
- * @param[in] a				- the first octdecic extension field element.
- * @param[in] b				- the second octdecic extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp18_cmp(fp18_t a, fp18_t b);
-
-/**
- * Returns the result of a signed comparison between an octdecic extension
- * field element and a digit.
- *
- * @param[in] a				- the octdecic extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp18_cmp_dig(fp18_t a, dig_t b);
-
-/**
- * Assigns an octdecic extension field element to a digit.
- *
- * @param[in] a				- the octdecic extension field element.
- * @param[in] b				- the digit.
- */
-void fp18_set_dig(fp18_t a, dig_t b);
-
-/**
- * Adds two octdecic extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first octdecic extension field element.
- * @param[in] b				- the second octdecic extension field element.
- */
-void fp18_add(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Subtracts an octdecic extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first octdecic extension field element.
- * @param[in] b				- the second octdecic extension field element.
- */
-void fp18_sub(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Negates an octdecic extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the octdecic extension field element to negate.
- */
-void fp18_neg(fp18_t c, fp18_t a);
-
-/**
- * Doubles an octdecic extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to double.
- */
-void fp18_dbl(fp18_t c, fp18_t a);
-
-/**
- * Multiples two octdecic extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element.
- * @param[in] b				- the octdecic extension field element.
- */
-void fp18_mul_unr(dv18_t c, fp18_t a, fp18_t b);
-
-/**
- * Multiples two octdecic extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element.
- * @param[in] b				- the octdecic extension field element.
- */
-void fp18_mul_basic(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Multiples two octdecic extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element.
- * @param[in] b				- the octdecic extension field element.
- */
-void fp18_mul_lazyr(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Multiplies an octdecic extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to multiply.
- */
-void fp18_mul_art(fp18_t c, fp18_t a);
-
-/**
- * Multiples a dense octdecic extension field element by a sparse element using
- * basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense octdecic extension field element.
- * @param[in] b				- the sparse octdecic extension field element.
- */
-void fp18_mul_dxs_basic(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Multiples a dense octdecic extension field element by a sparse element using
- * lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense octdecic extension field element.
- * @param[in] b				- the sparse octdecic extension field element.
- */
-void fp18_mul_dxs_lazyr(fp18_t c, fp18_t a, fp18_t b);
-
-/**
- * Computes the square of an octdecic extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to square.
- */
-void fp18_sqr_unr(dv18_t c, fp18_t a);
-
-/**
- * Computes the square of an octdecic extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to square.
- */
-void fp18_sqr_basic(fp18_t c, fp18_t a);
-
-/**
- * Computes the square of an octdecic extension field element using lazy
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to square.
- */
-void fp18_sqr_lazyr(fp18_t c, fp18_t a);
-
-/**
- * Inverts an octdecic extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to invert.
- */
-void fp18_inv(fp18_t c, fp18_t a);
-
-/**
- * Computes the inverse of a cyclotomic octdecic extension field element.
- * For unitary elements, this is equivalent to computing the conjugate.
- * A unitary element is one previously raised to the (p^9 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octdecic extension field element to invert.
- */
-void fp18_inv_cyc(fp18_t c, fp18_t a);
-
-/**
- * Converts an octdecic extension field element to a cyclotomic element.
- * Computes c = a^(p^9 - 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- an octdecic extension field element.
- */
-void fp18_conv_cyc(fp18_t c, fp18_t a);
-
-/**
- * Computes the Frobenius endomorphism of an octdecic extension element.
- * Computes c = a^(p^i).
- *
- * @param[out] c			- the result.
- * @param[in] a				- an octdecic extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp18_frb(fp18_t c, fp18_t a, int i);
-
-/**
- * Computes a power of an octdecic extension field element.
- * Faster formulas are used if the field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp18_exp(fp18_t c, fp18_t a, bn_t b);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to copy.
- */
-void fp24_copy(fp24_t c, fp24_t a);
-
-/**
- * Assigns zero to a 24-degree extension field element.
- *
- * @param[out] a			- the 24-degree extension field element to zero.
- */
-void fp24_zero(fp24_t a);
-
-/**
- * Tests if a 24-degree extension field element is zero or not.
- *
- * @param[in] a				- the 24-degree extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp24_is_zero(fp24_t a);
-
-/**
- * Assigns a random value to a 24-degree extension field element.
- *
- * @param[out] A			- the 24-degree extension field element to assign.
- */
-void fp24_rand(fp24_t a);
-
-/**
- * Prints a 24-degree extension field element to standard output.
- *
- * @param[in] A				- the 24-degree extension field element to print.
- */
-void fp24_print(fp24_t a);
-
-/**
- * Returns the number of bytes necessary to store a 24-degree extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp24_size_bin(fp24_t a, int pack);
-
-/**
- * Reads a 24-degree extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp24_read_bin(fp24_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a 24-degree extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp24_write_bin(uint8_t *bin, int len, fp24_t a, int pack);
-
-/**
- * Returns the result of a comparison between two 24-degree extension field
- * elements.
- *
- * @param[in] a				- the first 24-degree extension field element.
- * @param[in] b				- the second 24-degree extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp24_cmp(fp24_t a, fp24_t b);
-
-/**
- * Returns the result of a signed comparison between a 24-degree extension field
- * element and a digit.
- *
- * @param[in] a				- the 24-degree extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp24_cmp_dig(fp24_t a, dig_t b);
-
-/**
- * Assigns a 24-degree extension field element to a digit.
- *
- * @param[in] a				- the 24-degree extension field element.
- * @param[in] b				- the digit.
- */
-void fp24_set_dig(fp24_t a, dig_t b);
-
-/**
- * Adds two 24-degree extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 24-degree extension field element.
- * @param[in] b				- the second 24-degree extension field element.
- */
-void fp24_add(fp24_t c, fp24_t a, fp24_t b);
-
-/**
- * Subtracts a 24-degree extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 24-degree extension field element.
- * @param[in] b				- the second 24-degree extension field element.
- */
-void fp24_sub(fp24_t c, fp24_t a, fp24_t b);
-
-/**
- * Negates a 24-degree extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the 24-degree extension field element to negate.
- */
-void fp24_neg(fp24_t c, fp24_t a);
-
-/**
- * Doubles a 24-degree extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the octic extension field element to double.
- */
-void fp24_dbl(fp24_t c, fp24_t a);
-
-/**
- * Multiples two 24-degree extension field elements without performing modular
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element.
- * @param[in] b				- the 24-degree extension field element.
- */
-void fp24_mul_unr(dv24_t c, fp24_t a, fp24_t b);
-
-/**
- * Multiples two 24-degree extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element.
- * @param[in] b				- the 24-degree extension field element.
- */
-void fp24_mul_basic(fp24_t c, fp24_t a, fp24_t b);
-
-/**
- * Multiples two 24-degree extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element.
- * @param[in] b				- the 24-degree extension field element.
- */
-void fp24_mul_lazyr(fp24_t c, fp24_t a, fp24_t b);
-
-/**
- * Multiplies a 24-degree extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dodecic extension field element to multiply.
- */
-void fp24_mul_art(fp24_t c, fp24_t a);
-
-/**
- * Multiples a dense 24-degree extension field element by a sparse element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 24-degree extension field element.
- * @param[in] b				- a 24-degree quartic extension field element.
- */
-void fp24_mul_dxs(fp24_t c, fp24_t a, fp24_t b);
-
-/**
- * Computes the square of a 24-degree extension field element without performing
- * modular reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to square.
- */
-void fp24_sqr_unr(dv24_t c, fp24_t a);
-
-/**
- * Computes the square of a 24-degree extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to square.
- */
-void fp24_sqr_basic(fp24_t c, fp24_t a);
-
-/**
- * Computes the square of a 24-degree extension field element using lazy
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to square.
- */
-void fp24_sqr_lazyr(fp24_t c, fp24_t a);
-
-/**
- * Computes the square of a cyclotomic 24-extension field element using
- * basic arithmetic.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp24_sqr_cyc_basic(fp24_t c, fp24_t a);
-
-/**
- * Computes the square of a cyclotomic 24-extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp24_sqr_cyc_lazyr(fp24_t c, fp24_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp24_sqr_pck_basic(fp24_t c, fp24_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp24_sqr_pck_lazyr(fp24_t c, fp24_t a);
-
-/**
- * Tests if a 24-extension field element belongs to the cyclotomic
- * subgroup.
- *
- * @param[in] a				- the 24-extension field element to test.
- * @return 1 if the extension field element is in the subgroup, 0 otherwise.
- */
-int fp24_test_cyc(fp24_t a);
-
-/**
- * Converts a 24-extension field element to a cyclotomic element.
- * Computes c = a^(p^6 - 1)*(p^2 + 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 24-extension field element.
- */
-void fp24_conv_cyc(fp24_t c, fp24_t a);
-
-/**
- * Decompresses a compressed cyclotomic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-extension field element to decompress.
- */
-void fp24_back_cyc(fp24_t c, fp24_t a);
-
-/**
- * Decompresses multiple compressed cyclotomic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24 field elements to decompress.
- * @param[in] n				- the number of field elements to decompress.
- */
-void fp24_back_cyc_sim(fp24_t *c, fp24_t *a, int n);
-
-/**
- * Inverts a 24-degree extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to invert.
- */
-void fp24_inv(fp24_t c, fp24_t a);
-
-/**
- * Computes the inverse of a cyclotomic octdecic extension field element.
- * For unitary elements, this is equivalent to computing the conjugate.
- * A unitary element is one previously raised to the (p^12 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-degree extension field element to invert.
- */
-void fp24_inv_cyc(fp24_t c, fp24_t a);
-
-/**
- * Computes the Frobenius endomorphism of a 24-degree extension element.
- * Computes c = a^p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 24-degree extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp24_frb(fp24_t c, fp24_t a, int i);
-
-/**
- * Computes a power of a 24-degree extension field element.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp24_exp(fp24_t c, fp24_t a, bn_t b);
-
-/**
- * Computes a power of a 24-extension field element by a small exponent.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp24_exp_dig(fp24_t c, fp24_t a, dig_t b);
-
-/**
- * Computes a power of a cyclotomic 24-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp24_exp_cyc(fp24_t c, fp24_t a, bn_t b);
-
-/**
- * Computes a power of a cyclotomic dodecic extension field element.
- *
- * @param[out] e			- the result.
- * @param[in] a				- the first element to exponentiate.
- * @param[in] b				- the first exponent.
- * @param[in] c				- the second element to exponentiate.
- * @param[in] d				- the second exponent.
- */
-void fp24_exp_cyc_sim(fp24_t e, fp24_t a, bn_t b, fp24_t c, bn_t d);
-
-/**
- * Computes a power of a cyclotomic 24-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent in sparse form.
- * @param[in] l				- the length of the exponent in sparse form.
- * @param[in] s				- the sign of the exponent.
- */
-void fp24_exp_cyc_sps(fp24_t c, fp24_t a, const int *b, int l, int s);
-
-/**
- * Compresses a 24-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-extension field element to compress.
- */
-void fp24_pck(fp24_t c, fp24_t a);
-
-/**
- * Decompresses a 24-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 24-extension field element to decompress.
- * @return if the decompression was successful
- */
-int fp24_upk(fp24_t c, fp24_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to copy.
- */
-void fp48_copy(fp48_t c, fp48_t a);
-
-/**
- * Assigns zero to a 48-extension field element.
- *
- * @param[out] a			- the 48-extension field element to zero.
- */
-void fp48_zero(fp48_t a);
-
-/**
- * Tests if a 48-extension field element is zero or not.
- *
- * @param[in] a				- the 48-extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp48_is_zero(fp48_t a);
-
-/**
- * Assigns a random value to a 48-extension field element.
- *
- * @param[out] a			- the 48-extension field element to assign.
- */
-void fp48_rand(fp48_t a);
-
-/**
- * Prints a 48-extension field element to standard output.
- *
- * @param[in] a				- the 48-extension field element to print.
- */
-void fp48_print(fp48_t a);
-
-/**
- * Returns the number of bytes necessary to store a 48-extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp48_size_bin(fp48_t a, int pack);
-
-/**
- * Reads a 48-extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp48_read_bin(fp48_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a 48-extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp48_write_bin(uint8_t *bin, int len, fp48_t a, int pack);
-
-/**
- * Returns the result of a comparison between two 48-extension field
- * elements.
- *
- * @param[in] a				- the first 48-extension field element.
- * @param[in] b				- the second 48-extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp48_cmp(fp48_t a, fp48_t b);
-
-/**
- * Returns the result of a signed comparison between a 48-extension field
- * element and a digit.
- *
- * @param[in] a				- the 48-extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp48_cmp_dig(fp48_t a, dig_t b);
-
-/**
- * Assigns a 48-extension field element to a digit.
- *
- * @param[in] a				- the 48-extension field element.
- * @param[in] b				- the digit.
- */
-void fp48_set_dig(fp48_t a, dig_t b);
-
-/**
- * Adds two 48-extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 48-extension field element.
- * @param[in] b				- the second 48-extension field element.
- */
-void fp48_add(fp48_t c, fp48_t a, fp48_t b);
-
-/**
- * Subtracts a 48-extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 48-extension field element.
- * @param[in] b				- the second 48-extension field element.
- */
-void fp48_sub(fp48_t c, fp48_t a, fp48_t b);
-
-/**
- * Negates a 48-extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the 48-extension field element to negate.
- */
-void fp48_neg(fp48_t c, fp48_t a);
-
-/**
- * Doubles a 48-extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to double.
- */
-void fp48_dbl(fp48_t c, fp48_t a);
-
-/**
- * Multiples two 48-extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element.
- * @param[in] b				- the 48-extension field element.
- */
-void fp48_mul_basic(fp48_t c, fp48_t a, fp48_t b);
-
-/**
- * Multiples two 48-extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element.
- * @param[in] b				- the 48-extension field element.
- */
-void fp48_mul_lazyr(fp48_t c, fp48_t a, fp48_t b);
-
-/**
- * Multiplies a 48-extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to multiply.
- */
-void fp48_mul_art(fp48_t c, fp48_t a);
-
-/**
- * Multiples a dense 48-extension field element by a sparse element using
- * basic arithmetic. Computes C = A * B.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense 48-extension field element.
- * @param[in] b				- the sparse 48-extension field element.
- */
-void fp48_mul_dxs(fp48_t c, fp48_t a, fp48_t b);
-
-/**
- * Computes the square of a 48-extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to square.
- */
-void fp48_sqr_basic(fp48_t c, fp48_t a);
-
-/**
- * Computes the square of a 48-extension field element using lazy
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to square.
- */
-void fp48_sqr_lazyr(fp48_t c, fp48_t a);
-
-/**
- * Computes the square of a cyclotomic 48-extension field element using
- * basic arithmetic.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp48_sqr_cyc_basic(fp48_t c, fp48_t a);
-
-/**
- * Computes the square of a cyclotomic 48-extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp48_sqr_cyc_lazyr(fp48_t c, fp48_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp48_sqr_pck_basic(fp48_t c, fp48_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp48_sqr_pck_lazyr(fp48_t c, fp48_t a);
-
-/**
- * Tests if a 48-extension field element belongs to the cyclotomic
- * subgroup.
- *
- * @param[in] a				- the 48-extension field element to test.
- * @return 1 if the extension field element is in the subgroup, 0 otherwise.
- */
-int fp48_test_cyc(fp48_t a);
-
-/**
- * Converts a 48-extension field element to a cyclotomic element.
- * Computes c = a^(p^6 - 1)*(p^2 + 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 48-extension field element.
- */
-void fp48_conv_cyc(fp48_t c, fp48_t a);
-
-/**
- * Decompresses a compressed cyclotomic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to decompress.
- */
-void fp48_back_cyc(fp48_t c, fp48_t a);
-
-/**
- * Decompresses multiple compressed cyclotomic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48 field elements to decompress.
- * @param[in] n				- the number of field elements to decompress.
- */
-void fp48_back_cyc_sim(fp48_t *c, fp48_t *a, int n);
-
-/**
- * Inverts a 48-extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to invert.
- */
-void fp48_inv(fp48_t c, fp48_t a);
-
-/**
- * Computes the inverse of a cyclotomic 48-extension field element.
- *
- * For unitary elements, this is equivalent to computing the conjugate.
- * A unitary element is one previously raised to the (p^24 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to invert.
- */
-void fp48_inv_cyc(fp48_t c, fp48_t a);
-
-/**
- * Converts a 48-extension field element to a cyclotomic element. Computes
- * c = a^(p^6 - 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element.
- */
-void fp48_conv_cyc(fp48_t c, fp48_t a);
-
-/**
- * Computes the Frobenius endomorphism of a 48-extension element.
- * Computes c = a^p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 48-extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp48_frb(fp48_t c, fp48_t a, int i);
-
-/**
- * Computes a power of a 48-extension field element.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp48_exp(fp48_t c, fp48_t a, bn_t b);
-
-/**
- * Computes a power of a 48-extension field element by a small exponent.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp48_exp_dig(fp48_t c, fp48_t a, dig_t b);
-
-/**
- * Computes a power of a cyclotomic 48-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp48_exp_cyc(fp48_t c, fp48_t a, bn_t b);
-
-/**
- * Computes a power of a cyclotomic 48-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent in sparse form.
- * @param[in] l				- the length of the exponent in sparse form.
- * @param[in] s				- the sign of the exponent.
- */
-void fp48_exp_cyc_sps(fp48_t c, fp48_t a, const int *b, int l, int s);
-
-/**
- * Compresses a 48-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to compress.
- */
-void fp48_pck(fp48_t c, fp48_t a);
-
-/**
- * Decompresses a 48-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 48-extension field element to decompress.
- * @return if the decompression was successful
- */
-int fp48_upk(fp48_t c, fp48_t a);
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to copy.
- */
-void fp54_copy(fp54_t c, fp54_t a);
-
-/**
- * Assigns zero to a 54-extension field element.
- *
- * @param[out] a			- the 54-extension field element to zero.
- */
-void fp54_zero(fp54_t a);
-
-/**
- * Tests if a 54-extension field element is zero or not.
- *
- * @param[in] a				- the 54-extension field element to test.
- * @return 1 if the argument is zero, 0 otherwise.
- */
-int fp54_is_zero(fp54_t a);
-
-/**
- * Assigns a random value to a 54-extension field element.
- *
- * @param[out] a			- the 54-extension field element to assign.
- */
-void fp54_rand(fp54_t a);
-
-/**
- * Prints a 54-extension field element to standard output.
- *
- * @param[in] a				- the 54-extension field element to print.
- */
-void fp54_print(fp54_t a);
-
-/**
- * Returns the number of bytes necessary to store a 54-extension field
- * element.
- *
- * @param[in] a				- the extension field element.
- * @param[in] pack			- the flag to indicate compression.
- * @return the number of bytes.
- */
-int fp54_size_bin(fp54_t a, int pack);
-
-/**
- * Reads a 54-extension field element from a byte vector in big-endian
- * format.
- *
- * @param[out] a			- the result.
- * @param[in] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp54_read_bin(fp54_t a, const uint8_t *bin, int len);
-
-/**
- * Writes a 54-extension field element to a byte vector in big-endian
- * format.
- *
- * @param[out] bin			- the byte vector.
- * @param[in] len			- the buffer capacity.
- * @param[in] a				- the extension field element to write.
- * @param[in] pack			- the flag to indicate compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not correct.
- */
-void fp54_write_bin(uint8_t *bin, int len, fp54_t a, int pack);
-
-/**
- * Returns the result of a comparison between two 54-extension field
- * elements.
- *
- * @param[in] a				- the first 54-extension field element.
- * @param[in] b				- the second 54-extension field element.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp54_cmp(fp54_t a, fp54_t b);
-
-/**
- * Returns the result of a signed comparison between a 54-extension field
- * element and a digit.
- *
- * @param[in] a				- the 54-extension field element.
- * @param[in] b				- the digit.
- * @return RLC_EQ if a == b, and RLC_NE otherwise.
- */
-int fp54_cmp_dig(fp54_t a, dig_t b);
-
-/**
- * Assigns a 54-extension field element to a digit.
- *
- * @param[in] a				- the 54-extension field element.
- * @param[in] b				- the digit.
- */
-void fp54_set_dig(fp54_t a, dig_t b);
-
-/**
- * Adds two 54-extension field elements. Computes c = a + b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 54-extension field element.
- * @param[in] b				- the second 54-extension field element.
- */
-void fp54_add(fp54_t c, fp54_t a, fp54_t b);
-
-/**
- * Subtracts a 54-extension field element from another. Computes
- * c = a - b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first 54-extension field element.
- * @param[in] b				- the second 54-extension field element.
- */
-void fp54_sub(fp54_t c, fp54_t a, fp54_t b);
-
-/**
- * Negates a 54-extension field element.
- *
- * @param[out] c			- the result.
- * @param[out] a			- the 54-extension field element to negate.
- */
-void fp54_neg(fp54_t c, fp54_t a);
-
-/**
- * Doubles a 54-extension field element. Computes c = 2 * a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to double.
- */
-void fp54_dbl(fp54_t c, fp54_t a);
-
-/**
- * Multiples two 54-extension field elements using basic arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element.
- * @param[in] b				- the 54-extension field element.
- */
-void fp54_mul_basic(fp54_t c, fp54_t a, fp54_t b);
-
-/**
- * Multiples two 54-extension field elements using lazy reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element.
- * @param[in] b				- the 54-extension field element.
- */
-void fp54_mul_lazyr(fp54_t c, fp54_t a, fp54_t b);
-
-/**
- * Multiplies a 54-extension field element by the adjoined root.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to multiply.
- */
-void fp54_mul_art(fp54_t c, fp54_t a);
-
-/**
- * Multiples a dense 54-extension field element by a sparse element using
- * basic arithmetic. Computes C = A * B.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the dense 54-extension field element.
- * @param[in] b				- the sparse 54-extension field element.
- */
-void fp54_mul_dxs(fp54_t c, fp54_t a, fp54_t b);
-
-/**
- * Computes the square of a 54-extension field element using basic
- * arithmetic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to square.
- */
-void fp54_sqr_basic(fp54_t c, fp54_t a);
-
-/**
- * Computes the square of a 54-extension field element using lazy
- * reduction.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to square.
- */
-void fp54_sqr_lazyr(fp54_t c, fp54_t a);
-
-/**
- * Computes the square of a cyclotomic 54-extension field element using
- * basic arithmetic.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp54_sqr_cyc_basic(fp54_t c, fp54_t a);
-
-/**
- * Computes the square of a cyclotomic 54-extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp54_sqr_cyc_lazyr(fp54_t c, fp54_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp54_sqr_pck_basic(fp54_t c, fp54_t a);
-
-/**
- * Computes the square of a compressed cyclotomic extension field element using
- * lazy reduction.
- *
- * A cyclotomic element is one raised to the (p^6 - 1)(p^2 + 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the cyclotomic extension element to square.
- */
-void fp54_sqr_pck_lazyr(fp54_t c, fp54_t a);
-
-/**
- * Tests if a 54-extension field element belongs to the cyclotomic
- * subgroup.
- *
- * @param[in] a				- the 54-extension field element to test.
- * @return 1 if the extension field element is in the subgroup, 0 otherwise.
- */
-int fp54_test_cyc(fp54_t a);
-
-/**
- * Converts a 54-extension field element to a cyclotomic element.
- * Computes c = a^(p^6 - 1)*(p^2 + 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 54-extension field element.
- */
-void fp54_conv_cyc(fp54_t c, fp54_t a);
-
-/**
- * Decompresses a compressed cyclotomic extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to decompress.
- */
-void fp54_back_cyc(fp54_t c, fp54_t a);
-
-/**
- * Decompresses multiple compressed cyclotomic extension field elements.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54 field elements to decompress.
- * @param[in] n				- the number of field elements to decompress.
- */
-void fp54_back_cyc_sim(fp54_t *c, fp54_t *a, int n);
-
-/**
- * Inverts a 54-extension field element. Computes c = 1/a.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to invert.
- */
-void fp54_inv(fp54_t c, fp54_t a);
-
-/**
- * Computes the inverse of a cyclotomic 54-extension field element.
- *
- * For unitary elements, this is equivalent to computing the conjugate.
- * A unitary element is one previously raised to the (p^24 - 1)-th power.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to invert.
- */
-void fp54_inv_cyc(fp54_t c, fp54_t a);
-
-/**
- * Converts a 54-extension field element to a cyclotomic element. Computes
- * c = a^(p^6 - 1).
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element.
- */
-void fp54_conv_cyc(fp54_t c, fp54_t a);
-
-/**
- * Computes the Frobenius endomorphism of a 54-extension element.
- * Computes c = a^p.
- *
- * @param[out] c			- the result.
- * @param[in] a				- a 54-extension field element.
- * @param[in] i				- the power of the Frobenius map.
- */
-void fp54_frb(fp54_t c, fp54_t a, int i);
-
-/**
- * Computes a power of a 54-extension field element.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp54_exp(fp54_t c, fp54_t a, bn_t b);
-
-/**
- * Computes a power of a 54-extension field element by a small exponent.
- * Faster formulas are used if the extension field element is cyclotomic.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp54_exp_dig(fp54_t c, fp54_t a, dig_t b);
-
-/**
- * Computes a power of a cyclotomic 54-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent.
- */
-void fp54_exp_cyc(fp54_t c, fp54_t a, bn_t b);
-
-/**
- * Computes a power of a cyclotomic 54-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the basis.
- * @param[in] b				- the exponent in sparse form.
- * @param[in] l				- the length of the exponent in sparse form.
- * @param[in] s				- the sign of the exponent.
- */
-void fp54_exp_cyc_sps(fp54_t c, fp54_t a, const int *b, int l, int s);
-
-/**
- * Compresses a 54-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to compress.
- */
-void fp54_pck(fp54_t c, fp54_t a);
-
-/**
- * Decompresses a 54-extension field element.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the 54-extension field element to decompress.
- * @return if the decompression was successful
- */
-int fp54_upk(fp54_t c, fp54_t a);
-
-#endif /* !RLC_FPX_H */
diff --git a/src/dashbls/depends/relic/include/relic_label.h b/src/dashbls/depends/relic/include/relic_label.h
deleted file mode 100644
index ad49212f8cbb..000000000000
--- a/src/dashbls/depends/relic/include/relic_label.h
+++ /dev/null
@@ -1,2720 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Symbol renaming to a#undef clashes when simultaneous linking multiple builds.
- *
- * @ingroup core
- */
-
-#ifndef RLC_LABEL_H
-#define RLC_LABEL_H
-
-#include "relic_conf.h"
-
-#define RLC_PREFIX(F)			_RLC_PREFIX(LABEL, F)
-#define _RLC_PREFIX(A, B)		__RLC_PREFIX(A, B)
-#define __RLC_PREFIX(A, B)		A ## _ ## B
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-#ifdef LABEL
-
-#undef first_ctx
-#define first_ctx     RLC_PREFIX(first_ctx)
-#undef core_ctx
-#define core_ctx      RLC_PREFIX(core_ctx)
-
-#undef core_init
-#undef core_clean
-#undef core_get
-#undef core_set
-#undef core_set_thread_initializer
-
-#define core_init 	RLC_PREFIX(core_init)
-#define core_clean 	RLC_PREFIX(core_clean)
-#define core_get 	RLC_PREFIX(core_get)
-#define core_set 	RLC_PREFIX(core_set)
-#define core_set_thread_initializer 	RLC_PREFIX(core_set_thread_initializer)
-
-#undef arch_init
-#undef arch_clean
-#undef arch_cycles
-#undef arch_lzcnt
-#undef arch_copy_rom
-
-#define arch_init 	RLC_PREFIX(arch_init)
-#define arch_clean 	RLC_PREFIX(arch_clean)
-#define arch_cycles 	RLC_PREFIX(arch_cycles)
-#define arch_lzcnt 	RLC_PREFIX(arch_lzcnt)
-#define arch_copy_rom 	RLC_PREFIX(arch_copy_rom)
-
-#undef bench_init
-#undef bench_clean
-#undef bench_overhead
-#undef bench_reset
-#undef bench_before
-#undef bench_after
-#undef bench_compute
-#undef bench_print
-
-#define bench_init 	RLC_PREFIX(bench_init)
-#define bench_clean 	RLC_PREFIX(bench_clean)
-#define bench_overhead 	RLC_PREFIX(bench_overhead)
-#define bench_reset 	RLC_PREFIX(bench_reset)
-#define bench_before 	RLC_PREFIX(bench_before)
-#define bench_after 	RLC_PREFIX(bench_after)
-#define bench_compute 	RLC_PREFIX(bench_compute)
-#define bench_print 	RLC_PREFIX(bench_print)
-
-#undef err_simple_msg
-#undef err_full_msg
-#undef err_get_msg
-#undef err_get_code
-
-#define err_simple_msg 	RLC_PREFIX(err_simple_msg)
-#define err_full_msg 	RLC_PREFIX(err_full_msg)
-#define err_get_msg 	RLC_PREFIX(err_get_msg)
-#define err_get_code 	RLC_PREFIX(err_get_code)
-
-#undef rand_init
-#undef rand_clean
-#undef rand_seed
-#undef rand_seed
-#undef rand_bytes
-
-#define rand_init 	RLC_PREFIX(rand_init)
-#define rand_clean 	RLC_PREFIX(rand_clean)
-#define rand_seed 	RLC_PREFIX(rand_seed)
-#define rand_seed 	RLC_PREFIX(rand_seed)
-#define rand_bytes 	RLC_PREFIX(rand_bytes)
-
-#undef test_fail
-#undef test_pass
-
-#define test_fail 	RLC_PREFIX(test_fail)
-#define test_pass 	RLC_PREFIX(test_pass)
-
-#undef util_conv_endian
-#undef util_conv_big
-#undef util_conv_little
-#undef util_conv_char
-#undef util_bits_dig
-#undef util_cmp_const
-#undef util_printf
-#undef util_print_dig
-
-#define util_conv_endian 	RLC_PREFIX(util_conv_endian)
-#define util_conv_big 	RLC_PREFIX(util_conv_big)
-#define util_conv_little 	RLC_PREFIX(util_conv_little)
-#define util_conv_char 	RLC_PREFIX(util_conv_char)
-#define util_bits_dig 	RLC_PREFIX(util_bits_dig)
-#define util_cmp_const 	RLC_PREFIX(util_cmp_const)
-#define util_printf 	RLC_PREFIX(util_printf)
-#define util_print_dig 	RLC_PREFIX(util_print_dig)
-
-#undef conf_print
-#define conf_print    RLC_PREFIX(conf_print)
-
-#undef dv_t
-#define dv_t          RLC_PREFIX(dv_t)
-
-#undef dv_print
-#undef dv_zero
-#undef dv_copy
-#undef dv_copy_cond
-#undef dv_swap_cond
-#undef dv_cmp
-#undef dv_cmp_const
-#undef dv_new_dynam
-#undef dv_free_dynam
-#undef dv_lshd
-#undef dv_rshd
-
-#define dv_print 	RLC_PREFIX(dv_print)
-#define dv_zero 	RLC_PREFIX(dv_zero)
-#define dv_copy 	RLC_PREFIX(dv_copy)
-#define dv_copy_cond 	RLC_PREFIX(dv_copy_cond)
-#define dv_swap_cond 	RLC_PREFIX(dv_swap_cond)
-#define dv_cmp 	RLC_PREFIX(dv_cmp)
-#define dv_cmp_const 	RLC_PREFIX(dv_cmp_const)
-#define dv_new_dynam 	RLC_PREFIX(dv_new_dynam)
-#define dv_free_dynam 	RLC_PREFIX(dv_free_dynam)
-#define dv_lshd 	RLC_PREFIX(dv_lshd)
-#define dv_rshd 	RLC_PREFIX(dv_rshd)
-
-
-
-#undef bn_st
-#undef bn_t
-#define bn_st     	RLC_PREFIX(bn_st)
-#define bn_t      	RLC_PREFIX(bn_t)
-
-#undef bn_make
-#undef bn_clean
-#undef bn_grow
-#undef bn_trim
-#undef bn_copy
-#undef bn_abs
-#undef bn_neg
-#undef bn_sign
-#undef bn_zero
-#undef bn_is_zero
-#undef bn_is_even
-#undef bn_bits
-#undef bn_get_bit
-#undef bn_set_bit
-#undef bn_ham
-#undef bn_get_dig
-#undef bn_set_dig
-#undef bn_set_2b
-#undef bn_rand
-#undef bn_rand_mod
-#undef bn_print
-#undef bn_size_str
-#undef bn_read_str
-#undef bn_write_str
-#undef bn_size_bin
-#undef bn_read_bin
-#undef bn_write_bin
-#undef bn_size_raw
-#undef bn_read_raw
-#undef bn_write_raw
-#undef bn_cmp_abs
-#undef bn_cmp_dig
-#undef bn_cmp
-#undef bn_add
-#undef bn_add_dig
-#undef bn_sub
-#undef bn_sub_dig
-#undef bn_mul_dig
-#undef bn_mul_basic
-#undef bn_mul_comba
-#undef bn_mul_karat
-#undef bn_sqr_basic
-#undef bn_sqr_comba
-#undef bn_sqr_karat
-#undef bn_dbl
-#undef bn_hlv
-#undef bn_lsh
-#undef bn_rsh
-#undef bn_div
-#undef bn_div_rem
-#undef bn_div_dig
-#undef bn_div_rem_dig
-#undef bn_mod_inv
-#undef bn_mod_2b
-#undef bn_mod_dig
-#undef bn_mod_basic
-#undef bn_mod_pre_barrt
-#undef bn_mod_barrt
-#undef bn_mod_pre_monty
-#undef bn_mod_monty_conv
-#undef bn_mod_monty_back
-#undef bn_mod_monty_basic
-#undef bn_mod_monty_comba
-#undef bn_mod_pre_pmers
-#undef bn_mod_pmers
-#undef bn_mxp_basic
-#undef bn_mxp_slide
-#undef bn_mxp_monty
-#undef bn_mxp_dig
-#undef bn_srt
-#undef bn_gcd_basic
-#undef bn_gcd_lehme
-#undef bn_gcd_stein
-#undef bn_gcd_dig
-#undef bn_gcd_ext_basic
-#undef bn_gcd_ext_lehme
-#undef bn_gcd_ext_stein
-#undef bn_gcd_ext_mid
-#undef bn_gcd_ext_dig
-#undef bn_lcm
-#undef bn_smb_leg
-#undef bn_smb_jac
-#undef bn_get_prime
-#undef bn_is_prime
-#undef bn_is_prime_basic
-#undef bn_is_prime_rabin
-#undef bn_is_prime_solov
-#undef bn_gen_prime_basic
-#undef bn_gen_prime_safep
-#undef bn_gen_prime_stron
-#undef bn_factor
-#undef bn_is_factor
-#undef bn_rec_win
-#undef bn_rec_slw
-#undef bn_rec_naf
-#undef bn_rec_tnaf
-#undef bn_rec_rtnaf
-#undef bn_rec_tnaf_get
-#undef bn_rec_tnaf_mod
-#undef bn_rec_reg
-#undef bn_rec_jsf
-#undef bn_rec_glv
-
-#define bn_make 	RLC_PREFIX(bn_make)
-#define bn_clean 	RLC_PREFIX(bn_clean)
-#define bn_grow 	RLC_PREFIX(bn_grow)
-#define bn_trim 	RLC_PREFIX(bn_trim)
-#define bn_copy 	RLC_PREFIX(bn_copy)
-#define bn_abs 	RLC_PREFIX(bn_abs)
-#define bn_neg 	RLC_PREFIX(bn_neg)
-#define bn_sign 	RLC_PREFIX(bn_sign)
-#define bn_zero 	RLC_PREFIX(bn_zero)
-#define bn_is_zero 	RLC_PREFIX(bn_is_zero)
-#define bn_is_even 	RLC_PREFIX(bn_is_even)
-#define bn_bits 	RLC_PREFIX(bn_bits)
-#define bn_get_bit 	RLC_PREFIX(bn_get_bit)
-#define bn_set_bit 	RLC_PREFIX(bn_set_bit)
-#define bn_ham 	RLC_PREFIX(bn_ham)
-#define bn_get_dig 	RLC_PREFIX(bn_get_dig)
-#define bn_set_dig 	RLC_PREFIX(bn_set_dig)
-#define bn_set_2b 	RLC_PREFIX(bn_set_2b)
-#define bn_rand 	RLC_PREFIX(bn_rand)
-#define bn_rand_mod 	RLC_PREFIX(bn_rand_mod)
-#define bn_print 	RLC_PREFIX(bn_print)
-#define bn_size_str 	RLC_PREFIX(bn_size_str)
-#define bn_read_str 	RLC_PREFIX(bn_read_str)
-#define bn_write_str 	RLC_PREFIX(bn_write_str)
-#define bn_size_bin 	RLC_PREFIX(bn_size_bin)
-#define bn_read_bin 	RLC_PREFIX(bn_read_bin)
-#define bn_write_bin 	RLC_PREFIX(bn_write_bin)
-#define bn_size_raw 	RLC_PREFIX(bn_size_raw)
-#define bn_read_raw 	RLC_PREFIX(bn_read_raw)
-#define bn_write_raw 	RLC_PREFIX(bn_write_raw)
-#define bn_cmp_abs 	RLC_PREFIX(bn_cmp_abs)
-#define bn_cmp_dig 	RLC_PREFIX(bn_cmp_dig)
-#define bn_cmp 	RLC_PREFIX(bn_cmp)
-#define bn_add 	RLC_PREFIX(bn_add)
-#define bn_add_dig 	RLC_PREFIX(bn_add_dig)
-#define bn_sub 	RLC_PREFIX(bn_sub)
-#define bn_sub_dig 	RLC_PREFIX(bn_sub_dig)
-#define bn_mul_dig 	RLC_PREFIX(bn_mul_dig)
-#define bn_mul_basic 	RLC_PREFIX(bn_mul_basic)
-#define bn_mul_comba 	RLC_PREFIX(bn_mul_comba)
-#define bn_mul_karat 	RLC_PREFIX(bn_mul_karat)
-#define bn_sqr_basic 	RLC_PREFIX(bn_sqr_basic)
-#define bn_sqr_comba 	RLC_PREFIX(bn_sqr_comba)
-#define bn_sqr_karat 	RLC_PREFIX(bn_sqr_karat)
-#define bn_dbl 	RLC_PREFIX(bn_dbl)
-#define bn_hlv 	RLC_PREFIX(bn_hlv)
-#define bn_lsh 	RLC_PREFIX(bn_lsh)
-#define bn_rsh 	RLC_PREFIX(bn_rsh)
-#define bn_div 	RLC_PREFIX(bn_div)
-#define bn_div_rem 	RLC_PREFIX(bn_div_rem)
-#define bn_div_dig 	RLC_PREFIX(bn_div_dig)
-#define bn_div_rem_dig 	RLC_PREFIX(bn_div_rem_dig)
-#define bn_mod_inv 	RLC_PREFIX(bn_mod_inv)
-#define bn_mod_2b 	RLC_PREFIX(bn_mod_2b)
-#define bn_mod_dig 	RLC_PREFIX(bn_mod_dig)
-#define bn_mod_basic 	RLC_PREFIX(bn_mod_basic)
-#define bn_mod_pre_barrt 	RLC_PREFIX(bn_mod_pre_barrt)
-#define bn_mod_barrt 	RLC_PREFIX(bn_mod_barrt)
-#define bn_mod_pre_monty 	RLC_PREFIX(bn_mod_pre_monty)
-#define bn_mod_monty_conv 	RLC_PREFIX(bn_mod_monty_conv)
-#define bn_mod_monty_back 	RLC_PREFIX(bn_mod_monty_back)
-#define bn_mod_monty_basic 	RLC_PREFIX(bn_mod_monty_basic)
-#define bn_mod_monty_comba 	RLC_PREFIX(bn_mod_monty_comba)
-#define bn_mod_pre_pmers 	RLC_PREFIX(bn_mod_pre_pmers)
-#define bn_mod_pmers 	RLC_PREFIX(bn_mod_pmers)
-#define bn_mxp_basic 	RLC_PREFIX(bn_mxp_basic)
-#define bn_mxp_slide 	RLC_PREFIX(bn_mxp_slide)
-#define bn_mxp_monty 	RLC_PREFIX(bn_mxp_monty)
-#define bn_mxp_dig 	RLC_PREFIX(bn_mxp_dig)
-#define bn_srt 	RLC_PREFIX(bn_srt)
-#define bn_gcd_basic 	RLC_PREFIX(bn_gcd_basic)
-#define bn_gcd_lehme 	RLC_PREFIX(bn_gcd_lehme)
-#define bn_gcd_stein 	RLC_PREFIX(bn_gcd_stein)
-#define bn_gcd_dig 	RLC_PREFIX(bn_gcd_dig)
-#define bn_gcd_ext_basic 	RLC_PREFIX(bn_gcd_ext_basic)
-#define bn_gcd_ext_lehme 	RLC_PREFIX(bn_gcd_ext_lehme)
-#define bn_gcd_ext_stein 	RLC_PREFIX(bn_gcd_ext_stein)
-#define bn_gcd_ext_mid 	RLC_PREFIX(bn_gcd_ext_mid)
-#define bn_gcd_ext_dig 	RLC_PREFIX(bn_gcd_ext_dig)
-#define bn_lcm 	RLC_PREFIX(bn_lcm)
-#define bn_smb_leg 	RLC_PREFIX(bn_smb_leg)
-#define bn_smb_jac 	RLC_PREFIX(bn_smb_jac)
-#define bn_get_prime 	RLC_PREFIX(bn_get_prime)
-#define bn_is_prime 	RLC_PREFIX(bn_is_prime)
-#define bn_is_prime_basic 	RLC_PREFIX(bn_is_prime_basic)
-#define bn_is_prime_rabin 	RLC_PREFIX(bn_is_prime_rabin)
-#define bn_is_prime_solov 	RLC_PREFIX(bn_is_prime_solov)
-#define bn_gen_prime_basic 	RLC_PREFIX(bn_gen_prime_basic)
-#define bn_gen_prime_safep 	RLC_PREFIX(bn_gen_prime_safep)
-#define bn_gen_prime_stron 	RLC_PREFIX(bn_gen_prime_stron)
-#define bn_factor 	RLC_PREFIX(bn_factor)
-#define bn_is_factor 	RLC_PREFIX(bn_is_factor)
-#define bn_rec_win 	RLC_PREFIX(bn_rec_win)
-#define bn_rec_slw 	RLC_PREFIX(bn_rec_slw)
-#define bn_rec_naf 	RLC_PREFIX(bn_rec_naf)
-#define bn_rec_tnaf 	RLC_PREFIX(bn_rec_tnaf)
-#define bn_rec_rtnaf 	RLC_PREFIX(bn_rec_rtnaf)
-#define bn_rec_tnaf_get 	RLC_PREFIX(bn_rec_tnaf_get)
-#define bn_rec_tnaf_mod 	RLC_PREFIX(bn_rec_tnaf_mod)
-#define bn_rec_reg 	RLC_PREFIX(bn_rec_reg)
-#define bn_rec_jsf 	RLC_PREFIX(bn_rec_jsf)
-#define bn_rec_glv 	RLC_PREFIX(bn_rec_glv)
-
-#undef bn_add1_low
-#undef bn_addn_low
-#undef bn_sub1_low
-#undef bn_subn_low
-#undef bn_cmp1_low
-#undef bn_cmpn_low
-#undef bn_lsh1_low
-#undef bn_lshb_low
-#undef bn_rsh1_low
-#undef bn_rshb_low
-#undef bn_mula_low
-#undef bn_mul1_low
-#undef bn_muln_low
-#undef bn_muld_low
-#undef bn_sqra_low
-#undef bn_sqrn_low
-#undef bn_divn_low
-#undef bn_div1_low
-#undef bn_modn_low
-
-#define bn_add1_low 	RLC_PREFIX(bn_add1_low)
-#define bn_addn_low 	RLC_PREFIX(bn_addn_low)
-#define bn_sub1_low 	RLC_PREFIX(bn_sub1_low)
-#define bn_subn_low 	RLC_PREFIX(bn_subn_low)
-#define bn_cmp1_low 	RLC_PREFIX(bn_cmp1_low)
-#define bn_cmpn_low 	RLC_PREFIX(bn_cmpn_low)
-#define bn_lsh1_low 	RLC_PREFIX(bn_lsh1_low)
-#define bn_lshb_low 	RLC_PREFIX(bn_lshb_low)
-#define bn_rsh1_low 	RLC_PREFIX(bn_rsh1_low)
-#define bn_rshb_low 	RLC_PREFIX(bn_rshb_low)
-#define bn_mula_low 	RLC_PREFIX(bn_mula_low)
-#define bn_mul1_low 	RLC_PREFIX(bn_mul1_low)
-#define bn_muln_low 	RLC_PREFIX(bn_muln_low)
-#define bn_muld_low 	RLC_PREFIX(bn_muld_low)
-#define bn_sqra_low 	RLC_PREFIX(bn_sqra_low)
-#define bn_sqrn_low 	RLC_PREFIX(bn_sqrn_low)
-#define bn_divn_low 	RLC_PREFIX(bn_divn_low)
-#define bn_div1_low 	RLC_PREFIX(bn_div1_low)
-#define bn_modn_low 	RLC_PREFIX(bn_modn_low)
-
-#undef fp_st
-#undef fp_t
-#define fp_st	        RLC_PREFIX(fp_st)
-#define fp_t          RLC_PREFIX(fp_t)
-
-#undef fp_prime_init
-#undef fp_prime_clean
-#undef fp_prime_get
-#undef fp_prime_get_rdc
-#undef fp_prime_get_conv
-#undef fp_prime_get_mod8
-#undef fp_prime_get_sps
-#undef fp_prime_get_qnr
-#undef fp_prime_get_cnr
-#undef fp_prime_get_2ad
-#undef fp_param_get
-#undef fp_prime_set_dense
-#undef fp_prime_set_pmers
-#undef fp_prime_set_pairf
-#undef fp_prime_calc
-#undef fp_prime_conv
-#undef fp_prime_conv_dig
-#undef fp_prime_back
-#undef fp_param_set
-#undef fp_param_set_any
-#undef fp_param_set_any_dense
-#undef fp_param_set_any_pmers
-#undef fp_param_set_any_tower
-#undef fp_param_set_any_h2adc
-#undef fp_param_print
-#undef fp_prime_get_par
-#undef fp_prime_get_par_sps
-#undef fp_param_get_sps
-#undef fp_copy
-#undef fp_zero
-#undef fp_is_zero
-#undef fp_is_even
-#undef fp_get_bit
-#undef fp_set_bit
-#undef fp_set_dig
-#undef fp_bits
-#undef fp_rand
-#undef fp_print
-#undef fp_size_str
-#undef fp_read_str
-#undef fp_write_str
-#undef fp_read_bin
-#undef fp_write_bin
-#undef fp_cmp
-#undef fp_cmp_dig
-#undef fp_add_basic
-#undef fp_add_integ
-#undef fp_add_dig
-#undef fp_sub_basic
-#undef fp_sub_integ
-#undef fp_sub_dig
-#undef fp_neg_basic
-#undef fp_neg_integ
-#undef fp_dbl_basic
-#undef fp_dbl_integ
-#undef fp_hlv_basic
-#undef fp_hlv_integ
-#undef fp_mul_basic
-#undef fp_mul_comba
-#undef fp_mul_integ
-#undef fp_mul_karat
-#undef fp_mul_dig
-#undef fp_sqr_basic
-#undef fp_sqr_comba
-#undef fp_sqr_integ
-#undef fp_sqr_karat
-#undef fp_lsh
-#undef fp_rsh
-#undef fp_rdc_basic
-#undef fp_rdc_monty_basic
-#undef fp_rdc_monty_comba
-#undef fp_rdc_quick
-#undef fp_inv_basic
-#undef fp_inv_binar
-#undef fp_inv_monty
-#undef fp_inv_exgcd
-#undef fp_inv_divst
-#undef fp_inv_lower
-#undef fp_inv_sim
-#undef fp_exp_basic
-#undef fp_exp_slide
-#undef fp_exp_monty
-#undef fp_srt
-
-#define fp_prime_init 	RLC_PREFIX(fp_prime_init)
-#define fp_prime_clean 	RLC_PREFIX(fp_prime_clean)
-#define fp_prime_get 	RLC_PREFIX(fp_prime_get)
-#define fp_prime_get_rdc 	RLC_PREFIX(fp_prime_get_rdc)
-#define fp_prime_get_conv 	RLC_PREFIX(fp_prime_get_conv)
-#define fp_prime_get_mod8 	RLC_PREFIX(fp_prime_get_mod8)
-#define fp_prime_get_sps 	RLC_PREFIX(fp_prime_get_sps)
-#define fp_prime_get_qnr 	RLC_PREFIX(fp_prime_get_qnr)
-#define fp_prime_get_cnr 	RLC_PREFIX(fp_prime_get_cnr)
-#define fp_prime_get_2ad 	RLC_PREFIX(fp_prime_get_2ad)
-#define fp_param_get 	RLC_PREFIX(fp_param_get)
-#define fp_prime_set_dense 	RLC_PREFIX(fp_prime_set_dense)
-#define fp_prime_set_pmers 	RLC_PREFIX(fp_prime_set_pmers)
-#define fp_prime_set_pairf 	RLC_PREFIX(fp_prime_set_pairf)
-#define fp_prime_calc 	RLC_PREFIX(fp_prime_calc)
-#define fp_prime_conv 	RLC_PREFIX(fp_prime_conv)
-#define fp_prime_conv_dig 	RLC_PREFIX(fp_prime_conv_dig)
-#define fp_prime_back 	RLC_PREFIX(fp_prime_back)
-#define fp_param_set 	RLC_PREFIX(fp_param_set)
-#define fp_param_set_any 	RLC_PREFIX(fp_param_set_any)
-#define fp_param_set_any_dense 	RLC_PREFIX(fp_param_set_any_dense)
-#define fp_param_set_any_pmers 	RLC_PREFIX(fp_param_set_any_pmers)
-#define fp_param_set_any_tower 	RLC_PREFIX(fp_param_set_any_tower)
-#define fp_param_set_any_h2adc 	RLC_PREFIX(fp_param_set_any_h2adc)
-#define fp_param_print 	RLC_PREFIX(fp_param_print)
-#define fp_prime_get_par 	RLC_PREFIX(fp_prime_get_par)
-#define fp_prime_get_par_sps 	RLC_PREFIX(fp_prime_get_par_sps)
-#define fp_param_get_sps 	RLC_PREFIX(fp_param_get_sps)
-#define fp_copy 	RLC_PREFIX(fp_copy)
-#define fp_zero 	RLC_PREFIX(fp_zero)
-#define fp_is_zero 	RLC_PREFIX(fp_is_zero)
-#define fp_is_even 	RLC_PREFIX(fp_is_even)
-#define fp_get_bit 	RLC_PREFIX(fp_get_bit)
-#define fp_set_bit 	RLC_PREFIX(fp_set_bit)
-#define fp_set_dig 	RLC_PREFIX(fp_set_dig)
-#define fp_bits 	RLC_PREFIX(fp_bits)
-#define fp_rand 	RLC_PREFIX(fp_rand)
-#define fp_print 	RLC_PREFIX(fp_print)
-#define fp_size_str 	RLC_PREFIX(fp_size_str)
-#define fp_read_str 	RLC_PREFIX(fp_read_str)
-#define fp_write_str 	RLC_PREFIX(fp_write_str)
-#define fp_read_bin 	RLC_PREFIX(fp_read_bin)
-#define fp_write_bin 	RLC_PREFIX(fp_write_bin)
-#define fp_cmp 	RLC_PREFIX(fp_cmp)
-#define fp_cmp_dig 	RLC_PREFIX(fp_cmp_dig)
-#define fp_add_basic 	RLC_PREFIX(fp_add_basic)
-#define fp_add_integ 	RLC_PREFIX(fp_add_integ)
-#define fp_add_dig 	RLC_PREFIX(fp_add_dig)
-#define fp_sub_basic 	RLC_PREFIX(fp_sub_basic)
-#define fp_sub_integ 	RLC_PREFIX(fp_sub_integ)
-#define fp_sub_dig 	RLC_PREFIX(fp_sub_dig)
-#define fp_neg_basic 	RLC_PREFIX(fp_neg_basic)
-#define fp_neg_integ 	RLC_PREFIX(fp_neg_integ)
-#define fp_dbl_basic 	RLC_PREFIX(fp_dbl_basic)
-#define fp_dbl_integ 	RLC_PREFIX(fp_dbl_integ)
-#define fp_hlv_basic 	RLC_PREFIX(fp_hlv_basic)
-#define fp_hlv_integ 	RLC_PREFIX(fp_hlv_integ)
-#define fp_mul_basic 	RLC_PREFIX(fp_mul_basic)
-#define fp_mul_comba 	RLC_PREFIX(fp_mul_comba)
-#define fp_mul_integ 	RLC_PREFIX(fp_mul_integ)
-#define fp_mul_karat 	RLC_PREFIX(fp_mul_karat)
-#define fp_mul_dig 	RLC_PREFIX(fp_mul_dig)
-#define fp_sqr_basic 	RLC_PREFIX(fp_sqr_basic)
-#define fp_sqr_comba 	RLC_PREFIX(fp_sqr_comba)
-#define fp_sqr_integ 	RLC_PREFIX(fp_sqr_integ)
-#define fp_sqr_karat 	RLC_PREFIX(fp_sqr_karat)
-#define fp_lsh 	RLC_PREFIX(fp_lsh)
-#define fp_rsh 	RLC_PREFIX(fp_rsh)
-#define fp_rdc_basic 	RLC_PREFIX(fp_rdc_basic)
-#define fp_rdc_monty_basic 	RLC_PREFIX(fp_rdc_monty_basic)
-#define fp_rdc_monty_comba 	RLC_PREFIX(fp_rdc_monty_comba)
-#define fp_rdc_quick 	RLC_PREFIX(fp_rdc_quick)
-#define fp_inv_basic 	RLC_PREFIX(fp_inv_basic)
-#define fp_inv_binar 	RLC_PREFIX(fp_inv_binar)
-#define fp_inv_monty 	RLC_PREFIX(fp_inv_monty)
-#define fp_inv_exgcd 	RLC_PREFIX(fp_inv_exgcd)
-#define fp_inv_divst 	RLC_PREFIX(fp_inv_divst)
-#define fp_inv_lower 	RLC_PREFIX(fp_inv_lower)
-#define fp_inv_sim 	RLC_PREFIX(fp_inv_sim)
-#define fp_exp_basic 	RLC_PREFIX(fp_exp_basic)
-#define fp_exp_slide 	RLC_PREFIX(fp_exp_slide)
-#define fp_exp_monty 	RLC_PREFIX(fp_exp_monty)
-#define fp_srt 	RLC_PREFIX(fp_srt)
-
-#undef fp_add1_low
-#undef fp_addn_low
-#undef fp_addm_low
-#undef fp_addd_low
-#undef fp_addc_low
-#undef fp_sub1_low
-#undef fp_subn_low
-#undef fp_subm_low
-#undef fp_subd_low
-#undef fp_subc_low
-#undef fp_negm_low
-#undef fp_dbln_low
-#undef fp_dblm_low
-#undef fp_hlvm_low
-#undef fp_hlvd_low
-#undef fp_lsh1_low
-#undef fp_lshb_low
-#undef fp_rsh1_low
-#undef fp_rshb_low
-#undef fp_mula_low
-#undef fp_mul1_low
-#undef fp_muln_low
-#undef fp_mulm_low
-#undef fp_sqrn_low
-#undef fp_sqrm_low
-#undef fp_rdcs_low
-#undef fp_rdcn_low
-#undef fp_invm_low
-
-#define fp_add1_low 	RLC_PREFIX(fp_add1_low)
-#define fp_addn_low 	RLC_PREFIX(fp_addn_low)
-#define fp_addm_low 	RLC_PREFIX(fp_addm_low)
-#define fp_addd_low 	RLC_PREFIX(fp_addd_low)
-#define fp_addc_low 	RLC_PREFIX(fp_addc_low)
-#define fp_sub1_low 	RLC_PREFIX(fp_sub1_low)
-#define fp_subn_low 	RLC_PREFIX(fp_subn_low)
-#define fp_subm_low 	RLC_PREFIX(fp_subm_low)
-#define fp_subd_low 	RLC_PREFIX(fp_subd_low)
-#define fp_subc_low 	RLC_PREFIX(fp_subc_low)
-#define fp_negm_low 	RLC_PREFIX(fp_negm_low)
-#define fp_dbln_low 	RLC_PREFIX(fp_dbln_low)
-#define fp_dblm_low 	RLC_PREFIX(fp_dblm_low)
-#define fp_hlvm_low 	RLC_PREFIX(fp_hlvm_low)
-#define fp_hlvd_low 	RLC_PREFIX(fp_hlvd_low)
-#define fp_lsh1_low 	RLC_PREFIX(fp_lsh1_low)
-#define fp_lshb_low 	RLC_PREFIX(fp_lshb_low)
-#define fp_rsh1_low 	RLC_PREFIX(fp_rsh1_low)
-#define fp_rshb_low 	RLC_PREFIX(fp_rshb_low)
-#define fp_mula_low 	RLC_PREFIX(fp_mula_low)
-#define fp_mul1_low 	RLC_PREFIX(fp_mul1_low)
-#define fp_muln_low 	RLC_PREFIX(fp_muln_low)
-#define fp_mulm_low 	RLC_PREFIX(fp_mulm_low)
-#define fp_sqrn_low 	RLC_PREFIX(fp_sqrn_low)
-#define fp_sqrm_low 	RLC_PREFIX(fp_sqrm_low)
-#define fp_rdcs_low 	RLC_PREFIX(fp_rdcs_low)
-#define fp_rdcn_low 	RLC_PREFIX(fp_rdcn_low)
-#define fp_invm_low 	RLC_PREFIX(fp_invm_low)
-
-#undef fp_st
-#undef fp_t
-#define fp_st	        RLC_PREFIX(fp_st)
-#define fp_t          RLC_PREFIX(fp_t)
-
-#undef fb_poly_init
-#undef fb_poly_clean
-#undef fb_poly_get
-#undef fb_poly_set_dense
-#undef fb_poly_set_trino
-#undef fb_poly_set_penta
-#undef fb_poly_get_srz
-#undef fb_poly_tab_srz
-#undef fb_poly_tab_sqr
-#undef fb_poly_get_chain
-#undef fb_poly_get_rdc
-#undef fb_poly_get_trc
-#undef fb_poly_get_slv
-#undef fb_param_set
-#undef fb_param_set_any
-#undef fb_param_print
-#undef fb_poly_add
-#undef fb_copy
-#undef fb_neg
-#undef fb_zero
-#undef fb_is_zero
-#undef fb_get_bit
-#undef fb_set_bit
-#undef fb_set_dig
-#undef fb_bits
-#undef fb_rand
-#undef fb_print
-#undef fb_size_str
-#undef fb_read_str
-#undef fb_write_str
-#undef fb_read_bin
-#undef fb_write_bin
-#undef fb_cmp
-#undef fb_cmp_dig
-#undef fb_add
-#undef fb_add_dig
-#undef fb_mul_basic
-#undef fb_mul_integ
-#undef fb_mul_lodah
-#undef fb_mul_dig
-#undef fb_mul_karat
-#undef fb_sqr_basic
-#undef fb_sqr_integ
-#undef fb_sqr_quick
-#undef fb_lsh
-#undef fb_rsh
-#undef fb_rdc_basic
-#undef fb_rdc_quick
-#undef fb_srt_basic
-#undef fb_srt_quick
-#undef fb_trc_basic
-#undef fb_trc_quick
-#undef fb_inv_basic
-#undef fb_inv_binar
-#undef fb_inv_exgcd
-#undef fb_inv_almos
-#undef fb_inv_itoht
-#undef fb_inv_bruch
-#undef fb_inv_ctaia
-#undef fb_inv_lower
-#undef fb_inv_sim
-#undef fb_exp_2b
-#undef fb_exp_basic
-#undef fb_exp_slide
-#undef fb_exp_monty
-#undef fb_slv_basic
-#undef fb_slv_quick
-#undef fb_itr_basic
-#undef fb_itr_pre_quick
-#undef fb_itr_quick
-
-#define fb_poly_init 	RLC_PREFIX(fb_poly_init)
-#define fb_poly_clean 	RLC_PREFIX(fb_poly_clean)
-#define fb_poly_get 	RLC_PREFIX(fb_poly_get)
-#define fb_poly_set_dense 	RLC_PREFIX(fb_poly_set_dense)
-#define fb_poly_set_trino 	RLC_PREFIX(fb_poly_set_trino)
-#define fb_poly_set_penta 	RLC_PREFIX(fb_poly_set_penta)
-#define fb_poly_get_srz 	RLC_PREFIX(fb_poly_get_srz)
-#define fb_poly_tab_srz 	RLC_PREFIX(fb_poly_tab_srz)
-#define fb_poly_tab_sqr 	RLC_PREFIX(fb_poly_tab_sqr)
-#define fb_poly_get_chain 	RLC_PREFIX(fb_poly_get_chain)
-#define fb_poly_get_rdc 	RLC_PREFIX(fb_poly_get_rdc)
-#define fb_poly_get_trc 	RLC_PREFIX(fb_poly_get_trc)
-#define fb_poly_get_slv 	RLC_PREFIX(fb_poly_get_slv)
-#define fb_param_set 	RLC_PREFIX(fb_param_set)
-#define fb_param_set_any 	RLC_PREFIX(fb_param_set_any)
-#define fb_param_print 	RLC_PREFIX(fb_param_print)
-#define fb_poly_add 	RLC_PREFIX(fb_poly_add)
-#define fb_copy 	RLC_PREFIX(fb_copy)
-#define fb_neg 	RLC_PREFIX(fb_neg)
-#define fb_zero 	RLC_PREFIX(fb_zero)
-#define fb_is_zero 	RLC_PREFIX(fb_is_zero)
-#define fb_get_bit 	RLC_PREFIX(fb_get_bit)
-#define fb_set_bit 	RLC_PREFIX(fb_set_bit)
-#define fb_set_dig 	RLC_PREFIX(fb_set_dig)
-#define fb_bits 	RLC_PREFIX(fb_bits)
-#define fb_rand 	RLC_PREFIX(fb_rand)
-#define fb_print 	RLC_PREFIX(fb_print)
-#define fb_size_str 	RLC_PREFIX(fb_size_str)
-#define fb_read_str 	RLC_PREFIX(fb_read_str)
-#define fb_write_str 	RLC_PREFIX(fb_write_str)
-#define fb_read_bin 	RLC_PREFIX(fb_read_bin)
-#define fb_write_bin 	RLC_PREFIX(fb_write_bin)
-#define fb_cmp 	RLC_PREFIX(fb_cmp)
-#define fb_cmp_dig 	RLC_PREFIX(fb_cmp_dig)
-#define fb_add 	RLC_PREFIX(fb_add)
-#define fb_add_dig 	RLC_PREFIX(fb_add_dig)
-#define fb_mul_basic 	RLC_PREFIX(fb_mul_basic)
-#define fb_mul_integ 	RLC_PREFIX(fb_mul_integ)
-#define fb_mul_lodah 	RLC_PREFIX(fb_mul_lodah)
-#define fb_mul_dig 	RLC_PREFIX(fb_mul_dig)
-#define fb_mul_karat 	RLC_PREFIX(fb_mul_karat)
-#define fb_sqr_basic 	RLC_PREFIX(fb_sqr_basic)
-#define fb_sqr_integ 	RLC_PREFIX(fb_sqr_integ)
-#define fb_sqr_quick 	RLC_PREFIX(fb_sqr_quick)
-#define fb_lsh 	RLC_PREFIX(fb_lsh)
-#define fb_rsh 	RLC_PREFIX(fb_rsh)
-#define fb_rdc_basic 	RLC_PREFIX(fb_rdc_basic)
-#define fb_rdc_quick 	RLC_PREFIX(fb_rdc_quick)
-#define fb_srt_basic 	RLC_PREFIX(fb_srt_basic)
-#define fb_srt_quick 	RLC_PREFIX(fb_srt_quick)
-#define fb_trc_basic 	RLC_PREFIX(fb_trc_basic)
-#define fb_trc_quick 	RLC_PREFIX(fb_trc_quick)
-#define fb_inv_basic 	RLC_PREFIX(fb_inv_basic)
-#define fb_inv_binar 	RLC_PREFIX(fb_inv_binar)
-#define fb_inv_exgcd 	RLC_PREFIX(fb_inv_exgcd)
-#define fb_inv_almos 	RLC_PREFIX(fb_inv_almos)
-#define fb_inv_itoht 	RLC_PREFIX(fb_inv_itoht)
-#define fb_inv_bruch 	RLC_PREFIX(fb_inv_bruch)
-#define fb_inv_ctaia 	RLC_PREFIX(fb_inv_ctaia)
-#define fb_inv_lower 	RLC_PREFIX(fb_inv_lower)
-#define fb_inv_sim 	RLC_PREFIX(fb_inv_sim)
-#define fb_exp_2b 	RLC_PREFIX(fb_exp_2b)
-#define fb_exp_basic 	RLC_PREFIX(fb_exp_basic)
-#define fb_exp_slide 	RLC_PREFIX(fb_exp_slide)
-#define fb_exp_monty 	RLC_PREFIX(fb_exp_monty)
-#define fb_slv_basic 	RLC_PREFIX(fb_slv_basic)
-#define fb_slv_quick 	RLC_PREFIX(fb_slv_quick)
-#define fb_itr_basic 	RLC_PREFIX(fb_itr_basic)
-#define fb_itr_pre_quick 	RLC_PREFIX(fb_itr_pre_quick)
-#define fb_itr_quick 	RLC_PREFIX(fb_itr_quick)
-
-#undef fb_add1_low
-#undef fb_addn_low
-#undef fb_addd_low
-#undef fb_lsh1_low
-#undef fb_lshb_low
-#undef fb_rsh1_low
-#undef fb_rshb_low
-#undef fb_lsha_low
-#undef fb_mul1_low
-#undef fb_muln_low
-#undef fb_muld_low
-#undef fb_mulm_low
-#undef fb_sqrn_low
-#undef fb_sqrl_low
-#undef fb_sqrm_low
-#undef fb_itrn_low
-#undef fb_srtn_low
-#undef fb_slvn_low
-#undef fb_trcn_low
-#undef fb_rdcn_low
-#undef fb_rdc1_low
-#undef fb_invn_low
-
-#define fb_add1_low 	RLC_PREFIX(fb_add1_low)
-#define fb_addn_low 	RLC_PREFIX(fb_addn_low)
-#define fb_addd_low 	RLC_PREFIX(fb_addd_low)
-#define fb_lsh1_low 	RLC_PREFIX(fb_lsh1_low)
-#define fb_lshb_low 	RLC_PREFIX(fb_lshb_low)
-#define fb_rsh1_low 	RLC_PREFIX(fb_rsh1_low)
-#define fb_rshb_low 	RLC_PREFIX(fb_rshb_low)
-#define fb_lsha_low 	RLC_PREFIX(fb_lsha_low)
-#define fb_mul1_low 	RLC_PREFIX(fb_mul1_low)
-#define fb_muln_low 	RLC_PREFIX(fb_muln_low)
-#define fb_muld_low 	RLC_PREFIX(fb_muld_low)
-#define fb_mulm_low 	RLC_PREFIX(fb_mulm_low)
-#define fb_sqrn_low 	RLC_PREFIX(fb_sqrn_low)
-#define fb_sqrl_low 	RLC_PREFIX(fb_sqrl_low)
-#define fb_sqrm_low 	RLC_PREFIX(fb_sqrm_low)
-#define fb_itrn_low 	RLC_PREFIX(fb_itrn_low)
-#define fb_srtn_low 	RLC_PREFIX(fb_srtn_low)
-#define fb_slvn_low 	RLC_PREFIX(fb_slvn_low)
-#define fb_trcn_low 	RLC_PREFIX(fb_trcn_low)
-#define fb_rdcn_low 	RLC_PREFIX(fb_rdcn_low)
-#define fb_rdc1_low 	RLC_PREFIX(fb_rdc1_low)
-#define fb_invn_low 	RLC_PREFIX(fb_invn_low)
-
-#undef ep_st
-#undef ep_t
-#define ep_st         RLC_PREFIX(ep_st)
-#define ep_t          RLC_PREFIX(ep_t)
-
-#undef ep_curve_init
-#undef ep_curve_clean
-#undef ep_curve_get_a
-#undef ep_curve_get_b
-#undef ep_curve_get_b3
-#undef ep_curve_get_beta
-#undef ep_curve_get_v1
-#undef ep_curve_get_v2
-#undef ep_curve_opt_a
-#undef ep_curve_opt_b
-#undef ep_curve_opt_b3
-#undef ep_curve_mul_a
-#undef ep_curve_mul_b
-#undef ep_curve_mul_b3
-#undef ep_curve_is_endom
-#undef ep_curve_is_super
-#undef ep_curve_is_pairf
-#undef ep_curve_is_ctmap
-#undef ep_curve_get_gen
-#undef ep_curve_get_tab
-#undef ep_curve_get_ord
-#undef ep_curve_get_cof
-#undef ep_curve_get_iso
-#undef ep_curve_set_plain
-#undef ep_curve_set_super
-#undef ep_curve_set_endom
-#undef ep_param_set
-#undef ep_param_set_any
-#undef ep_param_set_any_plain
-#undef ep_param_set_any_endom
-#undef ep_param_set_any_super
-#undef ep_param_set_any_pairf
-#undef ep_param_get
-#undef ep_param_print
-#undef ep_param_level
-#undef ep_param_embed
-#undef ep_is_infty
-#undef ep_set_infty
-#undef ep_copy
-#undef ep_cmp
-#undef ep_rand
-#undef ep_blind
-#undef ep_rhs
-#undef ep_on_curve
-#undef ep_tab
-#undef ep_print
-#undef ep_size_bin
-#undef ep_read_bin
-#undef ep_write_bin
-#undef ep_neg
-#undef ep_add_basic
-#undef ep_add_slp_basic
-#undef ep_add_projc
-#undef ep_add_jacob
-#undef ep_sub
-#undef ep_dbl_basic
-#undef ep_dbl_slp_basic
-#undef ep_dbl_projc
-#undef ep_dbl_jacob
-#undef ep_psi
-#undef ep_mul_basic
-#undef ep_mul_slide
-#undef ep_mul_monty
-#undef ep_mul_lwnaf
-#undef ep_mul_lwreg
-#undef ep_mul_gen
-#undef ep_mul_dig
-#undef ep_mul_pre_basic
-#undef ep_mul_pre_yaowi
-#undef ep_mul_pre_nafwi
-#undef ep_mul_pre_combs
-#undef ep_mul_pre_combd
-#undef ep_mul_pre_lwnaf
-#undef ep_mul_fix_basic
-#undef ep_mul_fix_yaowi
-#undef ep_mul_fix_nafwi
-#undef ep_mul_fix_combs
-#undef ep_mul_fix_combd
-#undef ep_mul_fix_lwnaf
-#undef ep_mul_sim_basic
-#undef ep_mul_sim_trick
-#undef ep_mul_sim_inter
-#undef ep_mul_sim_joint
-#undef ep_mul_sim_lot
-#undef ep_mul_sim_gen
-#undef ep_mul_sim_dig
-#undef ep_norm
-#undef ep_norm_sim
-#undef ep_map
-#undef ep_map_dst
-#undef ep_map_dst
-#undef ep_pck
-#undef ep_upk
-
-  multiplication function, #define ep_mul_basic 	RLC_PREFIX(ep_mul_basic)
-#define ep_curve_init 	RLC_PREFIX(ep_curve_init)
-#define ep_curve_clean 	RLC_PREFIX(ep_curve_clean)
-#define ep_curve_get_a 	RLC_PREFIX(ep_curve_get_a)
-#define ep_curve_get_b 	RLC_PREFIX(ep_curve_get_b)
-#define ep_curve_get_b3 	RLC_PREFIX(ep_curve_get_b3)
-#define ep_curve_get_beta 	RLC_PREFIX(ep_curve_get_beta)
-#define ep_curve_get_v1 	RLC_PREFIX(ep_curve_get_v1)
-#define ep_curve_get_v2 	RLC_PREFIX(ep_curve_get_v2)
-#define ep_curve_opt_a 	RLC_PREFIX(ep_curve_opt_a)
-#define ep_curve_opt_b 	RLC_PREFIX(ep_curve_opt_b)
-#define ep_curve_opt_b3 	RLC_PREFIX(ep_curve_opt_b3)
-#define ep_curve_mul_a 	RLC_PREFIX(ep_curve_mul_a)
-#define ep_curve_mul_b 	RLC_PREFIX(ep_curve_mul_b)
-#define ep_curve_mul_b3 	RLC_PREFIX(ep_curve_mul_b3)
-#define ep_curve_is_endom 	RLC_PREFIX(ep_curve_is_endom)
-#define ep_curve_is_super 	RLC_PREFIX(ep_curve_is_super)
-#define ep_curve_is_pairf 	RLC_PREFIX(ep_curve_is_pairf)
-#define ep_curve_is_ctmap 	RLC_PREFIX(ep_curve_is_ctmap)
-#define ep_curve_get_gen 	RLC_PREFIX(ep_curve_get_gen)
-#define ep_curve_get_tab 	RLC_PREFIX(ep_curve_get_tab)
-#define ep_curve_get_ord 	RLC_PREFIX(ep_curve_get_ord)
-#define ep_curve_get_cof 	RLC_PREFIX(ep_curve_get_cof)
-#define ep_curve_get_iso 	RLC_PREFIX(ep_curve_get_iso)
-#define ep_curve_set_plain 	RLC_PREFIX(ep_curve_set_plain)
-#define ep_curve_set_super 	RLC_PREFIX(ep_curve_set_super)
-#define ep_curve_set_endom 	RLC_PREFIX(ep_curve_set_endom)
-#define ep_param_set 	RLC_PREFIX(ep_param_set)
-#define ep_param_set_any 	RLC_PREFIX(ep_param_set_any)
-#define ep_param_set_any_plain 	RLC_PREFIX(ep_param_set_any_plain)
-#define ep_param_set_any_endom 	RLC_PREFIX(ep_param_set_any_endom)
-#define ep_param_set_any_super 	RLC_PREFIX(ep_param_set_any_super)
-#define ep_param_set_any_pairf 	RLC_PREFIX(ep_param_set_any_pairf)
-#define ep_param_get 	RLC_PREFIX(ep_param_get)
-#define ep_param_print 	RLC_PREFIX(ep_param_print)
-#define ep_param_level 	RLC_PREFIX(ep_param_level)
-#define ep_param_embed 	RLC_PREFIX(ep_param_embed)
-#define ep_is_infty 	RLC_PREFIX(ep_is_infty)
-#define ep_set_infty 	RLC_PREFIX(ep_set_infty)
-#define ep_copy 	RLC_PREFIX(ep_copy)
-#define ep_cmp 	RLC_PREFIX(ep_cmp)
-#define ep_rand 	RLC_PREFIX(ep_rand)
-#define ep_blind 	RLC_PREFIX(ep_blind)
-#define ep_rhs 	RLC_PREFIX(ep_rhs)
-#define ep_on_curve 	RLC_PREFIX(ep_on_curve)
-#define ep_tab 	RLC_PREFIX(ep_tab)
-#define ep_print 	RLC_PREFIX(ep_print)
-#define ep_size_bin 	RLC_PREFIX(ep_size_bin)
-#define ep_read_bin 	RLC_PREFIX(ep_read_bin)
-#define ep_write_bin 	RLC_PREFIX(ep_write_bin)
-#define ep_neg 	RLC_PREFIX(ep_neg)
-#define ep_add_basic 	RLC_PREFIX(ep_add_basic)
-#define ep_add_slp_basic 	RLC_PREFIX(ep_add_slp_basic)
-#define ep_add_projc 	RLC_PREFIX(ep_add_projc)
-#define ep_add_jacob 	RLC_PREFIX(ep_add_jacob)
-#define ep_sub 	RLC_PREFIX(ep_sub)
-#define ep_dbl_basic 	RLC_PREFIX(ep_dbl_basic)
-#define ep_dbl_slp_basic 	RLC_PREFIX(ep_dbl_slp_basic)
-#define ep_dbl_projc 	RLC_PREFIX(ep_dbl_projc)
-#define ep_dbl_jacob 	RLC_PREFIX(ep_dbl_jacob)
-#define ep_psi 	RLC_PREFIX(ep_psi)
-#define ep_mul_basic 	RLC_PREFIX(ep_mul_basic)
-#define ep_mul_slide 	RLC_PREFIX(ep_mul_slide)
-#define ep_mul_monty 	RLC_PREFIX(ep_mul_monty)
-#define ep_mul_lwnaf 	RLC_PREFIX(ep_mul_lwnaf)
-#define ep_mul_lwreg 	RLC_PREFIX(ep_mul_lwreg)
-#define ep_mul_gen 	RLC_PREFIX(ep_mul_gen)
-#define ep_mul_dig 	RLC_PREFIX(ep_mul_dig)
-#define ep_mul_pre_basic 	RLC_PREFIX(ep_mul_pre_basic)
-#define ep_mul_pre_yaowi 	RLC_PREFIX(ep_mul_pre_yaowi)
-#define ep_mul_pre_nafwi 	RLC_PREFIX(ep_mul_pre_nafwi)
-#define ep_mul_pre_combs 	RLC_PREFIX(ep_mul_pre_combs)
-#define ep_mul_pre_combd 	RLC_PREFIX(ep_mul_pre_combd)
-#define ep_mul_pre_lwnaf 	RLC_PREFIX(ep_mul_pre_lwnaf)
-#define ep_mul_fix_basic 	RLC_PREFIX(ep_mul_fix_basic)
-#define ep_mul_fix_yaowi 	RLC_PREFIX(ep_mul_fix_yaowi)
-#define ep_mul_fix_nafwi 	RLC_PREFIX(ep_mul_fix_nafwi)
-#define ep_mul_fix_combs 	RLC_PREFIX(ep_mul_fix_combs)
-#define ep_mul_fix_combd 	RLC_PREFIX(ep_mul_fix_combd)
-#define ep_mul_fix_lwnaf 	RLC_PREFIX(ep_mul_fix_lwnaf)
-#define ep_mul_sim_basic 	RLC_PREFIX(ep_mul_sim_basic)
-#define ep_mul_sim_trick 	RLC_PREFIX(ep_mul_sim_trick)
-#define ep_mul_sim_inter 	RLC_PREFIX(ep_mul_sim_inter)
-#define ep_mul_sim_joint 	RLC_PREFIX(ep_mul_sim_joint)
-#define ep_mul_sim_lot 	RLC_PREFIX(ep_mul_sim_lot)
-#define ep_mul_sim_gen 	RLC_PREFIX(ep_mul_sim_gen)
-#define ep_mul_sim_dig 	RLC_PREFIX(ep_mul_sim_dig)
-#define ep_norm 	RLC_PREFIX(ep_norm)
-#define ep_norm_sim 	RLC_PREFIX(ep_norm_sim)
-#define ep_map 	RLC_PREFIX(ep_map)
-#define ep_map_dst 	RLC_PREFIX(ep_map_dst)
-#define ep_map_dst 	RLC_PREFIX(ep_map_dst)
-#define ep_pck 	RLC_PREFIX(ep_pck)
-#define ep_upk 	RLC_PREFIX(ep_upk)
-
-#undef ed_st
-#undef ed_t
-#define ed_st         RLC_PREFIX(ed_st)
-#define ed_t          RLC_PREFIX(ed_t)
-
-#undef ed_param_set
-#undef ed_param_set_any
-#undef ed_param_get
-#undef ed_curve_get_ord
-#undef ed_curve_get_gen
-#undef ed_curve_get_tab
-#undef ed_curve_get_cof
-#undef ed_param_print
-#undef ed_param_level
-#undef ed_projc_to_extnd
-#undef ed_rand
-#undef ed_blind
-#undef ed_rhs
-#undef ed_copy
-#undef ed_cmp
-#undef ed_set_infty
-#undef ed_is_infty
-#undef ed_neg_basic
-#undef ed_neg_projc
-#undef ed_add_basic
-#undef ed_add_projc
-#undef ed_add_extnd
-#undef ed_sub_basic
-#undef ed_sub_projc
-#undef ed_sub_extnd
-#undef ed_dbl_basic
-#undef ed_dbl_projc
-#undef ed_dbl_extnd
-#undef ed_norm
-#undef ed_norm_sim
-#undef ed_map
-#undef ed_map_dst
-#undef ed_curve_init
-#undef ed_curve_clean
-#undef ed_mul_pre_basic
-#undef ed_mul_pre_yaowi
-#undef ed_mul_pre_nafwi
-#undef ed_mul_pre_combs
-#undef ed_mul_pre_combd
-#undef ed_mul_pre_lwnaf
-#undef ed_mul_fix_basic
-#undef ed_mul_fix_yaowi
-#undef ed_mul_fix_nafwi
-#undef ed_mul_fix_combs
-#undef ed_mul_fix_combd
-#undef ed_mul_fix_lwnaf
-#undef ed_mul_fix_lwnaf_mixed
-#undef ed_mul_gen
-#undef ed_mul_dig
-#undef ed_mul_sim_basic
-#undef ed_mul_sim_trick
-#undef ed_mul_sim_inter
-#undef ed_mul_sim_joint
-#undef ed_mul_sim_gen
-#undef ed_tab
-#undef ed_print
-#undef ed_on_curve
-#undef ed_size_bin
-#undef ed_read_bin
-#undef ed_write_bin
-#undef ed_mul_basic
-#undef ed_mul_slide
-#undef ed_mul_monty
-#undef ed_mul_lwnaf
-#undef ed_mul_lwreg
-#undef ed_pck
-#undef ed_upk
-
-#define ed_param_set 	RLC_PREFIX(ed_param_set)
-#define ed_param_set_any 	RLC_PREFIX(ed_param_set_any)
-#define ed_param_get 	RLC_PREFIX(ed_param_get)
-#define ed_curve_get_ord 	RLC_PREFIX(ed_curve_get_ord)
-#define ed_curve_get_gen 	RLC_PREFIX(ed_curve_get_gen)
-#define ed_curve_get_tab 	RLC_PREFIX(ed_curve_get_tab)
-#define ed_curve_get_cof 	RLC_PREFIX(ed_curve_get_cof)
-#define ed_param_print 	RLC_PREFIX(ed_param_print)
-#define ed_param_level 	RLC_PREFIX(ed_param_level)
-#define ed_projc_to_extnd 	RLC_PREFIX(ed_projc_to_extnd)
-#define ed_rand 	RLC_PREFIX(ed_rand)
-#define ed_blind 	RLC_PREFIX(ed_blind)
-#define ed_rhs 	RLC_PREFIX(ed_rhs)
-#define ed_copy 	RLC_PREFIX(ed_copy)
-#define ed_cmp 	RLC_PREFIX(ed_cmp)
-#define ed_set_infty 	RLC_PREFIX(ed_set_infty)
-#define ed_is_infty 	RLC_PREFIX(ed_is_infty)
-#define ed_neg_basic 	RLC_PREFIX(ed_neg_basic)
-#define ed_neg_projc 	RLC_PREFIX(ed_neg_projc)
-#define ed_add_basic 	RLC_PREFIX(ed_add_basic)
-#define ed_add_projc 	RLC_PREFIX(ed_add_projc)
-#define ed_add_extnd 	RLC_PREFIX(ed_add_extnd)
-#define ed_sub_basic 	RLC_PREFIX(ed_sub_basic)
-#define ed_sub_projc 	RLC_PREFIX(ed_sub_projc)
-#define ed_sub_extnd 	RLC_PREFIX(ed_sub_extnd)
-#define ed_dbl_basic 	RLC_PREFIX(ed_dbl_basic)
-#define ed_dbl_projc 	RLC_PREFIX(ed_dbl_projc)
-#define ed_dbl_extnd 	RLC_PREFIX(ed_dbl_extnd)
-#define ed_norm 	RLC_PREFIX(ed_norm)
-#define ed_norm_sim 	RLC_PREFIX(ed_norm_sim)
-#define ed_map 	RLC_PREFIX(ed_map)
-#define ed_map_dst 	RLC_PREFIX(ed_map_dst)
-#define ed_curve_init 	RLC_PREFIX(ed_curve_init)
-#define ed_curve_clean 	RLC_PREFIX(ed_curve_clean)
-#define ed_mul_pre_basic 	RLC_PREFIX(ed_mul_pre_basic)
-#define ed_mul_pre_yaowi 	RLC_PREFIX(ed_mul_pre_yaowi)
-#define ed_mul_pre_nafwi 	RLC_PREFIX(ed_mul_pre_nafwi)
-#define ed_mul_pre_combs 	RLC_PREFIX(ed_mul_pre_combs)
-#define ed_mul_pre_combd 	RLC_PREFIX(ed_mul_pre_combd)
-#define ed_mul_pre_lwnaf 	RLC_PREFIX(ed_mul_pre_lwnaf)
-#define ed_mul_fix_basic 	RLC_PREFIX(ed_mul_fix_basic)
-#define ed_mul_fix_yaowi 	RLC_PREFIX(ed_mul_fix_yaowi)
-#define ed_mul_fix_nafwi 	RLC_PREFIX(ed_mul_fix_nafwi)
-#define ed_mul_fix_combs 	RLC_PREFIX(ed_mul_fix_combs)
-#define ed_mul_fix_combd 	RLC_PREFIX(ed_mul_fix_combd)
-#define ed_mul_fix_lwnaf 	RLC_PREFIX(ed_mul_fix_lwnaf)
-#define ed_mul_fix_lwnaf_mixed 	RLC_PREFIX(ed_mul_fix_lwnaf_mixed)
-#define ed_mul_gen 	RLC_PREFIX(ed_mul_gen)
-#define ed_mul_dig 	RLC_PREFIX(ed_mul_dig)
-#define ed_mul_sim_basic 	RLC_PREFIX(ed_mul_sim_basic)
-#define ed_mul_sim_trick 	RLC_PREFIX(ed_mul_sim_trick)
-#define ed_mul_sim_inter 	RLC_PREFIX(ed_mul_sim_inter)
-#define ed_mul_sim_joint 	RLC_PREFIX(ed_mul_sim_joint)
-#define ed_mul_sim_gen 	RLC_PREFIX(ed_mul_sim_gen)
-#define ed_tab 	RLC_PREFIX(ed_tab)
-#define ed_print 	RLC_PREFIX(ed_print)
-#define ed_on_curve 	RLC_PREFIX(ed_on_curve)
-#define ed_size_bin 	RLC_PREFIX(ed_size_bin)
-#define ed_read_bin 	RLC_PREFIX(ed_read_bin)
-#define ed_write_bin 	RLC_PREFIX(ed_write_bin)
-#define ed_mul_basic 	RLC_PREFIX(ed_mul_basic)
-#define ed_mul_slide 	RLC_PREFIX(ed_mul_slide)
-#define ed_mul_monty 	RLC_PREFIX(ed_mul_monty)
-#define ed_mul_lwnaf 	RLC_PREFIX(ed_mul_lwnaf)
-#define ed_mul_lwreg 	RLC_PREFIX(ed_mul_lwreg)
-#define ed_pck 	RLC_PREFIX(ed_pck)
-#define ed_upk 	RLC_PREFIX(ed_upk)
-
-#undef eb_st
-#undef eb_t
-#define eb_st         RLC_PREFIX(eb_st)
-#define eb_t          RLC_PREFIX(eb_t)
-
-#undef eb_curve_init
-#undef eb_curve_clean
-#undef eb_curve_get_a
-#undef eb_curve_get_b
-#undef eb_curve_opt_a
-#undef eb_curve_opt_b
-#undef eb_curve_is_kbltz
-#undef eb_curve_get_gen
-#undef eb_curve_get_tab
-#undef eb_curve_get_ord
-#undef eb_curve_get_cof
-#undef eb_curve_set
-#undef eb_param_set
-#undef eb_param_set_any
-#undef eb_param_set_any_plain
-#undef eb_param_set_any_kbltz
-#undef eb_param_get
-#undef eb_param_print
-#undef eb_param_level
-#undef eb_is_infty
-#undef eb_set_infty
-#undef eb_copy
-#undef eb_cmp
-#undef eb_rand
-#undef eb_blind
-#undef eb_rhs
-#undef eb_on_curve
-#undef eb_tab
-#undef eb_print
-#undef eb_size_bin
-#undef eb_read_bin
-#undef eb_write_bin
-#undef eb_neg_basic
-#undef eb_neg_projc
-#undef eb_add_basic
-#undef eb_add_projc
-#undef eb_sub_basic
-#undef eb_sub_projc
-#undef eb_dbl_basic
-#undef eb_dbl_projc
-#undef eb_hlv
-#undef eb_frb
-#undef eb_mul_basic
-#undef eb_mul_lodah
-#undef eb_mul_lwnaf
-#undef eb_mul_rwnaf
-#undef eb_mul_halve
-#undef eb_mul_gen
-#undef eb_mul_dig
-#undef eb_mul_pre_basic
-#undef eb_mul_pre_yaowi
-#undef eb_mul_pre_nafwi
-#undef eb_mul_pre_combs
-#undef eb_mul_pre_combd
-#undef eb_mul_pre_lwnaf
-#undef eb_mul_fix_basic
-#undef eb_mul_fix_yaowi
-#undef eb_mul_fix_nafwi
-#undef eb_mul_fix_combs
-#undef eb_mul_fix_combd
-#undef eb_mul_fix_lwnaf
-#undef eb_mul_sim_basic
-#undef eb_mul_sim_trick
-#undef eb_mul_sim_inter
-#undef eb_mul_sim_joint
-#undef eb_mul_sim_gen
-#undef eb_norm
-#undef eb_norm_sim
-#undef eb_map
-#undef eb_pck
-#undef eb_upk
-
-#define eb_curve_init 	RLC_PREFIX(eb_curve_init)
-#define eb_curve_clean 	RLC_PREFIX(eb_curve_clean)
-#define eb_curve_get_a 	RLC_PREFIX(eb_curve_get_a)
-#define eb_curve_get_b 	RLC_PREFIX(eb_curve_get_b)
-#define eb_curve_opt_a 	RLC_PREFIX(eb_curve_opt_a)
-#define eb_curve_opt_b 	RLC_PREFIX(eb_curve_opt_b)
-#define eb_curve_is_kbltz 	RLC_PREFIX(eb_curve_is_kbltz)
-#define eb_curve_get_gen 	RLC_PREFIX(eb_curve_get_gen)
-#define eb_curve_get_tab 	RLC_PREFIX(eb_curve_get_tab)
-#define eb_curve_get_ord 	RLC_PREFIX(eb_curve_get_ord)
-#define eb_curve_get_cof 	RLC_PREFIX(eb_curve_get_cof)
-#define eb_curve_set 	RLC_PREFIX(eb_curve_set)
-#define eb_param_set 	RLC_PREFIX(eb_param_set)
-#define eb_param_set_any 	RLC_PREFIX(eb_param_set_any)
-#define eb_param_set_any_plain 	RLC_PREFIX(eb_param_set_any_plain)
-#define eb_param_set_any_kbltz 	RLC_PREFIX(eb_param_set_any_kbltz)
-#define eb_param_get 	RLC_PREFIX(eb_param_get)
-#define eb_param_print 	RLC_PREFIX(eb_param_print)
-#define eb_param_level 	RLC_PREFIX(eb_param_level)
-#define eb_is_infty 	RLC_PREFIX(eb_is_infty)
-#define eb_set_infty 	RLC_PREFIX(eb_set_infty)
-#define eb_copy 	RLC_PREFIX(eb_copy)
-#define eb_cmp 	RLC_PREFIX(eb_cmp)
-#define eb_rand 	RLC_PREFIX(eb_rand)
-#define eb_blind 	RLC_PREFIX(eb_blind)
-#define eb_rhs 	RLC_PREFIX(eb_rhs)
-#define eb_on_curve 	RLC_PREFIX(eb_on_curve)
-#define eb_tab 	RLC_PREFIX(eb_tab)
-#define eb_print 	RLC_PREFIX(eb_print)
-#define eb_size_bin 	RLC_PREFIX(eb_size_bin)
-#define eb_read_bin 	RLC_PREFIX(eb_read_bin)
-#define eb_write_bin 	RLC_PREFIX(eb_write_bin)
-#define eb_neg_basic 	RLC_PREFIX(eb_neg_basic)
-#define eb_neg_projc 	RLC_PREFIX(eb_neg_projc)
-#define eb_add_basic 	RLC_PREFIX(eb_add_basic)
-#define eb_add_projc 	RLC_PREFIX(eb_add_projc)
-#define eb_sub_basic 	RLC_PREFIX(eb_sub_basic)
-#define eb_sub_projc 	RLC_PREFIX(eb_sub_projc)
-#define eb_dbl_basic 	RLC_PREFIX(eb_dbl_basic)
-#define eb_dbl_projc 	RLC_PREFIX(eb_dbl_projc)
-#define eb_hlv 	RLC_PREFIX(eb_hlv)
-#define eb_frb 	RLC_PREFIX(eb_frb)
-#define eb_mul_basic 	RLC_PREFIX(eb_mul_basic)
-#define eb_mul_lodah 	RLC_PREFIX(eb_mul_lodah)
-#define eb_mul_lwnaf 	RLC_PREFIX(eb_mul_lwnaf)
-#define eb_mul_rwnaf 	RLC_PREFIX(eb_mul_rwnaf)
-#define eb_mul_halve 	RLC_PREFIX(eb_mul_halve)
-#define eb_mul_gen 	RLC_PREFIX(eb_mul_gen)
-#define eb_mul_dig 	RLC_PREFIX(eb_mul_dig)
-#define eb_mul_pre_basic 	RLC_PREFIX(eb_mul_pre_basic)
-#define eb_mul_pre_yaowi 	RLC_PREFIX(eb_mul_pre_yaowi)
-#define eb_mul_pre_nafwi 	RLC_PREFIX(eb_mul_pre_nafwi)
-#define eb_mul_pre_combs 	RLC_PREFIX(eb_mul_pre_combs)
-#define eb_mul_pre_combd 	RLC_PREFIX(eb_mul_pre_combd)
-#define eb_mul_pre_lwnaf 	RLC_PREFIX(eb_mul_pre_lwnaf)
-#define eb_mul_fix_basic 	RLC_PREFIX(eb_mul_fix_basic)
-#define eb_mul_fix_yaowi 	RLC_PREFIX(eb_mul_fix_yaowi)
-#define eb_mul_fix_nafwi 	RLC_PREFIX(eb_mul_fix_nafwi)
-#define eb_mul_fix_combs 	RLC_PREFIX(eb_mul_fix_combs)
-#define eb_mul_fix_combd 	RLC_PREFIX(eb_mul_fix_combd)
-#define eb_mul_fix_lwnaf 	RLC_PREFIX(eb_mul_fix_lwnaf)
-#define eb_mul_sim_basic 	RLC_PREFIX(eb_mul_sim_basic)
-#define eb_mul_sim_trick 	RLC_PREFIX(eb_mul_sim_trick)
-#define eb_mul_sim_inter 	RLC_PREFIX(eb_mul_sim_inter)
-#define eb_mul_sim_joint 	RLC_PREFIX(eb_mul_sim_joint)
-#define eb_mul_sim_gen 	RLC_PREFIX(eb_mul_sim_gen)
-#define eb_norm 	RLC_PREFIX(eb_norm)
-#define eb_norm_sim 	RLC_PREFIX(eb_norm_sim)
-#define eb_map 	RLC_PREFIX(eb_map)
-#define eb_pck 	RLC_PREFIX(eb_pck)
-#define eb_upk 	RLC_PREFIX(eb_upk)
-
-#undef ep2_st
-#undef ep2_t
-#define ep2_st        RLC_PREFIX(ep2_st)
-#define ep2_t         RLC_PREFIX(ep2_t)
-
-#undef ep2_curve_init
-#undef ep2_curve_clean
-#undef ep2_curve_get_a
-#undef ep2_curve_get_b
-#undef ep2_curve_get_vs
-#undef ep2_curve_opt_a
-#undef ep2_curve_opt_b
-#undef ep2_curve_is_twist
-#undef ep2_curve_is_ctmap
-#undef ep2_curve_get_gen
-#undef ep2_curve_get_tab
-#undef ep2_curve_get_ord
-#undef ep2_curve_get_cof
-#undef ep2_curve_get_iso
-#undef ep2_curve_set
-#undef ep2_curve_set_twist
-#undef ep2_is_infty
-#undef ep2_set_infty
-#undef ep2_copy
-#undef ep2_cmp
-#undef ep2_rand
-#undef ep2_blind
-#undef ep2_rhs
-#undef ep2_on_curve
-#undef ep2_tab
-#undef ep2_print
-#undef ep2_size_bin
-#undef ep2_read_bin
-#undef ep2_write_bin
-#undef ep2_neg
-#undef ep2_add_basic
-#undef ep2_add_slp_basic
-#undef ep2_add_projc
- #undef ep2_sub
-#undef ep2_dbl_basic
-#undef ep2_dbl_slp_basic
-#undef ep2_dbl_projc
-#undef ep2_mul_basic
-#undef ep2_mul_slide
-#undef ep2_mul_monty
-#undef ep2_mul_lwnaf
-#undef ep2_mul_lwreg
-#undef ep2_mul_gen
-#undef ep2_mul_dig
-#undef ep2_mul_cof
-#undef ep2_mul_pre_basic
-#undef ep2_mul_pre_yaowi
-#undef ep2_mul_pre_nafwi
-#undef ep2_mul_pre_combs
-#undef ep2_mul_pre_combd
-#undef ep2_mul_pre_lwnaf
-#undef ep2_mul_fix_basic
-#undef ep2_mul_fix_yaowi
-#undef ep2_mul_fix_nafwi
-#undef ep2_mul_fix_combs
-#undef ep2_mul_fix_combd
-#undef ep2_mul_fix_lwnaf
-#undef ep2_mul_sim_basic
-#undef ep2_mul_sim_trick
-#undef ep2_mul_sim_inter
-#undef ep2_mul_sim_joint
-#undef ep2_mul_sim_lot
-#undef ep2_mul_sim_gen
-#undef ep2_mul_sim_dig
-#undef ep2_norm
-#undef ep2_norm_sim
-#undef ep2_map
-#undef ep2_map_dst
-#undef ep2_frb
-#undef ep2_pck
-#undef ep2_upk
-
-#define ep2_curve_init 	RLC_PREFIX(ep2_curve_init)
-#define ep2_curve_clean 	RLC_PREFIX(ep2_curve_clean)
-#define ep2_curve_get_a 	RLC_PREFIX(ep2_curve_get_a)
-#define ep2_curve_get_b 	RLC_PREFIX(ep2_curve_get_b)
-#define ep2_curve_get_vs 	RLC_PREFIX(ep2_curve_get_vs)
-#define ep2_curve_opt_a 	RLC_PREFIX(ep2_curve_opt_a)
-#define ep2_curve_opt_b 	RLC_PREFIX(ep2_curve_opt_b)
-#define ep2_curve_is_twist 	RLC_PREFIX(ep2_curve_is_twist)
-#define ep2_curve_is_ctmap 	RLC_PREFIX(ep2_curve_is_ctmap)
-#define ep2_curve_get_gen 	RLC_PREFIX(ep2_curve_get_gen)
-#define ep2_curve_get_tab 	RLC_PREFIX(ep2_curve_get_tab)
-#define ep2_curve_get_ord 	RLC_PREFIX(ep2_curve_get_ord)
-#define ep2_curve_get_cof 	RLC_PREFIX(ep2_curve_get_cof)
-#define ep2_curve_get_iso 	RLC_PREFIX(ep2_curve_get_iso)
-#define ep2_curve_set 	RLC_PREFIX(ep2_curve_set)
-#define ep2_curve_set_twist 	RLC_PREFIX(ep2_curve_set_twist)
-#define ep2_is_infty 	RLC_PREFIX(ep2_is_infty)
-#define ep2_set_infty 	RLC_PREFIX(ep2_set_infty)
-#define ep2_copy 	RLC_PREFIX(ep2_copy)
-#define ep2_cmp 	RLC_PREFIX(ep2_cmp)
-#define ep2_rand 	RLC_PREFIX(ep2_rand)
-#define ep2_blind 	RLC_PREFIX(ep2_blind)
-#define ep2_rhs 	RLC_PREFIX(ep2_rhs)
-#define ep2_on_curve 	RLC_PREFIX(ep2_on_curve)
-#define ep2_tab 	RLC_PREFIX(ep2_tab)
-#define ep2_print 	RLC_PREFIX(ep2_print)
-#define ep2_size_bin 	RLC_PREFIX(ep2_size_bin)
-#define ep2_read_bin 	RLC_PREFIX(ep2_read_bin)
-#define ep2_write_bin 	RLC_PREFIX(ep2_write_bin)
-#define ep2_neg 	RLC_PREFIX(ep2_neg)
-#define ep2_add_basic 	RLC_PREFIX(ep2_add_basic)
-#define ep2_add_slp_basic 	RLC_PREFIX(ep2_add_slp_basic)
-#define ep2_add_projc 	RLC_PREFIX(ep2_add_projc)
- #define ep2_sub 	RLC_PREFIX(ep2_sub)
-#define ep2_dbl_basic 	RLC_PREFIX(ep2_dbl_basic)
-#define ep2_dbl_slp_basic 	RLC_PREFIX(ep2_dbl_slp_basic)
-#define ep2_dbl_projc 	RLC_PREFIX(ep2_dbl_projc)
-#define ep2_mul_basic 	RLC_PREFIX(ep2_mul_basic)
-#define ep2_mul_slide 	RLC_PREFIX(ep2_mul_slide)
-#define ep2_mul_monty 	RLC_PREFIX(ep2_mul_monty)
-#define ep2_mul_lwnaf 	RLC_PREFIX(ep2_mul_lwnaf)
-#define ep2_mul_lwreg 	RLC_PREFIX(ep2_mul_lwreg)
-#define ep2_mul_gen 	RLC_PREFIX(ep2_mul_gen)
-#define ep2_mul_dig 	RLC_PREFIX(ep2_mul_dig)
-#define ep2_mul_cof 	RLC_PREFIX(ep2_mul_cof)
-#define ep2_mul_pre_basic 	RLC_PREFIX(ep2_mul_pre_basic)
-#define ep2_mul_pre_yaowi 	RLC_PREFIX(ep2_mul_pre_yaowi)
-#define ep2_mul_pre_nafwi 	RLC_PREFIX(ep2_mul_pre_nafwi)
-#define ep2_mul_pre_combs 	RLC_PREFIX(ep2_mul_pre_combs)
-#define ep2_mul_pre_combd 	RLC_PREFIX(ep2_mul_pre_combd)
-#define ep2_mul_pre_lwnaf 	RLC_PREFIX(ep2_mul_pre_lwnaf)
-#define ep2_mul_fix_basic 	RLC_PREFIX(ep2_mul_fix_basic)
-#define ep2_mul_fix_yaowi 	RLC_PREFIX(ep2_mul_fix_yaowi)
-#define ep2_mul_fix_nafwi 	RLC_PREFIX(ep2_mul_fix_nafwi)
-#define ep2_mul_fix_combs 	RLC_PREFIX(ep2_mul_fix_combs)
-#define ep2_mul_fix_combd 	RLC_PREFIX(ep2_mul_fix_combd)
-#define ep2_mul_fix_lwnaf 	RLC_PREFIX(ep2_mul_fix_lwnaf)
-#define ep2_mul_sim_basic 	RLC_PREFIX(ep2_mul_sim_basic)
-#define ep2_mul_sim_trick 	RLC_PREFIX(ep2_mul_sim_trick)
-#define ep2_mul_sim_inter 	RLC_PREFIX(ep2_mul_sim_inter)
-#define ep2_mul_sim_joint 	RLC_PREFIX(ep2_mul_sim_joint)
-#define ep2_mul_sim_lot 	RLC_PREFIX(ep2_mul_sim_lot)
-#define ep2_mul_sim_gen 	RLC_PREFIX(ep2_mul_sim_gen)
-#define ep2_mul_sim_dig 	RLC_PREFIX(ep2_mul_sim_dig)
-#define ep2_norm 	RLC_PREFIX(ep2_norm)
-#define ep2_norm_sim 	RLC_PREFIX(ep2_norm_sim)
-#define ep2_map 	RLC_PREFIX(ep2_map)
-#define ep2_map_dst 	RLC_PREFIX(ep2_map_dst)
-#define ep2_frb 	RLC_PREFIX(ep2_frb)
-#define ep2_pck 	RLC_PREFIX(ep2_pck)
-#define ep2_upk 	RLC_PREFIX(ep2_upk)
-
-#undef fp2_st
-#undef fp2_t
-#undef dv2_t
-#define fp2_st        RLC_PREFIX(fp2_st)
-#define fp2_t         RLC_PREFIX(fp2_t)
-#define dv2_t         RLC_PREFIX(dv2_t)
-#undef fp3_st
-#undef fp3_t
-#undef dv3_t
-#define fp3_st        RLC_PREFIX(fp3_st)
-#define fp3_t         RLC_PREFIX(fp3_t)
-#define dv3_t         RLC_PREFIX(dv3_t)
-#undef fp6_st
-#undef fp6_t
-#undef dv6_t
-#define fp6_st        RLC_PREFIX(fp6_st)
-#define fp6_t         RLC_PREFIX(fp6_t)
-#define dv6_t         RLC_PREFIX(dv6_t)
-#undef fp9_st
-#undef fp8_t
-#undef dv8_t
-#define fp8_st        RLC_PREFIX(fp8_st)
-#define fp8_t         RLC_PREFIX(fp8_t)
-#define dv8_t         RLC_PREFIX(dv8_t)
-#undef fp9_st
-#undef fp9_t
-#undef dv9_t
-#define fp9_st        RLC_PREFIX(fp9_st)
-#define fp9_t         RLC_PREFIX(fp9_t)
-#define dv9_t         RLC_PREFIX(dv9_t)
-#undef fp12_st
-#undef fp12_t
-#undef dv12_t
-#define fp12_st        RLC_PREFIX(fp12_st)
-#define fp12_t         RLC_PREFIX(fp12_t)
-#define dv12_t         RLC_PREFIX(dv12_t)
-#undef fp18_st
-#undef fp18_t
-#undef dv18_t
-#define fp18_st        RLC_PREFIX(fp18_st)
-#define fp18_t         RLC_PREFIX(fp18_t)
-#define dv18_t         RLC_PREFIX(dv18_t)
-#undef fp24_st
-#undef fp24_t
-#undef dv24_t
-#define fp24_st        RLC_PREFIX(fp24_st)
-#define fp24_t         RLC_PREFIX(fp24_t)
-#define dv24_t         RLC_PREFIX(dv24_t)
-#undef fp48_st
-#undef fp48_t
-#undef dv48_t
-#define fp48_st        RLC_PREFIX(fp48_st)
-#define fp48_t         RLC_PREFIX(fp48_t)
-#define dv48_t         RLC_PREFIX(dv48_t)
-#undef fp54_st
-#undef fp54_t
-#undef dv54_t
-#define fp54_st        RLC_PREFIX(fp54_st)
-#define fp54_t         RLC_PREFIX(fp54_t)
-#define dv54_t         RLC_PREFIX(dv54_t)
-
-#undef fp2_add_dig
-#undef fp2_sub_dig
-#undef fp2_field_init
-#undef fp2_field_get_qnr
-#undef fp2_copy
-#undef fp2_zero
-#undef fp2_is_zero
-#undef fp2_rand
-#undef fp2_print
-#undef fp2_size_bin
-#undef fp2_read_bin
-#undef fp2_write_bin
-#undef fp2_cmp
-#undef fp2_cmp_dig
-#undef fp2_set_dig
-#undef fp2_add_basic
-#undef fp2_add_integ
-#undef fp2_sub_basic
-#undef fp2_sub_integ
-#undef fp2_neg
-#undef fp2_dbl_basic
-#undef fp2_dbl_integ
-#undef fp2_mul_basic
-#undef fp2_mul_integ
-#undef fp2_mul_art
-#undef fp2_mul_nor_basic
-#undef fp2_mul_nor_integ
-#undef fp2_mul_frb
-#undef fp2_mul_dig
-#undef fp2_sqr_basic
-#undef fp2_sqr_integ
-#undef fp2_inv
-#undef fp2_inv_cyc
-#undef fp2_inv_sim
-#undef fp2_test_cyc
-#undef fp2_conv_cyc
-#undef fp2_exp
-#undef fp2_exp_dig
-#undef fp2_exp_cyc
-#undef fp2_frb
-#undef fp2_srt
-#undef fp2_pck
-#undef fp2_upk
-#undef fp2_exp_cyc_sim
-
-#define fp2_add_dig 	RLC_PREFIX(fp2_add_dig)
-#define fp2_sub_dig 	RLC_PREFIX(fp2_sub_dig)
-#define fp2_field_init 	RLC_PREFIX(fp2_field_init)
-#define fp2_field_get_qnr 	RLC_PREFIX(fp2_field_get_qnr)
-#define fp2_copy 	RLC_PREFIX(fp2_copy)
-#define fp2_zero 	RLC_PREFIX(fp2_zero)
-#define fp2_is_zero 	RLC_PREFIX(fp2_is_zero)
-#define fp2_rand 	RLC_PREFIX(fp2_rand)
-#define fp2_print 	RLC_PREFIX(fp2_print)
-#define fp2_size_bin 	RLC_PREFIX(fp2_size_bin)
-#define fp2_read_bin 	RLC_PREFIX(fp2_read_bin)
-#define fp2_write_bin 	RLC_PREFIX(fp2_write_bin)
-#define fp2_cmp 	RLC_PREFIX(fp2_cmp)
-#define fp2_cmp_dig 	RLC_PREFIX(fp2_cmp_dig)
-#define fp2_set_dig 	RLC_PREFIX(fp2_set_dig)
-#define fp2_add_basic 	RLC_PREFIX(fp2_add_basic)
-#define fp2_add_integ 	RLC_PREFIX(fp2_add_integ)
-#define fp2_sub_basic 	RLC_PREFIX(fp2_sub_basic)
-#define fp2_sub_integ 	RLC_PREFIX(fp2_sub_integ)
-#define fp2_neg 	RLC_PREFIX(fp2_neg)
-#define fp2_dbl_basic 	RLC_PREFIX(fp2_dbl_basic)
-#define fp2_dbl_integ 	RLC_PREFIX(fp2_dbl_integ)
-#define fp2_mul_basic 	RLC_PREFIX(fp2_mul_basic)
-#define fp2_mul_integ 	RLC_PREFIX(fp2_mul_integ)
-#define fp2_mul_art 	RLC_PREFIX(fp2_mul_art)
-#define fp2_mul_nor_basic 	RLC_PREFIX(fp2_mul_nor_basic)
-#define fp2_mul_nor_integ 	RLC_PREFIX(fp2_mul_nor_integ)
-#define fp2_mul_frb 	RLC_PREFIX(fp2_mul_frb)
-#define fp2_mul_dig 	RLC_PREFIX(fp2_mul_dig)
-#define fp2_sqr_basic 	RLC_PREFIX(fp2_sqr_basic)
-#define fp2_sqr_integ 	RLC_PREFIX(fp2_sqr_integ)
-#define fp2_inv 	RLC_PREFIX(fp2_inv)
-#define fp2_inv_cyc 	RLC_PREFIX(fp2_inv_cyc)
-#define fp2_inv_sim 	RLC_PREFIX(fp2_inv_sim)
-#define fp2_test_cyc 	RLC_PREFIX(fp2_test_cyc)
-#define fp2_conv_cyc 	RLC_PREFIX(fp2_conv_cyc)
-#define fp2_exp 	RLC_PREFIX(fp2_exp)
-#define fp2_exp_dig 	RLC_PREFIX(fp2_exp_dig)
-#define fp2_exp_cyc 	RLC_PREFIX(fp2_exp_cyc)
-#define fp2_frb 	RLC_PREFIX(fp2_frb)
-#define fp2_srt 	RLC_PREFIX(fp2_srt)
-#define fp2_pck 	RLC_PREFIX(fp2_pck)
-#define fp2_upk 	RLC_PREFIX(fp2_upk)
-#define fp2_exp_cyc_sim 	RLC_PREFIX(fp2_exp_cyc_sim)
-
-#undef fp2_addn_low
-#undef fp2_addm_low
-#undef fp2_addd_low
-#undef fp2_addc_low
-#undef fp2_subn_low
-#undef fp2_subm_low
-#undef fp2_subd_low
-#undef fp2_subc_low
-#undef fp2_dbln_low
-#undef fp2_dblm_low
-#undef fp2_norm_low
-#undef fp2_norh_low
-#undef fp2_nord_low
-#undef fp2_muln_low
-#undef fp2_mulc_low
-#undef fp2_mulm_low
-#undef fp2_sqrn_low
-#undef fp2_sqrm_low
-#undef fp2_rdcn_low
-
-#define fp2_addn_low 	RLC_PREFIX(fp2_addn_low)
-#define fp2_addm_low 	RLC_PREFIX(fp2_addm_low)
-#define fp2_addd_low 	RLC_PREFIX(fp2_addd_low)
-#define fp2_addc_low 	RLC_PREFIX(fp2_addc_low)
-#define fp2_subn_low 	RLC_PREFIX(fp2_subn_low)
-#define fp2_subm_low 	RLC_PREFIX(fp2_subm_low)
-#define fp2_subd_low 	RLC_PREFIX(fp2_subd_low)
-#define fp2_subc_low 	RLC_PREFIX(fp2_subc_low)
-#define fp2_dbln_low 	RLC_PREFIX(fp2_dbln_low)
-#define fp2_dblm_low 	RLC_PREFIX(fp2_dblm_low)
-#define fp2_norm_low 	RLC_PREFIX(fp2_norm_low)
-#define fp2_norh_low 	RLC_PREFIX(fp2_norh_low)
-#define fp2_nord_low 	RLC_PREFIX(fp2_nord_low)
-#define fp2_muln_low 	RLC_PREFIX(fp2_muln_low)
-#define fp2_mulc_low 	RLC_PREFIX(fp2_mulc_low)
-#define fp2_mulm_low 	RLC_PREFIX(fp2_mulm_low)
-#define fp2_sqrn_low 	RLC_PREFIX(fp2_sqrn_low)
-#define fp2_sqrm_low 	RLC_PREFIX(fp2_sqrm_low)
-#define fp2_rdcn_low 	RLC_PREFIX(fp2_rdcn_low)
-
-#undef fp3_field_init
-#undef fp3_copy
-#undef fp3_zero
-#undef fp3_is_zero
-#undef fp3_rand
-#undef fp3_print
-#undef fp3_size_bin
-#undef fp3_read_bin
-#undef fp3_write_bin
-#undef fp3_cmp
-#undef fp3_cmp_dig
-#undef fp3_set_dig
-#undef fp3_add_basic
-#undef fp3_add_integ
-#undef fp3_sub_basic
-#undef fp3_sub_integ
-#undef fp3_neg
-#undef fp3_dbl_basic
-#undef fp3_dbl_integ
-#undef fp3_mul_basic
-#undef fp3_mul_integ
-#undef fp3_mul_nor
-#undef fp3_mul_frb
-#undef fp3_sqr_basic
-#undef fp3_sqr_integ
-#undef fp3_inv
-#undef fp3_inv_sim
-#undef fp3_exp
-#undef fp3_frb
-#undef fp3_srt
-
-#define fp3_field_init 	RLC_PREFIX(fp3_field_init)
-#define fp3_copy 	RLC_PREFIX(fp3_copy)
-#define fp3_zero 	RLC_PREFIX(fp3_zero)
-#define fp3_is_zero 	RLC_PREFIX(fp3_is_zero)
-#define fp3_rand 	RLC_PREFIX(fp3_rand)
-#define fp3_print 	RLC_PREFIX(fp3_print)
-#define fp3_size_bin 	RLC_PREFIX(fp3_size_bin)
-#define fp3_read_bin 	RLC_PREFIX(fp3_read_bin)
-#define fp3_write_bin 	RLC_PREFIX(fp3_write_bin)
-#define fp3_cmp 	RLC_PREFIX(fp3_cmp)
-#define fp3_cmp_dig 	RLC_PREFIX(fp3_cmp_dig)
-#define fp3_set_dig 	RLC_PREFIX(fp3_set_dig)
-#define fp3_add_basic 	RLC_PREFIX(fp3_add_basic)
-#define fp3_add_integ 	RLC_PREFIX(fp3_add_integ)
-#define fp3_sub_basic 	RLC_PREFIX(fp3_sub_basic)
-#define fp3_sub_integ 	RLC_PREFIX(fp3_sub_integ)
-#define fp3_neg 	RLC_PREFIX(fp3_neg)
-#define fp3_dbl_basic 	RLC_PREFIX(fp3_dbl_basic)
-#define fp3_dbl_integ 	RLC_PREFIX(fp3_dbl_integ)
-#define fp3_mul_basic 	RLC_PREFIX(fp3_mul_basic)
-#define fp3_mul_integ 	RLC_PREFIX(fp3_mul_integ)
-#define fp3_mul_nor 	RLC_PREFIX(fp3_mul_nor)
-#define fp3_mul_frb 	RLC_PREFIX(fp3_mul_frb)
-#define fp3_sqr_basic 	RLC_PREFIX(fp3_sqr_basic)
-#define fp3_sqr_integ 	RLC_PREFIX(fp3_sqr_integ)
-#define fp3_inv 	RLC_PREFIX(fp3_inv)
-#define fp3_inv_sim 	RLC_PREFIX(fp3_inv_sim)
-#define fp3_exp 	RLC_PREFIX(fp3_exp)
-#define fp3_frb 	RLC_PREFIX(fp3_frb)
-#define fp3_srt 	RLC_PREFIX(fp3_srt)
-
-#undef fp3_addn_low
-#undef fp3_addm_low
-#undef fp3_addd_low
-#undef fp3_addc_low
-#undef fp3_subn_low
-#undef fp3_subm_low
-#undef fp3_subd_low
-#undef fp3_subc_low
-#undef fp3_dbln_low
-#undef fp3_dblm_low
-#undef fp3_nord_low
-#undef fp3_muln_low
-#undef fp3_mulc_low
-#undef fp3_mulm_low
-#undef fp3_sqrn_low
-#undef fp3_sqrm_low
-#undef fp3_rdcn_low
-
-#define fp3_addn_low 	RLC_PREFIX(fp3_addn_low)
-#define fp3_addm_low 	RLC_PREFIX(fp3_addm_low)
-#define fp3_addd_low 	RLC_PREFIX(fp3_addd_low)
-#define fp3_addc_low 	RLC_PREFIX(fp3_addc_low)
-#define fp3_subn_low 	RLC_PREFIX(fp3_subn_low)
-#define fp3_subm_low 	RLC_PREFIX(fp3_subm_low)
-#define fp3_subd_low 	RLC_PREFIX(fp3_subd_low)
-#define fp3_subc_low 	RLC_PREFIX(fp3_subc_low)
-#define fp3_dbln_low 	RLC_PREFIX(fp3_dbln_low)
-#define fp3_dblm_low 	RLC_PREFIX(fp3_dblm_low)
-#define fp3_nord_low 	RLC_PREFIX(fp3_nord_low)
-#define fp3_muln_low 	RLC_PREFIX(fp3_muln_low)
-#define fp3_mulc_low 	RLC_PREFIX(fp3_mulc_low)
-#define fp3_mulm_low 	RLC_PREFIX(fp3_mulm_low)
-#define fp3_sqrn_low 	RLC_PREFIX(fp3_sqrn_low)
-#define fp3_sqrm_low 	RLC_PREFIX(fp3_sqrm_low)
-#define fp3_rdcn_low 	RLC_PREFIX(fp3_rdcn_low)
-
-#undef fp4_copy
-#undef fp4_zero
-#undef fp4_is_zero
-#undef fp4_rand
-#undef fp4_print
-#undef fp4_size_bin
-#undef fp4_read_bin
-#undef fp4_write_bin
-#undef fp4_cmp
-#undef fp4_cmp_dig
-#undef fp4_set_dig
-#undef fp4_add
-#undef fp4_sub
-#undef fp4_neg
-#undef fp4_dbl
-#undef fp4_mul_unr
-#undef fp4_mul_basic
-#undef fp4_mul_lazyr
-#undef fp4_mul_art
-#undef fp4_mul_dxs
-#undef fp4_sqr_unr
-#undef fp4_sqr_basic
-#undef fp4_sqr_lazyr
-#undef fp4_inv
-#undef fp4_inv_cyc
-#undef fp4_exp
-#undef fp4_frb
-
-#define fp4_copy 	RLC_PREFIX(fp4_copy)
-#define fp4_zero 	RLC_PREFIX(fp4_zero)
-#define fp4_is_zero 	RLC_PREFIX(fp4_is_zero)
-#define fp4_rand 	RLC_PREFIX(fp4_rand)
-#define fp4_print 	RLC_PREFIX(fp4_print)
-#define fp4_size_bin 	RLC_PREFIX(fp4_size_bin)
-#define fp4_read_bin 	RLC_PREFIX(fp4_read_bin)
-#define fp4_write_bin 	RLC_PREFIX(fp4_write_bin)
-#define fp4_cmp 	RLC_PREFIX(fp4_cmp)
-#define fp4_cmp_dig 	RLC_PREFIX(fp4_cmp_dig)
-#define fp4_set_dig 	RLC_PREFIX(fp4_set_dig)
-#define fp4_add 	RLC_PREFIX(fp4_add)
-#define fp4_sub 	RLC_PREFIX(fp4_sub)
-#define fp4_neg 	RLC_PREFIX(fp4_neg)
-#define fp4_dbl 	RLC_PREFIX(fp4_dbl)
-#define fp4_mul_unr 	RLC_PREFIX(fp4_mul_unr)
-#define fp4_mul_basic 	RLC_PREFIX(fp4_mul_basic)
-#define fp4_mul_lazyr 	RLC_PREFIX(fp4_mul_lazyr)
-#define fp4_mul_art 	RLC_PREFIX(fp4_mul_art)
-#define fp4_mul_dxs 	RLC_PREFIX(fp4_mul_dxs)
-#define fp4_sqr_unr 	RLC_PREFIX(fp4_sqr_unr)
-#define fp4_sqr_basic 	RLC_PREFIX(fp4_sqr_basic)
-#define fp4_sqr_lazyr 	RLC_PREFIX(fp4_sqr_lazyr)
-#define fp4_inv 	RLC_PREFIX(fp4_inv)
-#define fp4_inv_cyc 	RLC_PREFIX(fp4_inv_cyc)
-#define fp4_exp 	RLC_PREFIX(fp4_exp)
-#define fp4_frb 	RLC_PREFIX(fp4_frb)
-
-#undef fp6_copy
-#undef fp6_zero
-#undef fp6_is_zero
-#undef fp6_rand
-#undef fp6_print
-#undef fp6_size_bin
-#undef fp6_read_bin
-#undef fp6_write_bin
-#undef fp6_cmp
-#undef fp6_cmp_dig
-#undef fp6_set_dig
-#undef fp6_add
-#undef fp6_sub
-#undef fp6_neg
-#undef fp6_dbl
-#undef fp6_mul_unr
-#undef fp6_mul_basic
-#undef fp6_mul_lazyr
-#undef fp6_mul_art
-#undef fp6_mul_dxs
-#undef fp6_sqr_unr
-#undef fp6_sqr_basic
-#undef fp6_sqr_lazyr
-#undef fp6_inv
-#undef fp6_exp
-#undef fp6_frb
-
-#define fp6_copy 	RLC_PREFIX(fp6_copy)
-#define fp6_zero 	RLC_PREFIX(fp6_zero)
-#define fp6_is_zero 	RLC_PREFIX(fp6_is_zero)
-#define fp6_rand 	RLC_PREFIX(fp6_rand)
-#define fp6_print 	RLC_PREFIX(fp6_print)
-#define fp6_size_bin 	RLC_PREFIX(fp6_size_bin)
-#define fp6_read_bin 	RLC_PREFIX(fp6_read_bin)
-#define fp6_write_bin 	RLC_PREFIX(fp6_write_bin)
-#define fp6_cmp 	RLC_PREFIX(fp6_cmp)
-#define fp6_cmp_dig 	RLC_PREFIX(fp6_cmp_dig)
-#define fp6_set_dig 	RLC_PREFIX(fp6_set_dig)
-#define fp6_add 	RLC_PREFIX(fp6_add)
-#define fp6_sub 	RLC_PREFIX(fp6_sub)
-#define fp6_neg 	RLC_PREFIX(fp6_neg)
-#define fp6_dbl 	RLC_PREFIX(fp6_dbl)
-#define fp6_mul_unr 	RLC_PREFIX(fp6_mul_unr)
-#define fp6_mul_basic 	RLC_PREFIX(fp6_mul_basic)
-#define fp6_mul_lazyr 	RLC_PREFIX(fp6_mul_lazyr)
-#define fp6_mul_art 	RLC_PREFIX(fp6_mul_art)
-#define fp6_mul_dxs 	RLC_PREFIX(fp6_mul_dxs)
-#define fp6_sqr_unr 	RLC_PREFIX(fp6_sqr_unr)
-#define fp6_sqr_basic 	RLC_PREFIX(fp6_sqr_basic)
-#define fp6_sqr_lazyr 	RLC_PREFIX(fp6_sqr_lazyr)
-#define fp6_inv 	RLC_PREFIX(fp6_inv)
-#define fp6_exp 	RLC_PREFIX(fp6_exp)
-#define fp6_frb 	RLC_PREFIX(fp6_frb)
-
-#undef fp8_copy
-#undef fp8_zero
-#undef fp8_is_zero
-#undef fp8_rand
-#undef fp8_print
-#undef fp8_size_bin
-#undef fp8_read_bin
-#undef fp8_write_bin
-#undef fp8_cmp
-#undef fp8_cmp_dig
-#undef fp8_set_dig
-#undef fp8_add
-#undef fp8_sub
-#undef fp8_neg
-#undef fp8_dbl
-#undef fp8_mul_unr
-#undef fp8_mul_basic
-#undef fp8_mul_lazyr
-#undef fp8_mul_art
-#undef fp8_mul_dxs
-#undef fp8_sqr_unr
-#undef fp8_sqr_basic
-#undef fp8_sqr_lazyr
-#undef fp8_sqr_cyc
-#undef fp8_inv
-#undef fp8_inv_cyc
-#undef fp8_inv_sim
-#undef fp8_test_cyc
-#undef fp8_conv_cyc
-#undef fp8_exp
-#undef fp8_exp_cyc
-#undef fp8_frb
-
-#define fp8_copy 	RLC_PREFIX(fp8_copy)
-#define fp8_zero 	RLC_PREFIX(fp8_zero)
-#define fp8_is_zero 	RLC_PREFIX(fp8_is_zero)
-#define fp8_rand 	RLC_PREFIX(fp8_rand)
-#define fp8_print 	RLC_PREFIX(fp8_print)
-#define fp8_size_bin 	RLC_PREFIX(fp8_size_bin)
-#define fp8_read_bin 	RLC_PREFIX(fp8_read_bin)
-#define fp8_write_bin 	RLC_PREFIX(fp8_write_bin)
-#define fp8_cmp 	RLC_PREFIX(fp8_cmp)
-#define fp8_cmp_dig 	RLC_PREFIX(fp8_cmp_dig)
-#define fp8_set_dig 	RLC_PREFIX(fp8_set_dig)
-#define fp8_add 	RLC_PREFIX(fp8_add)
-#define fp8_sub 	RLC_PREFIX(fp8_sub)
-#define fp8_neg 	RLC_PREFIX(fp8_neg)
-#define fp8_dbl 	RLC_PREFIX(fp8_dbl)
-#define fp8_mul_unr 	RLC_PREFIX(fp8_mul_unr)
-#define fp8_mul_basic 	RLC_PREFIX(fp8_mul_basic)
-#define fp8_mul_lazyr 	RLC_PREFIX(fp8_mul_lazyr)
-#define fp8_mul_art 	RLC_PREFIX(fp8_mul_art)
-#define fp8_mul_dxs 	RLC_PREFIX(fp8_mul_dxs)
-#define fp8_sqr_unr 	RLC_PREFIX(fp8_sqr_unr)
-#define fp8_sqr_basic 	RLC_PREFIX(fp8_sqr_basic)
-#define fp8_sqr_lazyr 	RLC_PREFIX(fp8_sqr_lazyr)
-#define fp8_sqr_cyc 	RLC_PREFIX(fp8_sqr_cyc)
-#define fp8_inv 	RLC_PREFIX(fp8_inv)
-#define fp8_inv_cyc 	RLC_PREFIX(fp8_inv_cyc)
-#define fp8_inv_sim 	RLC_PREFIX(fp8_inv_sim)
-#define fp8_test_cyc 	RLC_PREFIX(fp8_test_cyc)
-#define fp8_conv_cyc 	RLC_PREFIX(fp8_conv_cyc)
-#define fp8_exp 	RLC_PREFIX(fp8_exp)
-#define fp8_exp_cyc 	RLC_PREFIX(fp8_exp_cyc)
-#define fp8_frb 	RLC_PREFIX(fp8_frb)
-
-#undef fp9_copy
-#undef fp9_zero
-#undef fp9_is_zero
-#undef fp9_rand
-#undef fp9_print
-#undef fp9_size_bin
-#undef fp9_read_bin
-#undef fp9_write_bin
-#undef fp9_cmp
-#undef fp9_cmp_dig
-#undef fp9_set_dig
-#undef fp9_add
-#undef fp9_sub
-#undef fp9_neg
-#undef fp9_dbl
-#undef fp9_mul_unr
-#undef fp9_mul_basic
-#undef fp9_mul_lazyr
-#undef fp9_mul_art
-#undef fp9_mul_dxs
-#undef fp9_sqr_unr
-#undef fp9_sqr_basic
-#undef fp9_sqr_lazyr
-#undef fp9_inv
-#undef fp9_inv_sim
-#undef fp9_exp
-#undef fp9_frb
-
-#define fp9_copy 	RLC_PREFIX(fp9_copy)
-#define fp9_zero 	RLC_PREFIX(fp9_zero)
-#define fp9_is_zero 	RLC_PREFIX(fp9_is_zero)
-#define fp9_rand 	RLC_PREFIX(fp9_rand)
-#define fp9_print 	RLC_PREFIX(fp9_print)
-#define fp9_size_bin 	RLC_PREFIX(fp9_size_bin)
-#define fp9_read_bin 	RLC_PREFIX(fp9_read_bin)
-#define fp9_write_bin 	RLC_PREFIX(fp9_write_bin)
-#define fp9_cmp 	RLC_PREFIX(fp9_cmp)
-#define fp9_cmp_dig 	RLC_PREFIX(fp9_cmp_dig)
-#define fp9_set_dig 	RLC_PREFIX(fp9_set_dig)
-#define fp9_add 	RLC_PREFIX(fp9_add)
-#define fp9_sub 	RLC_PREFIX(fp9_sub)
-#define fp9_neg 	RLC_PREFIX(fp9_neg)
-#define fp9_dbl 	RLC_PREFIX(fp9_dbl)
-#define fp9_mul_unr 	RLC_PREFIX(fp9_mul_unr)
-#define fp9_mul_basic 	RLC_PREFIX(fp9_mul_basic)
-#define fp9_mul_lazyr 	RLC_PREFIX(fp9_mul_lazyr)
-#define fp9_mul_art 	RLC_PREFIX(fp9_mul_art)
-#define fp9_mul_dxs 	RLC_PREFIX(fp9_mul_dxs)
-#define fp9_sqr_unr 	RLC_PREFIX(fp9_sqr_unr)
-#define fp9_sqr_basic 	RLC_PREFIX(fp9_sqr_basic)
-#define fp9_sqr_lazyr 	RLC_PREFIX(fp9_sqr_lazyr)
-#define fp9_inv 	RLC_PREFIX(fp9_inv)
-#define fp9_inv_sim 	RLC_PREFIX(fp9_inv_sim)
-#define fp9_exp 	RLC_PREFIX(fp9_exp)
-#define fp9_frb 	RLC_PREFIX(fp9_frb)
-
-#undef fp12_copy
-#undef fp12_zero
-#undef fp12_is_zero
-#undef fp12_rand
-#undef fp12_print
-#undef fp12_size_bin
-#undef fp12_read_bin
-#undef fp12_write_bin
-#undef fp12_cmp
-#undef fp12_cmp_dig
-#undef fp12_set_dig
-#undef fp12_add
-#undef fp12_sub
-#undef fp12_neg
-#undef fp12_dbl
-#undef fp12_mul_unr
-#undef fp12_mul_basic
-#undef fp12_mul_lazyr
-#undef fp12_mul_art
-#undef fp12_mul_dxs_basic
-#undef fp12_mul_dxs_lazyr
-#undef fp12_sqr_unr
-#undef fp12_sqr_basic
-#undef fp12_sqr_lazyr
-#undef fp12_sqr_cyc_basic
-#undef fp12_sqr_cyc_lazyr
-#undef fp12_sqr_pck_basic
-#undef fp12_sqr_pck_lazyr
-#undef fp12_test_cyc
-#undef fp12_conv_cyc
-#undef fp12_back_cyc
-#undef fp12_back_cyc_sim
-#undef fp12_inv
-#undef fp12_inv_cyc
-#undef fp12_frb
-#undef fp12_exp
-#undef fp12_exp_dig
-#undef fp12_exp_cyc
-#undef fp12_exp_cyc_sim
-#undef fp12_exp_cyc_sps
-#undef fp12_pck
-#undef fp12_upk
-#undef fp12_pck_max
-#undef fp12_upk_max
-
-#define fp12_copy 	RLC_PREFIX(fp12_copy)
-#define fp12_zero 	RLC_PREFIX(fp12_zero)
-#define fp12_is_zero 	RLC_PREFIX(fp12_is_zero)
-#define fp12_rand 	RLC_PREFIX(fp12_rand)
-#define fp12_print 	RLC_PREFIX(fp12_print)
-#define fp12_size_bin 	RLC_PREFIX(fp12_size_bin)
-#define fp12_read_bin 	RLC_PREFIX(fp12_read_bin)
-#define fp12_write_bin 	RLC_PREFIX(fp12_write_bin)
-#define fp12_cmp 	RLC_PREFIX(fp12_cmp)
-#define fp12_cmp_dig 	RLC_PREFIX(fp12_cmp_dig)
-#define fp12_set_dig 	RLC_PREFIX(fp12_set_dig)
-#define fp12_add 	RLC_PREFIX(fp12_add)
-#define fp12_sub 	RLC_PREFIX(fp12_sub)
-#define fp12_neg 	RLC_PREFIX(fp12_neg)
-#define fp12_dbl 	RLC_PREFIX(fp12_dbl)
-#define fp12_mul_unr 	RLC_PREFIX(fp12_mul_unr)
-#define fp12_mul_basic 	RLC_PREFIX(fp12_mul_basic)
-#define fp12_mul_lazyr 	RLC_PREFIX(fp12_mul_lazyr)
-#define fp12_mul_art 	RLC_PREFIX(fp12_mul_art)
-#define fp12_mul_dxs_basic 	RLC_PREFIX(fp12_mul_dxs_basic)
-#define fp12_mul_dxs_lazyr 	RLC_PREFIX(fp12_mul_dxs_lazyr)
-#define fp12_sqr_unr 	RLC_PREFIX(fp12_sqr_unr)
-#define fp12_sqr_basic 	RLC_PREFIX(fp12_sqr_basic)
-#define fp12_sqr_lazyr 	RLC_PREFIX(fp12_sqr_lazyr)
-#define fp12_sqr_cyc_basic 	RLC_PREFIX(fp12_sqr_cyc_basic)
-#define fp12_sqr_cyc_lazyr 	RLC_PREFIX(fp12_sqr_cyc_lazyr)
-#define fp12_sqr_pck_basic 	RLC_PREFIX(fp12_sqr_pck_basic)
-#define fp12_sqr_pck_lazyr 	RLC_PREFIX(fp12_sqr_pck_lazyr)
-#define fp12_test_cyc 	RLC_PREFIX(fp12_test_cyc)
-#define fp12_conv_cyc 	RLC_PREFIX(fp12_conv_cyc)
-#define fp12_back_cyc 	RLC_PREFIX(fp12_back_cyc)
-#define fp12_back_cyc_sim 	RLC_PREFIX(fp12_back_cyc_sim)
-#define fp12_inv 	RLC_PREFIX(fp12_inv)
-#define fp12_inv_cyc 	RLC_PREFIX(fp12_inv_cyc)
-#define fp12_frb 	RLC_PREFIX(fp12_frb)
-#define fp12_exp 	RLC_PREFIX(fp12_exp)
-#define fp12_exp_dig 	RLC_PREFIX(fp12_exp_dig)
-#define fp12_exp_cyc 	RLC_PREFIX(fp12_exp_cyc)
-#define fp12_exp_cyc_sim 	RLC_PREFIX(fp12_exp_cyc_sim)
-#define fp12_exp_cyc_sps 	RLC_PREFIX(fp12_exp_cyc_sps)
-#define fp12_pck 	RLC_PREFIX(fp12_pck)
-#define fp12_upk 	RLC_PREFIX(fp12_upk)
-#define fp12_pck_max 	RLC_PREFIX(fp12_pck_max)
-#define fp12_upk_max 	RLC_PREFIX(fp12_upk_max)
-
-#undef fp18_copy
-#undef fp18_zero
-#undef fp18_is_zero
-#undef fp18_rand
-#undef fp18_print
-#undef fp18_size_bin
-#undef fp18_read_bin
-#undef fp18_write_bin
-#undef fp18_cmp
-#undef fp18_cmp_dig
-#undef fp18_set_dig
-#undef fp18_add
-#undef fp18_sub
-#undef fp18_neg
-#undef fp18_dbl
-#undef fp18_mul_unr
-#undef fp18_mul_basic
-#undef fp18_mul_lazyr
-#undef fp18_mul_art
-#undef fp18_mul_dxs_basic
-#undef fp18_mul_dxs_lazyr
-#undef fp18_sqr_unr
-#undef fp18_sqr_basic
-#undef fp18_sqr_lazyr
-#undef fp18_inv
-#undef fp18_inv_cyc
-#undef fp18_conv_cyc
-#undef fp18_frb
-#undef fp18_exp
-
-#define fp18_copy 	RLC_PREFIX(fp18_copy)
-#define fp18_zero 	RLC_PREFIX(fp18_zero)
-#define fp18_is_zero 	RLC_PREFIX(fp18_is_zero)
-#define fp18_rand 	RLC_PREFIX(fp18_rand)
-#define fp18_print 	RLC_PREFIX(fp18_print)
-#define fp18_size_bin 	RLC_PREFIX(fp18_size_bin)
-#define fp18_read_bin 	RLC_PREFIX(fp18_read_bin)
-#define fp18_write_bin 	RLC_PREFIX(fp18_write_bin)
-#define fp18_cmp 	RLC_PREFIX(fp18_cmp)
-#define fp18_cmp_dig 	RLC_PREFIX(fp18_cmp_dig)
-#define fp18_set_dig 	RLC_PREFIX(fp18_set_dig)
-#define fp18_add 	RLC_PREFIX(fp18_add)
-#define fp18_sub 	RLC_PREFIX(fp18_sub)
-#define fp18_neg 	RLC_PREFIX(fp18_neg)
-#define fp18_dbl 	RLC_PREFIX(fp18_dbl)
-#define fp18_mul_unr 	RLC_PREFIX(fp18_mul_unr)
-#define fp18_mul_basic 	RLC_PREFIX(fp18_mul_basic)
-#define fp18_mul_lazyr 	RLC_PREFIX(fp18_mul_lazyr)
-#define fp18_mul_art 	RLC_PREFIX(fp18_mul_art)
-#define fp18_mul_dxs_basic 	RLC_PREFIX(fp18_mul_dxs_basic)
-#define fp18_mul_dxs_lazyr 	RLC_PREFIX(fp18_mul_dxs_lazyr)
-#define fp18_sqr_unr 	RLC_PREFIX(fp18_sqr_unr)
-#define fp18_sqr_basic 	RLC_PREFIX(fp18_sqr_basic)
-#define fp18_sqr_lazyr 	RLC_PREFIX(fp18_sqr_lazyr)
-#define fp18_inv 	RLC_PREFIX(fp18_inv)
-#define fp18_inv_cyc 	RLC_PREFIX(fp18_inv_cyc)
-#define fp18_conv_cyc 	RLC_PREFIX(fp18_conv_cyc)
-#define fp18_frb 	RLC_PREFIX(fp18_frb)
-#define fp18_exp 	RLC_PREFIX(fp18_exp)
-
-#undef fp24_copy
-#undef fp24_zero
-#undef fp24_is_zero
-#undef fp24_rand
-#undef fp24_print
-#undef fp24_size_bin
-#undef fp24_read_bin
-#undef fp24_write_bin
-#undef fp24_cmp
-#undef fp24_cmp_dig
-#undef fp24_set_dig
-#undef fp24_add
-#undef fp24_sub
-#undef fp24_neg
-#undef fp24_dbl
-#undef fp24_mul_unr
-#undef fp24_mul_basic
-#undef fp24_mul_lazyr
-#undef fp24_mul_art
-#undef fp24_mul_dxs
-#undef fp24_sqr_unr
-#undef fp24_sqr_basic
-#undef fp24_sqr_lazyr
-#undef fp24_inv
-#undef fp24_frb
-#undef fp24_exp
-
-#define fp24_copy 	RLC_PREFIX(fp24_copy)
-#define fp24_zero 	RLC_PREFIX(fp24_zero)
-#define fp24_is_zero 	RLC_PREFIX(fp24_is_zero)
-#define fp24_rand 	RLC_PREFIX(fp24_rand)
-#define fp24_print 	RLC_PREFIX(fp24_print)
-#define fp24_size_bin 	RLC_PREFIX(fp24_size_bin)
-#define fp24_read_bin 	RLC_PREFIX(fp24_read_bin)
-#define fp24_write_bin 	RLC_PREFIX(fp24_write_bin)
-#define fp24_cmp 	RLC_PREFIX(fp24_cmp)
-#define fp24_cmp_dig 	RLC_PREFIX(fp24_cmp_dig)
-#define fp24_set_dig 	RLC_PREFIX(fp24_set_dig)
-#define fp24_add 	RLC_PREFIX(fp24_add)
-#define fp24_sub 	RLC_PREFIX(fp24_sub)
-#define fp24_neg 	RLC_PREFIX(fp24_neg)
-#define fp24_dbl 	RLC_PREFIX(fp24_dbl)
-#define fp24_mul_unr 	RLC_PREFIX(fp24_mul_unr)
-#define fp24_mul_basic 	RLC_PREFIX(fp24_mul_basic)
-#define fp24_mul_lazyr 	RLC_PREFIX(fp24_mul_lazyr)
-#define fp24_mul_art 	RLC_PREFIX(fp24_mul_art)
-#define fp24_mul_dxs 	RLC_PREFIX(fp24_mul_dxs)
-#define fp24_sqr_unr 	RLC_PREFIX(fp24_sqr_unr)
-#define fp24_sqr_basic 	RLC_PREFIX(fp24_sqr_basic)
-#define fp24_sqr_lazyr 	RLC_PREFIX(fp24_sqr_lazyr)
-#define fp24_inv 	RLC_PREFIX(fp24_inv)
-#define fp24_frb 	RLC_PREFIX(fp24_frb)
-#define fp24_exp 	RLC_PREFIX(fp24_exp)
-
-#undef fp48_copy
-#undef fp48_zero
-#undef fp48_is_zero
-#undef fp48_rand
-#undef fp48_print
-#undef fp48_size_bin
-#undef fp48_read_bin
-#undef fp48_write_bin
-#undef fp48_cmp
-#undef fp48_cmp_dig
-#undef fp48_set_dig
-#undef fp48_add
-#undef fp48_sub
-#undef fp48_neg
-#undef fp48_dbl
-#undef fp48_mul_basic
-#undef fp48_mul_lazyr
-#undef fp48_mul_art
-#undef fp48_mul_dxs
-#undef fp48_sqr_basic
-#undef fp48_sqr_lazyr
-#undef fp48_sqr_cyc_basic
-#undef fp48_sqr_cyc_lazyr
-#undef fp48_sqr_pck_basic
-#undef fp48_sqr_pck_lazyr
-#undef fp48_test_cyc
-#undef fp48_conv_cyc
-#undef fp48_back_cyc
-#undef fp48_back_cyc_sim
-#undef fp48_inv
-#undef fp48_inv_cyc
-#undef fp48_conv_cyc
-#undef fp48_frb
-#undef fp48_exp
-#undef fp48_exp_dig
-#undef fp48_exp_cyc
-#undef fp48_exp_cyc_sps
-#undef fp48_pck
-#undef fp48_upk
-
-#define fp48_copy 	RLC_PREFIX(fp48_copy)
-#define fp48_zero 	RLC_PREFIX(fp48_zero)
-#define fp48_is_zero 	RLC_PREFIX(fp48_is_zero)
-#define fp48_rand 	RLC_PREFIX(fp48_rand)
-#define fp48_print 	RLC_PREFIX(fp48_print)
-#define fp48_size_bin 	RLC_PREFIX(fp48_size_bin)
-#define fp48_read_bin 	RLC_PREFIX(fp48_read_bin)
-#define fp48_write_bin 	RLC_PREFIX(fp48_write_bin)
-#define fp48_cmp 	RLC_PREFIX(fp48_cmp)
-#define fp48_cmp_dig 	RLC_PREFIX(fp48_cmp_dig)
-#define fp48_set_dig 	RLC_PREFIX(fp48_set_dig)
-#define fp48_add 	RLC_PREFIX(fp48_add)
-#define fp48_sub 	RLC_PREFIX(fp48_sub)
-#define fp48_neg 	RLC_PREFIX(fp48_neg)
-#define fp48_dbl 	RLC_PREFIX(fp48_dbl)
-#define fp48_mul_basic 	RLC_PREFIX(fp48_mul_basic)
-#define fp48_mul_lazyr 	RLC_PREFIX(fp48_mul_lazyr)
-#define fp48_mul_art 	RLC_PREFIX(fp48_mul_art)
-#define fp48_mul_dxs 	RLC_PREFIX(fp48_mul_dxs)
-#define fp48_sqr_basic 	RLC_PREFIX(fp48_sqr_basic)
-#define fp48_sqr_lazyr 	RLC_PREFIX(fp48_sqr_lazyr)
-#define fp48_sqr_cyc_basic 	RLC_PREFIX(fp48_sqr_cyc_basic)
-#define fp48_sqr_cyc_lazyr 	RLC_PREFIX(fp48_sqr_cyc_lazyr)
-#define fp48_sqr_pck_basic 	RLC_PREFIX(fp48_sqr_pck_basic)
-#define fp48_sqr_pck_lazyr 	RLC_PREFIX(fp48_sqr_pck_lazyr)
-#define fp48_test_cyc 	RLC_PREFIX(fp48_test_cyc)
-#define fp48_conv_cyc 	RLC_PREFIX(fp48_conv_cyc)
-#define fp48_back_cyc 	RLC_PREFIX(fp48_back_cyc)
-#define fp48_back_cyc_sim 	RLC_PREFIX(fp48_back_cyc_sim)
-#define fp48_inv 	RLC_PREFIX(fp48_inv)
-#define fp48_inv_cyc 	RLC_PREFIX(fp48_inv_cyc)
-#define fp48_conv_cyc 	RLC_PREFIX(fp48_conv_cyc)
-#define fp48_frb 	RLC_PREFIX(fp48_frb)
-#define fp48_exp 	RLC_PREFIX(fp48_exp)
-#define fp48_exp_dig 	RLC_PREFIX(fp48_exp_dig)
-#define fp48_exp_cyc 	RLC_PREFIX(fp48_exp_cyc)
-#define fp48_exp_cyc_sps 	RLC_PREFIX(fp48_exp_cyc_sps)
-#define fp48_pck 	RLC_PREFIX(fp48_pck)
-#define fp48_upk 	RLC_PREFIX(fp48_upk)
-
-#undef fp54_copy
-#undef fp54_zero
-#undef fp54_is_zero
-#undef fp54_rand
-#undef fp54_print
-#undef fp54_size_bin
-#undef fp54_read_bin
-#undef fp54_write_bin
-#undef fp54_cmp
-#undef fp54_cmp_dig
-#undef fp54_set_dig
-#undef fp54_add
-#undef fp54_sub
-#undef fp54_neg
-#undef fp54_dbl
-#undef fp54_mul_basic
-#undef fp54_mul_lazyr
-#undef fp54_mul_art
-#undef fp54_mul_dxs
-#undef fp54_sqr_basic
-#undef fp54_sqr_lazyr
-#undef fp54_sqr_cyc_basic
-#undef fp54_sqr_cyc_lazyr
-#undef fp54_sqr_pck_basic
-#undef fp54_sqr_pck_lazyr
-#undef fp54_test_cyc
-#undef fp54_conv_cyc
-#undef fp54_back_cyc
-#undef fp54_back_cyc_sim
-#undef fp54_inv
-#undef fp54_inv_cyc
-#undef fp54_conv_cyc
-#undef fp54_frb
-#undef fp54_exp
-#undef fp54_exp_dig
-#undef fp54_exp_cyc
-#undef fp54_exp_cyc_sps
-#undef fp54_pck
-#undef fp54_upk
-
-#define fp54_copy 	RLC_PREFIX(fp54_copy)
-#define fp54_zero 	RLC_PREFIX(fp54_zero)
-#define fp54_is_zero 	RLC_PREFIX(fp54_is_zero)
-#define fp54_rand 	RLC_PREFIX(fp54_rand)
-#define fp54_print 	RLC_PREFIX(fp54_print)
-#define fp54_size_bin 	RLC_PREFIX(fp54_size_bin)
-#define fp54_read_bin 	RLC_PREFIX(fp54_read_bin)
-#define fp54_write_bin 	RLC_PREFIX(fp54_write_bin)
-#define fp54_cmp 	RLC_PREFIX(fp54_cmp)
-#define fp54_cmp_dig 	RLC_PREFIX(fp54_cmp_dig)
-#define fp54_set_dig 	RLC_PREFIX(fp54_set_dig)
-#define fp54_add 	RLC_PREFIX(fp54_add)
-#define fp54_sub 	RLC_PREFIX(fp54_sub)
-#define fp54_neg 	RLC_PREFIX(fp54_neg)
-#define fp54_dbl 	RLC_PREFIX(fp54_dbl)
-#define fp54_mul_basic 	RLC_PREFIX(fp54_mul_basic)
-#define fp54_mul_lazyr 	RLC_PREFIX(fp54_mul_lazyr)
-#define fp54_mul_art 	RLC_PREFIX(fp54_mul_art)
-#define fp54_mul_dxs 	RLC_PREFIX(fp54_mul_dxs)
-#define fp54_sqr_basic 	RLC_PREFIX(fp54_sqr_basic)
-#define fp54_sqr_lazyr 	RLC_PREFIX(fp54_sqr_lazyr)
-#define fp54_sqr_cyc_basic 	RLC_PREFIX(fp54_sqr_cyc_basic)
-#define fp54_sqr_cyc_lazyr 	RLC_PREFIX(fp54_sqr_cyc_lazyr)
-#define fp54_sqr_pck_basic 	RLC_PREFIX(fp54_sqr_pck_basic)
-#define fp54_sqr_pck_lazyr 	RLC_PREFIX(fp54_sqr_pck_lazyr)
-#define fp54_test_cyc 	RLC_PREFIX(fp54_test_cyc)
-#define fp54_conv_cyc 	RLC_PREFIX(fp54_conv_cyc)
-#define fp54_back_cyc 	RLC_PREFIX(fp54_back_cyc)
-#define fp54_back_cyc_sim 	RLC_PREFIX(fp54_back_cyc_sim)
-#define fp54_inv 	RLC_PREFIX(fp54_inv)
-#define fp54_inv_cyc 	RLC_PREFIX(fp54_inv_cyc)
-#define fp54_conv_cyc 	RLC_PREFIX(fp54_conv_cyc)
-#define fp54_frb 	RLC_PREFIX(fp54_frb)
-#define fp54_exp 	RLC_PREFIX(fp54_exp)
-#define fp54_exp_dig 	RLC_PREFIX(fp54_exp_dig)
-#define fp54_exp_cyc 	RLC_PREFIX(fp54_exp_cyc)
-#define fp54_exp_cyc_sps 	RLC_PREFIX(fp54_exp_cyc_sps)
-#define fp54_pck 	RLC_PREFIX(fp54_pck)
-#define fp54_upk 	RLC_PREFIX(fp54_upk)
-
-#undef fb2_mul
- #undef fb2_mul_nor
-#undef fb2_sqr
-#undef fb2_slv
-#undef fb2_inv
-
-#define fb2_mul 	RLC_PREFIX(fb2_mul)
- #define fb2_mul_nor 	RLC_PREFIX(fb2_mul_nor)
-#define fb2_sqr 	RLC_PREFIX(fb2_sqr)
-#define fb2_slv 	RLC_PREFIX(fb2_slv)
-#define fb2_inv 	RLC_PREFIX(fb2_inv)
-
-
-
-#undef pp_map_init
-#undef pp_map_clean
-#undef pp_add_k2_basic
-#undef pp_add_k2_projc_basic
-#undef pp_add_k2_projc_lazyr
-#undef pp_add_k8_basic
-#undef pp_add_k8_projc_basic
-#undef pp_add_k8_projc_lazyr
-#undef pp_add_k12_basic
-#undef pp_add_k12_projc_basic
-#undef pp_add_k12_projc_lazyr
-#undef pp_add_lit_k12
-#undef pp_add_k48_basic
-#undef pp_add_k48_projc
-#undef pp_add_k54_basic
-#undef pp_add_k54_projc
-#undef pp_dbl_k2_basic
-#undef pp_dbl_k2_projc_basic
-#undef pp_dbl_k2_projc_lazyr
-#undef pp_dbl_k8_basic
-#undef pp_dbl_k8_projc_basic
-#undef pp_dbl_k8_projc_lazyr
-#undef pp_dbl_k12_basic
-#undef pp_dbl_k12_projc_basic
-#undef pp_dbl_k12_projc_lazyr
-#undef pp_dbl_k48_basic
-#undef pp_dbl_k48_projc
-#undef pp_dbl_k54_basic
-#undef pp_dbl_k54_projc
-#undef pp_dbl_lit_k12
-#undef pp_exp_k2
-#undef pp_exp_k8
-#undef pp_exp_k12
-#undef pp_exp_k48
-#undef pp_exp_k54
-#undef pp_norm_k2
-#undef pp_norm_k8
-#undef pp_norm_k12
-#undef pp_map_tatep_k2
-#undef pp_map_sim_tatep_k2
-#undef pp_map_weilp_k2
-#undef pp_map_oatep_k8
-#undef pp_map_sim_weilp_k2
-#undef pp_map_tatep_k12
-#undef pp_map_sim_tatep_k12
-#undef pp_map_weilp_k12
-#undef pp_map_sim_weilp_k12
-#undef pp_map_oatep_k12
-#undef pp_map_sim_oatep_k12
-#undef pp_map_k48
-#undef pp_map_k54
-
-#define pp_map_init 	RLC_PREFIX(pp_map_init)
-#define pp_map_clean 	RLC_PREFIX(pp_map_clean)
-#define pp_add_k2_basic 	RLC_PREFIX(pp_add_k2_basic)
-#define pp_add_k2_projc_basic 	RLC_PREFIX(pp_add_k2_projc_basic)
-#define pp_add_k2_projc_lazyr 	RLC_PREFIX(pp_add_k2_projc_lazyr)
-#define pp_add_k8_basic 	RLC_PREFIX(pp_add_k8_basic)
-#define pp_add_k8_projc_basic 	RLC_PREFIX(pp_add_k8_projc_basic)
-#define pp_add_k8_projc_lazyr 	RLC_PREFIX(pp_add_k8_projc_lazyr)
-#define pp_add_k12_basic 	RLC_PREFIX(pp_add_k12_basic)
-#define pp_add_k12_projc_basic 	RLC_PREFIX(pp_add_k12_projc_basic)
-#define pp_add_k12_projc_lazyr 	RLC_PREFIX(pp_add_k12_projc_lazyr)
-#define pp_add_lit_k12 	RLC_PREFIX(pp_add_lit_k12)
-#define pp_add_k48_basic 	RLC_PREFIX(pp_add_k48_basic)
-#define pp_add_k48_projc 	RLC_PREFIX(pp_add_k48_projc)
-#define pp_add_k54_basic 	RLC_PREFIX(pp_add_k54_basic)
-#define pp_add_k54_projc 	RLC_PREFIX(pp_add_k54_projc)
-#define pp_dbl_k2_basic 	RLC_PREFIX(pp_dbl_k2_basic)
-#define pp_dbl_k2_projc_basic 	RLC_PREFIX(pp_dbl_k2_projc_basic)
-#define pp_dbl_k2_projc_lazyr 	RLC_PREFIX(pp_dbl_k2_projc_lazyr)
-#define pp_dbl_k8_basic 	RLC_PREFIX(pp_dbl_k8_basic)
-#define pp_dbl_k8_projc_basic 	RLC_PREFIX(pp_dbl_k8_projc_basic)
-#define pp_dbl_k8_projc_lazyr 	RLC_PREFIX(pp_dbl_k8_projc_lazyr)
-#define pp_dbl_k12_basic 	RLC_PREFIX(pp_dbl_k12_basic)
-#define pp_dbl_k12_projc_basic 	RLC_PREFIX(pp_dbl_k12_projc_basic)
-#define pp_dbl_k12_projc_lazyr 	RLC_PREFIX(pp_dbl_k12_projc_lazyr)
-#define pp_dbl_k48_basic 	RLC_PREFIX(pp_dbl_k48_basic)
-#define pp_dbl_k48_projc 	RLC_PREFIX(pp_dbl_k48_projc)
-#define pp_dbl_k54_basic 	RLC_PREFIX(pp_dbl_k54_basic)
-#define pp_dbl_k54_projc 	RLC_PREFIX(pp_dbl_k54_projc)
-#define pp_dbl_lit_k12 	RLC_PREFIX(pp_dbl_lit_k12)
-#define pp_exp_k2 	RLC_PREFIX(pp_exp_k2)
-#define pp_exp_k8 	RLC_PREFIX(pp_exp_k8)
-#define pp_exp_k12 	RLC_PREFIX(pp_exp_k12)
-#define pp_exp_k48 	RLC_PREFIX(pp_exp_k48)
-#define pp_exp_k54 	RLC_PREFIX(pp_exp_k54)
-#define pp_norm_k2 	RLC_PREFIX(pp_norm_k2)
-#define pp_norm_k8 	RLC_PREFIX(pp_norm_k8)
-#define pp_norm_k12 	RLC_PREFIX(pp_norm_k12)
-#define pp_map_tatep_k2 	RLC_PREFIX(pp_map_tatep_k2)
-#define pp_map_sim_tatep_k2 	RLC_PREFIX(pp_map_sim_tatep_k2)
-#define pp_map_weilp_k2 	RLC_PREFIX(pp_map_weilp_k2)
-#define pp_map_oatep_k8 	RLC_PREFIX(pp_map_oatep_k8)
-#define pp_map_sim_weilp_k2 	RLC_PREFIX(pp_map_sim_weilp_k2)
-#define pp_map_tatep_k12 	RLC_PREFIX(pp_map_tatep_k12)
-#define pp_map_sim_tatep_k12 	RLC_PREFIX(pp_map_sim_tatep_k12)
-#define pp_map_weilp_k12 	RLC_PREFIX(pp_map_weilp_k12)
-#define pp_map_sim_weilp_k12 	RLC_PREFIX(pp_map_sim_weilp_k12)
-#define pp_map_oatep_k12 	RLC_PREFIX(pp_map_oatep_k12)
-#define pp_map_sim_oatep_k12 	RLC_PREFIX(pp_map_sim_oatep_k12)
-#define pp_map_k48 	RLC_PREFIX(pp_map_k48)
-#define pp_map_k54 	RLC_PREFIX(pp_map_k54)
-
-#undef crt_t
-#undef rsa_t
-#undef rabin_t
-#undef phpe_t
-#undef bdpe_t
-#undef sokaka_t
-#define crt_t		RLC_PREFIX(crt_t)
-#define rsa_t		RLC_PREFIX(rsa_t)
-#define rabin_t	RLC_PREFIX(rabin_t)
-#define phpe_t	RLC_PREFIX(phpe_t)
-#define bdpe_t	RLC_PREFIX(bdpe_t)
-#define sokaka_t	RLC_PREFIX(sokaka_t)
-
-#undef cp_rsa_gen
-#undef cp_rsa_enc
-#undef cp_rsa_dec
-#undef cp_rsa_sig
-#undef cp_rsa_ver
-#undef cp_rabin_gen
-#undef cp_rabin_enc
-#undef cp_rabin_dec
-#undef cp_bdpe_gen
-#undef cp_bdpe_enc
-#undef cp_bdpe_dec
-#undef cp_phpe_gen
-#undef cp_phpe_enc
-#undef cp_phpe_dec
-#undef cp_ghpe_gen
-#undef cp_ghpe_enc
-#undef cp_ghpe_dec
-#undef cp_ecdh_gen
-#undef cp_ecdh_key
-#undef cp_ecmqv_gen
-#undef cp_ecmqv_key
-#undef cp_ecies_gen
-#undef cp_ecies_enc
-#undef cp_ecies_dec
-#undef cp_ecdsa_gen
-#undef cp_ecdsa_sig
-#undef cp_ecdsa_ver
-#undef cp_ecss_gen
-#undef cp_ecss_sig
-#undef cp_ecss_ver
-#undef cp_sokaka_gen
-#undef cp_sokaka_gen_prv
-#undef cp_sokaka_key
-#undef cp_bgn_gen
-#undef cp_bgn_enc1
-#undef cp_bgn_dec1
-#undef cp_bgn_enc2
-#undef cp_bgn_dec2
-#undef cp_bgn_add
-#undef cp_bgn_mul
-#undef cp_bgn_dec
-#undef cp_ibe_gen
-#undef cp_ibe_gen_prv
-#undef cp_ibe_enc
-#undef cp_ibe_dec
-#undef cp_bls_gen
-#undef cp_bls_sig
-#undef cp_bls_ver
-#undef cp_bbs_gen
-#undef cp_bbs_sig
-#undef cp_bbs_ver
-#undef cp_cls_gen
-#undef cp_cls_sig
-#undef cp_cls_ver
-#undef cp_cli_gen
-#undef cp_cli_sig
-#undef cp_cli_ver
-#undef cp_clb_gen
-#undef cp_clb_sig
-#undef cp_clb_ver
-#undef cp_pss_gen
-#undef cp_pss_sig
-#undef cp_pss_ver
-#undef cp_mpss_gen
-#undef cp_mpss_sig
-#undef cp_mpss_bct
-#undef cp_mpss_ver
-#undef cp_psb_gen
-#undef cp_psb_sig
-#undef cp_psb_ver
-#undef cp_mpsb_gen
-#undef cp_mpsb_sig
-#undef cp_mpsb_bct
-#undef cp_mpsb_ver
-#undef cp_zss_gen
-#undef cp_zss_sig
-#undef cp_zss_ver
-#undef cp_vbnn_gen
-#undef cp_vbnn_gen_prv
-#undef cp_vbnn_sig
-#undef cp_vbnn_ver
-#undef cp_cmlhs_init
-#undef cp_cmlhs_gen
-#undef cp_cmlhs_sig
-#undef cp_cmlhs_fun
-#undef cp_cmlhs_evl
-#undef cp_cmlhs_ver
-#undef cp_cmlhs_off
-#undef cp_cmlhs_onv
-#undef cp_mklhs_gen
-#undef cp_mklhs_sig
-#undef cp_mklhs_fun
-#undef cp_mklhs_evl
-#undef cp_mklhs_ver
-#undef cp_mklhs_off
-#undef cp_mklhs_onv
-
-#define cp_rsa_gen 	RLC_PREFIX(cp_rsa_gen)
-#define cp_rsa_enc 	RLC_PREFIX(cp_rsa_enc)
-#define cp_rsa_dec 	RLC_PREFIX(cp_rsa_dec)
-#define cp_rsa_sig 	RLC_PREFIX(cp_rsa_sig)
-#define cp_rsa_ver 	RLC_PREFIX(cp_rsa_ver)
-#define cp_rabin_gen 	RLC_PREFIX(cp_rabin_gen)
-#define cp_rabin_enc 	RLC_PREFIX(cp_rabin_enc)
-#define cp_rabin_dec 	RLC_PREFIX(cp_rabin_dec)
-#define cp_bdpe_gen 	RLC_PREFIX(cp_bdpe_gen)
-#define cp_bdpe_enc 	RLC_PREFIX(cp_bdpe_enc)
-#define cp_bdpe_dec 	RLC_PREFIX(cp_bdpe_dec)
-#define cp_phpe_gen 	RLC_PREFIX(cp_phpe_gen)
-#define cp_phpe_enc 	RLC_PREFIX(cp_phpe_enc)
-#define cp_phpe_dec 	RLC_PREFIX(cp_phpe_dec)
-#define cp_ghpe_gen 	RLC_PREFIX(cp_ghpe_gen)
-#define cp_ghpe_enc 	RLC_PREFIX(cp_ghpe_enc)
-#define cp_ghpe_dec 	RLC_PREFIX(cp_ghpe_dec)
-#define cp_ecdh_gen 	RLC_PREFIX(cp_ecdh_gen)
-#define cp_ecdh_key 	RLC_PREFIX(cp_ecdh_key)
-#define cp_ecmqv_gen 	RLC_PREFIX(cp_ecmqv_gen)
-#define cp_ecmqv_key 	RLC_PREFIX(cp_ecmqv_key)
-#define cp_ecies_gen 	RLC_PREFIX(cp_ecies_gen)
-#define cp_ecies_enc 	RLC_PREFIX(cp_ecies_enc)
-#define cp_ecies_dec 	RLC_PREFIX(cp_ecies_dec)
-#define cp_ecdsa_gen 	RLC_PREFIX(cp_ecdsa_gen)
-#define cp_ecdsa_sig 	RLC_PREFIX(cp_ecdsa_sig)
-#define cp_ecdsa_ver 	RLC_PREFIX(cp_ecdsa_ver)
-#define cp_ecss_gen 	RLC_PREFIX(cp_ecss_gen)
-#define cp_ecss_sig 	RLC_PREFIX(cp_ecss_sig)
-#define cp_ecss_ver 	RLC_PREFIX(cp_ecss_ver)
-#define cp_sokaka_gen 	RLC_PREFIX(cp_sokaka_gen)
-#define cp_sokaka_gen_prv 	RLC_PREFIX(cp_sokaka_gen_prv)
-#define cp_sokaka_key 	RLC_PREFIX(cp_sokaka_key)
-#define cp_bgn_gen 	RLC_PREFIX(cp_bgn_gen)
-#define cp_bgn_enc1 	RLC_PREFIX(cp_bgn_enc1)
-#define cp_bgn_dec1 	RLC_PREFIX(cp_bgn_dec1)
-#define cp_bgn_enc2 	RLC_PREFIX(cp_bgn_enc2)
-#define cp_bgn_dec2 	RLC_PREFIX(cp_bgn_dec2)
-#define cp_bgn_add 	RLC_PREFIX(cp_bgn_add)
-#define cp_bgn_mul 	RLC_PREFIX(cp_bgn_mul)
-#define cp_bgn_dec 	RLC_PREFIX(cp_bgn_dec)
-#define cp_ibe_gen 	RLC_PREFIX(cp_ibe_gen)
-#define cp_ibe_gen_prv 	RLC_PREFIX(cp_ibe_gen_prv)
-#define cp_ibe_enc 	RLC_PREFIX(cp_ibe_enc)
-#define cp_ibe_dec 	RLC_PREFIX(cp_ibe_dec)
-#define cp_bls_gen 	RLC_PREFIX(cp_bls_gen)
-#define cp_bls_sig 	RLC_PREFIX(cp_bls_sig)
-#define cp_bls_ver 	RLC_PREFIX(cp_bls_ver)
-#define cp_bbs_gen 	RLC_PREFIX(cp_bbs_gen)
-#define cp_bbs_sig 	RLC_PREFIX(cp_bbs_sig)
-#define cp_bbs_ver 	RLC_PREFIX(cp_bbs_ver)
-#define cp_cls_gen 	RLC_PREFIX(cp_cls_gen)
-#define cp_cls_sig 	RLC_PREFIX(cp_cls_sig)
-#define cp_cls_ver 	RLC_PREFIX(cp_cls_ver)
-#define cp_cli_gen 	RLC_PREFIX(cp_cli_gen)
-#define cp_cli_sig 	RLC_PREFIX(cp_cli_sig)
-#define cp_cli_ver 	RLC_PREFIX(cp_cli_ver)
-#define cp_clb_gen 	RLC_PREFIX(cp_clb_gen)
-#define cp_clb_sig 	RLC_PREFIX(cp_clb_sig)
-#define cp_clb_ver 	RLC_PREFIX(cp_clb_ver)
-#define cp_pss_gen 	RLC_PREFIX(cp_pss_gen)
-#define cp_pss_sig 	RLC_PREFIX(cp_pss_sig)
-#define cp_pss_ver 	RLC_PREFIX(cp_pss_ver)
-#define cp_mpss_gen 	RLC_PREFIX(cp_mpss_gen)
-#define cp_mpss_sig 	RLC_PREFIX(cp_mpss_sig)
-#define cp_mpss_bct 	RLC_PREFIX(cp_mpss_bct)
-#define cp_mpss_ver 	RLC_PREFIX(cp_mpss_ver)
-#define cp_psb_gen 	RLC_PREFIX(cp_psb_gen)
-#define cp_psb_sig 	RLC_PREFIX(cp_psb_sig)
-#define cp_psb_ver 	RLC_PREFIX(cp_psb_ver)
-#define cp_mpsb_gen 	RLC_PREFIX(cp_mpsb_gen)
-#define cp_mpsb_sig 	RLC_PREFIX(cp_mpsb_sig)
-#define cp_mpsb_bct 	RLC_PREFIX(cp_mpsb_bct)
-#define cp_mpsb_ver 	RLC_PREFIX(cp_mpsb_ver)
-#define cp_zss_gen 	RLC_PREFIX(cp_zss_gen)
-#define cp_zss_sig 	RLC_PREFIX(cp_zss_sig)
-#define cp_zss_ver 	RLC_PREFIX(cp_zss_ver)
-#define cp_vbnn_gen 	RLC_PREFIX(cp_vbnn_gen)
-#define cp_vbnn_gen_prv 	RLC_PREFIX(cp_vbnn_gen_prv)
-#define cp_vbnn_sig 	RLC_PREFIX(cp_vbnn_sig)
-#define cp_vbnn_ver 	RLC_PREFIX(cp_vbnn_ver)
-#define cp_cmlhs_init 	RLC_PREFIX(cp_cmlhs_init)
-#define cp_cmlhs_gen 	RLC_PREFIX(cp_cmlhs_gen)
-#define cp_cmlhs_sig 	RLC_PREFIX(cp_cmlhs_sig)
-#define cp_cmlhs_fun 	RLC_PREFIX(cp_cmlhs_fun)
-#define cp_cmlhs_evl 	RLC_PREFIX(cp_cmlhs_evl)
-#define cp_cmlhs_ver 	RLC_PREFIX(cp_cmlhs_ver)
-#define cp_cmlhs_off 	RLC_PREFIX(cp_cmlhs_off)
-#define cp_cmlhs_onv 	RLC_PREFIX(cp_cmlhs_onv)
-#define cp_mklhs_gen 	RLC_PREFIX(cp_mklhs_gen)
-#define cp_mklhs_sig 	RLC_PREFIX(cp_mklhs_sig)
-#define cp_mklhs_fun 	RLC_PREFIX(cp_mklhs_fun)
-#define cp_mklhs_evl 	RLC_PREFIX(cp_mklhs_evl)
-#define cp_mklhs_ver 	RLC_PREFIX(cp_mklhs_ver)
-#define cp_mklhs_off 	RLC_PREFIX(cp_mklhs_off)
-#define cp_mklhs_onv 	RLC_PREFIX(cp_mklhs_onv)
-
-#undef md_map_sh224
-#undef md_map_sh256
-#undef md_map_sh384
-#undef md_map_sh512
-#undef md_map_b2s160
-#undef md_map_b2s256
-#undef md_kdf
-#undef md_mgf
-#undef md_hmac
-#undef md_xmd_sh224
-#undef md_xmd_sh256
-#undef md_xmd_sh384
-#undef md_xmd_sh512
-
-#define md_map_sh224 	RLC_PREFIX(md_map_sh224)
-#define md_map_sh256 	RLC_PREFIX(md_map_sh256)
-#define md_map_sh384 	RLC_PREFIX(md_map_sh384)
-#define md_map_sh512 	RLC_PREFIX(md_map_sh512)
-#define md_map_b2s160 	RLC_PREFIX(md_map_b2s160)
-#define md_map_b2s256 	RLC_PREFIX(md_map_b2s256)
-#define md_kdf 	RLC_PREFIX(md_kdf)
-#define md_mgf 	RLC_PREFIX(md_mgf)
-#define md_hmac 	RLC_PREFIX(md_hmac)
-#define md_xmd_sh224 	RLC_PREFIX(md_xmd_sh224)
-#define md_xmd_sh256 	RLC_PREFIX(md_xmd_sh256)
-#define md_xmd_sh384 	RLC_PREFIX(md_xmd_sh384)
-#define md_xmd_sh512 	RLC_PREFIX(md_xmd_sh512)
-
-#endif /* LABEL */
-
-#endif /* !RLC_LABEL_H */
diff --git a/src/dashbls/depends/relic/include/relic_md.h b/src/dashbls/depends/relic/include/relic_md.h
deleted file mode 100644
index a624b66cc9eb..000000000000
--- a/src/dashbls/depends/relic/include/relic_md.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup md Hash functions
- */
-
-/**
- * @file
- *
- * Interface of the module for computing hash functions.
- *
- * @ingroup md
- */
-
-#ifndef RLC_MD_H
-#define RLC_MD_H
-
-#include "relic_conf.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-enum {
-	/** Hash length for SHA-224 function. */
-	RLC_MD_LEN_SH224 = 28,
-	/** Hash length for SHA-256 function. */
-	RLC_MD_LEN_SH256 = 32,
-	/** Hash length for SHA-384 function. */
-	RLC_MD_LEN_SH384 = 48,
-	/** Hash length for SHA-512 function. */
-	RLC_MD_LEN_SH512 = 64,
-	/** Hash length for BLAKE2s-160 function. */
-	RLC_MD_LEN_B2S160 = 20,
-	/** Hash length for BLAKE2s-256 function. */
-	RLC_MD_LEN_B2S256 = 32
-};
-
-/**
- * Length in bytes of default hash function output.
- */
-#if MD_MAP == SH224
-#define RLC_MD_LEN					RLC_MD_LEN_SH224
-#elif MD_MAP == SH256
-#define RLC_MD_LEN					RLC_MD_LEN_SH256
-#elif MD_MAP == SH384
-#define RLC_MD_LEN					RLC_MD_LEN_SH384
-#elif MD_MAP == SH512
-#define RLC_MD_LEN					RLC_MD_LEN_SH512
-#elif MD_MAP == B2S160
-#define RLC_MD_LEN					RLC_MD_LEN_B2S160
-#elif MD_MAP == B2S256
-#define RLC_MD_LEN					RLC_MD_LEN_B2S256
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Maps a byte vector to a fixed-length byte vector using the chosen hash
- * function.
- *
- * @param[out] H				- the digest.
- * @param[in] M					- the message to hash.
- * @param[in] L					- the message length in bytes.
- */
-#if MD_MAP == SH224
-#define md_map(H, M, L)			md_map_sh224(H, M, L)
-#elif MD_MAP == SH256
-#define md_map(H, M, L)			md_map_sh256(H, M, L)
-#elif MD_MAP == SH384
-#define md_map(H, M, L)			md_map_sh384(H, M, L)
-#elif MD_MAP == SH512
-#define md_map(H, M, L)			md_map_sh512(H, M, L)
-#elif MD_MAP == B2S160
-#define md_map(H, M, L)			md_map_b2s160(H, M, L)
-#elif MD_MAP == B2S256
-#define md_map(H, M, L)			md_map_b2s256(H, M, L)
-#endif
-
-/**
- * Maps a byte vector and optional domain separation tag to an arbitrary-length
- * pseudorandom output using the chosen hash function.
- *
- * @param[out] B					- the output buffer.
- * @param[in] BL					- the requested size of the output.
- * @param[in] I						- the message to hash.
- * @param[in] IL					- the message length in bytes.
- * @param[in] D						- the domain separation tag.
- * @param[in] DL					- the domain separation tag length in bytes.
- */
-#if MD_MAP == SH224
-#define md_xmd(B, BL, I, IL, D, DL) 	md_xmd_sh224(B, BL, I, IL, D, DL)
-#elif MD_MAP == SH256
-#define md_xmd(B, BL, I, IL, D, DL) 	md_xmd_sh256(B, BL, I, IL, D, DL)
-#elif MD_MAP == SH384
-#define md_xmd(B, BL, I, IL, D, DL) 	md_xmd_sh384(B, BL, I, IL, D, DL)
-#elif MD_MAP == SH512
-#define md_xmd(B, BL, I, IL, D, DL) 	md_xmd_sh512(B, BL, I, IL, D, DL)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Computes the SHA-224 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_sh224(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Computes the SHA-256 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_sh256(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Computes the SHA-384 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_sh384(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Computes the SHA-512 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_sh512(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Computes the BLAKE2s-160 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_b2s160(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Computes the BLAKE2s-256 hash function.
- *
- * @param[out] hash				- the digest.
- * @param[in] msg				- the message to hash.
- * @param[in] len				- the message length in bytes.
- */
-void md_map_b2s256(uint8_t *hash, const uint8_t *msg, int len);
-
-/**
- * Derives a key from shared secret material through the standardized KDF2
- * function.
- *
- * @param[out] key				- the resulting key.
- * @param[in] key_len			- the intended key length in bytes.
- * @param[in] in				- the shared secret.
- * @param[in] in_len			- the length of the shared secret in bytes.
- */
-void md_kdf(uint8_t *key, int key_len, const uint8_t *in, int in_len);
-
-/**
- * Derives a mask from shared secret material through the PKCS#1 2.1 MGF1
- * function. This is the same as the standardized KDF1 key derivation function.
- *
- * @param[out] key				- the resulting mask.
- * @param[in] key_len			- the intended mask length in bytes.
- * @param[in] in				- the shared secret.
- * @param[in] in_len			- the length of the shared secret in bytes.
- */
-void md_mgf(uint8_t *mask, int mask_len, const uint8_t *in, int in_len);
-
-/**
- * Computes a Message Authentication Code through HMAC.
- *
- * @param[out] mac				- the authentication.
- * @param[in] in				- the date to authenticate.
- * @param[in] in_len			- the number of bytes to authenticate.
- * @param[in] key				- the cryptographic key.
- * @param[in] key_len			- the size of the key in bytes.
- */
-void md_hmac(uint8_t *mac, const uint8_t *in, int in_len, const uint8_t *key,
-		int key_len);
-
-/**
- * Map a byte vector and optional domain separation tag to an arbitrary-length
- * pseudorandom output using the SHA-224 hash function.
- *
- * @param[out] buf					- the output buffer.
- * @param[in] buf_len				- the requested size of the output.
- * @param[in] in					- the message to hash.
- * @param[in] in_len				- the message length in bytes.
- * @param[in] dst					- the domain separation tag.
- * @param[in] dst_len				- the domain separation tag length in bytes.
- */
-void md_xmd_sh224(uint8_t *buf, int buf_len, const uint8_t *in, int in_len,
-		const uint8_t *dst, int dst_len);
-
-/**
- * Map a byte vector and optional domain separation tag to an arbitrary-length
- * pseudorandom output using the SHA-256 hash function.
- *
- * @param[out] buf					- the output buffer.
- * @param[in] buf_len				- the requested size of the output.
- * @param[in] in					- the message to hash.
- * @param[in] in_len				- the message length in bytes.
- * @param[in] dst					- the domain separation tag.
- * @param[in] dst_len				- the domain separation tag length in bytes.
- */
-void md_xmd_sh256(uint8_t *buf, int buf_len, const uint8_t *in, int in_len,
-		const uint8_t *dst, int dst_len);
-
-/**
- * Map a byte vector and optional domain separation tag to an arbitrary-length
- * pseudorandom output using the SHA-384 hash function.
- *
- * @param[out] buf					- the output buffer.
- * @param[in] buf_len				- the requested size of the output.
- * @param[in] in					- the message to hash.
- * @param[in] in_len				- the message length in bytes.
- * @param[in] dst					- the domain separation tag.
- * @param[in] dst_len				- the domain separation tag length in bytes.
- */
-void md_xmd_sh384(uint8_t *buf, int buf_len, const uint8_t *in, int in_len,
-		const uint8_t *dst, int dst_len);
-
-/**
- * Map a byte vector and optional domain separation tag to an arbitrary-length
- * pseudorandom output using the SHA-512 hash function.
- *
- * @param[out] buf					- the output buffer.
- * @param[in] buf_len				- the requested size of the output.
- * @param[in] in					- the message to hash.
- * @param[in] in_len				- the message length in bytes.
- * @param[in] dst					- the domain separation tag.
- * @param[in] dst_len				- the domain separation tag length in bytes.
- */
-void md_xmd_sh512(uint8_t *buf, int buf_len, const uint8_t *in, int in_len,
-		const uint8_t *dst, int dst_len);
-
-#endif /* !RLC_MD_H */
diff --git a/src/dashbls/depends/relic/include/relic_mpc.h b/src/dashbls/depends/relic/include/relic_mpc.h
deleted file mode 100644
index f25e401dbdd5..000000000000
--- a/src/dashbls/depends/relic/include/relic_mpc.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup mpc Multi-party computation
- */
-
-/**
- * @file
- *
- * Interface of the module for multi-party computation.
- *
- * @ingroup bn
- */
-
-#ifndef RLC_MPC_H
-#define RLC_MPC_H
-
-#include "relic_conf.h"
-#include "relic_pc.h"
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a multiplication triple.
- */
-typedef struct {
-	/* The share of the first operand. */
-	bn_t a;
-	/* The share of the second operand. */
-	bn_t b;
-	union {
-		g1_t *b1;
-		g2_t *b2;
-		gt_t *bt;
-	};
-	/* The share of the multiplication. */
-	bn_t c;
-	union {
-		g1_t *c1;
-		g2_t *c2;
-		gt_t *ct;
-	};
-} mt_st;
-
-/**
- * Pointer to a multiplication triple structure.
- */
-#if ALLOC == AUTO
-typedef mt_st mt_t[1];
-#else
-typedef mt_st *mt_t;
-#endif
-
-/**
- * Represents a pairing triple.
- */
-typedef struct _pt_st {
-	/** The shares of the G1 element a. */
-	g1_t a;
-	/** The shares of the G2 element b. */
-	g2_t b;
-	/** The shares of the GT element c = e(a,b). */
-	gt_t c;
-} pt_st;
-
-/**
- * Pointer to a pairing triple.
- */
-#if ALLOC == AUTO
-typedef pt_st pt_t[1];
-#else
-typedef pt_st *pt_t;
-#endif
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a multiplication triple.
- *
- * @param[out] A			- the multiple precision integer to initialize.
- */
-#if ALLOC == AUTO
-#define mt_null(A)				/* empty */
-#else
-#define mt_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate and initialize a multiple precision integer.
- *
- * @param[in,out] A			- the multiple precision integer to initialize.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#if ALLOC == DYNAMIC
-#define mt_new(A)															\
-	A = (mt_t)calloc(1, sizeof(mt_st));										\
-	if ((A) == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	bn_null((A)->a);														\
-	bn_null((A)->b);														\
-	bn_null((A)->c);														\
-	bn_new((A)->a);															\
-	bn_new((A)->b);															\
-	bn_new((A)->c);															\
-
-#elif ALLOC == AUTO
-#define mt_new(A)															\
-	bn_new((A)->a);															\
-	bn_new((A)->b);															\
-	bn_new((A)->c);															\
-
-#endif
-
-/**
- * Calls a function to clean and free a multiple precision integer.
- *
- * @param[in,out] A			- the multiple precision integer to free.
- */
-#if ALLOC == DYNAMIC
-#define mt_free(A)															\
-	if (A != NULL) {														\
-		bn_free((A)->a);													\
-		bn_free((A)->b);													\
-		bn_free((A)->c);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define mt_free(A)			/* empty */										\
-
-#endif
-
-/**
- * Initializes a pairing triple with a null value.
- *
- * @param[out] A			- the key pair to initialize.
- */
-#if ALLOC == AUTO
-#define pt_null(A)				/* empty */
-#else
-#define pt_null(A)			A = NULL;
-#endif
-
-/**
- * Calls a function to allocate and initialize a pairing triple.
- *
- * @param[out] A			- the new pairing triple.
- */
-#if ALLOC == DYNAMIC
-#define pt_new(A)															\
-	A = (pt_t)calloc(1, sizeof(pt_st));										\
-	if (A == NULL) {														\
-		RLC_THROW(ERR_NO_MEMORY);											\
-	}																		\
-	g1_new((A)->a);															\
-	g2_new((A)->b);															\
-	gt_new((A)->c);															\
-
-#elif ALLOC == AUTO
-#define pt_new(A)				/* empty */
-
-#endif
-
-/**
- * Calls a function to clean and free a pairing triple.
- *
- * @param[out] A			- the pairing triple to clean and free.
- */
-#if ALLOC == DYNAMIC
-#define pt_free(A)															\
-	if (A != NULL) {														\
-		g1_free((A)->a);													\
-		g2_free((A)->b);													\
-		gt_free((A)->c);													\
-		free(A);															\
-		A = NULL;															\
-	}
-
-#elif ALLOC == AUTO
-#define pt_free(A)				/* empty */
-
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Generates a pair of multiplication triples for use in MPC protocols such that
- * [a] * [b] = [c] modulo a certain order.
- *
- * @param[out] tri				- the multiplication triples to generate.
- * @param[in] order				- the order.
- */
-void mt_gen(mt_t tri[2], bn_t order);
-
-/**
- * Performs the local work for a MPC multiplication.
- *
- * @param[out] d 				- the masked first multiplication operand.
- * @param[out] e 				- the masked second multiplication operand.
- * @param[in] x 				- the first multiplication operand.
- * @param[in] y 				- the second multiplication operand.
- * @param[in] n 				- the order.
- * @param[in] tri 				- the multiplication triple.
-*/
-void mt_mul_lcl(bn_t d, bn_t e, bn_t x, bn_t y, bn_t n, mt_t tri);
-
-/**
- * Opens the public values in an MPC multiplication.
- *
- * @param[out] d 				- the first public value.
- * @param[out] e 				- the second public value.
- * @param[in] n 				- the order.
-*/
-void mt_mul_bct(bn_t d[2], bn_t e[2], bn_t n);
-
-/**
- * Finishes an MPC multiplication by computing the multiplication result.
- *
- * @param[out] r 				- the share of the multiplication result.
- * @param[in] d 				- the first public value.
- * @param[in] e 				- the second public value.
- * @param[in] n 				- the order.
- * @param[in] tri 				- the multiplication triple.
- * @param[in] party				- the party performing the computation.
- */
-void mt_mul_mpc(bn_t r, bn_t d, bn_t e, bn_t n, mt_t tri, int party);
-
-/**
- * Performs the local work for a MPC scalar multiplication in G1.
- *
- * @param[out] d 				- the share of the masked scalar.
- * @param[out] q 				- the share of the masked point to multiply.
- * @param[in] x 				- the scalar.
- * @param[in] p 				- the point to multiply.
- * @param[in] tri 				- the multiplication triple.
-*/
-void g1_mul_lcl(bn_t d, g1_t q, bn_t x, g1_t p, mt_t tri);
-
-/**
- * Opens the public values in an MPC scalar multiplication in G1.
- *
- * @param[out] d 				- the first public value (masked scalar).
- * @param[out] q 				- the second public value (masked point).
- * @param[in] n 				- the order.
-*/
-void g1_mul_bct(bn_t d[2], g1_t q[2]);
-
-/**
- * Finishes an MPC scalar multiplication in G1 by computing the result.
- *
- * @param[out] r 				- the share of the result.
- * @param[in] d 				- the first public value.
- * @param[in] q 				- the second public value.
- * @param[in] tri 				- the multiplication triple.
- * @param[in] party				- the party performing the computation.
- */
-void g1_mul_mpc(g1_t r, bn_t d, g1_t q, mt_t tri, int party);
-
-/**
- * Performs the local work for a MPC scalar multiplication in G2.
- *
- * @param[out] d 				- the share of the masked scalar.
- * @param[out] q 				- the share of the masked point to multiply.
- * @param[in] x 				- the scalar.
- * @param[in] p 				- the point to multiply.
- * @param[in] tri 				- the multiplication triple.
-*/
-void g2_mul_lcl(bn_t d, g2_t q, bn_t x, g2_t p, mt_t tri);
-
-/**
- * Opens the public values in an MPC scalar multiplication in G2.
- *
- * @param[out] d 				- the first public value (masked scalar).
- * @param[out] q 				- the second public value (masked point).
- * @param[in] n 				- the order.
-*/
-void g2_mul_bct(bn_t d[2], g2_t q[2]);
-
-/**
- * Finishes an MPC scalar multiplication in G2 by computing the result.
- *
- * @param[out] r 				- the share of the result.
- * @param[in] d 				- the first public value.
- * @param[in] q 				- the second public value.
- * @param[in] tri 				- the multiplication triple.
- * @param[in] party				- the party performing the computation.
- */
-void g2_mul_mpc(g2_t r, bn_t d, g2_t q, mt_t tri, int party);
-
-/**
- * Performs the local work for a MPC scalar multiplication in G2.
- *
- * @param[out] d 				- the share of the masked scalar.
- * @param[out] q 				- the share of the masked point to multiply.
- * @param[in] x 				- the scalar.
- * @param[in] p 				- the point to multiply.
- * @param[in] tri 				- the multiplication triple.
-*/
-void gt_exp_lcl(bn_t d, gt_t q, bn_t x, gt_t p, mt_t tri);
-
-/**
- * Opens the public values in an MPC scalar multiplication in G2.
- *
- * @param[out] d 				- the first public value (masked scalar).
- * @param[out] q 				- the second public value (masked point).
- * @param[in] n 				- the order.
-*/
-void gt_exp_bct(bn_t d[2], gt_t q[2]);
-
-/**
- * Finishes an MPC scalar multiplication in G2 by computing the result.
- *
- * @param[out] r 				- the share of the result.
- * @param[in] d 				- the first public value.
- * @param[in] q 				- the second public value.
- * @param[in] tri 				- the multiplication triple.
- * @param[in] party				- the party performing the computation.
- */
-void gt_exp_mpc(gt_t r, bn_t d, gt_t q, mt_t tri, int party);
-
-/**
- * Generates a pairing triple.
- *
- * @param[out] t			- the pairing triple to generate.
- */
-void pc_map_tri(pt_t t[2]);
-
-/**
- * Computes the public values from the pairing inputs and triple.
- *
- * @param[out] d			- the share of the first public value.
- * @param[out] e			- the share of the second public value.
- * @param[in] p				- the share of the first pairnig argument.
- * @param[in] q				- the share of the second pairing argument.
- * @param[in] t				- the pairing triple.
- */
-void pc_map_lcl(g1_t d, g2_t e, g1_t p, g2_t q, pt_t t);
-
-/**
- * Broadcasts the public values for pairing computation.
- *
- * @param[out] d			- the first set of public values.
- * @param[out] e			- the second set of public values.
- */
-void pc_map_bct(g1_t d[2], g2_t e[2]);
-
-/**
- * Computes a pairing using a pairing triple.
- *
- * @param[out] r 			- the pairing result.
- * @param[in] d1				- the first public value.
- * @param[in] d2				- the second public value.
- * @param[in] triple		- the pairing triple.
- * @param[in] party			- the number of the party executing the computation.
- */
-void pc_map_mpc(gt_t r, g1_t d1, g2_t d2, pt_t triple, int party);
-
-#endif /* !RLC_MPC_H */
diff --git a/src/dashbls/depends/relic/include/relic_multi.h b/src/dashbls/depends/relic/include/relic_multi.h
deleted file mode 100644
index 0e2b39609884..000000000000
--- a/src/dashbls/depends/relic/include/relic_multi.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup relic Core functions
- */
-
-/**
- * @file
- *
- * Multithreading support.
- *
- * @ingroup relic
- */
-
-#ifndef RLC_MULTI_H
-#define RLC_MULTI_H
-
-#if defined(MULTI)
-#include <math.h>
-#if MULTI == OPENMP
-#include <omp.h>
-#elif MULTI == PTHREAD
-#include <pthread.h>
-#endif /* OPENMP */
-#endif /* MULTI */
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-#if defined(MULTI)
-
-/**
- * If multi-threading is enabled, assigns each thread a local copy of the data.
- */
-#if MULTI == PTHREAD
-#define rlc_thread 	__thread
-#else
-#define rlc_thread /* */
-#endif
-
-/**
- * Make library context private to each thread.
- */
-#if MULTI == OPENMP
-/**
- * Active library context, only visible inside the library.
- */
-extern ctx_t first_ctx;
-
-/**
- * Pointer to active library context, only visible inside the library.
- */
-extern ctx_t *core_ctx;
-
-#pragma omp threadprivate(first_ctx, core_ctx)
-#endif
-
-#endif /* MULTI */
-
-#endif /* !RLC_MULTI_H */
diff --git a/src/dashbls/depends/relic/include/relic_pc.h b/src/dashbls/depends/relic/include/relic_pc.h
deleted file mode 100644
index 5c55b1055f42..000000000000
--- a/src/dashbls/depends/relic/include/relic_pc.h
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup pc Pairing-based cryptography
- */
-
-/**
- * @file
- *
- * Abstractions of pairing computation useful to protocol implementors.
- *
- * @ingroup pc
- */
-
-#ifndef RLC_PC_H
-#define RLC_PC_H
-
-#include "relic_fbx.h"
-#include "relic_ep.h"
-#include "relic_eb.h"
-#include "relic_pp.h"
-#include "relic_bn.h"
-#include "relic_util.h"
-#include "relic_conf.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Prefix for function mappings.
- */
-/** @{ */
-#if FP_PRIME < 1536
-
-#define RLC_G1_LOWER			ep_
-#define RLC_G1_UPPER			EP
-
-#if FP_PRIME == 509
-#define RLC_G2_LOWER			ep4_
-#else
-#define RLC_G2_LOWER			ep2_
-#endif
-
-#define RLC_G2_UPPER			EP
-
-#if FP_PRIME == 509
-#define RLC_GT_LOWER			fp24_
-#else
-#define RLC_GT_LOWER			fp12_
-#endif
-
-#define RLC_PC_LOWER			pp_
-
-#else
-#define RLC_G1_LOWER			ep_
-#define RLC_G1_UPPER			EP
-#define RLC_G2_LOWER			ep_
-#define RLC_G2_UPPER			EP
-#define RLC_GT_LOWER			fp2_
-#define RLC_PC_LOWER			pp_
-#endif
-/** @} */
-
-/**
- * Represents the size in bytes of the order of G_1 and G_2.
- */
-#define RLC_PC_BYTES			RLC_FP_BYTES
-
-/**
- * Represents a G_1 precomputed table.
- */
-#define RLC_G1_TABLE			RLC_CAT(RLC_CAT(RLC_, RLC_G1_UPPER), _TABLE)
-
-/**
- * Represents a G_2 precomputed table.
- */
-#define RLC_G2_TABLE			RLC_CAT(RLC_CAT(RLC_, RLC_G2_UPPER), _TABLE)
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a G_1 element.
- */
-typedef RLC_CAT(RLC_G1_LOWER, t) g1_t;
-
-/**
- * Represents a G_1 element with automatic allocation.
- */
-typedef RLC_CAT(RLC_G1_LOWER, st) g1_st;
-
-/**
- * Represents a G_2 element.
- */
-typedef RLC_CAT(RLC_G2_LOWER, t) g2_t;
-
-/**
- * Represents a G_2 element with automatic allocation.
- */
-typedef RLC_CAT(RLC_G2_LOWER, st) g2_st;
-
-/**
- * Represents a G_T element.
- */
-typedef RLC_CAT(RLC_GT_LOWER, t) gt_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Initializes a G_1 element with a null value.
- *
- * @param[out] A			- the element to initialize.
- */
-#define g1_null(A)			RLC_CAT(RLC_G1_LOWER, null)(A)
-
-/**
- * Initializes a G_2 element with a null value.
- *
- * @param[out] A			- the element to initialize.
- */
-#define g2_null(A)			RLC_CAT(RLC_G2_LOWER, null)(A)
-
-/**
- * Initializes a G_T element with a null value.
- *
- * @param[out] A			- the element to initialize.
- */
-#define gt_null(A)			RLC_CAT(RLC_GT_LOWER, null)(A)
-
-/**
- * Calls a function to allocate a G_1 element.
- *
- * @param[out] A			- the new element.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#define g1_new(A)			RLC_CAT(RLC_G1_LOWER, new)(A)
-
-/**
- * Calls a function to allocate a G_2 element.
- *
- * @param[out] A			- the new element.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#define g2_new(A)			RLC_CAT(RLC_G2_LOWER, new)(A)
-
-/**
- * Calls a function to allocate a G_T element.
- *
- * @param[out] A			- the new element.
- * @throw ERR_NO_MEMORY		- if there is no available memory.
- */
-#define gt_new(A)			RLC_CAT(RLC_GT_LOWER, new)(A)
-
-/**
- * Calls a function to clean and free a G_1 element.
- *
- * @param[out] A			- the element to clean and free.
- */
-#define g1_free(A)			RLC_CAT(RLC_G1_LOWER, free)(A)
-
-/**
- * Calls a function to clean and free a G_2 element.
- *
- * @param[out] A			- the element to clean and free.
- */
-#define g2_free(A)			RLC_CAT(RLC_G2_LOWER, free)(A)
-
-/**
- * Calls a function to clean and free a G_T element.
- *
- * @param[out] A			- the element to clean and free.
- */
-#define gt_free(A)			RLC_CAT(RLC_GT_LOWER, free)(A)
-
-
-
-/**
- * Returns the generator of the group G_1.
- *
- * @param[out] G			- the returned generator.
- */
-#define g1_get_gen(G)		RLC_CAT(RLC_G1_LOWER, curve_get_gen)(G)
-
-/**
- * Returns the generator of the group G_2.
- *
- * @param[out] G			- the returned generator.
- */
-#define g2_get_gen(G)		RLC_CAT(RLC_G2_LOWER, curve_get_gen)(G)
-
-/**
- * Returns the order of the groups G_1, G_2 and G_T.
- *
- * @param[out] N			0 the returned order.
- */
-#define pc_get_ord(N)		RLC_CAT(RLC_G1_LOWER, curve_get_ord)(N)
-
-/**
- * Old macros to preserve interface.
- * @{
- */
-#define g1_get_ord			pc_get_ord
-#define g2_get_ord			pc_get_ord
-#define gt_get_ord			pc_get_ord
-
-/**
- * Configures some set of curve parameters for the current security level.
- */
-#define pc_param_set_any()	ep_param_set_any_pairf()
-
-/**
- * Returns the type of the configured pairing.
- * @{
- */
-#if FP_PRIME < 1536
-#define pc_map_is_type1()	(0)
-#define pc_map_is_type3()	(1)
-#else
-#define pc_map_is_type1()	(1)
-#define pc_map_is_type3()	(0)
-#endif
-/**
- * @}
- */
-
-/**
- * Prints the current configured binary elliptic curve.
- */
-#define pc_param_print()	RLC_CAT(RLC_G1_LOWER, param_print)()
-
-/*
- * Returns the current security level.
- */
-#define pc_param_level()	RLC_CAT(RLC_G1_LOWER, param_level)()
-
-/**
- * Tests if a G_1 element is on the curve.
- *
- * @param[in] P				- the element to test.
- * @return 1 if the element it the unity, 0 otherwise.
- */
-#define g1_on_curve(P)		RLC_CAT(RLC_G1_LOWER, on_curve)(P)
-
-/**
- * Tests if a G_2 element is on the curve.
- *
- * @param[in] P				- the element to test.
- * @return 1 if the element it the unity, 0 otherwise.
- */
-#define g2_on_curve(P)		RLC_CAT(RLC_G2_LOWER, on_curve)(P)
-
-/**
- * Tests if a G_1 element is the point at infinity.
- *
- * @param[in] P				- the element to test.
- * @return 1 if the element it the unity, 0 otherwise.
- */
-#define g1_is_infty(P)		RLC_CAT(RLC_G1_LOWER, is_infty)(P)
-
-/**
- * Tests if a G_2 element is the point at infinity.
- *
- * @param[in] P				- the element to test.
- * @return 1 if the element it the unity, 0 otherwise.
- */
-#define g2_is_infty(P)		RLC_CAT(RLC_G2_LOWER, is_infty)(P)
-
-/**
- * Tests if a G_T element is the identity.
- *
- * @param[in] A				- the element to test.
- * @return 1 if the element it the unity, 0 otherwise.
- */
-#define gt_is_unity(A)		(RLC_CAT(RLC_GT_LOWER, cmp_dig)(A, 1) == RLC_EQ)
-
-/**
- * Assigns a G_1 element to the unity.
- *
- * @param[out] P			- the element to assign.
- */
-#define g1_set_infty(P)		RLC_CAT(RLC_G1_LOWER, set_infty)(P)
-
-/**
- * Assigns a G_2 element to the unity.
- *
- * @param[out] P			- the element to assign.
- */
-#define g2_set_infty(P)		RLC_CAT(RLC_G2_LOWER, set_infty)(P)
-
-/**
- * Assigns a G_T element to zero.
- *
- * @param[out] A			- the element to assign.
- */
-#define gt_zero(A)			RLC_CAT(RLC_GT_LOWER, zero)(A)
-
-/**
- * Assigns a G_T element to the unity.
- *
- * @param[out] A			- the element to assign.
- */
-#define gt_set_unity(A)		RLC_CAT(RLC_GT_LOWER, set_dig)(A, 1)
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to copy.
- */
-#define g1_copy(R, P)		RLC_CAT(RLC_G1_LOWER, copy)(R, P)
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to copy.
- */
-#define g2_copy(R, P)		RLC_CAT(RLC_G2_LOWER, copy)(R, P)
-
-/**
- * Copies the second argument to the first argument.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the element to copy.
- */
-#define gt_copy(C, A)		RLC_CAT(RLC_GT_LOWER, copy)(C, A)
-
-/**
- * Compares two elements from G_1.
- *
- * @param[in] P				- the first element.
- * @param[in] Q				- the second element.
- * @return RLC_EQ if P == Q and RLC_NE if P != Q.
- */
-#define g1_cmp(P, Q)		RLC_CAT(RLC_G1_LOWER, cmp)(P, Q)
-
-/**
- * Compares two elements from G_2.
- *
- * @param[in] P				- the first element.
- * @param[in] Q				- the second element.
- * @return RLC_EQ if P == Q and RLC_NE if P != Q.
- */
-#define g2_cmp(P, Q)		RLC_CAT(RLC_G2_LOWER, cmp)(P, Q)
-
-/**
- * Compares two elements from G_T.
- *
- * @param[in] A				- the first element.
- * @param[in] B				- the second element.
- * @return RLC_EQ if A == B and RLC_NE if P != Q.
- */
-#define gt_cmp(A, B)		RLC_CAT(RLC_GT_LOWER, cmp)(A, B)
-
-/**
- * Compares a G_T element with a digit.
- *
- * @param[in] A				- the G_T element.
- * @param[in] D				- the digit.
- * @return RLC_EQ if A == D and RLC_NE if A != D.
- */
-#define gt_cmp_dig(A, D)	RLC_CAT(RLC_GT_LOWER, cmp_dig)(A, D)
-
-/**
- * Assigns a random value to a G_1 element.
- *
- * @param[out] P			- the element to assign.
- */
-#define g1_rand(P)			RLC_CAT(RLC_G1_LOWER, rand)(P)
-
-/**
- * Assigns a random value to a G_2 element.
- *
- * @param[out] P			- the element to assign.
- */
-#define g2_rand(P)			RLC_CAT(RLC_G2_LOWER, rand)(P)
-
-/**
- * Randomizes coordinates of a G_1 element.
- *
- * @param[out] R			- the blinded G_1 element.
- * @param[in] P				- the G_1 element to blind.
- */
- #define g1_blind(R, P)		RLC_CAT(RLC_G1_LOWER, blind)(R, P)
-
- /**
-  * Randomizes coordinates of a G_2 element.
-  *
-  * @param[out] R			- the blinded G_2 element.
-  * @param[in] P			- the G_2 element to blind.
-  */
-#define g2_blind(R, P)		RLC_CAT(RLC_G2_LOWER, blind)(R, P)
-
-/**
- * Prints a G_1 element.
- *
- * @param[in] P				- the element to print.
- */
-#define g1_print(P)			RLC_CAT(RLC_G1_LOWER, print)(P)
-
-/**
- * Prints a G_2 element.
- *
- * @param[in] P				- the element to print.
- */
-#define g2_print(P)			RLC_CAT(RLC_G2_LOWER, print)(P)
-
-/**
- * Prints a G_T element.
- *
- * @param[in] A				- the element to print.
- */
-#define gt_print(A)			RLC_CAT(RLC_GT_LOWER, print)(A)
-
-/**
- * Returns the number of bytes necessary to store a G_1 element.
- *
- * @param[in] P				- the element of G_1.
- * @param[in] C 			- the flag to indicate point compression.
- */
-#define g1_size_bin(P, C)	RLC_CAT(RLC_G1_LOWER, size_bin)(P, C)
-
-/**
- * Returns the number of bytes necessary to store a G_2 element.
- *
- * @param[in] P				- the element of G_2.
- * @param[in] C 			- the flag to indicate point compression.
- */
-#define g2_size_bin(P, C)	RLC_CAT(RLC_G2_LOWER, size_bin)(P, C)
-
-/**
- * Returns the number of bytes necessary to store a G_T element.
- *
- * @param[in] A				- the element of G_T.
- * @param[in] C 			- the flag to indicate compression.
- */
-#define gt_size_bin(A, C)	RLC_CAT(RLC_GT_LOWER, size_bin)(A, C)
-
-/**
- * Reads a G_1 element from a byte vector in big-endian format.
- *
- * @param[out] P			- the result.
- * @param[in] B				- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not sufficient.
- */
-#define g1_read_bin(P, B, L) 	RLC_CAT(RLC_G1_LOWER, read_bin)(P, B, L)
-
-/**
- * Reads a G_2 element from a byte vector in big-endian format.
- *
- * @param[out] P			- the result.
- * @param[in] B				- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not sufficient.
- */
-#define g2_read_bin(P, B, L) 	RLC_CAT(RLC_G2_LOWER, read_bin)(P, B, L)
-
-/**
- * Reads a G_T element from a byte vector in big-endian format.
- *
- * @param[out] A			- the result.
- * @param[in] B				- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not sufficient.
- */
-#define gt_read_bin(A, B, L) 	RLC_CAT(RLC_GT_LOWER, read_bin)(A, B, L)
-
-/**
- * Writes an optionally compressed G_1 element to a byte vector in big-endian
- * format.
- *
- * @param[out] B			- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @param[in] P				- the G_1 element to write.
- * @param[in] C 			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not enough.
- */
-#define g1_write_bin(B, L, P, C)	RLC_CAT(RLC_G1_LOWER, write_bin)(B, L, P, C)
-
-/**
- * Writes an optionally compressed G_2 element to a byte vector in big-endian
- * format.
- *
- * @param[out] B			- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @param[in] P				- the G_2 element to write.
- * @param[in] C 			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not enough.
- */
-#define g2_write_bin(B, L, P, C)	RLC_CAT(RLC_G2_LOWER, write_bin)(B, L, P, C)
-
-/**
- * Writes an optionally compresseds G_T element to a byte vector in big-endian
- * format.
- *
- * @param[out] B			- the byte vector.
- * @param[in] L				- the buffer capacity.
- * @param[in] A				- the G_T element to write.
- * @param[in] C 			- the flag to indicate point compression.
- * @throw ERR_NO_BUFFER		- if the buffer capacity is not sufficient.
- */
-#define gt_write_bin(B, L, A, C)	RLC_CAT(RLC_GT_LOWER, write_bin)(B, L, A, C)
-
-/**
- * Negates a element from G_1. Computes R = -P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to negate.
- */
-#define g1_neg(R, P)		RLC_CAT(RLC_G1_LOWER, neg)(R, P)
-
-/**
- * Negates a element from G_2. Computes R = -P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to negate.
- */
-#define g2_neg(R, P)		RLC_CAT(RLC_G2_LOWER, neg)(R, P)
-
-/**
- * Inverts a element from G_T. Computes C = 1/A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the element to invert.
- */
-#define gt_inv(C, A)		RLC_CAT(RLC_GT_LOWER, inv_cyc)(C, A)
-
-/**
- * Adds two elliptic elements from G_1. Computes R = P + Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first element to add.
- * @param[in] Q				- the second element to add.
- */
-#define g1_add(R, P, Q)		RLC_CAT(RLC_G1_LOWER, add)(R, P, Q)
-
-/**
- * Adds two elliptic elements from G_2. Computes R = P + Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first element to add.
- * @param[in] Q				- the second element to add.
- */
-#define g2_add(R, P, Q)		RLC_CAT(RLC_G2_LOWER, add)(R, P, Q)
-
-/**
- * Multiplies two elliptic elements from G_T. Computes C = A * B.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the first element to multiply.
- * @param[in] B				- the second element to multiply.
- */
-#define gt_mul(C, A, B)		RLC_CAT(RLC_GT_LOWER, mul)(C, A, B)
-
-/**
- * Subtracts a G_1 element from another. Computes R = P - Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first element.
- * @param[in] Q				- the second element.
- */
-#define g1_sub(R, P, Q)		RLC_CAT(RLC_G1_LOWER, sub)(R, P, Q)
-
-/**
- * Subtracts a G_2 element from another. Computes R = P - Q.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first element.
- * @param[in] Q				- the second element.
- */
-#define g2_sub(R, P, Q)		RLC_CAT(RLC_G2_LOWER, sub)(R, P, Q)
-
-/**
- * Doubles a G_1 element. Computes R = 2P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to double.
- */
-#define g1_dbl(R, P)		RLC_CAT(RLC_G1_LOWER, dbl)(R, P)
-
-/**
- * Doubles a G_2 element. Computes R = 2P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to double.
- */
-#define g2_dbl(R, P)		RLC_CAT(RLC_G2_LOWER, dbl)(R, P)
-
-/**
- * Squares a G_T element. Computes C = A^2.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the element to square.
- */
-#define gt_sqr(C, A)		RLC_CAT(RLC_GT_LOWER, sqr)(C, A)
-
-/**
- * Normalizes an element of G_1.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to normalize.
- */
-#define g1_norm(R, P)		RLC_CAT(RLC_G1_LOWER, norm)(R, P)
-
-/**
- * Normalizes a vector of G_1 elements.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the elements to normalize.
- * @param[in] N				- the number of elements to normalize.
- */
-#define g1_norm_sim(R, P, N)	RLC_CAT(RLC_G1_LOWER, norm_sim)(R, P, N)
-
-/**
- * Normalizes an element of G_2.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to normalize.
- */
-#define g2_norm(R, P)		RLC_CAT(RLC_G2_LOWER, norm)(R, P)
-
-/**
- * Normalizes a vector of G_2 elements.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the elements to normalize.
- * @param[in] N				- the number of elements to normalize.
- */
-#define g2_norm_sim(R, P, N)	RLC_CAT(RLC_G2_LOWER, norm_sim)(R, P, N)
-
-/**
- * Multiplies an element from G_1 by a secret scalar. Computes R = [k]P.
- *
- * @param[out] R				- the result.
- * @param[in] P					- the element to multiply.
- * @param[in] K					- the secret scalar.
- */
-#define g1_mul_key(R, P, K)		RLC_CAT(RLC_G1_LOWER, mul_lwreg)(R, P, K)
-
-/**
- * Multiplies an element from G_1 by a small integer. Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to multiply.
- * @param[in] K				- the small integer.
- */
-#define g1_mul_dig(R, P, K)		RLC_CAT(RLC_G1_LOWER, mul_dig)(R, P, K)
-
-/**
- * Multiplies an element from G_2 by a small integer. Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the element to multiply.
- * @param[in] K				- the small integer.
- */
-#define g2_mul_dig(R, P, K)		RLC_CAT(RLC_G2_LOWER, mul_dig)(R, P, K)
-
-/**
- * Builds a precomputation table for multiplying an element from G_1.
- *
- * @param[out] T			- the precomputation table.
- * @param[in] P				- the element to multiply.
- */
-#define g1_mul_pre(T, P)	RLC_CAT(RLC_G1_LOWER, mul_pre)(T, P)
-
-/**
- * Builds a precomputation table for multiplying an element from G_2.
- *
- * @param[out] T			- the precomputation table.
- * @param[in] P				- the element to multiply.
- */
-#define g2_mul_pre(T, P)	RLC_CAT(RLC_G2_LOWER, mul_pre)(T, P)
-
-/**
- * Multiplies an element from G_1 using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] T				- the precomputation table.
- * @param[in] K				- the integer.
- */
-#define g1_mul_fix(R, T, K)	RLC_CAT(RLC_G1_LOWER, mul_fix)(R, T, K)
-
-/**
- * Multiplies an element from G_2 using a precomputation table.
- * Computes R = [k]P.
- *
- * @param[out] R			- the result.
- * @param[in] T				- the precomputation table.
- * @param[in] K				- the integer.
- */
-#define g2_mul_fix(R, T, K)	RLC_CAT(RLC_G2_LOWER, mul_fix)(R, T, K)
-
-/**
- * Multiplies simultaneously two elements from G_1. Computes R = [k]P + [l]Q.
- *
- * @param[out] R			- the result.
- * @param[out] P			- the first G_1 element to multiply.
- * @param[out] K			- the first integer scalar.
- * @param[out] L			- the second G_1 element to multiply.
- * @param[out] Q			- the second integer scalar.
- */
-#define g1_mul_sim(R, P, K, Q, L)	RLC_CAT(RLC_G1_LOWER, mul_sim)(R, P, K, Q, L)
-
-/**
- * Multiplies simultaneously elements from G_1. Computes R = \Sum_i=0..n k_iP_i.
- *
- * @param[out] R			- the result.
- * @param[out] P			- the G_1 elements to multiply.
- * @param[out] K			- the integer scalars.
- * @param[out] N			- the number of elements to multiply.
- */
-#define g1_mul_sim_lot(R, P, K, N)	RLC_CAT(RLC_G1_LOWER, mul_sim_lot)(R, P, K, N)
-
-/**
- * Multiplies elements from G_1 by small scalars. Computes R = \sum k_iP_i.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the elements to multiply.
- * @param[in] K				- the small scalars.
- * @param[in] L				- the number of points to multiply.
- */
-#define g1_mul_sim_dig(R, P, K, L)	RLC_CAT(RLC_G1_LOWER, mul_sim_dig)(R, P, K, L)
-
-/**
- * Multiplies simultaneously two elements from G_2. Computes R = [k]P + [l]Q.
- *
- * @param[out] R			- the result.
- * @param[out] P			- the first G_2 element to multiply.
- * @param[out] K			- the first integer scalar.
- * @param[out] L			- the second G_2 element to multiply.
- * @param[out] Q			- the second integer scalar.
- */
-#define g2_mul_sim(R, P, K, Q, L)	RLC_CAT(RLC_G2_LOWER, mul_sim)(R, P, K, Q, L)
-
-/**
- * Multiplies simultaneously elements from G_2. Computes R = \Sum_i=0..n k_iP_i.
- *
- * @param[out] R			- the result.
- * @param[out] P			- the G_2 elements to multiply.
- * @param[out] K			- the integer scalars.
- * @param[out] N			- the number of elements to multiply.
- */
-#define g2_mul_sim_lot(R, P, K, N)	RLC_CAT(RLC_G2_LOWER, mul_sim_lot)(R, P, K, N)
-
-/**
- * Multiplies elements from G_2 by small scalars. Computes R = \sum k_iP_i.
- *
- * @param[out] R			- the result.
- * @param[in] P				- the elements to multiply.
- * @param[in] K				- the small scalars.
- * @param[in] L				- the number of points to multiply.
- */
-#define g2_mul_sim_dig(R, P, K, L)	RLC_CAT(RLC_G2_LOWER, mul_sim_dig)(R, P, K, L)
-
-/**
- * Multiplies simultaneously two elements from G_1, where one of the is the
- * generator. Computes R = [k]G + [l]Q.
- *
- * @param[out] R			- the result.
- * @param[out] K			- the first integer scalar.
- * @param[out] L			- the second G_1 element to multiply.
- * @param[out] Q			- the second integer scalar.
- */
-#define g1_mul_sim_gen(R, K, Q, L)	RLC_CAT(RLC_G1_LOWER, mul_sim_gen)(R, K, Q, L)
-
-/**
- * Multiplies simultaneously two elements from G_1, where one of the is the
- * generator. Computes R = [k]G + [l]Q.
- *
- * @param[out] R			- the result.
- * @param[out] K			- the first integer scalar.
- * @param[out] L			- the second G_1 element to multiply.
- * @param[out] Q			- the second integer scalar.
- */
-#define g2_mul_sim_gen(R, K, Q, L)	RLC_CAT(RLC_G2_LOWER, mul_sim_gen)(R, K, Q, L)
-
-/**
- * Exponetiates a G_2 element using the i-th power Frobenius.
- * Computes C = [p^i]A.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the element to exponentiate.
- * @param[in] I				- the power of the Frobenius map.
- */
-#define g2_frb(C, A, I)		RLC_CAT(RLC_G2_LOWER, frb)(C, A, I)
-
-/**
- * Exponetiates a G_T element using the i-th power Frobenius.
- * Computes C = A^(p^i).
- *
- * @param[out] C			- the result.
- * @param[in] A				- the element to exponentiate.
- * @param[in] I				- the power of the Frobenius map.
- */
-#define gt_frb(C, A, I)		RLC_CAT(RLC_GT_LOWER, frb)(C, A, I)
-
-/**
- * Maps a byte array to an element in G_1.
- *
- * @param[out] P			- the result.
- * @param[in] M				- the byte array to map.
- * @param[in] L				- the array length in bytes.
- */
-#define g1_map(P, M, L);	RLC_CAT(RLC_G1_LOWER, map)(P, M, L)
-
-/**
- * Maps a byte array to an element in G_2.
- *
- * @param[out] P			- the result.
- * @param[in] M				- the byte array to map.
- * @param[in] L				- the array length in bytes.
- */
-#define g2_map(P, M, L);	RLC_CAT(RLC_G2_LOWER, map)(P, M, L)
-
-/**
- * Computes the bilinear pairing of a G_1 element and a G_2 element. Computes
- * R = e(P, Q).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first element.
- * @param[in] Q				- the second element.
- */
-#if FP_PRIME < 1536
-
-#if FP_PRIME == 509
-#define pc_map(R, P, Q);		RLC_CAT(RLC_PC_LOWER, map_k24)(R, P, Q)
-#else
-#define pc_map(R, P, Q);		RLC_CAT(RLC_PC_LOWER, map_k12)(R, P, Q)
-#endif
-
-#else
-
-#define pc_map(R, P, Q);		RLC_CAT(RLC_PC_LOWER, map_k2)(R, P, Q)
-
-#endif
-
-/**
- * Computes the multi-pairing of G_1 elements and G_2 elements. Computes
- * R = \prod e(P_i, Q_i).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first pairing arguments.
- * @param[in] Q				- the second pairing arguments.
- * @param[in] M 			- the number of pairing arguments.
- */
-#if FP_PRIME < 1536
-
-#if FP_PRIME == 509
-#define pc_map_sim(R, P, Q, M);	RLC_CAT(RLC_PC_LOWER, map_sim_k24)(R, P, Q, M)
-#else
-#define pc_map_sim(R, P, Q, M);	RLC_CAT(RLC_PC_LOWER, map_sim_k12)(R, P, Q, M)
-#endif
-
-#else
-#define pc_map_sim(R, P, Q, M);	RLC_CAT(RLC_PC_LOWER, map_sim_k2)(R, P, Q, M)
-#endif
-
-/**
- * Computes the final exponentiation of the pairing.
- *
- * @param[out] C			- the result.
- * @param[in] A				- the field element to exponentiate.
- */
-#if FP_PRIME < 1536
-
-#if FP_PRIME == 509
-#define pc_exp(C, A);			RLC_CAT(RLC_PC_LOWER, exp_k24)(C, A)
-#else
-#define pc_exp(C, A);			RLC_CAT(RLC_PC_LOWER, exp_k12)(C, A)
-#endif
-
-#else
-#define pc_exp(C, A);			RLC_CAT(RLC_PC_LOWER, exp_k2)(C, A)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the cryptographic protocol module.
- */
-void pc_core_init(void);
-
-/**
- * Computes constants internal to the cryptographic protocol module.
- */
-void pc_core_calc(void);
-
-/**
- * Finalizes the cryptographic protocol module.
- */
-void pc_core_clean(void);
-
-
-/**
- * Assigns a random value to an element from G_T.
- *
- * @param[out] a			- the element to assign.
- */
-void gt_rand(gt_t a);
-
-/**
- * Multiplies an element from G_1 by an integer. Computes R = [k]P.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the element to multiply.
- * @param[in] k				- the integer.
- */
-void g1_mul(g1_t r, g1_t p, bn_t k);
-
-/**
- * Multiplies an element from G_2 by an integer. Computes R = [k]P.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the element to multiply.
- * @param[in] k				- the integer.
- */
-void g2_mul(g2_t r, g2_t p, bn_t k);
-
-/**
- * Multiplies the generator of G_1 by an integer.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void g1_mul_gen(g1_t r, bn_t k);
-
-/**
- * Multiplies the generator of G_2 by an integer.
- *
- * @param[out] r			- the result.
- * @param[in] k				- the integer.
- */
-void g2_mul_gen(g2_t r, bn_t k);
-
-/**
- * Exponentiates an element from G_T by an integer. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the element to exponentiate.
- * @param[in] b				- the integer exponent.
- */
-void gt_exp(gt_t c, gt_t a, bn_t b);
-
-/**
- * Exponentiates an element from G_T by a small integer. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the element to exponentiate.
- * @param[in] b				- the integer exponent.
- */
-void gt_exp_dig(gt_t c, gt_t a, dig_t b);
-
-/**
- * Exponentiates two element from G_T by integers simultaneously. Computes
- * e = a^b * c^d.
- *
- * @param[out] e			- the result.
- * @param[in] a				- the first element to exponentiate.
- * @param[in] b				- the first integer exponent.
- * @param[in] a				- the second element to exponentiate.
- * @param[in] b				- the second integer exponent.
- */
-void gt_exp_sim(gt_t e, gt_t a, bn_t b, gt_t c, bn_t d);
-
-/**
- * Exponentiates a generator from G_T by an integer. Computes c = a^b.
- *
- * @param[out] c			- the result.
- * @param[in] b				- the integer exponent.
- */
-void gt_exp_gen(gt_t c, bn_t b);
-
- /**
-  * Returns the generator for the group G_T.
-  *
-  * @param[out] g			- the returned generator.
-  */
-void gt_get_gen(gt_t g);
-
-/**
- * Checks if an element from G_1 is valid (has the right order).
- *
- * @param[in] a             - the element to check.
- */
-int g1_is_valid(g1_t a);
-
-/**
- * Checks if an element form G_2 is valid (has the right order).
- *
- * @param[in] a             - the element to check.
- */
-int g2_is_valid(g2_t a);
-
-/**
- * Checks if an element form G_T is valid (has the right order).
- *
- * @param[in] a             - the element to check.
- */
-int gt_is_valid(gt_t a);
-
-#endif /* !RLC_PC_H */
diff --git a/src/dashbls/depends/relic/include/relic_pp.h b/src/dashbls/depends/relic/include/relic_pp.h
deleted file mode 100644
index 4baee4c32034..000000000000
--- a/src/dashbls/depends/relic/include/relic_pp.h
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup pp Bilinear pairings over prime elliptic curves.
- */
-
-/**
- * @file
- *
- * Interface of the module for computing bilinear pairings over prime elliptic
- * curves.
- *
- * @ingroup pp
- */
-
-#ifndef RLC_PP_H
-#define RLC_PP_H
-
-#include "relic_fpx.h"
-#include "relic_epx.h"
-#include "relic_types.h"
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] P				- the second point to add.
- * @param[in] Q				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_add_k2_projc(L, R, P, Q)		pp_add_k2_projc_basic(L, R, P, Q)
-#else
-#define pp_add_k2_projc(L, R, P, Q)		pp_add_k2_projc_lazyr(L, R, P, Q)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] P				- the second point to add.
- * @param[in] Q				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k2(L, R, P, Q)		pp_add_k2_basic(L, R, P, Q)
-#else
-#define pp_add_k2(L, R, P, Q)		pp_add_k2_projc(L, R, P, Q)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_add_k8_projc(L, R, Q, P)	pp_add_k8_projc_basic(L, R, Q, P)
-#elif PP_EXT == LAZYR
-#define pp_add_k8_projc(L, R, Q, P)	pp_add_k8_projc_lazyr(L, R, Q, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k8(L, R, Q, P)		pp_add_k8_basic(L, R, Q, P)
-#else
-#define pp_add_k8(L, R, Q, P)		pp_add_k8_projc(L, R, Q, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_add_k12_projc(L, R, Q, P)	pp_add_k12_projc_basic(L, R, Q, P)
-#elif PP_EXT == LAZYR
-#define pp_add_k12_projc(L, R, Q, P)	pp_add_k12_projc_lazyr(L, R, Q, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k12(L, R, Q, P)		pp_add_k12_basic(L, R, Q, P)
-#else
-#define pp_add_k12(L, R, Q, P)		pp_add_k12_projc(L, R, Q, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k24(L, R, Q, P)		pp_add_k24_basic(L, R, Q, P)
-#else
-#define pp_add_k24(L, R, Q, P)		pp_add_k24_projc(L, R, Q, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k48(L, RX, RY, RZ, QX, QY, P)	pp_add_k48_basic(L, RX, RY, QX, QY, P)
-#else
-#define pp_add_k48(L, RX, RY, RZ, QX, QY, P)	pp_add_k48_projc(L, RX, RY, RZ, QX, QY, P)
-#endif
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point and first point to add.
- * @param[in] Q				- the second point to add.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_add_k54(L, RX, RY, RZ, QX, QY, P)	pp_add_k54_basic(L, RX, RY, QX, QY, P)
-#else
-#define pp_add_k54(L, RX, RY, RZ, QX, QY, P)	pp_add_k54_projc(L, RX, RY, RZ, QX, QY, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_dbl_k2_projc(L, R, P, Q)		pp_dbl_k2_projc_basic(L, R, P, Q)
-#elif PP_EXT == LAZYR
-#define pp_dbl_k2_projc(L, R, P, Q)		pp_dbl_k2_projc_lazyr(L, R, P, Q)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] P				- the point to double.
- * @param[in] Q				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k2(L, R, P, Q)			pp_dbl_k2_basic(L, R, P, Q)
-#else
-#define pp_dbl_k2(L, R, P, Q)			pp_dbl_k2_projc(L, R, P, Q)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_dbl_k8_projc(L, R, Q, P)		pp_dbl_k8_projc_basic(L, R, Q, P)
-#elif PP_EXT == LAZYR
-#define pp_dbl_k8_projc(L, R, Q, P)		pp_dbl_k8_projc_lazyr(L, R, Q, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k8(L, R, Q, P)			pp_dbl_k8_basic(L, R, Q, P)
-#else
-#define pp_dbl_k8(L, R, Q, P)			pp_dbl_k8_projc(L, R, Q, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[in, out] R		- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if PP_EXT == BASIC
-#define pp_dbl_k12_projc(L, R, Q, P)	pp_dbl_k12_projc_basic(L, R, Q, P)
-#elif PP_EXT == LAZYR
-#define pp_dbl_k12_projc(L, R, Q, P)	pp_dbl_k12_projc_lazyr(L, R, Q, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k12(L, R, Q, P)			pp_dbl_k12_basic(L, R, Q, P)
-#else
-#define pp_dbl_k12(L, R, Q, P)			pp_dbl_k12_projc(L, R, Q, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k24(L, R, Q, P)			pp_dbl_k24_basic(L, R, Q, P)
-#else
-#define pp_dbl_k24(L, R, Q, P)			pp_dbl_k24_projc(L, R, Q, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k48(L, RX, RY, RZ, P)	pp_dbl_k48_basic(L, RX, RY, P)
-#else
-#define pp_dbl_k48(L, RX, RY, RZ, P)	pp_dbl_k48_projc(L, RX, RY, RZ, P)
-#endif
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54.
- *
- * @param[out] L			- the result of the evaluation.
- * @param[out] R			- the resulting point.
- * @param[in] Q				- the point to double.
- * @param[in] P				- the affine point to evaluate the line function.
- */
-#if EP_ADD == BASIC
-#define pp_dbl_k54(L, RX, RY, RZ, P)	pp_dbl_k54_basic(L, RX, RY, P)
-#else
-#define pp_dbl_k54(L, RX, RY, RZ, P)	pp_dbl_k54_projc(L, RX, RY, RZ, P)
-#endif
-
-/**
- * Computes a pairing of two prime elliptic curve points defined on an elliptic
- * curves of embedding degree 2. Computes e(P, Q).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first elliptic curve point.
- * @param[in] Q				- the second elliptic curve point.
- */
-#if PP_MAP == TATEP
-#define pp_map_k2(R, P, Q)				pp_map_tatep_k2(R, P, Q)
-#elif PP_MAP == WEILP
-#define pp_map_k2(R, P, Q)				pp_map_weilp_k2(R, P, Q)
-#elif PP_MAP == OATEP
-#define pp_map_k2(R, P, Q)				pp_map_tatep_k2(R, P, Q)
-#endif
-
-/**
- * Computes a pairing of two prime elliptic curve points defined on an elliptic
- * curve of embedding degree 12. Computes e(P, Q).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first elliptic curve point.
- * @param[in] Q				- the second elliptic curve point.
- */
-#if PP_MAP == TATEP
-#define pp_map_k12(R, P, Q)				pp_map_tatep_k12(R, P, Q)
-#elif PP_MAP == WEILP
-#define pp_map_k12(R, P, Q)				pp_map_weilp_k12(R, P, Q)
-#elif PP_MAP == OATEP
-#define pp_map_k12(R, P, Q)				pp_map_oatep_k12(R, P, Q)
-#endif
-
-/**
- * Computes a multi-pairing of elliptic curve points defined on an elliptic
- * curve of embedding degree 2. Computes \prod e(P_i, Q_i).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first pairing arguments.
- * @param[in] Q				- the second pairing arguments.
- * @param[in] M 			- the number of pairings to evaluate.
- */
-#if PP_MAP == WEILP
-#define pp_map_sim_k2(R, P, Q, M)		pp_map_sim_weilp_k2(R, P, Q, M)
-#elif PP_MAP == TATEP || PP_MAP == OATEP
-#define pp_map_sim_k2(R, P, Q, M)		pp_map_sim_tatep_k2(R, P, Q, M)
-#endif
-
-
-/**
- * Computes a multi-pairing of elliptic curve points defined on an elliptic
- * curve of embedding degree 12. Computes \prod e(P_i, Q_i).
- *
- * @param[out] R			- the result.
- * @param[in] P				- the first pairing arguments.
- * @param[in] Q				- the second pairing arguments.
- * @param[in] M 			- the number of pairings to evaluate.
- */
-#if PP_MAP == TATEP
-#define pp_map_sim_k12(R, P, Q, M)		pp_map_sim_tatep_k12(R, P, Q, M)
-#elif PP_MAP == WEILP
-#define pp_map_sim_k12(R, P, Q, M)		pp_map_sim_weilp_k12(R, P, Q, M)
-#elif PP_MAP == OATEP
-#define pp_map_sim_k12(R, P, Q, M)		pp_map_sim_oatep_k12(R, P, Q, M)
-#endif
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the pairing over prime fields.
- */
-void pp_map_init(void);
-
-/**
- * Finalizes the pairing over prime fields.
- */
-void pp_map_clean(void);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] p				- the second point to add.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_add_k2_basic(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] p				- the second point to add.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_add_k2_projc_basic(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] p				- the second point to add.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_add_k2_projc_lazyr(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k8_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k8_projc_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k8_projc_lazyr(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k12_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k12_projc_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k12_projc_lazyr(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve twist with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] p				- the second point to add.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_add_lit_k12(fp12_t l, ep_t r, ep_t p, ep2_t q);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k24_basic(fp24_t l, ep4_t r, ep4_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k24_projc(fp24_t l, ep4_t r, ep4_t q, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k48_basic(fp48_t l, fp8_t rx, fp8_t ry, fp8_t qx, fp8_t qy, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k48_projc(fp48_t l, fp8_t rx, fp8_t ry, fp8_t rz, fp8_t qx, fp8_t qy, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54 using affine coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k54_basic(fp54_t l, fp9_t rx, fp9_t ry, fp9_t qx, fp9_t qy, ep_t p);
-
-/**
- * Adds two points and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point and first point to add.
- * @param[in] q				- the second point to add.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_add_k54_projc(fp54_t l, fp9_t rx, fp9_t ry, fp9_t rz, fp9_t qx, fp9_t qy, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 2 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] p				- the point to double.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_dbl_k2_basic(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] p				- the point to double.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_dbl_k2_projc_basic(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] p				- the point to double.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_dbl_k2_projc_lazyr(fp2_t l, ep_t r, ep_t p, ep_t q);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k8_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k8_projc_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 8 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k8_projc_lazyr(fp8_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k12_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k12_projc_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 12 using projective
- * coordinates and lazy reduction.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k12_projc_lazyr(fp12_t l, ep2_t r, ep2_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k24_basic(fp24_t l, ep4_t r, ep4_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 24 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k24_projc(fp24_t l, ep4_t r, ep4_t q, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k48_basic(fp48_t l, fp8_t rx, fp8_t ry, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 48 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k48_projc(fp48_t l, fp8_t rx, fp8_t ry, fp8_t rz, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54 using affine
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k54_basic(fp54_t l, fp9_t rx, fp9_t ry, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve with embedding degree 54 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] q				- the point to double.
- * @param[in] p				- the affine point to evaluate the line function.
- */
-void pp_dbl_k54_projc(fp54_t l, fp9_t rx, fp9_t ry, fp9_t rz, ep_t p);
-
-/**
- * Doubles a point and evaluates the corresponding line function at another
- * point on an elliptic curve twist with embedding degree 12 using projective
- * coordinates.
- *
- * @param[out] l			- the result of the evaluation.
- * @param[in, out] r		- the resulting point.
- * @param[in] p				- the point to double.
- * @param[in] q				- the affine point to evaluate the line function.
- */
-void pp_dbl_lit_k12(fp12_t l, ep_t r, ep_t p, ep2_t q);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 2. Computes c = a^(p^2 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k2(fp2_t c, fp2_t a);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 8. Computes c = a^(p^8 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k8(fp8_t c, fp8_t a);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 12. Computes c = a^(p^12 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k12(fp12_t c, fp12_t a);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 24. Computes c = a^(p^24 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k24(fp24_t c, fp24_t a);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 48. Computes c = a^(p^48 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k48(fp48_t c, fp48_t a);
-
-/**
- * Computes the final exponentiation for a pairing defined over curves of
- * embedding degree 54. Computes c = a^(p^54 - 1)/r.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-void pp_exp_k54(fp54_t c, fp54_t a);
-
-/**
- * Normalizes the accumulator point used inside pairing computation defined
- * over curves of embedding degree 2.
- *
- * @param[out] r			- the resulting point.
- * @param[in] p				- the point to normalize.
- */
-void pp_norm_k2(ep_t c, ep_t a);
-
-/**
- * Normalizes the accumulator point used inside pairing computation defined
- * over curves of embedding degree 8.
- *
- * @param[out] r			- the resulting point.
- * @param[in] p				- the point to normalize.
- */
-void pp_norm_k8(ep2_t c, ep2_t a);
-
-/**
- * Normalizes the accumulator point used inside pairing computation defined
- * over curves of embedding degree 12.
- *
- * @param[out] r			- the resulting point.
- * @param[in] p				- the point to normalize.
- */
-void pp_norm_k12(ep2_t c, ep2_t a);
-
-/**
- * Normalizes the accumulator point used inside pairing computation defined
- * over curves of embedding degree 24.
- *
- * @param[out] r			- the resulting point.
- * @param[in] p				- the point to normalize.
- */
-void pp_norm_k24(ep4_t c, ep4_t a);
-
-/**
- * Computes the Tate pairing of two points in a parameterized elliptic curve
- * with embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_tatep_k2(fp2_t r, ep_t p, ep_t q);
-
-/**
- * Computes the Tate multi-pairing of in a parameterized elliptic curve with
- * embedding degree 2.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_tatep_k2(fp2_t r, ep_t *p, ep_t *q, int m);
-
-/**
- * Computes the Weil pairing of two points in a parameterized elliptic curve
- * with embedding degree 2.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_weilp_k2(fp2_t r, ep_t p, ep_t q);
-
-/**
- * Computes the optimal ate pairing of two points in a parameterized elliptic
- * curve with embedding degree 8.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_oatep_k8(fp8_t r, ep_t p, ep2_t q);
-
-/**
- * Computes the Weil multi-pairing of in a parameterized elliptic curve with
- * embedding degree 2.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_weilp_k2(fp2_t r, ep_t *p, ep_t *q, int m);
-
-/**
- * Computes the Tate pairing of two points in a parameterized elliptic curve
- * with embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_tatep_k12(fp12_t r, ep_t p, ep2_t q);
-
-/**
- * Computes the Tate multi-pairing of in a parameterized elliptic curve with
- * embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_tatep_k12(fp12_t r, ep_t *p, ep2_t *q, int m);
-
-/**
- * Computes the Weil pairing of two points in a parameterized elliptic curve
- * with embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_weilp_k12(fp12_t r, ep_t p, ep2_t q);
-
-/**
- * Computes the Weil multi-pairing of in a parameterized elliptic curve with
- * embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_weilp_k12(fp12_t r, ep_t *p, ep2_t *q, int m);
-
-/**
- * Computes the optimal ate pairing of two points in a parameterized elliptic
- * curve with embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_oatep_k12(fp12_t r, ep_t p, ep2_t q);
-
-/**
- * Computes the optimal ate multi-pairing of in a parameterized elliptic
- * curve with embedding degree 12.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_oatep_k12(fp12_t r, ep_t *p, ep2_t *q, int m);
-
-/**
- * Computes the Optimal Ate pairing of two points in a parameterized elliptic
- * curve with embedding degree 24.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_k24(fp24_t r, ep_t p, ep4_t q);
-
-/**
- * Computes the optimal ate multi-pairing of in a parameterized elliptic
- * curve with embedding degree 24.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first pairing arguments.
- * @param[in] p				- the second pairing arguments.
- * @param[in] m 			- the number of pairings to evaluate.
- */
-void pp_map_sim_k24(fp24_t r, ep_t *p, ep4_t *q, int m);
-
-/**
- * Computes the Optimal Ate pairing of two points in a parameterized elliptic
- * curve with embedding degree 48.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_k48(fp48_t r, ep_t p, fp8_t qx, fp8_t qy);
-
-/**
- * Computes the Optimal Ate pairing of two points in a parameterized elliptic
- * curve with embedding degree 54.
- *
- * @param[out] r			- the result.
- * @param[in] q				- the first elliptic curve point.
- * @param[in] p				- the second elliptic curve point.
- */
-void pp_map_k54(fp54_t r, ep_t p, fp9_t qx, fp9_t qy);
-
-#endif /* !RLC_PP_H */
diff --git a/src/dashbls/depends/relic/include/relic_rand.h b/src/dashbls/depends/relic/include/relic_rand.h
deleted file mode 100644
index bf92ac376e6a..000000000000
--- a/src/dashbls/depends/relic/include/relic_rand.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup rand Pseudo-random number generators.
- */
-
-/**
- * @file
- *
- * Interface of the module for pseudo-random number generation.
- *
- * @ingroup rand
- */
-
-#ifndef RLC_RAND_H
-#define RLC_RAND_H
-
-#include "relic_rand.h"
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Size of the PRNG internal state in bytes.
- */
-#if RAND == HASHD
-
-#if MD_MAP == SH224 || MD_MAP == SH256 || MD_MAP == B2S160 || MD_MAP == B2S256
-#define RLC_RAND_SIZE		(1 + 2*440/8)
-#elif MD_MAP == SH384 || MD_MAP == SH512
-#define RLC_RAND_SIZE		(1 + 2*888/8)
-#endif
-
-#elif RAND == UDEV
-#define RLC_RAND_SIZE		(sizeof(int))
-#elif RAND == CALL
-#define RLC_RAND_SIZE		(sizeof(void (*)(uint8_t *, int)))
-#elif RAND == RDRND
-#define RLC_RAND_SIZE      0
-#endif
-
-/**
- * Minimum size of the PRNG seed.
- */
-#define RLC_RAND_SEED	    64
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Initializes the pseudo-random number generator.
- */
-void rand_init(void);
-
-/**
- * Finishes the pseudo-random number generator.
- */
-void rand_clean(void);
-
-#if RAND != CALL
-
-/**
- * Sets the initial state of the pseudo-random number generator.
- *
- * @param[in] buf			- the buffer that represents the initial state.
- * @param[in] size			- the number of bytes.
- * @throw ERR_NO_VALID		- if the entropy length is too small or too large.
- */
-void rand_seed(uint8_t *buf, int size);
-
-#else
-
-/**
- * Sets the initial state of the pseudo-random number generator as a function
- * pointer.
- *
- * @param[in] callback		- the callback to call.
- * @param[in] arg			- the argument for the callback.
- */
-void rand_seed(void (*callback)(uint8_t *, int, void *), void *arg);
-
-#endif
-
-/**
- * Performs a basic self-test in the pseudo-random number generator output, and
- * raises an exception in case a string of identifical bytes is found.
- *
- * @param[out] buf			- the buffer to check.
- * @param[in] size			- the number of bytes to check.
- * @throw ERR_NO_RAND       - if the pseudo-random number generator is stuck.
- */
-int rand_check(uint8_t *buf, int size);
-
-/**
- * Gathers pseudo-random bytes from the pseudo-random number generator.
- *
- * @param[out] buf			- the buffer to write.
- * @param[in] size			- the number of bytes to gather.
- * @throw ERR_NO_VALID		- if the required length is too large.
- * @throw ERR_NO_READ		- it the pseudo-random number generator cannot
- * 							generate the specified number of bytes.
- */
-void rand_bytes(uint8_t *buf, int size);
-
-#endif /* !RLC_RAND_H */
diff --git a/src/dashbls/depends/relic/include/relic_test.h b/src/dashbls/depends/relic/include/relic_test.h
deleted file mode 100644
index 35200a6bfc5e..000000000000
--- a/src/dashbls/depends/relic/include/relic_test.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup tests Automated tests
- */
-
-/**
- * @file
- *
- * Interface of useful routines for testing.
- *
- * @ingroup test
- */
-
-#ifndef RLC_TEST_H
-#define RLC_TEST_H
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_label.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Runs a new benchmark once.
- *
- * @param[in] P				- the property description.
- */
-#define TEST_ONCE(P)														\
-	util_print("Testing if " P "...%*c", (64 - strlen(P)), ' ');			\
-
-/**
- * Tests a sequence of commands to see if they respect some property.
- *
- * @param[in] P				- the property description.
- */
-#define TEST_CASE(P)														\
-	util_print("Testing if " P "...%*c", (64 - strlen(P)), ' ');			\
-	for (int i = 0; i < TESTS; i++)											\
-
-/**
- * Asserts a condition.
- *
- * If the condition is not satisfied, a unconditional jump is made to the passed
- * label.
- *
- * @param[in] C				- the condition to assert.
- * @param[in] LABEL			- the label to jump if the condition is no satisfied.
- */
-#define TEST_ASSERT(C, LABEL)												\
-	if (!(C)) {																\
-		test_fail();														\
-		util_print("(at ");													\
-		util_print(__FILE__);												\
-		util_print(":%d)\n", __LINE__);										\
-		RLC_ERROR(LABEL);													\
-	}																		\
-
-/**
- * Finalizes a test printing the test result.
- */
-#define TEST_END															\
-	test_pass()																\
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Prints a string indicating that the test failed.
- */
-void test_fail(void);
-
-/**
- * Prints a string indicating that the test passed.
- */
-void test_pass(void);
-
-#endif /* !RLC_TEST_H */
diff --git a/src/dashbls/depends/relic/include/relic_types.h b/src/dashbls/depends/relic/include/relic_types.h
deleted file mode 100644
index 92316bfec517..000000000000
--- a/src/dashbls/depends/relic/include/relic_types.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Elementary types.
- *
- * @ingroup relic
- */
-
-#ifndef RLC_TYPES_H
-#define RLC_TYPES_H
-
-#include <stdint.h>
-
-#include "relic_conf.h"
-
-#if ARITH == GMP
-#include <gmp.h>
-#endif
-
-#if defined(_MSC_VER) && WSIZE == 64
-#include <intrin.h>
-#endif
-
-/*============================================================================*/
-/* Constant definitions                                                       */
-/*============================================================================*/
-
-/**
- * Size in bits of a digit.
- */
-#define RLC_DIG			(WSIZE)
-
-/**
- * Logarithm of the digit size in bits in base two.
- */
-#if RLC_DIG == 8
-#define RLC_DIG_LOG		3
-#elif RLC_DIG == 16
-#define RLC_DIG_LOG		4
-#elif RLC_DIG == 32
-#define RLC_DIG_LOG		5
-#elif RLC_DIG == 64
-#define RLC_DIG_LOG		6
-#endif
-
-/*============================================================================*/
-/* Type definitions                                                           */
-/*============================================================================*/
-
-/**
- * Represents a digit from a multiple precision integer.
- *
- * Each digit is represented as an unsigned long to use the biggest native
- * type that potentially supports native instructions.
- */
-#if ARITH == GMP
-typedef mp_limb_t dig_t;
-#elif WSIZE == 8
-typedef uint8_t dig_t;
-#elif WSIZE == 16
-typedef uint16_t dig_t;
-#elif WSIZE == 32
-typedef uint32_t dig_t;
-#elif WSIZE == 64
-typedef uint64_t dig_t;
-#endif
-
-/**
- * Represents a signed digit.
- */
-#if WSIZE == 8
-typedef int8_t dis_t;
-#elif WSIZE == 16
-typedef int16_t dis_t;
-#elif WSIZE == 32
-typedef int32_t dis_t;
-#elif WSIZE == 64
-typedef int64_t dis_t;
-#endif
-
-/**
- * Represents a double-precision integer from a multiple precision integer.
- *
- * This is useful to store a result from a multiplication of two digits.
- */
-#if WSIZE == 8
-typedef uint16_t dbl_t;
-#elif WSIZE == 16
-typedef uint32_t dbl_t;
-#elif WSIZE == 32
-typedef uint64_t dbl_t;
-#elif WSIZE == 64
-#ifdef _MSC_VER
-/** MSVS does not support 128-bit type. */
-#define RLC_CONF_NODBL
-#else
-typedef __uint128_t dbl_t;
-#endif
-#endif
-
-/**
- * Multiplies two digits to give a double precision result.
- *
- * @param[out] H		- the higher half of the result.
- * @param[out] L		- the lower half of the result.
- * @param[in] A			- the first digit to multiply.
- * @param[in] B			- the second digit to multiply.
- */
-#ifdef RLC_CONF_NODBL
-#define RLC_MUL_DIG(H, L, A, B)		L = _umul128(A, B, &(H))
-#else
-#define RLC_MUL_DIG(H, L, A, B)												\
-	H = ((dbl_t)(A) * (dbl_t)(B)) >> RLC_DIG;								\
-	L = (A) * (B);															\
-
-#endif
-
-/**
- * Divides a double-digit by a digit, setting quotient and remainder.
- *
- * @param[out] Q		- the quotient.
- * @param[out] R		- the remainder.
- * @param[in] H			- the higher half of the dividend.
- * @param[in] L			- the lower half of the dividend.
- * @param[in] D			- the divisor.
- */
-#ifdef RLC_CONF_NODBL
-#define RLC_DIV_DIG(Q, R, H, L, D)	Q = _udiv128(H, L, D, &(R))
-#else
-
-#define RLC_DIV_DIG(Q, R, H, L, D)											\
-	Q = (((dbl_t)(H) << RLC_DIG) | (L)) / (D);								\
-	R = (((dbl_t)(H) << RLC_DIG) | (L)) - (dbl_t)(Q) * (dbl_t)(D);			\
-
-#endif
-
-/*
- * Represents the unsigned integer with maximum precision.
- */
-typedef unsigned long long ull_t;
-
-/*
- * Represents the unsigned integer with maximum precision.
- */
-typedef unsigned int uint_t;
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Specification for aligned variables.
- */
-#if ALIGN > 1
-#define rlc_align 		__attribute__ ((aligned (ALIGN)))
-#else
-#define rlc_align 		/* empty*/
-#endif
-
-/**
- * Size of padding to be added so that digit vectors are aligned.
- */
-#if ALIGN > 1
-#define RLC_PAD(A)		((A) % ALIGN == 0 ? 0 : ALIGN - ((A) % ALIGN))
-#else
-#define RLC_PAD(A)		(0)
-#endif
-
-/**
- * Align digit vector pointer to specified byte-boundary.
- *
- * @param[in,out] A		- the pointer to align.
- */
-#if ALIGN > 1
-#if ARCH == AVR || ARCH == MSP || ARCH == X86 || ARCH == ARM
-#define RLC_ALIGN(A)														\
-	((unsigned int)(A) + RLC_PAD((unsigned int)(A)));						\
-
-#elif ARCH  == X64
-#define RLC_ALIGN(A)														\
-	((unsigned long)(A) + RLC_PAD((unsigned long)(A)));						\
-
-#endif
-#else
-#define RLC_ALIGN(A)		(A)
-#endif
-
-#endif /* !RLC_TYPES_H */
diff --git a/src/dashbls/depends/relic/include/relic_util.h b/src/dashbls/depends/relic/include/relic_util.h
deleted file mode 100644
index 0dd17441ebc6..000000000000
--- a/src/dashbls/depends/relic/include/relic_util.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @defgroup util Misc utilities
- */
-
-/**
- * @file
- *
- * Interface of misc utilitles.
- *
- * @ingroup util
- */
-
-#ifndef RLC_UTIL_H
-#define RLC_UTIL_H
-
-#include "relic_arch.h"
-#include "relic_types.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-/**
- * Returns the minimum between two numbers.
- *
- * @param[in] A		- the first number.
- * @param[in] B		- the second number.
- */
-#define RLC_MIN(A, B)			((A) < (B) ? (A) : (B))
-
-/**
- * Returns the maximum between two numbers.
- *
- * @param[in] A		- the first number.
- * @param[in] B		- the second number.
- */
-#define RLC_MAX(A, B)			((A) > (B) ? (A) : (B))
-
-/**
- * Splits a bit count in a digit count and an updated bit count.
- *
- * @param[out] B		- the resulting bit count.
- * @param[out] D		- the resulting digit count.
- * @param[out] V		- the bit count.
- */
-#define RLC_RIP(B, D, V)													\
-	D = (V) >> (RLC_DIG_LOG); B = (V) - ((D) * (1 << RLC_DIG_LOG));
-
-/**
- * Computes the ceiling function of an integer division.
- *
- * @param[in] A			- the dividend.
- * @param[in] B			- the divisor.
- */
-#define RLC_CEIL(A, B)			(((A) - 1) / (B) + 1)
-
-/**
- * Returns a bit mask to isolate the lowest part of a digit.
- *
- * @param[in] B			- the number of bits to isolate.
- */
-#define RLC_MASK(B)															\
-	((-(dig_t)((B) >= WSIZE)) | (((dig_t)1 << ((B) % WSIZE)) - 1))
-
-/**
- * Returns a bit mask to isolate the lowest half of a digit.
- */
-#define RLC_LMASK				(RLC_MASK(RLC_DIG >> 1))
-
-/**
- * Returns a bit mask to isolate the highest half of a digit.
- */
-#define RLC_HMASK				(RLC_LMASK << (RLC_DIG >> 1))
-
-/**
- * Bit mask used to return an entire digit.
- */
-#define RLC_DMASK				(RLC_HMASK | RLC_LMASK)
-
-/**
- * Returns the lowest half of a digit.
- *
- * @param[in] D			- the digit.
- */
-#define RLC_LOW(D)				(D & RLC_LMASK)
-
-/**
- * Returns the highest half of a digit.
- *
- * @param[in] D			- the digit.
- */
-#define RLC_HIGH(D)				(D >> (RLC_DIG >> 1))
-
-/**
- * Selects between two values based on the value of a given flag.
- *
- * @param[in] A			- the first argument.
- * @param[in] B			- the second argument.
- * @param[in] C			- the selection flag.
- */
-#define RLC_SEL(A, B, C) 		((-(C) & ((A) ^ (B))) ^ (A))
-
-/**
- * Swaps two values.
- *
- * @param[in] A			- the first argument.
- * @param[in] B			- the second argument.
- */
-#define RLC_SWAP(A, B) 			((A) ^= (B), (B) ^= (A), (A) ^= (B))
-
-/**
- * Returns the given character in upper case.
- *
- * @param[in] C			- the character.
- */
-#define RLC_UPP(C)				((C) - 0x20 * (((C) >= 'a') && ((C) <= 'z')))
-
-/**
-  *  Indirection to help some compilers expand symbols.
-  */
-#define RLC_ECHO(A) 			A
-
-/**
- * Concatenates two tokens.
- */
-/** @{ */
-#define RLC_CAT(A, B)			_RLC_CAT(A, B)
-#define _RLC_CAT(A, B)			A ## B
-/** @} */
-
-/**
- * Selects a basic or advanced version of a function by checking if an
- * additional argument was passed.
- */
-/** @{ */
-#define RLC_OPT(...)			_OPT(__VA_ARGS__, _imp, _basic, _error)
-#define _OPT(...)				RLC_ECHO(__OPT(__VA_ARGS__))
-#define __OPT(_1, _2, N, ...)	N
-/** @} */
-
-/**
- * Generic macro to initialize an object to NULL.
- *
- * @param[out] A			- the object to initialize.
- */
-#if ALLOC == AUTO
-#define RLC_NULL(A)			/* empty */
-#else
-#define RLC_NULL(A)			A = NULL;
-#endif
-
-
-/**
- * Accumulates a double precision digit in a triple register variable.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- * @param[in] B				- the second digit to multiply.
- */
-#define RLC_COMBA_STEP_MUL(R2, R1, R0, A, B)								\
-	dig_t _r, _r0, _r1;														\
-	RLC_MUL_DIG(_r1, _r0, A, B);											\
-	RLC_COMBA_ADD(_r, R2, R1, R0, _r0);										\
-	(R1) += _r1;															\
-	(R2) += (R1) < _r1;														\
-
-/**
- * Computes the step of a Comba squaring.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- * @param[in] B				- the second digit to multiply.
- */
-#define RLC_COMBA_STEP_SQR(R2, R1, R0, A, B)								\
-	dig_t _r, _r0, _r1;														\
-	RLC_MUL_DIG(_r1, _r0, A, B);											\
-	dig_t _s0 = _r0 + _r0;													\
-	dig_t _s1 = _r1 + _r1 + (_s0 < _r0);									\
-	RLC_COMBA_ADD(_r, R2, R1, R0, _s0);										\
-	(R1) += _s1;															\
-	(R2) += (R1) < _s1;														\
-	(R2) += (_s1 < _r1);													\
-
-/**
- * Accumulates a single precision digit in a triple register variable.
- *
- * @param[in,out] T			- the temporary variable.
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to accumulate.
- */
-#define RLC_COMBA_ADD(T, R2, R1, R0, A)										\
-	(T) = (R1);																\
-	(R0) += (A);															\
-	(R1) += (R0) < (A);														\
-	(R2) += (R1) < (T);														\
-
-/**
- * Selects a real or dummy printing function depending on library flags.
- *
- * @param[in] F			- the format string.
- */
-#ifndef QUIET
-#define util_print(F, ...)		util_printf(RLC_STR(F), ##__VA_ARGS__)
-#else
-#define util_print(F, ...)		/* empty */
-#endif
-
-/**
- * Prints a standard label.
- *
- * @param[in] L			- the label of the banner.
- * @param[in] I			- if the banner is inside an hierarchy.
- */
-#define util_banner(L, I)													\
-	if (!I) {																\
-		util_print("\n-- " L "\n");											\
-	} else {																\
-		util_print("\n** " L "\n\n");										\
-	}																		\
-
-/*============================================================================*/
-/* Function prototypes                                                        */
-/*============================================================================*/
-
-/**
- * Toggle endianess of a digit.
- */
-uint32_t util_conv_endian(uint32_t i);
-
-/**
- * Convert a digit to big-endian.
- */
-uint32_t util_conv_big(uint32_t i);
-
-/**
- * Convert a digit to little-endian.
- */
-uint32_t util_conv_little(uint32_t i);
-
-/**
- * Converts a small digit to a character.
- */
-char util_conv_char(dig_t i);
-
-/**
- * Returns the highest bit set on a digit.
- *
- * @param[in] a				- the digit.
- * @return the position of the highest bit set.
- */
-int util_bits_dig(dig_t a);
-
-/**
- * Compares two buffers in constant time.
- *
- * @param[in] a				- the first buffer.
- * @param[in] b				- the second buffer.
- * @param[in] n				- the length in bytes of the buffers.
- * @return RLC_EQ if they are equal and RLC_NE otherwise.
- */
-int util_cmp_const(const void *a, const void *b, int n);
-
-/**
- * Formats and prints data following a printf-like syntax.
- *
- * @param[in] format		- the format.
- * @param[in] ...			- the list of arguments matching the format.
- */
-void util_printf(const char *format, ...);
-
-/**
- * Prints a digit.
- *
- * @param[in] a 			- the digit to print.
- * @param[in] pad 			- the flag to indicate if the digit must be padded
- * 							with zeroes.
- */
-void util_print_dig(dig_t a, int pad);
-
-#endif /* !RLC_UTIL_H */
diff --git a/src/dashbls/depends/relic/preset/ardue-pbc-bn254.sh b/src/dashbls/depends/relic/preset/ardue-pbc-bn254.sh
deleted file mode 100755
index 2ce681faa33a..000000000000
--- a/src/dashbls/depends/relic/preset/ardue-pbc-bn254.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ARDUINO=${HOME}/.arduino15/packages/arduino/
-CC="${ARDUINO}/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-gcc -nostdlib" CXX="${ARDUINO}/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-g++ -nostdlib" LDFLAGS="-mthumb -Wl,--gc-sections" CFLAGS="-O2 -ggdb -DF_CPU=84000000L -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections" cmake -DCMAKE_SYSTEM_NAME="Generic" -DARCH=ARM -DWSIZE=32 -DOPSYS=DUINO -DSEED=LIBC -DSHLIB=OFF -DSTBIN=ON -DTIMER=HREAL -DWITH="DV;BN;FP;EP;EC;CP;MD;FPX;EPX;PP;PC" -DBENCH=0 -DTESTS=0 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=off -DARITH=easy -DBN_METHD="COMBA;COMBA;BASIC;BASIC;STEIN;BASIC" -DBN_PRECI=256 -DBN_MAGNI=DOUBLE -DFP_PRIME=254 -DFP_QNRES=on -DFP_METHD="INTEG;COMBA;COMBA;MONTY;EXGCD;SLIDE" -DEP_ENDOM=on -DEP_PLAIN=off -DEP_SUPER=off -DEC_ENDOM=on -DEC_METHD="PRIME" -DMD_METHD=SH256 -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/arm-pbc-bn254.sh b/src/dashbls/depends/relic/preset/arm-pbc-bn254.sh
deleted file mode 100755
index 302bcea1c5c7..000000000000
--- a/src/dashbls/depends/relic/preset/arm-pbc-bn254.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cmake -DWITH="ALL" -DCHECK=off -DARITH=arm-asm-254 -DARCH=ARM -DCOLOR=off -DSEED= -DSHLIB=off -DFP_PRIME=254 -DFP_QNRES=on -DFP_METHD="INTEG;INTEG;INTEG;MONTY;EXGCD;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer" -DTIMER=HREAL -DWSIZE=32 -DSTLIB=on $1
diff --git a/src/dashbls/depends/relic/preset/armdroid-pbc-bn254.sh b/src/dashbls/depends/relic/preset/armdroid-pbc-bn254.sh
deleted file mode 100755
index c9adeeacddb2..000000000000
--- a/src/dashbls/depends/relic/preset/armdroid-pbc-bn254.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# First run /opt/android-ndk/build/tools/make-standalone-toolchain.sh --platform=android-18 --install-dir=/tmp/android-test/
-
-ROOT=/tmp/android-test
-export NDK=/opt/android-ndk
-SYSROOT=$ROOT/sysroot
-
-PREF=arm-linux-androideabi-
-
-export CC="$ROOT/bin/${PREF}gcc --sysroot=$SYSROOT"
-
-cmake -DWITH="DV;BN;MD;FP;EP;FPX;EPX;PP;PC;CP" -DCHECK=off -DARITH=arm-asm-254 -DARCH=ARM -DCOLOR=off -DOPSYS=DROID -DFP_PRIME=254 -DFP_QNRES=on -DFP_METHD="INTEG;INTEG;INTEG;MONTY;EXGCD;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer" -DLDFLAGS="-L$SYSROOT/usr/lib/gcc/arm-linux-androideabi/4.9.x/ -L$SYSROOT/usr/lib -llog" -DTIMER=HREAL -DWSIZE=32 -DSTLIB=on -DSHLIB=off $1
diff --git a/src/dashbls/depends/relic/preset/armduino-ecc-128k.sh b/src/dashbls/depends/relic/preset/armduino-ecc-128k.sh
deleted file mode 100755
index f83ad42eb9d9..000000000000
--- a/src/dashbls/depends/relic/preset/armduino-ecc-128k.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ARDUINO=${HOME}/projects/arduino-1.5.2/hardware/
-CC="${ARDUINO}/tools/g++_arm_none_eabi/bin/arm-none-eabi-gcc" CXX=c++ LDFLAGS="-mthumb -Wl,-gc-sections" CFLAGS="-O2 -ggdb -DF_CPU=84000000L -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections" cmake -DARCH=ARM -DWSIZE=32 -DOPSYS=DUINO -DSEED=LIBC -DSHLIB=OFF -DSTBIN=ON -DTIMER=HREAL -DWITH="DV;BN;FP;EP;EC;CP;MD" -DBENCH=20 -DTESTS=20 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=off -DARITH=easy -DBN_METHD="COMBA;COMBA;BASIC;BASIC;STEIN;BASIC" -DBN_PRECI=256 -DBN_MAGNI=DOUBLE -DFP_PRIME=256 -DFP_METHD="INTEG;COMBA;COMBA;QUICK;EXGCD;SLIDE" -DEP_ENDOM=on -DEP_PLAIN=off -DEP_SUPER=off -DEC_ENDOM=on -DEC_METHD="PRIME" -DMD_METHD=SH256 $1
diff --git a/src/dashbls/depends/relic/preset/armega-pbc-bn254.sh b/src/dashbls/depends/relic/preset/armega-pbc-bn254.sh
deleted file mode 100755
index 2800a6c363fe..000000000000
--- a/src/dashbls/depends/relic/preset/armega-pbc-bn254.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ARDUINO=/usr/share/arduino
-CC="${ARDUINO}/hardware/tools/avr/bin/avr-gcc -nostdlib" CXX="${ARDUINO}/hardware/tools/avr/bin/avr-g++ -nostdlib" LDFLAGS=" -Wl,--gc-sections" CFLAGS="-O2 -ggdb -DF_CPU=16000000L -mmcu=atmega2560 -ffunction-sections -fdata-sections" cmake -DCMAKE_SYSTEM_NAME="Generic" -DARCH=AVR -DWSIZE=8 -DOPSYS=DUINO -DSEED=LIBC -DSHLIB=OFF -DSTBIN=ON -DTIMER=HREAL -DWITH="DV;BN;FP;EP;EC;CP;MD;FPX;EPX;PP;PC" -DBENCH=0 -DTESTS=0 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=off -DARITH=easy -DBN_METHD="COMBA;COMBA;BASIC;BASIC;STEIN;BASIC" -DBN_PRECI=256 -DBN_MAGNI=DOUBLE -DFP_PRIME=254 -DFP_QNRES=on -DFP_METHD="INTEG;COMBA;COMBA;MONTY;EXGCD;SLIDE" -DEP_ENDOM=on -DEP_PLAIN=off -DEP_SUPER=off -DEC_ENDOM=on -DEC_METHD="PRIME" -DMD_METHD=SH256 -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DEP_PRECO=off $1
diff --git a/src/dashbls/depends/relic/preset/armios-pbc-bn254.sh b/src/dashbls/depends/relic/preset/armios-pbc-bn254.sh
deleted file mode 100755
index ed1ab2d4320e..000000000000
--- a/src/dashbls/depends/relic/preset/armios-pbc-bn254.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export XCODE_BASE=/Applications/Xcode.app/Contents
-export SIMULATOR_BASEiOS=$XCODE_BASE/Developer/Platforms/iPhoneOS.platform
-export FRAMEWORKSiOS=$SIMULATOR_BASEiOS/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/
-export ARCHFLAGS="-arch arm64 "
-export VERFLAGS="-mios-simulator-version-min=11.0"
-
-export CC=`xcrun --sdk iphoneos --find clang`
-export SYSROOT=`xcrun --sdk iphoneos --show-sdk-path`
-
-cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.cmake -DIOS_PLATFORM=OS64 -DWITH="DV;BN;MD;FP;EP;FPX;EPX;PP;PC;CP" -DCHECK=off -DARITH=easy -DARCH=ARM -DCOLOR=off -DOPSYS=NONE -DFP_PRIME=254 -DFP_QNRES=on -DFP_METHD="INTEG;INTEG;INTEG;MONTY;EXGCD;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer $INCLUDES -isysroot $SYSROOT $ARCHFLAGS $VERFLAGS -fembed-bitcode" -DTIMER=HREAL -DWSIZE=64 -DSTLIB=on -DSHLIB=off $1
diff --git a/src/dashbls/depends/relic/preset/avr-ecc-80k-sim.sh b/src/dashbls/depends/relic/preset/avr-ecc-80k-sim.sh
deleted file mode 100755
index 8f1146918937..000000000000
--- a/src/dashbls/depends/relic/preset/avr-ecc-80k-sim.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=8 -DOPSYS= -DRAND=HASHD -DSEED=LIBC -DSHLIB=ON -DSTBIN=ON -DTIMER= -DWITH="ALL" -DBENCH=20 -DTESTS=20 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=off -DARITH=easy -DFB_POLYN=163 -DFB_METHD="INTEG;INTEG;QUICK;QUICK;QUICK;QUICK;EXGCD;BASIC;BASIC" -DFB_PRECO=off -DFB_TRINO=off -DBN_PRECI=160 -DBN_MAGNI=DOUBLE -DEB_PRECO=on -DEB_METHD="PROJC;RWNAF;LWNAF;INTER" -DEB_MIXED=on -DEB_KBLTZ=on -DEB_PLAIN=off -DEC_METHD="CHAR2" -DEC_ENDOM=on -DMD_METHD=SH256 $1
diff --git a/src/dashbls/depends/relic/preset/avr-ecc-80k.sh b/src/dashbls/depends/relic/preset/avr-ecc-80k.sh
deleted file mode 100755
index 7bbf03fe763e..000000000000
--- a/src/dashbls/depends/relic/preset/avr-ecc-80k.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC=avr-gcc CXX=avr-c++ LDFLAGS="-mmcu=atmega128 -Wl,-gc-sections" CFLAGS="-O2 -ggdb -Wa,-mmcu=atmega128 -mmcu=atmega128 -ffunction-sections -fdata-sections" cmake -DCMAKE_SYSTEM_NAME=Generic -DARCH=AVR -DWSIZE=8 -DOPSYS= -DRAND=HASHD -DSEED=LIBC -DSHLIB=OFF -DSTBIN=ON -DTIMER= -DWITH="DV;MD;BN;FB;EB;EC" -DBENCH=10 -DTESTS=10 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=off -DCOLOR=off -DARITH=avr-asm-163 -DFB_POLYN=163 -DBN_METHD="COMBA;COMBA;BASIC;BASIC;STEIN;BASIC" -DFB_METHD="INTEG;INTEG;QUICK;BASIC;BASIC;BASIC;EXGCD;BASIC;BASIC" -DFB_PRECO=off -DFB_TRINO=off -DBN_PRECI=160 -DBN_MAGNI=DOUBLE -DEB_PRECO=on -DEB_METHD="PROJC;RWNAF;LWNAF;INTER" -DEB_MIXED=on -DEB_KBLTZ=on -DEB_PLAIN=off -DEC_METHD="CHAR2" -DMD_METHD=SH256 $1
diff --git a/src/dashbls/depends/relic/preset/avr-pbc-80.sh b/src/dashbls/depends/relic/preset/avr-pbc-80.sh
deleted file mode 100755
index 95f36fdd141a..000000000000
--- a/src/dashbls/depends/relic/preset/avr-pbc-80.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC=avr-gcc CXX=c++ LDFLAGS="-mmcu=atmega128 -Wl,-gc-sections" CFLAGS="-O2 -ggdb -Wa,-mmcu=atmega128 -mmcu=atmega128 -ffunction-sections -fdata-sections" cmake -DARCH=AVR -DWSIZE=8 -DOPSYS= -DSEED=LIBC -DSHLIB=OFF -DSTBIN=ON -DTIMER= -DWITH="DV;MD;BN;FP;FPX;EP;EC;PP;PC" -DBENCH=20 -DTESTS=20 -DCHECK=off -DVERBS=off -DSTRIP=on -DQUIET=on -DARITH=avr-asm-158 -DFP_PRIME=158 -DBN_METHD="COMBA;COMBA;MONTY;BASIC;STEIN;BASIC" -DFP_QNRES=off -DFP_METHD="INTEG;COMBA;COMBA;MONTY;MONTY;SLIDE" -DBN_PRECI=160 -DBN_MAGNI=DOUBLE -DEP_PRECO=off -DEP_METHD="PROJC;LWNAF;LWNAF;BASIC" -DEP_ENDOM=on -DEP_PLAIN=on -DEC_METHD="PRIME" -DFPX_METHD="INTEG;INTEG;BASIC" -DPP_METHD="BASIC;OATEP" -DRAND=HASHD -DSEED=LIBC -DMD_METHD=SH256 $1
diff --git a/src/dashbls/depends/relic/preset/curve2251-clmul-gcc.sh b/src/dashbls/depends/relic/preset/curve2251-clmul-gcc.sh
deleted file mode 100755
index 7ca36d15f5e3..000000000000
--- a/src/dashbls/depends/relic/preset/curve2251-clmul-gcc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DALIGN=16 -DARCH=X64 -DARITH=curve2251-sse -DCHECK=off -DFB_POLYN=251 -DFB_METHD="INTEG;INTEG;QUICK;QUICK;QUICK;QUICK;LOWER;SLIDE;QUICK" -DFB_PRECO=on -DFB_SQRTF=off -DEB_METHD="PROJC;LODAH;COMBS;INTER" -DEC_METHD="CHAR2" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -march=native -msse4.2 -mpclmul" -DTIMER=CYCLE -DWITH="MD;DV;BN;FB;EB;EC" -DWSIZE=64 $1
diff --git a/src/dashbls/depends/relic/preset/curve2251-clmul-icc.sh b/src/dashbls/depends/relic/preset/curve2251-clmul-icc.sh
deleted file mode 100755
index 322849f363cd..000000000000
--- a/src/dashbls/depends/relic/preset/curve2251-clmul-icc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DALIGN=16 -DARCH=X64 -DARITH=curve2251-sse -DCHECK=off -DFB_POLYN=251 -DFB_METHD="INTEG;INTEG;QUICK;QUICK;QUICK;QUICK;LOWER;SLIDE;QUICK" -DFB_PRECO=on -DFB_SQRTF=off -DEB_METHD="PROJC;LODAH;COMBS;INTER" -DEC_METHD="CHAR2" -DCFLAGS="-O3 -xSSE4.2 -unroll" -DTIMER=CYCLE -DWITH="MD;DV;BN;FB;EB;EC" -DWSIZE=64 $1
diff --git a/src/dashbls/depends/relic/preset/curve2251-ssse3-gcc.sh b/src/dashbls/depends/relic/preset/curve2251-ssse3-gcc.sh
deleted file mode 100755
index eab02e6353ed..000000000000
--- a/src/dashbls/depends/relic/preset/curve2251-ssse3-gcc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DALIGN=16 -DARCH=X64 -DARITH=curve2251-sse -DCHECK=off -DFB_POLYN=251 -DFB_METHD="INTEG;INTEG;QUICK;QUICK;QUICK;QUICK;LOWER;SLIDE;QUICK" -DFB_PRECO=on -DFB_SQRTF=off -DEB_METHD="PROJC;LODAH;COMBS;INTER" -DEC_METHD="CHAR2" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -march=core2 -mssse3" -DTIMER=CYCLE -DWITH="MD;DV;BN;FB;EB;EC" -DWSIZE=64 $1
diff --git a/src/dashbls/depends/relic/preset/curve2251-ssse3-icc.sh b/src/dashbls/depends/relic/preset/curve2251-ssse3-icc.sh
deleted file mode 100755
index e8fb92545ac1..000000000000
--- a/src/dashbls/depends/relic/preset/curve2251-ssse3-icc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DALIGN=16 -DARCH=X64 -DARITH=curve2251-sse -DCHECK=off -DFB_POLYN=251 -DFB_METHD="INTEG;INTEG;QUICK;QUICK;QUICK;QUICK;LOWER;SLIDE;QUICK" -DFB_PRECO=on -DFB_SQRTF=off -DEB_METHD="PROJC;LODAH;COMBS;INTER" -DEC_METHD="CHAR2" -DCFLAGS="-O3 -xHOST -unroll" -DTIMER=CYCLE -DWITH="MD;DV;BN;FB;EB;EC" -DWSIZE=64 $1
diff --git a/src/dashbls/depends/relic/preset/fiat-pbc-bls381.sh b/src/dashbls/depends/relic/preset/fiat-pbc-bls381.sh
deleted file mode 100755
index 1b8b8bc1c317..000000000000
--- a/src/dashbls/depends/relic/preset/fiat-pbc-bls381.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=x64-fiat-381 -DFP_PRIME=381 -DFP_QNRES=on -DFP_METHD="BASIC;COMBA;COMBA;MONTY;LOWER;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" $1
diff --git a/src/dashbls/depends/relic/preset/gmp-ecc-128.sh b/src/dashbls/depends/relic/preset/gmp-ecc-128.sh
deleted file mode 100755
index a36a302117f9..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-ecc-128.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=gmp -DFP_PRIME=255 -DFP_QNRES=off -DEC_METHD="EDDIE" -DFP_METHD="INTEG;COMBA;COMBA;MONTY;MONTY;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -march=native -mtune=native" $1
diff --git a/src/dashbls/depends/relic/preset/gmp-ecc-tweedledum.sh b/src/dashbls/depends/relic/preset/gmp-ecc-tweedledum.sh
deleted file mode 100755
index c133a99ef686..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-ecc-tweedledum.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=gmp -DFP_PRIME=255 -DFP_QNRES=off -DEC_METHD="PRIME" -DEC_ENDOM=on -DFP_METHD="INTEG;COMBA;COMBA;MONTY;MONTY;SLIDE" -DCFLAGS="-O2 -funroll-loops -fomit-frame-pointer" $1
diff --git a/src/dashbls/depends/relic/preset/gmp-paillier-4096.sh b/src/dashbls/depends/relic/preset/gmp-paillier-4096.sh
deleted file mode 100755
index 564a4fb8f494..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-paillier-4096.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=gmp -DBN_PRECI=4096 -DALLOC=DYNAMIC -DCFLAGS="-O3 -march=native -mtune=native -fomit-frame-pointer" -DWITH="DV;BN;MD;CP" -DSHLIB=off $1
diff --git a/src/dashbls/depends/relic/preset/gmp-pbc-bls381.sh b/src/dashbls/depends/relic/preset/gmp-pbc-bls381.sh
deleted file mode 100755
index 391b8a367650..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-pbc-bls381.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DCHECK=off -DARITH=gmp -DFP_PRIME=381 -DFP_QNRES=on -DFP_METHD="BASIC;COMBA;COMBA;MONTY;LOWER;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O2 -funroll-loops -fomit-frame-pointer" -DWITH="DV;MD;BC;BN;FP;FPX;EP;EPC;EC;PP;PC;CP" $1
diff --git a/src/dashbls/depends/relic/preset/gmp-pbc-bn254.sh b/src/dashbls/depends/relic/preset/gmp-pbc-bn254.sh
deleted file mode 100755
index c0786d94d315..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-pbc-bn254.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DARCH=X86 -DWSIZE=32 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=gmp -DFP_PRIME=254 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/gmp-pbc-ss1536.sh b/src/dashbls/depends/relic/preset/gmp-pbc-ss1536.sh
deleted file mode 100755
index db81fab76169..000000000000
--- a/src/dashbls/depends/relic/preset/gmp-pbc-ss1536.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=gmp -DBN_PRECI=1536 -DFP_PRIME=1536 -DFP_QNRES=on -DFP_METHD="BASIC;COMBA;COMBA;MONTY;LOWER;SLIDE" -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" -DCFLAGS="-O2 -funroll-loops -fomit-frame-pointer" $1
diff --git a/src/dashbls/depends/relic/preset/msp-ecc-128.sh b/src/dashbls/depends/relic/preset/msp-ecc-128.sh
deleted file mode 100755
index c5acfc9e1cbe..000000000000
--- a/src/dashbls/depends/relic/preset/msp-ecc-128.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DARITH=msp-asm -DCMAKE_SYSTEM_NAME=Generic -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -DEP_DEPTH=3 -DEP_PLAIN=ON -DEP_ENDOM=OFF "-DFP_METHD=BASIC;COMBA;COMBA;QUICK;LOWER;BASIC" -DFP_PMERS=ON "-DLDFLAGS=-Wl,-mmcu=msp430f1611 -Wl,--gc-sections" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=256 -DBN_PRECI=256 -DMD_METHD=SH256 "-DWITH=FP;EP;EC;DV;CP;MD;BN" -DEC_ENDOM=OFF -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/msp-ecc-128k.sh b/src/dashbls/depends/relic/preset/msp-ecc-128k.sh
deleted file mode 100755
index 832a59c56385..000000000000
--- a/src/dashbls/depends/relic/preset/msp-ecc-128k.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DARITH=msp-asm -DCMAKE_SYSTEM_NAME=Generic -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -DEB_DEPTH=3 -DEB_PLAIN=OFF -DEP_DEPTH=3 -DEP_PLAIN=OFF "-DFB_METHD=LODAH;RLC_TABLE;QUICK;QUICK;BASIC;BASIC;EXGCD;BASIC;BASIC" -DFB_PRECO=OFF "-DFP_METHD=BASIC;COMBA;COMBA;QUICK;LOWER;BASIC" -DFP_PMERS=ON "-DLDFLAGS=-Wl,--gc-sections" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=256 -DFB_POLYN=283 -DBN_PRECI=284 -DMD_METHD=SH256 "-DWITH=FP;FB;EP;EB;EC;DV;CP;MD;BN" -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/msp-ecc-80.sh b/src/dashbls/depends/relic/preset/msp-ecc-80.sh
deleted file mode 100755
index caccf1ad5fcc..000000000000
--- a/src/dashbls/depends/relic/preset/msp-ecc-80.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DARITH=msp-asm -DCMAKE_SYSTEM_NAME=Generic -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -DEP_DEPTH=3 -DEP_PLAIN=ON -DEP_ENDOM=OFF "-DFP_METHD=BASIC;COMBA;COMBA;QUICK;LOWER;BASIC" -DFP_PMERS=ON "-DLDFLAGS=-Wl,--gc-sections" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=160 -DBN_PRECI=160 -DMD_METHD=SH256 "-DWITH=FP;EP;EC;DV;CP;MD;BN" -DEC_ENDOM=OFF -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/msp-ecc-80k.sh b/src/dashbls/depends/relic/preset/msp-ecc-80k.sh
deleted file mode 100755
index fdaf8ab58857..000000000000
--- a/src/dashbls/depends/relic/preset/msp-ecc-80k.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DARITH=msp-asm -DCMAKE_SYSTEM_NAME=Generic -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -DEB_DEPTH=3 -DEB_PLAIN=OFF -DEP_DEPTH=3 -DEP_PLAIN=OFF "-DFB_METHD=LODAH;RLC_TABLE;QUICK;QUICK;BASIC;BASIC;EXGCD;BASIC;BASIC" -DFB_PRECO=OFF "-DFP_METHD=BASIC;COMBA;COMBA;QUICK;LOWER;BASIC" -DFP_PMERS=ON "-DLDFLAGS=-Wl,--gc-sections" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=160 -DFB_POLYN=163 -DBN_PRECI=164 -DMD_METHD=SH256 "-DWITH=FP;FB;EP;EB;EC;DV;CP;MD;BN" -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/msp-pbc-bn158.sh b/src/dashbls/depends/relic/preset/msp-pbc-bn158.sh
deleted file mode 100755
index 257a97359d56..000000000000
--- a/src/dashbls/depends/relic/preset/msp-pbc-bn158.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DCMAKE_SYSTEM_NAME=Generic -DARITH=msp-asm -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -EB_KBTLZ=OFF -DEB_ORDIN=OFF -DEB_PRECO=OFF -DEP_PRECO=OFF "-DFP_METHD=BASIC;COMBA;MULTP;MONTY;MONTY;SLIDE" "-DLDFLAGS=-Wl,--gc-sections" "-DFPX_METHD=INTEG;INTEG;BASIC" "-DPP_METHD=BASIC;OATEP" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=158 -DFP_QNRES=OFF -DBN_PRECI=160 -DMD_METHD=SH256 "-DWITH=FP;FPX;EP;EPX;PP;PC;DV;CP;MD;BN" -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/msp-pbc-bn254.sh b/src/dashbls/depends/relic/preset/msp-pbc-bn254.sh
deleted file mode 100755
index c68723ffd5f7..000000000000
--- a/src/dashbls/depends/relic/preset/msp-pbc-bn254.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-CC="msp430-gcc -mmcu=msp430f1611" CXX="c++" cmake -DCMAKE_SYSTEM_NAME=Generic -DARITH=msp-asm -DALIGN=2 -DARCH=MSP -DBENCH=1 "-DBN_METHD=BASIC;MULTP;MONTY;BASIC;BASIC;BASIC" -DCHECK=OFF -DCOLOR=OFF "-DCFLAGS:STRING=-O2 -g -mmcu=msp430f1611 -ffunction-sections -fdata-sections -fno-inline -mdisable-watchdog" -DDOCUM=OFF -DEP_PRECO=OFF "-DFP_METHD=BASIC;COMBA;MULTP;MONTY;MONTY;SLIDE" "-DLDFLAGS=-Wl,--gc-sections" "-DFPX_METHD=INTEG;INTEG;BASIC" "-DPP_METHD=BASIC;OATEP" -DSEED= -DSHLIB=OFF -DSTRIP=ON -DTESTS=1 -DTIMER=CYCLE -DVERBS=OFF -DWSIZE=16 -DFP_PRIME=254 -DFP_QNRES=ON -DBN_PRECI=256 -DMD_METHD=SH256 "-DwITH=FP;FPX;EP;EPX;PP;PC;DV;CP;MD;BN" -DEC_METHD=PRIME -DRAND=HASHD $1
diff --git a/src/dashbls/depends/relic/preset/valgrind-debug.sh b/src/dashbls/depends/relic/preset/valgrind-debug.sh
deleted file mode 100755
index 6a49e590a91e..000000000000
--- a/src/dashbls/depends/relic/preset/valgrind-debug.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DCHECK=on -DSEED= -DALLOC=DYNAMIC -DDEBUG=on -DSHLIB=off -DTESTS=1 -DBENCH=1 -DSIMUL="/usr/bin/valgrind" -DSIMAR="--tool=memcheck --track-origins=yes --leak-check=full" $1
diff --git a/src/dashbls/depends/relic/preset/x64-ecc-128.sh b/src/dashbls/depends/relic/preset/x64-ecc-128.sh
deleted file mode 100755
index fc4e7f3f73f5..000000000000
--- a/src/dashbls/depends/relic/preset/x64-ecc-128.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh 
-cmake -DCHECK=off -DARITH=x64-asm-4l -DFP_PRIME=255 -DFP_QNRES=off -DEC_METHD="EDDIE" -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -march=native -mtune=native" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls12-381.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls12-381.sh
deleted file mode 100755
index f4344e4ca196..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls12-381.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-6l -DFP_PRIME=381 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" -DWITH="DV;MD;BC;BN;FP;FPX;EP;EPX;EC;PP;PC;CP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls12-446.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls12-446.sh
deleted file mode 100755
index e820b9b67407..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls12-446.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-446 -DFP_PRIME=446 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls12-455.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls12-455.sh
deleted file mode 100755
index 1f3474bd78ed..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls12-455.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-455 -DFP_PRIME=455 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls12-638.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls12-638.sh
deleted file mode 100755
index 20c2788097a7..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls12-638.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-638 -DFP_PRIME=638 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls24-509.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls24-509.sh
deleted file mode 100755
index deeec8b910a3..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls24-509.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-8l -DFP_PRIME=509 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" -DWITH="ALL" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bls48-575.sh b/src/dashbls/depends/relic/preset/x64-pbc-bls48-575.sh
deleted file mode 100755
index 8f0e69646e53..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bls48-575.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-9l -DFP_PRIME=575 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bn254.sh b/src/dashbls/depends/relic/preset/x64-pbc-bn254.sh
deleted file mode 100755
index e8dfbb0363df..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bn254.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-4l -DFP_PRIME=254 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bn382.sh b/src/dashbls/depends/relic/preset/x64-pbc-bn382.sh
deleted file mode 100755
index 7fd1ca15c552..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bn382.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-6l -DFP_PRIME=382 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=on -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/preset/x64-pbc-bn446.sh b/src/dashbls/depends/relic/preset/x64-pbc-bn446.sh
deleted file mode 100755
index 0d6cce619b8e..000000000000
--- a/src/dashbls/depends/relic/preset/x64-pbc-bn446.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cmake -DWSIZE=64 -DRAND=UDEV -DSHLIB=OFF -DSTBIN=ON -DTIMER=CYCLE -DCHECK=off -DVERBS=off -DARITH=x64-asm-446 -DFP_PRIME=446 -DFP_METHD="INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" -DCFLAGS="-O3 -funroll-loops -fomit-frame-pointer -finline-small-functions -march=native -mtune=native" -DFP_PMERS=off -DFP_QNRES=off -DFPX_METHD="INTEG;INTEG;LAZYR" -DEP_PLAIN=off -DEP_SUPER=off -DPP_METHD="LAZYR;OATEP" $1
diff --git a/src/dashbls/depends/relic/src/CMakeLists.txt b/src/dashbls/depends/relic/src/CMakeLists.txt
deleted file mode 100644
index b28f56597cf4..000000000000
--- a/src/dashbls/depends/relic/src/CMakeLists.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-string(TOLOWER ${ARITH} ARITH_PATH)
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/low/${ARITH_PATH}/CMakeLists.txt")
-	include("${CMAKE_CURRENT_SOURCE_DIR}/low/${ARITH_PATH}/CMakeLists.txt")
-endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/low/${ARITH_PATH}/CMakeLists.txt")
-
-if (NOT INHERIT)
-	set(INHERIT "easy")
-endif(NOT INHERIT)
-string(TOLOWER ${INHERIT} INHERIT_PATH)
-
-set(CORE_SRCS relic_err.c relic_core.c relic_conf.c relic_util.c)
-
-if (ARCH)
-	string(TOLOWER ${ARCH} ARCH_PATH)
-	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/arch/relic_arch_${ARCH_PATH}.c")
-		list(APPEND CORE_SRCS "arch/relic_arch_${ARCH_PATH}.c")
-	endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/arch/relic_arch_${ARCH_PATH}.c")
-else(ARCH)
-	list(APPEND CORE_SRCS "arch/relic_arch_none.c")
-endif(ARCH)
-
-string(TOLOWER ${RAND} RAND_PATH)
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rand/relic_rand_${RAND_PATH}.c")
-	list(APPEND CORE_SRCS "rand/relic_rand_core.c")
-	list(APPEND CORE_SRCS "rand/relic_rand_${RAND_PATH}.c")
-endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rand/relic_rand_${RAND_PATH}.c")
-
-file(GLOB BN_SRCS bn/*.c)
-file(GLOB DV_SRCS dv/*.c)
-file(GLOB FP_SRCS fp/*.c)
-file(GLOB FPX_SRCS fpx/*.c)
-file(GLOB FB_SRCS fb/*.c)
-file(GLOB FBX_SRCS fbx/*.c)
-file(GLOB EP_SRCS ep/*.c)
-file(GLOB EPX_SRCS epx/*.c)
-file(GLOB EB_SRCS eb/*.c)
-file(GLOB ED_SRCS ed/*.c)
-file(GLOB PP_SRCS pp/*.c)
-file(GLOB BC_SRCS bc/*.c)
-file(GLOB MD_SRCS md/*.c)
-file(GLOB EC_SRCS ec/*.c)
-file(GLOB PC_SRCS pc/*.c)
-file(GLOB MPC_SRCS mpc/*.c)
-
-set(RELIC_SRCS ${CORE_SRCS})
-
-if (TESTS GREATER 0)
-	list(APPEND RELIC_SRCS "relic_test.c")
-endif(TESTS GREATER 0)
-
-if (BENCH GREATER 0)
-	list(APPEND RELIC_SRCS "relic_bench.c")
-endif(BENCH GREATER 0)
-
-if (WITH_BN)
-	list(APPEND RELIC_SRCS ${BN_SRCS})
-	file(GLOB TEMP low/easy/relic_bn*.c)
-	list(APPEND LOW_SRCS ${TEMP})
-endif(WITH_BN)
-
-if (WITH_DV)
-	list(APPEND RELIC_SRCS ${DV_SRCS})
-endif(WITH_DV)
-
-if (WITH_FP)
-	list(APPEND RELIC_SRCS ${FP_SRCS})
-	file(GLOB TEMP low/easy/relic_fp_*.c)
-	list(APPEND LOW_SRCS ${TEMP})
-endif(WITH_FP)
-
-if (WITH_FPX)
-	list(APPEND RELIC_SRCS ${FPX_SRCS})
-	file(GLOB TEMP low/easy/relic_fpx_*.c)
-	list(APPEND LOW_SRCS ${TEMP})
-endif(WITH_FPX)
-
-if (WITH_FB)
-	list(APPEND RELIC_SRCS ${FB_SRCS})
-	file(GLOB TEMP low/easy/relic_fb*.c)
-	list(APPEND LOW_SRCS ${TEMP})
-endif(WITH_FB)
-
-if (WITH_FBX)
-	list(APPEND RELIC_SRCS ${FBX_SRCS})
-endif(WITH_FBX)
-
-if (WITH_EP)
-	list(APPEND RELIC_SRCS ${EP_SRCS})
-endif(WITH_EP)
-
-if (WITH_EPX)
-	list(APPEND RELIC_SRCS ${EPX_SRCS})
-endif(WITH_EPX)
-
-if (WITH_EB)
-	list(APPEND RELIC_SRCS ${EB_SRCS})
-endif(WITH_EB)
-
-if (WITH_ED)
-	list(APPEND RELIC_SRCS ${ED_SRCS})
-endif(WITH_ED)
-
-if (WITH_PP)
-	list(APPEND RELIC_SRCS ${PP_SRCS})
-endif(WITH_PP)
-
-if (WITH_PC)
-	list(APPEND RELIC_SRCS ${PC_SRCS})
-endif(WITH_PC)
-
-if (WITH_CP)
-	if (WITH_BN)
-		list(APPEND RELIC_SRCS "cp/relic_cp_rsa.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_rabin.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_bdpe.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ghpe.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_phpe.c")
-	endif()
-	if (WITH_EB OR WITH_EP OR WITH_ED OR WITH_EC)
-		list(APPEND RELIC_SRCS "cp/relic_cp_ecdh.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ecmqv.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ecies.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ecdsa.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ecss.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_vbnn.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_pok.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_sok.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ers.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_etrs.c")
-	endif()
-	if (WITH_PP OR WITH_PC)
-		list(APPEND RELIC_SRCS "cp/relic_cp_pcdel.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_sokaka.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_bgn.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_ibe.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_bls.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_cls.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_pss.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_bbs.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_zss.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_cmlhs.c")
-		list(APPEND RELIC_SRCS "cp/relic_cp_mklhs.c")
-	endif()
-	if (WITH_MPC)
-		list(APPEND RELIC_SRCS "cp/relic_cp_mpss.c")
-	endif()
-endif()
-
-if (WITH_BC)
-	list(APPEND RELIC_SRCS ${BC_SRCS})
-endif(WITH_BC)
-
-if (WITH_MD)
-	list(APPEND RELIC_SRCS ${MD_SRCS})
-endif(WITH_MD)
-
-if (WITH_MPC)
-	list(APPEND RELIC_SRCS ${MPC_SRCS})
-endif(WITH_MPC)
-
-foreach(SRC ${LOW_SRCS})
-	get_filename_component(SRC ${SRC} NAME_WE)
-	set(FILE "${CMAKE_CURRENT_SOURCE_DIR}/low/${ARITH_PATH}/${SRC}")
-	if (EXISTS "${FILE}.c")
-		list(APPEND ARITH_SRCS "${FILE}.c")
-	endif(EXISTS "${FILE}.c")
-	if (EXISTS "${FILE}.s")
-		list(APPEND ARITH_ASMS "${FILE}.s")
-	endif(EXISTS "${FILE}.s")
-	if (NOT EXISTS "${FILE}.c" AND NOT EXISTS "${FILE}.s")
-		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/low/${INHERIT_PATH}/${SRC}.c")
-			list(APPEND ARITH_SRCS "low/${INHERIT_PATH}/${SRC}.c")
-		else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/low/${INHERIT_PATH}/${SRC}.c")
-			list(APPEND ARITH_SRCS "low/easy/${SRC}.c")
-		endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/low/${INHERIT_PATH}/${SRC}.c")
-	endif(NOT EXISTS "${FILE}.c" AND NOT EXISTS "${FILE}.s")
-endforeach(SRC)
-
-list(APPEND RELIC_SRCS ${ARITH_SRCS})
-
-list(APPEND RELIC_SRCS ${ARITH_ASMS})
-set_source_files_properties(${ARITH_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS "-DASM -x assembler-with-cpp")
-
-add_custom_target(arith_objs DEPENDS ${ARITH_OBJS})
-
-macro(LINK_LIBS LIBRARY)
-	if(OPSYS STREQUAL LINUX)
-		target_link_libraries(${LIBRARY} rt)
-	endif(OPSYS STREQUAL LINUX)
-	if(MULTI STREQUAL OPENMP AND NOT MSVC)
-		target_link_libraries(${LIBRARY} gomp m)
-	endif(MULTI STREQUAL OPENMP AND NOT MSVC)
-	if(MULTI STREQUAL PTHREAD)
-		target_link_libraries(${LIBRARY} pthread m)
-	endif(MULTI STREQUAL PTHREAD)
-endmacro(LINK_LIBS)
-
-function(AMALGAMATE output inputFiles)
-	file(WRITE "${output}" "// This file is an automatic amalgamation of all relic source files.\n" )
-	FOREACH(file ${inputFiles})
-		file(APPEND "${output}" "#include \"${file}\"\n")
-	ENDFOREACH()
-endfunction(AMALGAMATE)
-
-if(AMALG)
-	AMALGAMATE("relic-all.c" "${RELIC_SRCS}${ARITH_OBJS}")
-endif(AMALG)
-
-if (SHLIB)
-	if(AMALG)
-		add_library(${RELIC} SHARED "relic-all.c")
-	else(AMALG)
-		add_library(${RELIC} SHARED ${RELIC_SRCS} ${ARITH_OBJS})
-	endif(AMALG)
-	add_dependencies(${RELIC} arith_objs)
-	target_link_libraries(${RELIC} ${ARITH_LIBS})
-	link_libs(${RELIC})
-	install(TARGETS ${RELIC} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-endif(SHLIB)
-
-if (STLIB)
-	if(AMALG)
-		add_library(${RELIC_S} STATIC "relic-all.c")
-	else(AMALG)
-		add_library(${RELIC_S} STATIC ${RELIC_SRCS} ${ARITH_OBJS})
-	endif(AMALG)
-	add_dependencies(${RELIC_S} arith_objs)
-	target_link_libraries(${RELIC_S} ${ARITH_LIBS})
-	link_libs(${RELIC_S})
-	install(TARGETS ${RELIC_S} ARCHIVE DESTINATION lib)
-endif(STLIB)
diff --git a/src/dashbls/depends/relic/src/arch/lzcnt.inc b/src/dashbls/depends/relic/src/arch/lzcnt.inc
deleted file mode 100644
index edca8d5a4cb2..000000000000
--- a/src/dashbls/depends/relic/src/arch/lzcnt.inc
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
-Count leading zero bits.
-
-David Reid - mackron@gmail.com
-
-The lzcnt32 and lzcnt64 functions count the number of leading zero bits in a given 32- or 64-bit variable. When the input variable is 0, the
-total size in bits will be returned (32 for lzcnt32 and 64 for lzcnt64).
-
-For x86/64 platforms, this will use the LZCNT instruction if available. On ARM it will try the CLZ instruction. If these are unavailable it
-will fall back to compiler-specific built-ins. If these are unavailable it'll fall back to the generic implementation.
-
-
-License
-=======
-
-Public Domain (www.unlicense.org)
--------------------------------------------------
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-
-
-Functions
----------
-lzcnt32_generic
-lzcnt64_generic
-    Generic implementation.
-
-lzcnt32_msvc_bsr
-lzcnt64_msvc_bsr
-    MSVC built-in implementation using _BitScanReverse/64(). Note that lzcnt64_mscv_bsr() is only available when compiling as 64-bit.
-
-lzcnt32_gcc_builtin
-lzcnt64_gcc_builtin
-    GCC/Clang built-in implementation using __builtin_clzl/l(). Note that lzcnt64_gcc_builtin() is only available when compiling as 64-bit.
-
-lzcnt32_msvc_x86
-lzcnt64_msvc_x64
-    MSVC implementation using the __lzcnt and __lzcnt64 intrinsic. This should emit a LZCNT instruction. Note that these are only available
-    when targeting x86/64. lzcnt64_msvc_x64() is only available when compiling as 64-bit.
-
-lzcnt32_gcc_x86
-lzcnt64_gcc_x64
-    GCC/Clang inline assembly implementation. This will emit the LZCNT instruction. Note that these are only available when targeting x86/x64
-    and when compiled using a compiler that supports GCC style inline assembly.
-
-lzcnt32_gcc_arm
-lzcnt64_gcc_arm
-    GCC/Clang inline assembly implementation. This will emit the CLZ instruction. Note that these are only available when targeting ARM
-    architecture version 5 and above and when compiled using a compiler that supports GCC style inline assembly.
-
-lzcnt32_hard
-lzcnt64_hard
-    High level helper for calling an hardware implementation. This will choose either lzcnt32_msvc_x86()/lzcnt64_msvc_x64() or lzcnt32_gcc_x86()/
-    lzcnt64_gcc_x64() depending on the environment. Note that this is only available when targeting x86/64. lzcnt64_hard() is only available
-    when compiling as 64-bit. You should only call this if has_lzcnt_hard() returns non-zero.
-
-lzcnt32_soft
-lzcnt64_soft
-    High level helper for calling the best software implementation available for the current build environment.
-
-lzcnt32
-lzcnt64
-    High level helper for calling either a hardware or software implementation depending on the build environment. This will always favor a
-    hardware implementation. Do not call this in high performance code. The reason for this is that each it will call has_lzcnt_hard() each
-    time which may be too fine grained for your purposes. You may be better off calling has_lzcnt_hard() once at a higher level.
-
-has_lzcnt_hard
-    Determines whether or not a hardware implementation of lzcnt is available. Use this to know whether or not you can call lzcnt32/64_hard().
-    Note that this calls CPUID for each, so you may want to cache the result. Use HAS_LZCNT32/64_HARD to check for compile-time support.
-*/
-#if defined(_MSC_VER)
-#include <intrin.h>
-#endif
-
-#if defined(__i386) || defined(_M_IX86)
-    #define ARCH_X86
-#elif defined(__x86_64__) || defined(_M_X64)
-    #define ARCH_X64
-#elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 5) || (defined(_M_ARM) && _M_ARM >= 5) || defined(__ARM_FEATURE_CLZ) /* ARM (Architecture Version 5) */
-    #define ARCH_ARM
-#endif
-
-#if defined(_WIN64) || defined(_LP64) || defined(__LP64__)
-    #define ARCH_64BIT
-#else
-    #define ARCH_32BIT
-#endif
-
-#if defined(ARCH_X86) || defined(ARCH_X64)
-    /* x86/64 */
-    #if defined(_MSC_VER) && _MSC_VER >= 1500
-        #define HAS_LZCNT32_HARD
-        #if defined(ARCH_64BIT)
-            #define HAS_LZCNT64_HARD
-        #endif
-    #elif defined(__GNUC__) || defined(__clang__)
-        #define HAS_LZCNT32_HARD
-        #if defined(ARCH_64BIT)
-            #define HAS_LZCNT64_HARD
-        #endif
-    #endif
-#elif defined(ARCH_ARM)
-    /* ARM */
-    #if defined(__GNUC__) || defined(__clang__)
-        #define HAS_LZCNT32_HARD
-        #if defined(ARCH_64BIT)
-            #define HAS_LZCNT64_HARD
-        #endif
-    #endif
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && (defined(ARCH_X86) || defined(ARCH_X64)) && !defined(__clang__)
-    #define HAS_LZCNT_INTRINSIC
-#elif (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
-    #define HAS_LZCNT_INTRINSIC
-#elif defined(__clang__)
-    #if defined(__has_builtin)
-        #if __has_builtin(__builtin_clzll) || __has_builtin(__builtin_clzl)
-            #define HAS_LZCNT_INTRINSIC
-        #endif
-    #endif
-#endif
-
-inline static unsigned int lzcnt32_generic(unsigned int x)
-{
-    unsigned int n;
-    static unsigned int clz_table_4[] = {
-        0,
-        4,
-        3, 3,
-        2, 2, 2, 2,
-        1, 1, 1, 1, 1, 1, 1, 1
-    };
-
-    if (x == 0) {
-        return sizeof(x)*8;
-    }
-
-    n = clz_table_4[x >> (sizeof(x)*8 - 4)];
-    if (n == 0) {
-        if ((x & 0xFFFF0000) == 0) { n  = 16; x <<= 16; }
-        if ((x & 0xFF000000) == 0) { n += 8;  x <<= 8;  }
-        if ((x & 0xF0000000) == 0) { n += 4;  x <<= 4;  }
-        n += clz_table_4[x >> (sizeof(x)*8 - 4)];
-    }
-
-    return n - 1;
-}
-
-inline static unsigned int lzcnt64_generic(unsigned long long x)
-{
-    unsigned int n;
-    static unsigned int clz_table_4[] = {
-        0,
-        4,
-        3, 3,
-        2, 2, 2, 2,
-        1, 1, 1, 1, 1, 1, 1, 1
-    };
-
-    if (x == 0) {
-        return sizeof(x)*8;
-    }
-
-    n = clz_table_4[x >> (sizeof(x)*8 - 4)];
-    if (n == 0) {
-        if ((x & ((unsigned long long)0xFFFFFFFF << 32)) == 0) { n  = 32; x <<= 32; }
-        if ((x & ((unsigned long long)0xFFFF0000 << 32)) == 0) { n += 16; x <<= 16; }
-        if ((x & ((unsigned long long)0xFF000000 << 32)) == 0) { n += 8;  x <<= 8;  }
-        if ((x & ((unsigned long long)0xF0000000 << 32)) == 0) { n += 4;  x <<= 4;  }
-        n += clz_table_4[x >> (sizeof(x)*8 - 4)];
-    }
-
-    return n - 1;
-}
-
-/* Generic compiler specific intrinsics. */
-#if defined(_MSC_VER)
-static unsigned int lzcnt32_msvc_bsr(unsigned int x)
-{
-    unsigned long n;
-
-    if (x == 0) {
-        return 32;
-    }
-
-    _BitScanReverse(&n, x);
-
-    return 32 - n - 1;
-}
-
-/* _BitScanReverse64() is only available on 64-bit builds. */
-#if defined(ARCH_64BIT)
-static unsigned int lzcnt64_msvc_bsr(unsigned long long x)
-{
-    unsigned long n;
-
-    if (x == 0) {
-        return 64;
-    }
-
-    _BitScanReverse64(&n, x);
-
-    return 64 - n - 1;
-}
-#endif  /* ARCH_64BIT */
-#elif (defined(__GNUC__) || defined(__clang__)) && defined(HAS_LZCNT_INTRINSIC)
-static unsigned int lzcnt32_gcc_builtin(unsigned int x)
-{
-    if (x == 0) {
-        return 32;
-    }
-
-    return (unsigned int)__builtin_clzl((unsigned long)x);
-}
-
-static unsigned int lzcnt64_gcc_builtin(unsigned long long x)
-{
-    if (x == 0) {
-        return 64;
-    }
-
-    return (unsigned int)__builtin_clzll(x);
-}
-#endif
-
-static int has_lzcnt_hard()
-{
-#if defined(ARCH_X86) || defined(ARCH_X64)
-    int info[4] = {0};
-
-    #if defined(_MSC_VER)
-        __cpuid(info, 0x80000001);
-    #elif defined(__GNUC__) || defined(__clang__)
-        /*
-        It looks like the -fPIC option uses the ebx register which GCC complains about. We can work around this by just using a different register, the
-        specific register of which I'm letting the compiler decide on. The "k" prefix is used to specify a 32-bit register. The {...} syntax is for
-        supporting different assembly dialects.
-
-        What's basically happening is that we're saving and restoring the ebx register manually.
-        */
-        #if defined(ARCH_X86) && defined(__PIC__)
-            __asm__ __volatile__ (
-                "xchg{l} {%%}ebx, %k1;"
-                "cpuid;"
-                "xchg{l} {%%}ebx, %k1;"
-                : "=a"(info[0]), "=&r"(info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(0x80000001), "c"(0)
-            );
-        #else
-            __asm__ __volatile__ (
-                "cpuid" : "=a"(info[0]), "=b"(info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(0x80000001), "c"(0)
-            );
-        #endif
-    #endif
-
-    return (info[2] & (1 << 5)) != 0;
-#elif defined(ARCH_ARM)
-    return 1;   /* The CLZ instruction is available starting from ARM architecture version 5. Our ARCH_ARM #define is only defined when targeting version 5 at compile time. */
-#else
-    return 0;   /* Hardware LZCNT is only supported in x86/64 and ARM for now. */
-#endif
-}
-
-/* Intrinsics and inline-assembly. x86/64 has a hardware LZCNT instruction. You can only call these if has_lzcnt_hard() returns true. */
-#if defined(HAS_LZCNT32_HARD)
-    #if defined(ARCH_X86) || defined(ARCH_X64)
-        #if defined(_MSC_VER) && !defined(__clang__)
-            static unsigned int lzcnt32_msvc_x86(unsigned int x)
-            {
-                return __lzcnt(x);
-            }
-        #elif defined(__GNUC__) || defined(__clang__)
-            static unsigned int lzcnt32_gcc_x86(unsigned int x)
-            {
-                /*
-                att:   lzcntl [out], [in]
-                intel: lzcnt  [in], [out]
-                */
-                unsigned int r;
-                __asm__ __volatile__ (
-                    "lzcnt{l %1, %0| %0, %1}" : "=r"(r) : "r"(x)
-                );
-
-                return r;
-            }
-        #endif
-    #endif
-    #if defined(ARCH_ARM)
-        #if defined(__GNUC__) || defined(__clang__)
-            static unsigned int lzcnt32_gcc_arm(unsigned int x)
-            {
-                unsigned int r;
-                __asm__ __volatile__ (
-                #if defined(ARCH_32BIT)
-                    "clz %[out], %[in]" : [out]"=r"(r) : [in]"r"(x)
-                #else
-                    "clz %w[out], %w[in]" : [out]"=r"(r) : [in]"r"(x)
-                #endif
-                );
-
-                return r;
-            }
-        #endif
-    #endif
-
-    inline static unsigned int lzcnt32_hard(unsigned int x)
-    {
-        #if defined(ARCH_X86) || defined(ARCH_X64)
-            #if defined(_MSC_VER) && !defined(__clang__)
-                return lzcnt32_msvc_x86(x);
-            #elif defined(__GNUC__) || defined(__clang__)
-                return lzcnt32_gcc_x86(x);
-            #else
-                #error "This compiler does not support the lzcnt intrinsic."
-            #endif
-        #elif defined(ARCH_ARM)
-            #if defined(__GNUC__) || defined(__clang__)
-                return lzcnt32_gcc_arm(x);
-            #else
-                #error "This compiler does not support the clz intrinsic."
-            #endif
-        #else
-            #error "The build target does not support a native instruction."
-        #endif
-    }
-#endif
-
-#if defined(HAS_LZCNT64_HARD)
-    #if defined(ARCH_X86) || defined(ARCH_X64)
-        #if defined(_MSC_VER) && !defined(__clang__)
-            static unsigned int lzcnt64_msvc_x64(unsigned long long x)
-            {
-                return (unsigned int)__lzcnt64(x);
-            }
-        #elif defined(__GNUC__) || defined(__clang__)
-            static unsigned int lzcnt64_gcc_x64(unsigned long long x)
-            {
-                /*
-                att:   lzcnt [out], [in]
-                intel: lzcnt [in], [out]
-                */
-                unsigned long long r;
-                __asm__ __volatile__ (
-                    "lzcnt{ %1, %0| %0, %1}" : "=r"(r) : "r"(x)
-                );
-
-                return r;
-            }
-        #endif
-    #endif
-    #if defined(ARCH_ARM)
-        #if defined(__GNUC__) || defined(__clang__)
-            static unsigned int lzcnt64_gcc_arm(unsigned long long x)
-            {
-                unsigned long long r;
-                __asm__ __volatile__ (
-                    "clz %[out], %[in]" : [out]"=r"(r) : [in]"r"(x)
-                );
-
-                return r;
-            }
-        #endif
-    #endif
-
-    static unsigned int lzcnt64_hard(unsigned long long x)
-    {
-    #if defined(ARCH_X64)
-        #if defined(_MSC_VER) && !defined(__clang__)
-            return lzcnt64_msvc_x64(x);
-        #elif defined(__GNUC__) || defined(__clang__)
-            return lzcnt64_gcc_x64(x);
-        #else
-            #error "This compiler does not support the lzcnt intrinsic."
-        #endif
-    #elif defined(ARCH_ARM) && defined(ARCH_64BIT)
-        #if defined(__GNUC__) || defined(__clang__)
-            return lzcnt64_gcc_arm(x);
-        #else
-            #error "This compiler does not support the clz intrinsic."
-        #endif
-    #else
-        #error "The build target does not support a native instruction."
-    #endif
-    }
-#endif
-
-
-inline static unsigned int lzcnt32_soft(unsigned int x)
-{
-#if defined(_MSC_VER)
-    return lzcnt32_msvc_bsr(x);
-#elif defined(HAS_LZCNT_INTRINSIC)
-    return lzcnt32_gcc_builtin(x);
-#else
-    return lzcnt32_generic(x);
-#endif
-}
-
-inline static unsigned int lzcnt64_soft(unsigned long long x)
-{
-#if defined(ARCH_64BIT)
-    #if defined(_MSC_VER)
-        return lzcnt64_msvc_bsr(x);
-    #elif defined(HAS_LZCNT_INTRINSIC)
-        return lzcnt64_gcc_builtin(x);
-    #else
-        return lzcnt64_generic(x);
-    #endif
-#else
-    return lzcnt64_generic(x);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_arm.c b/src/dashbls/depends/relic/src/arch/relic_arch_arm.c
deleted file mode 100644
index c6b108c0127f..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_arm.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of architecture-dependent routines.
- *
- * @ingroup arch
- */
-
-#include "relic_types.h"
-
-#include "lzcnt.inc"
-
-/**
- * Renames the inline assembly macro to a prettier name.
- */
-#define asm					__asm__ volatile
-
-#ifdef __ARM_ARCH_7M__
-	/**
-	 * Addresses of the registers.
-	 */
- 	/** @{ */
-	volatile unsigned int *DWT_CYCCNT = (unsigned int *)0xE0001004;
-	volatile unsigned int *DWT_CONTROL = (unsigned int *)0xE0001000;
-	volatile unsigned int *SCB_DEMCR = (unsigned int *)0xE000EDFC;
-	/** @} */
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-#if TIMER == CYCLE
-
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
-	/*
-	 * This relies on a Kernel module described in:
-	 * http://blog.regehr.org/archives/794
-	 */
-	asm("mcr p15, 0, %0, c15, c12, 0" : : "r" (1));
-#elif __ARM_ARCH_7A__
-	/*
-	 * This relies on a Kernel module described in:
-	 * http://stackoverflow.com/questions/3247373/
-	 * how-to-measure-program-execution-time-in-arm-cortex-a8-processor
-	 */
-	asm("mcr p15, 0, %0, c9, c12, 0" :: "r"(17));
-	asm("mcr p15, 0, %0, c9, c12, 1" :: "r"(0x8000000f));
-	asm("mcr p15, 0, %0, c9, c12, 3" :: "r"(0x8000000f));
-#elif __ARM_ARCH_7M__
-	*SCB_DEMCR = *SCB_DEMCR | 0x01000000;
-	*DWT_CYCCNT = 0; // reset the counter
-	*DWT_CONTROL = *DWT_CONTROL | 1 ; // enable the counter
-#endif
-
-#endif /* TIMER = CYCLE */
-}
-
-void arch_clean(void) {
-}
-
-
-ull_t arch_cycles(void) {
-	unsigned int value = 0;
-
-#if TIMER == CYCLE
-
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
-	asm("mrc p15, 0, %0, c15, c12, 1" : "=r"(value));
-#elif __ARM_ARCH_7A__
-	asm("mrc p15, 0, %0, c9, c13, 0" : "=r"(value));
-#elif __ARM_ARCH_7M__
-	value = *DWT_CYCCNT;
-#else
-	#error "Unsupported ARM architecture. Cycle count implementation missing for this ARM version."
-#endif
-
-#endif /* TIMER = CYCLE */
-
-	return value;
-}
-
-unsigned int arch_lzcnt(unsigned int x) {
-#ifdef WSIZE == 32
-	return lzcnt32_gcc_arm(x);
-#elif WSIZE == 64
-	return lzcnt64_gcc_arm(x);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_avr.c b/src/dashbls/depends/relic/src/arch/relic_arch_avr.c
deleted file mode 100644
index a92e75bb0548..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_avr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of AVR-dependent routines.
- *
- * @ingroup arch
- */
-
-#include <avr/pgmspace.h>
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-}
-
-void arch_clean(void) {
-}
-
-void arch_copy_rom(char *dest, const char *src, int len) {
-	int i = 0;
-	char c;
-
-	while ((c = pgm_read_byte(src++)) && (i++ < len - 1)) {
-		*dest++ = c;
-	}
-	*dest = 0;
-}
-
-unsigned int arch_lzcnt() {
-	static const uint8_t table[16] = {
-		0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
-	};
-	if (a >> 4 == 0) {
-		return table[a & 0xF];
-	} else {
-		return table[a >> 4] + 4;
-	}
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_msp.c b/src/dashbls/depends/relic/src/arch/relic_arch_msp.c
deleted file mode 100644
index cc203e65aeaa..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_msp.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of MSP-dependent routines.
- *
- * @ingroup arch
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-}
-
-void arch_clean(void) {
-}
-
-#if TIMER == CYCLE
-
-#ifdef __MSP430__
-/* Support for MSPGCC with custom MSPsim simulator. */
-
-static volatile uint8_t TEST_TEXTOUT __asm__("0x01b0");
-static volatile unsigned int BENCH_CYCLES_0 __asm__("0x01b2");
-static volatile unsigned int BENCH_CYCLES_1 __asm__("0x01b4");
-static volatile unsigned int BENCH_CYCLES_2 __asm__("0x01b6");
-static volatile unsigned int BENCH_CYCLES_3 __asm__("0x01b8");
-
-union cycles_t {
-    unsigned long long cycles;
-    struct {
-        unsigned int e0;
-        unsigned int e1;
-        unsigned int e2;
-        unsigned int e3;
-    } e;
-};
-
-int putchar(int c) {
-    TEST_TEXTOUT = (char) c;
-    return c;
-}
-
-unsigned long long arch_cycles(void) {
-    union cycles_t cycles;
-    cycles.e.e0 = BENCH_CYCLES_0;
-    cycles.e.e1 = BENCH_CYCLES_1;
-    cycles.e.e2 = BENCH_CYCLES_2;
-    cycles.e.e3 = BENCH_CYCLES_3;
-    return cycles.cycles;
-}
-
-#endif /* __MSP430__ */
-
-#if __ICC430__
-/* Support for IAR using simulator with custom macro. */
-
-volatile ull_t  __cycles = 0;
-
-ull_t arch_cycles(void) {
-	return __cycles;
-}
-
-#endif /* __ICC430__ */
-
-#endif /* TIMER = CYCLE */
-
-unsigned int arch_lzcnt() {
-    static const uint8_t table[16] = {
-    	0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
-    };
-#if WSIZE == 8
-	if (a >> 4 == 0) {
-		return table[a & 0xF];
-	} else {
-		return table[a >> 4] + 4;
-	}
-	return 0;
-#elif WSIZE == 16
-	int offset;
-
-	if (a >= ((dig_t)1 << 8)) {
-		offset = 8;
-	} else {
-		offset = 0;
-	}
-	a = a >> offset;
-	if (a >> 4 == 0) {
-		return table[a & 0xF] + offset;
-	} else {
-		return table[a >> 4] + 4 + offset;
-	}
-	return 0;
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_none.c b/src/dashbls/depends/relic/src/arch/relic_arch_none.c
deleted file mode 100644
index 47fddc20d8cf..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_none.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of architecture-dependent routines.
- *
- * @ingroup arch
- */
-
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-}
-
-void arch_clean(void) {
-}
-
-ull_t arch_cycles(void) {
-	return 0;
-}
-
-unsigned int arch_lzcnt(dig_t a) {
-#if WSIZE == 8 || WSIZE == 16
-	static const uint8_t table[16] = {
-		4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0
-	};
-#endif
-#if WSIZE == 8
-	if (a >> 4 == 0) {
-		return table[a & 0xF] + 4;
-	} else {
-		return table[a >> 4];
-	}
-	return 0;
-#elif WSIZE == 16
-	int offset;
-
-	if (a >= ((dig_t)1 << 8)) {
-		offset = 8;
-	} else {
-		offset = 0;
-	}
-	a = a >> offset;
-	if (a >> 4 == 0) {
-		return table[a & 0xF] + offset;
-	} else {
-		return table[a >> 4] + 4 + offset;
-	}
-	return 0;
-#elif WSIZE == 32
-#ifdef _MSC_VER
-    return __lzcnt(a);
-#else
-	return __builtin_clz(a);
-#endif
-#elif WSIZE == 64
-#ifdef _MSC_VER
-    return __lzcnt64(a);
-#else
-	return __builtin_clzll(a);
-#endif
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_x64.c b/src/dashbls/depends/relic/src/arch/relic_arch_x64.c
deleted file mode 100644
index 56e92aa74c39..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_x64.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of AMD64-dependent routines.
- *
- * @ingroup arch
- */
-
-#include <stdio.h>
-
-#include "relic_types.h"
-#include "relic_arch.h"
-#include "relic_core.h"
-
-#include "lzcnt.inc"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Function pointer to underlying lznct implementation.
- */
-static unsigned int (*lzcnt_ptr)(ull_t);
-
-#if TIMER == CYCLE || TIMER == PERF
-/**
- * Renames the inline assembly macro to a prettier name.
- */
-#define asm					__asm__ volatile
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-	lzcnt_ptr = (has_lzcnt_hard() ? lzcnt64_hard : lzcnt64_soft);
-}
-
-void arch_clean(void) {
-	lzcnt_ptr = NULL;
-}
-
-#if TIMER == CYCLE
-
-ull_t arch_cycles(void) {
-	unsigned int hi, lo;
-	asm (
-		"cpuid\n\t"/*serialize*/
-		"rdtsc\n\t"/*read the clock*/
-		"mov %%edx, %0\n\t"
-		"mov %%eax, %1\n\t"
-		: "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx"
-	);
-	return ((ull_t) lo) | (((ull_t) hi) << 32);
-}
-
-#elif TIMER == PERF
-
-ull_t arch_cycles(void) {
-	unsigned int seq;
-	ull_t index, offset, result = 0;
-	if (core_get()->perf_buf != NULL) {
-		do {
-			seq = core_get()->perf_buf->lock;
-			asm("" ::: "memory");
-			index = core_get()->perf_buf->index;
-			offset = core_get()->perf_buf->offset;
-			asm(
-				"rdpmc; shlq $32, %%rdx; orq %%rdx,%%rax"
-				: "=a" (result) : "c" (index - 1) : "%rdx"
-			);
-			asm("" ::: "memory");
-		} while (core_get()->perf_buf->lock != seq);
-
-		result += offset;
-		result &= RLC_MASK(48); /* Get lower 48 bits only. */
-	}
-	return result;
-}
-#endif
-
-unsigned int arch_lzcnt(dig_t x) {
-	return lzcnt_ptr((ull_t)x) - (8 * sizeof(ull_t) - WSIZE);
-}
diff --git a/src/dashbls/depends/relic/src/arch/relic_arch_x86.c b/src/dashbls/depends/relic/src/arch/relic_arch_x86.c
deleted file mode 100644
index 91a8064fa101..000000000000
--- a/src/dashbls/depends/relic/src/arch/relic_arch_x86.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of AMD64-dependent routines.
- *
- * @ingroup arch
- */
-
-#include <stdio.h>
-
-#include "relic_types.h"
-#include "relic_arch.h"
-
-#include "lzcnt.inc"
-
-/**
- * Renames the inline assembly macro to a prettier name.
- */
-#define asm					__asm__ volatile
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Function pointer to underlying lznct implementation.
- */
-static unsigned int (*lzcnt_ptr)(unsigned int);
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void arch_init(void) {
-	lzcnt_ptr = (has_lzcnt_hard() ? lzcnt32_hard : lzcnt32_soft);
-}
-
-void arch_clean(void) {
-	lzcnt_ptr = NULL;
-}
-
-ull_t arch_cycles(void) {
-	unsigned int hi, lo;
-	asm (
-		"cpuid\n\t"/*serialize*/
-		"rdtsc\n\t"/*read the clock*/
-		"mov %%edx, %0\n\t"
-		"mov %%eax, %1\n\t"
-		: "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx"
-	);
-	return ((ull_t) lo) | (((ull_t) hi) << 32);
-}
-
-unsigned int arch_lzcnt(dig_t x) {
-	return lzcnt_ptr((unsigned int)x) - (8 * sizeof(unsigned int) - WSIZE);
-}
diff --git a/src/dashbls/depends/relic/src/bc/relic_bc_aes.c b/src/dashbls/depends/relic/src/bc/relic_bc_aes.c
deleted file mode 100644
index c5d170f3297b..000000000000
--- a/src/dashbls/depends/relic/src/bc/relic_bc_aes.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the AES block cipher.
- *
- * @ingroup bc
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_err.h"
-#include "relic_bc.h"
-#include "rijndael-api-fst.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int bc_aes_cbc_enc(uint8_t *out, int *out_len, uint8_t *in,
-		int in_len, uint8_t *key, int key_len, uint8_t *iv) {
-	keyInstance key_inst;
-	cipherInstance cipher_inst;
-
-	int pad_len = 16 - (in_len - 16 * (in_len/16));
-	if (*out_len < in_len + pad_len) {
-		return RLC_ERR;
-	}
-	if (makeKey2(&key_inst, DIR_ENCRYPT, 8 * key_len, (char *)key) != TRUE) {
-		return RLC_ERR;
-	}
-	if (cipherInit(&cipher_inst, MODE_CBC, NULL) != TRUE) {
-		return RLC_ERR;
-	}
-	memcpy(cipher_inst.IV, iv, RLC_BC_LEN);
-	*out_len = padEncrypt(&cipher_inst, &key_inst, in, in_len, out);
-	if (*out_len <= 0) {
-		return RLC_ERR;
-	}
-	return RLC_OK;
-}
-
-int bc_aes_cbc_dec(uint8_t *out, int *out_len, uint8_t *in,
-		int in_len, uint8_t *key, int key_len, uint8_t *iv) {
-	keyInstance key_inst;
-	cipherInstance cipher_inst;
-
-	if (*out_len < in_len) {
-		return RLC_ERR;
-	}
-
-	if (makeKey2(&key_inst, DIR_DECRYPT, 8 * key_len, (char *)key) != TRUE) {
-		return RLC_ERR;
-	}
-	if (cipherInit(&cipher_inst, MODE_CBC, NULL) != TRUE) {
-		return RLC_ERR;
-	}
-	memcpy(cipher_inst.IV, iv, RLC_BC_LEN);
-	*out_len = padDecrypt(&cipher_inst, &key_inst, in, in_len, out);
-	if (*out_len <= 0) {
-		return RLC_ERR;
-	}
-	return RLC_OK;
-}
diff --git a/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.c b/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.c
deleted file mode 100644
index 2e2e91306133..000000000000
--- a/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.c
+++ /dev/null
@@ -1,1401 +0,0 @@
-/**
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-//#include <assert.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "rijndael-alg-fst.h"
-
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-Te4[x] = S [x].[01, 01, 01, 01];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-
-static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-static const u32 Te3[256] = {
-
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-static const u32 Te4[256] = {
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
-static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-static const u32 Td4[256] = {
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-};
-static const u32 rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-
-#ifdef _MSC_VER
-#define GETU32(p) SWAP(*((u32 *)(p)))
-#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
-#else
-#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-#endif
-
-/**
- * Expand the cipher key into the encryption key schedule.
- *
- * @return	the number of rounds for the given cipher key size.
- */
-int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) {
-   	int i = 0;
-	u32 temp;
-
-	rk[0] = GETU32(cipherKey     );
-	rk[1] = GETU32(cipherKey +  4);
-	rk[2] = GETU32(cipherKey +  8);
-	rk[3] = GETU32(cipherKey + 12);
-	if (keyBits == 128) {
-		for (;;) {
-			temp  = rk[3];
-			rk[4] = rk[0] ^
-				(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[5] = rk[1] ^ rk[4];
-			rk[6] = rk[2] ^ rk[5];
-			rk[7] = rk[3] ^ rk[6];
-			if (++i == 10) {
-				return 10;
-			}
-			rk += 4;
-		}
-	}
-	rk[4] = GETU32(cipherKey + 16);
-	rk[5] = GETU32(cipherKey + 20);
-	if (keyBits == 192) {
-		for (;;) {
-			temp = rk[ 5];
-			rk[ 6] = rk[ 0] ^
-				(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 7] = rk[ 1] ^ rk[ 6];
-			rk[ 8] = rk[ 2] ^ rk[ 7];
-			rk[ 9] = rk[ 3] ^ rk[ 8];
-			if (++i == 8) {
-				return 12;
-			}
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-			rk += 6;
-		}
-	}
-	rk[6] = GETU32(cipherKey + 24);
-	rk[7] = GETU32(cipherKey + 28);
-	if (keyBits == 256) {
-        for (;;) {
-        	temp = rk[ 7];
-        	rk[ 8] = rk[ 0] ^
-        		(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-        		(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-        		(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-        		(Te4[(temp >> 24)       ] & 0x000000ff) ^
-        		rcon[i];
-        	rk[ 9] = rk[ 1] ^ rk[ 8];
-        	rk[10] = rk[ 2] ^ rk[ 9];
-        	rk[11] = rk[ 3] ^ rk[10];
-			if (++i == 7) {
-				return 14;
-			}
-        	temp = rk[11];
-        	rk[12] = rk[ 4] ^
-        		(Te4[(temp >> 24)       ] & 0xff000000) ^
-        		(Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-        		(Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-        		(Te4[(temp      ) & 0xff] & 0x000000ff);
-        	rk[13] = rk[ 5] ^ rk[12];
-        	rk[14] = rk[ 6] ^ rk[13];
-        	rk[15] = rk[ 7] ^ rk[14];
-
-			rk += 8;
-        }
-	}
-	return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- *
- * @return	the number of rounds for the given cipher key size.
- */
-int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) {
-	int Nr, i, j;
-	u32 temp;
-
-	/* expand the cipher key: */
-	Nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits);
-	/* invert the order of the round keys: */
-	for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) {
-		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-	}
-	/* apply the inverse MixColumn transform to all round keys but the first and the last: */
-	for (i = 1; i < Nr; i++) {
-		rk += 4;
-		rk[0] =
-			Td0[Te4[(rk[0] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[0]      ) & 0xff] & 0xff];
-		rk[1] =
-			Td0[Te4[(rk[1] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[1]      ) & 0xff] & 0xff];
-		rk[2] =
-			Td0[Te4[(rk[2] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[2]      ) & 0xff] & 0xff];
-		rk[3] =
-			Td0[Te4[(rk[3] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[3]      ) & 0xff] & 0xff];
-	}
-	return Nr;
-}
-
-void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) {
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-    int r;
-#endif /* ?FULL_UNROLL */
-
-    /*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(pt     ) ^ rk[0];
-	s1 = GETU32(pt +  4) ^ rk[1];
-	s2 = GETU32(pt +  8) ^ rk[2];
-	s3 = GETU32(pt + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-   	/* round 2: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
-    /* round 3: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-   	/* round 4: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
-    /* round 5: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-   	/* round 6: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
-    /* round 7: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-   	/* round 8: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
-    /* round 9: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (Nr > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (Nr > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-    /*
-	 * Nr - 1 full rounds:
-	 */
-    r = Nr >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-	s0 =
-		(Te4[(t0 >> 24)       ] & 0xff000000) ^
-		(Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t3      ) & 0xff] & 0x000000ff) ^
-		rk[0];
-	PUTU32(ct     , s0);
-	s1 =
-		(Te4[(t1 >> 24)       ] & 0xff000000) ^
-		(Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t0      ) & 0xff] & 0x000000ff) ^
-		rk[1];
-	PUTU32(ct +  4, s1);
-	s2 =
-		(Te4[(t2 >> 24)       ] & 0xff000000) ^
-		(Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t1      ) & 0xff] & 0x000000ff) ^
-		rk[2];
-	PUTU32(ct +  8, s2);
-	s3 =
-		(Te4[(t3 >> 24)       ] & 0xff000000) ^
-		(Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t2      ) & 0xff] & 0x000000ff) ^
-		rk[3];
-	PUTU32(ct + 12, s3);
-}
-
-void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]) {
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-    int r;
-#endif /* ?FULL_UNROLL */
-
-    /*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-    s0 = GETU32(ct     ) ^ rk[0];
-    s1 = GETU32(ct +  4) ^ rk[1];
-    s2 = GETU32(ct +  8) ^ rk[2];
-    s3 = GETU32(ct + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (Nr > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (Nr > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
-	rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = Nr >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-   	s0 =
-   		(Td4[(t0 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t1      ) & 0xff] & 0x000000ff) ^
-   		rk[0];
-	PUTU32(pt     , s0);
-   	s1 =
-   		(Td4[(t1 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t2      ) & 0xff] & 0x000000ff) ^
-   		rk[1];
-	PUTU32(pt +  4, s1);
-   	s2 =
-   		(Td4[(t2 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t3      ) & 0xff] & 0x000000ff) ^
-   		rk[2];
-	PUTU32(pt +  8, s2);
-   	s3 =
-   		(Td4[(t3 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t0      ) & 0xff] & 0x000000ff) ^
-   		rk[3];
-	PUTU32(pt + 12, s3);
-}
-
-#ifdef INTERMEDIATE_VALUE_KAT
-
-void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds) {
-	int r;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-
-    /*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(block     ) ^ rk[0];
-	s1 = GETU32(block +  4) ^ rk[1];
-	s2 = GETU32(block +  8) ^ rk[2];
-	s3 = GETU32(block + 12) ^ rk[3];
-    rk += 4;
-
-    /*
-	 * Nr - 1 full rounds:
-	 */
-	for (r = (rounds < Nr ? rounds : Nr - 1); r > 0; r--) {
-		t0 =
-			Te0[(s0 >> 24)       ] ^
-			Te1[(s1 >> 16) & 0xff] ^
-			Te2[(s2 >>  8) & 0xff] ^
-			Te3[(s3      ) & 0xff] ^
-			rk[0];
-		t1 =
-			Te0[(s1 >> 24)       ] ^
-			Te1[(s2 >> 16) & 0xff] ^
-			Te2[(s3 >>  8) & 0xff] ^
-			Te3[(s0      ) & 0xff] ^
-			rk[1];
-		t2 =
-			Te0[(s2 >> 24)       ] ^
-			Te1[(s3 >> 16) & 0xff] ^
-			Te2[(s0 >>  8) & 0xff] ^
-			Te3[(s1      ) & 0xff] ^
-			rk[2];
-		t3 =
-			Te0[(s3 >> 24)       ] ^
-			Te1[(s0 >> 16) & 0xff] ^
-			Te2[(s1 >>  8) & 0xff] ^
-			Te3[(s2      ) & 0xff] ^
-			rk[3];
-
-		s0 = t0;
-		s1 = t1;
-		s2 = t2;
-		s3 = t3;
-		rk += 4;
-
-    }
-
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-	if (rounds == Nr) {
-    	t0 =
-    		(Te4[(s0 >> 24)       ] & 0xff000000) ^
-    		(Te4[(s1 >> 16) & 0xff] & 0x00ff0000) ^
-    		(Te4[(s2 >>  8) & 0xff] & 0x0000ff00) ^
-    		(Te4[(s3      ) & 0xff] & 0x000000ff) ^
-    		rk[0];
-    	t1 =
-    		(Te4[(s1 >> 24)       ] & 0xff000000) ^
-    		(Te4[(s2 >> 16) & 0xff] & 0x00ff0000) ^
-    		(Te4[(s3 >>  8) & 0xff] & 0x0000ff00) ^
-    		(Te4[(s0      ) & 0xff] & 0x000000ff) ^
-    		rk[1];
-    	t2 =
-    		(Te4[(s2 >> 24)       ] & 0xff000000) ^
-    		(Te4[(s3 >> 16) & 0xff] & 0x00ff0000) ^
-    		(Te4[(s0 >>  8) & 0xff] & 0x0000ff00) ^
-    		(Te4[(s1      ) & 0xff] & 0x000000ff) ^
-    		rk[2];
-    	t3 =
-    		(Te4[(s3 >> 24)       ] & 0xff000000) ^
-    		(Te4[(s0 >> 16) & 0xff] & 0x00ff0000) ^
-    		(Te4[(s1 >>  8) & 0xff] & 0x0000ff00) ^
-    		(Te4[(s2      ) & 0xff] & 0x000000ff) ^
-    		rk[3];
-		
-		s0 = t0;
-		s1 = t1;
-		s2 = t2;
-		s3 = t3;
-	}
-
-	PUTU32(block     , s0);
-	PUTU32(block +  4, s1);
-	PUTU32(block +  8, s2);
-	PUTU32(block + 12, s3);
-}
-
-void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds) {
-	int r;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-
-    /*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(block     ) ^ rk[0];
-	s1 = GETU32(block +  4) ^ rk[1];
-	s2 = GETU32(block +  8) ^ rk[2];
-	s3 = GETU32(block + 12) ^ rk[3];
-    rk += 4;
-
-    /*
-	 * Nr - 1 full rounds:
-	 */
-	for (r = (rounds < Nr ? rounds : Nr) - 1; r > 0; r--) {
-		t0 =
-			Td0[(s0 >> 24)       ] ^
-			Td1[(s3 >> 16) & 0xff] ^
-			Td2[(s2 >>  8) & 0xff] ^
-			Td3[(s1      ) & 0xff] ^
-			rk[0];
-		t1 =
-			Td0[(s1 >> 24)       ] ^
-			Td1[(s0 >> 16) & 0xff] ^
-			Td2[(s3 >>  8) & 0xff] ^
-			Td3[(s2      ) & 0xff] ^
-			rk[1];
-		t2 =
-			Td0[(s2 >> 24)       ] ^
-			Td1[(s1 >> 16) & 0xff] ^
-			Td2[(s0 >>  8) & 0xff] ^
-			Td3[(s3      ) & 0xff] ^
-			rk[2];
-		t3 =
-			Td0[(s3 >> 24)       ] ^
-			Td1[(s2 >> 16) & 0xff] ^
-			Td2[(s1 >>  8) & 0xff] ^
-			Td3[(s0      ) & 0xff] ^
-			rk[3];
-
-		s0 = t0;
-		s1 = t1;
-		s2 = t2;
-		s3 = t3;
-		rk += 4;
-
-    }
-
-    /*
-	 * complete the last round and
-	 * map cipher state to byte array block:
-	 */
-	t0 =
-		(Td4[(s0 >> 24)       ] & 0xff000000) ^
-		(Td4[(s3 >> 16) & 0xff] & 0x00ff0000) ^
-		(Td4[(s2 >>  8) & 0xff] & 0x0000ff00) ^
-		(Td4[(s1      ) & 0xff] & 0x000000ff);
-	t1 =
-		(Td4[(s1 >> 24)       ] & 0xff000000) ^
-		(Td4[(s0 >> 16) & 0xff] & 0x00ff0000) ^
-		(Td4[(s3 >>  8) & 0xff] & 0x0000ff00) ^
-		(Td4[(s2      ) & 0xff] & 0x000000ff);
-	t2 =
-		(Td4[(s2 >> 24)       ] & 0xff000000) ^
-		(Td4[(s1 >> 16) & 0xff] & 0x00ff0000) ^
-		(Td4[(s0 >>  8) & 0xff] & 0x0000ff00) ^
-		(Td4[(s3      ) & 0xff] & 0x000000ff);
-	t3 =
-		(Td4[(s3 >> 24)       ] & 0xff000000) ^
-		(Td4[(s2 >> 16) & 0xff] & 0x00ff0000) ^
-		(Td4[(s1 >>  8) & 0xff] & 0x0000ff00) ^
-		(Td4[(s0      ) & 0xff] & 0x000000ff);
-
-	if (rounds == Nr) {
-	    t0 ^= rk[0];
-	    t1 ^= rk[1];
-	    t2 ^= rk[2];
-	    t3 ^= rk[3];
-	}
-
-	PUTU32(block     , t0);
-	PUTU32(block +  4, t1);
-	PUTU32(block +  8, t2);
-	PUTU32(block + 12, t3);
-}
-
-#endif /* INTERMEDIATE_VALUE_KAT */
diff --git a/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.h b/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.h
deleted file mode 100644
index 190840ab0039..000000000000
--- a/src/dashbls/depends/relic/src/bc/rijndael-alg-fst.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * rijndael-alg-fst.h
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef __RIJNDAEL_ALG_FST_H
-#define __RIJNDAEL_ALG_FST_H
-
-#define MAXKC	(256/32)
-#define MAXKB	(256/8)
-#define MAXNR	14
-
-typedef uint8_t		u8;
-typedef uint16_t	u16;
-typedef uint32_t	u32;
-
-int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
-int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
-void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]);
-void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]);
-
-#ifdef INTERMEDIATE_VALUE_KAT
-void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);
-void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);
-#endif /* INTERMEDIATE_VALUE_KAT */
-
-#endif /* __RIJNDAEL_ALG_FST_H */
diff --git a/src/dashbls/depends/relic/src/bc/rijndael-api-fst.c b/src/dashbls/depends/relic/src/bc/rijndael-api-fst.c
deleted file mode 100644
index 1afbbdee4b27..000000000000
--- a/src/dashbls/depends/relic/src/bc/rijndael-api-fst.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/**
- * rijndael-api-fst.c
- *
- * @version 2.9 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Acknowledgements:
- *
- * We are deeply indebted to the following people for their bug reports,
- * fixes, and improvement suggestions to this implementation. Though we
- * tried to list all contributions, we apologise in advance for any
- * missing reference.
- *
- * Andrew Bales <Andrew.Bales@Honeywell.com>
- * Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
- * John Skodon <skodonj@webquill.com>
- */
-
-//#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-#include "rijndael-alg-fst.h"
-#include "rijndael-api-fst.h"
-
-int makeKey(keyInstance * key, BYTE direction, int keyLen, char *keyMaterial) {
-	int i;
-	char *keyMat;
-	u8 cipherKey[MAXKB];
-
-	if (key == NULL) {
-		return BAD_KEY_INSTANCE;
-	}
-
-	if ((direction == DIR_ENCRYPT) || (direction == DIR_DECRYPT)) {
-		key->direction = direction;
-	} else {
-		return BAD_KEY_DIR;
-	}
-
-	if ((keyLen == 128) || (keyLen == 192) || (keyLen == 256)) {
-		key->keyLen = keyLen;
-	} else {
-		return BAD_KEY_MAT;
-	}
-
-	if (keyMaterial != NULL) {
-		strncpy(key->keyMaterial, keyMaterial, keyLen / 4);
-	}
-
-	/* initialize key schedule: */
-	keyMat = key->keyMaterial;
-	for (i = 0; i < key->keyLen / 8; i++) {
-		int t, v;
-
-		t = *keyMat++;
-		if ((t >= '0') && (t <= '9'))
-			v = (t - '0') << 4;
-		else if ((t >= 'a') && (t <= 'f'))
-			v = (t - 'a' + 10) << 4;
-		else if ((t >= 'A') && (t <= 'F'))
-			v = (t - 'A' + 10) << 4;
-		else
-			return BAD_KEY_MAT;
-
-		t = *keyMat++;
-		if ((t >= '0') && (t <= '9'))
-			v ^= (t - '0');
-		else if ((t >= 'a') && (t <= 'f'))
-			v ^= (t - 'a' + 10);
-		else if ((t >= 'A') && (t <= 'F'))
-			v ^= (t - 'A' + 10);
-		else
-			return BAD_KEY_MAT;
-
-		cipherKey[i] = (u8) v;
-	}
-	if (direction == DIR_ENCRYPT) {
-		key->Nr = rijndaelKeySetupEnc(key->rk, cipherKey, keyLen);
-	} else {
-		key->Nr = rijndaelKeySetupDec(key->rk, cipherKey, keyLen);
-	}
-	rijndaelKeySetupEnc(key->ek, cipherKey, keyLen);
-	return TRUE;
-}
-
-
-int makeKey2(keyInstance * key, BYTE direction, int keyLen, char *keyMaterial) {
-	int i;
-	char *keyMat;
-	u8 cipherKey[MAXKB];
-
-	if (key == NULL) {
-		return BAD_KEY_INSTANCE;
-	}
-
-	if ((direction == DIR_ENCRYPT) || (direction == DIR_DECRYPT)) {
-		key->direction = direction;
-	} else {
-		return BAD_KEY_DIR;
-	}
-
-	if ((keyLen == 128) || (keyLen == 192) || (keyLen == 256)) {
-		key->keyLen = keyLen;
-	} else {
-		return BAD_KEY_MAT;
-	}
-
-	if (keyMaterial != NULL) {
-		memcpy(key->keyMaterial, keyMaterial, keyLen / 8);
-	}
-
-	/* initialize key schedule: */
-	keyMat = key->keyMaterial;
-	for (i = 0; i < key->keyLen / 8; i++) {
-		cipherKey[i] = *keyMat++;
-	}
-
-	if (direction == DIR_ENCRYPT) {
-		key->Nr = rijndaelKeySetupEnc(key->rk, cipherKey, keyLen);
-	} else {
-		key->Nr = rijndaelKeySetupDec(key->rk, cipherKey, keyLen);
-	}
-	rijndaelKeySetupEnc(key->ek, cipherKey, keyLen);
-	return TRUE;
-}
-
-int cipherInit(cipherInstance * cipher, BYTE mode, char *IV) {
-	if ((mode == MODE_ECB) || (mode == MODE_CBC) || (mode == MODE_CFB1)) {
-		cipher->mode = mode;
-	} else {
-		return BAD_CIPHER_MODE;
-	}
-	if (IV != NULL) {
-		int i;
-		for (i = 0; i < MAX_IV_SIZE; i++) {
-			int t, j;
-
-			t = IV[2 * i];
-			if ((t >= '0') && (t <= '9'))
-				j = (t - '0') << 4;
-			else if ((t >= 'a') && (t <= 'f'))
-				j = (t - 'a' + 10) << 4;
-			else if ((t >= 'A') && (t <= 'F'))
-				j = (t - 'A' + 10) << 4;
-			else
-				return BAD_CIPHER_INSTANCE;
-
-			t = IV[2 * i + 1];
-			if ((t >= '0') && (t <= '9'))
-				j ^= (t - '0');
-			else if ((t >= 'a') && (t <= 'f'))
-				j ^= (t - 'a' + 10);
-			else if ((t >= 'A') && (t <= 'F'))
-				j ^= (t - 'A' + 10);
-			else
-				return BAD_CIPHER_INSTANCE;
-
-			cipher->IV[i] = (u8) j;
-		}
-	} else {
-		memset(cipher->IV, 0, MAX_IV_SIZE);
-	}
-	return TRUE;
-}
-
-int blockEncrypt(cipherInstance * cipher, keyInstance * key,
-		BYTE * input, int inputLen, BYTE * outBuffer) {
-	int i, k, t, numBlocks;
-	u8 block[16], *iv;
-
-	if (cipher == NULL || key == NULL || key->direction == DIR_DECRYPT) {
-		return BAD_CIPHER_STATE;
-	}
-	if (input == NULL || inputLen <= 0) {
-		return 0;				/* nothing to do */
-	}
-
-	numBlocks = inputLen / 128;
-
-	switch (cipher->mode) {
-		case MODE_ECB:
-			for (i = numBlocks; i > 0; i--) {
-				rijndaelEncrypt(key->rk, key->Nr, input, outBuffer);
-				input += 16;
-				outBuffer += 16;
-			}
-			break;
-
-		case MODE_CBC:
-			iv = cipher->IV;
-			for (i = numBlocks; i > 0; i--) {
-				block[0] = input[0] ^ iv[0];
-				block[1] = input[1] ^ iv[1];
-				block[2] = input[2] ^ iv[2];
-				block[3] = input[3] ^ iv[3];
-				block[4] = input[4] ^ iv[4];
-				block[5] = input[5] ^ iv[5];
-				block[6] = input[6] ^ iv[6];
-				block[7] = input[7] ^ iv[7];
-				block[8] = input[8] ^ iv[8];
-				block[9] = input[9] ^ iv[9];
-				block[10] = input[10] ^ iv[10];
-				block[11] = input[11] ^ iv[11];
-				block[12] = input[12] ^ iv[12];
-				block[13] = input[13] ^ iv[13];
-				block[14] = input[14] ^ iv[14];
-				block[15] = input[15] ^ iv[15];
-				rijndaelEncrypt(key->rk, key->Nr, block, outBuffer);
-				iv = outBuffer;
-				input += 16;
-				outBuffer += 16;
-			}
-			break;
-
-		case MODE_CFB1:
-			iv = cipher->IV;
-			for (i = numBlocks; i > 0; i--) {
-				memcpy(outBuffer, input, 16);
-				for (k = 0; k < 128; k++) {
-					rijndaelEncrypt(key->ek, key->Nr, iv, block);
-					outBuffer[k >> 3] ^= (block[0] & 0x80U) >> (k & 7);
-					for (t = 0; t < 15; t++) {
-						iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7);
-					}
-					iv[15] = (iv[15] << 1) | ((outBuffer[k >> 3] >> (7 -
-											(k & 7))) & 1);
-				}
-				outBuffer += 16;
-				input += 16;
-			}
-			break;
-
-		default:
-			return BAD_CIPHER_STATE;
-	}
-
-	return 128 * numBlocks;
-}
-
-/**
- * Encrypt data partitioned in octets, using RFC 2040-like padding.
- *
- * @param   input           data to be encrypted (octet sequence)
- * @param   inputOctets		input length in octets (not bits)
- * @param   outBuffer       encrypted output data
- *
- * @return	length in octets (not bits) of the encrypted output buffer.
- */
-int padEncrypt(cipherInstance * cipher, keyInstance * key,
-		BYTE * input, int inputOctets, BYTE * outBuffer) {
-	int i, numBlocks, padLen;
-	u8 block[16], *iv;
-
-	if (cipher == NULL || key == NULL || key->direction == DIR_DECRYPT) {
-		return BAD_CIPHER_STATE;
-	}
-	if (input == NULL || inputOctets <= 0) {
-		return 0;				/* nothing to do */
-	}
-
-	numBlocks = inputOctets / 16;
-
-	switch (cipher->mode) {
-		case MODE_ECB:
-			for (i = numBlocks; i > 0; i--) {
-				rijndaelEncrypt(key->rk, key->Nr, input, outBuffer);
-				input += 16;
-				outBuffer += 16;
-			}
-			padLen = 16 - (inputOctets - 16 * numBlocks);
-			//      assert(padLen > 0 && padLen <= 16);
-			memcpy(block, input, 16 - padLen);
-			memset(block + 16 - padLen, padLen, padLen);
-			rijndaelEncrypt(key->rk, key->Nr, block, outBuffer);
-			break;
-
-		case MODE_CBC:
-			iv = cipher->IV;
-			for (i = numBlocks; i > 0; i--) {
-				block[0] = input[0] ^ iv[0];
-				block[1] = input[1] ^ iv[1];
-				block[2] = input[2] ^ iv[2];
-				block[3] = input[3] ^ iv[3];
-				block[4] = input[4] ^ iv[4];
-				block[5] = input[5] ^ iv[5];
-				block[6] = input[6] ^ iv[6];
-				block[7] = input[7] ^ iv[7];
-				block[8] = input[8] ^ iv[8];
-				block[9] = input[9] ^ iv[9];
-				block[10] = input[10] ^ iv[10];
-				block[11] = input[11] ^ iv[11];
-				block[12] = input[12] ^ iv[12];
-				block[13] = input[13] ^ iv[13];
-				block[14] = input[14] ^ iv[14];
-				block[15] = input[15] ^ iv[15];
-				rijndaelEncrypt(key->rk, key->Nr, block, outBuffer);
-				iv = outBuffer;
-				input += 16;
-				outBuffer += 16;
-			}
-			padLen = 16 - (inputOctets - 16 * numBlocks);
-			//      assert(padLen > 0 && padLen <= 16);
-			for (i = 0; i < 16 - padLen; i++) {
-				block[i] = input[i] ^ iv[i];
-			}
-			for (i = 16 - padLen; i < 16; i++) {
-				block[i] = (BYTE) padLen ^ iv[i];
-			}
-			rijndaelEncrypt(key->rk, key->Nr, block, outBuffer);
-			break;
-
-		default:
-			return BAD_CIPHER_STATE;
-	}
-
-	return 16 * (numBlocks + 1);
-}
-
-int blockDecrypt(cipherInstance * cipher, keyInstance * key,
-		BYTE * input, int inputLen, BYTE * outBuffer) {
-	int i, k, t, numBlocks;
-	u8 block[16], *iv;
-
-	if (cipher == NULL || key == NULL ||
-			(cipher->mode != MODE_CFB1 && key->direction == DIR_ENCRYPT)) {
-		return BAD_CIPHER_STATE;
-	}
-	if (input == NULL || inputLen <= 0) {
-		return 0;				/* nothing to do */
-	}
-
-	numBlocks = inputLen / 128;
-
-	switch (cipher->mode) {
-		case MODE_ECB:
-			for (i = numBlocks; i > 0; i--) {
-				rijndaelDecrypt(key->rk, key->Nr, input, outBuffer);
-				input += 16;
-				outBuffer += 16;
-			}
-			break;
-
-		case MODE_CBC:
-			iv = cipher->IV;
-			for (i = numBlocks; i > 0; i--) {
-				rijndaelDecrypt(key->rk, key->Nr, input, block);
-				block[0] ^= iv[0];
-				block[1] ^= iv[1];
-				block[2] ^= iv[2];
-				block[3] ^= iv[3];
-				block[4] ^= iv[4];
-				block[5] ^= iv[5];
-				block[6] ^= iv[6];
-				block[7] ^= iv[7];
-				block[8] ^= iv[8];
-				block[9] ^= iv[9];
-				block[10] ^= iv[10];
-				block[11] ^= iv[11];
-				block[12] ^= iv[12];
-				block[13] ^= iv[13];
-				block[14] ^= iv[14];
-				block[15] ^= iv[15];
-				memcpy(cipher->IV, input, 16);
-				memcpy(outBuffer, block, 16);
-				input += 16;
-				outBuffer += 16;
-			}
-			break;
-
-		case MODE_CFB1:
-			iv = cipher->IV;
-			for (i = numBlocks; i > 0; i--) {
-				memcpy(outBuffer, input, 16);
-				for (k = 0; k < 128; k++) {
-					rijndaelEncrypt(key->ek, key->Nr, iv, block);
-					for (t = 0; t < 15; t++) {
-						iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7);
-					}
-					iv[15] = (iv[15] << 1) | ((input[k >> 3] >> (7 -
-											(k & 7))) & 1);
-					outBuffer[k >> 3] ^= (block[0] & 0x80U) >> (k & 7);
-				}
-				outBuffer += 16;
-				input += 16;
-			}
-			break;
-
-		default:
-			return BAD_CIPHER_STATE;
-	}
-
-	return 128 * numBlocks;
-}
-
-int padDecrypt(cipherInstance * cipher, keyInstance * key,
-		BYTE * input, int inputOctets, BYTE * outBuffer) {
-	int i, numBlocks, padLen;
-	u8 block[16];
-
-	if (cipher == NULL || key == NULL || key->direction == DIR_ENCRYPT) {
-		return BAD_CIPHER_STATE;
-	}
-	if (input == NULL || inputOctets <= 0) {
-		return 0;				/* nothing to do */
-	}
-	if (inputOctets % 16 != 0) {
-		return BAD_DATA;
-	}
-
-	numBlocks = inputOctets / 16;
-
-	switch (cipher->mode) {
-		case MODE_ECB:
-			/* all blocks but last */
-			for (i = numBlocks - 1; i > 0; i--) {
-				rijndaelDecrypt(key->rk, key->Nr, input, outBuffer);
-				input += 16;
-				outBuffer += 16;
-			}
-			/* last block */
-			rijndaelDecrypt(key->rk, key->Nr, input, block);
-			padLen = block[15];
-			if (padLen >= 16) {
-				return BAD_DATA;
-			}
-			for (i = 16 - padLen; i < 16; i++) {
-				if (block[i] != padLen) {
-					return BAD_DATA;
-				}
-			}
-			memcpy(outBuffer, block, 16 - padLen);
-			break;
-
-		case MODE_CBC:
-			/* all blocks but last */
-			for (i = numBlocks - 1; i > 0; i--) {
-				rijndaelDecrypt(key->rk, key->Nr, input, block);
-				block[0] ^= cipher->IV[0];
-				block[1] ^= cipher->IV[1];
-				block[2] ^= cipher->IV[2];
-				block[3] ^= cipher->IV[3];
-				block[4] ^= cipher->IV[4];
-				block[5] ^= cipher->IV[5];
-				block[6] ^= cipher->IV[6];
-				block[7] ^= cipher->IV[7];
-				block[8] ^= cipher->IV[8];
-				block[9] ^= cipher->IV[9];
-				block[10] ^= cipher->IV[10];
-				block[11] ^= cipher->IV[11];
-				block[12] ^= cipher->IV[12];
-				block[13] ^= cipher->IV[13];
-				block[14] ^= cipher->IV[14];
-				block[15] ^= cipher->IV[15];
-				memcpy(cipher->IV, input, 16);
-				memcpy(outBuffer, block, 16);
-				input += 16;
-				outBuffer += 16;
-			}
-			/* last block */
-			rijndaelDecrypt(key->rk, key->Nr, input, block);
-			block[0] ^= cipher->IV[0];
-			block[1] ^= cipher->IV[1];
-			block[2] ^= cipher->IV[2];
-			block[3] ^= cipher->IV[3];
-			block[4] ^= cipher->IV[4];
-			block[5] ^= cipher->IV[5];
-			block[6] ^= cipher->IV[6];
-			block[7] ^= cipher->IV[7];
-			block[8] ^= cipher->IV[8];
-			block[9] ^= cipher->IV[9];
-			block[10] ^= cipher->IV[10];
-			block[11] ^= cipher->IV[11];
-			block[12] ^= cipher->IV[12];
-			block[13] ^= cipher->IV[13];
-			block[14] ^= cipher->IV[14];
-			block[15] ^= cipher->IV[15];
-			padLen = block[15];
-			if (padLen <= 0 || padLen > 16) {
-				return BAD_DATA;
-			}
-			for (i = 16 - padLen; i < 16; i++) {
-				if (block[i] != padLen) {
-					return BAD_DATA;
-				}
-			}
-			memcpy(outBuffer, block, 16 - padLen);
-			break;
-
-		default:
-			return BAD_CIPHER_STATE;
-	}
-
-	return 16 * numBlocks - padLen;
-}
-
-#ifdef INTERMEDIATE_VALUE_KAT
-/**
- *	cipherUpdateRounds:
- *
- *	Encrypts/Decrypts exactly one full block a specified number of rounds.
- *	Only used in the Intermediate Value Known Answer Test.	
- *
- *	Returns:
- *		TRUE - on success
- *		BAD_CIPHER_STATE - cipher in bad state (e.g., not initialized)
- */
-int cipherUpdateRounds(cipherInstance * cipher, keyInstance * key,
-		BYTE * input, int inputLen, BYTE * outBuffer, int rounds) {
-	u8 block[16];
-
-	if (cipher == NULL || key == NULL) {
-		return BAD_CIPHER_STATE;
-	}
-
-	memcpy(block, input, 16);
-
-	switch (key->direction) {
-		case DIR_ENCRYPT:
-			rijndaelEncryptRound(key->rk, key->Nr, block, rounds);
-			break;
-
-		case DIR_DECRYPT:
-			rijndaelDecryptRound(key->rk, key->Nr, block, rounds);
-			break;
-
-		default:
-			return BAD_KEY_DIR;
-	}
-
-	memcpy(outBuffer, block, 16);
-
-	return TRUE;
-}
-#endif /* INTERMEDIATE_VALUE_KAT */
diff --git a/src/dashbls/depends/relic/src/bc/rijndael-api-fst.h b/src/dashbls/depends/relic/src/bc/rijndael-api-fst.h
deleted file mode 100644
index 4bfcb0a6121c..000000000000
--- a/src/dashbls/depends/relic/src/bc/rijndael-api-fst.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * rijndael-api-fst.h
- *
- * @version 2.9 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Acknowledgements:
- *
- * We are deeply indebted to the following people for their bug reports,
- * fixes, and improvement suggestions to this implementation. Though we
- * tried to list all contributions, we apologise in advance for any
- * missing reference.
- *
- * Andrew Bales <Andrew.Bales@Honeywell.com>
- * Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
- * John Skodon <skodonj@webquill.com>
- */
-
-#ifndef __RIJNDAEL_API_FST_H
-#define __RIJNDAEL_API_FST_H
-
-#include <stdio.h>
-#include "rijndael-alg-fst.h"
-
-/*  Generic Defines  */
-#define     DIR_ENCRYPT           0 /*  Are we encrpyting?  */
-#define     DIR_DECRYPT           1 /*  Are we decrpyting?  */
-#define     MODE_ECB              1 /*  Are we ciphering in ECB mode?   */
-#define     MODE_CBC              2 /*  Are we ciphering in CBC mode?   */
-#define     MODE_CFB1             3 /*  Are we ciphering in 1-bit CFB mode? */
-#define     TRUE                  1
-#define     FALSE                 0
-#define     BITSPERBLOCK        128 /* Default number of bits in a cipher block */
-
-/*  Error Codes  */
-#define     BAD_KEY_DIR          -1 /*  Key direction is invalid, e.g., unknown value */
-#define     BAD_KEY_MAT          -2 /*  Key material not of correct length */
-#define     BAD_KEY_INSTANCE     -3 /*  Key passed is not valid */
-#define     BAD_CIPHER_MODE      -4 /*  Params struct passed to cipherInit invalid */
-#define     BAD_CIPHER_STATE     -5 /*  Cipher in wrong state (e.g., not initialized) */
-#define     BAD_BLOCK_LENGTH     -6
-#define     BAD_CIPHER_INSTANCE  -7
-#define     BAD_DATA             -8 /*  Data contents are invalid, e.g., invalid padding */
-#define     BAD_OTHER            -9 /*  Unknown error */
-
-/*  Algorithm-specific Defines  */
-#define     MAX_KEY_SIZE         64 /* # of ASCII char's needed to represent a key */
-#define     MAX_IV_SIZE          16 /* # bytes needed to represent an IV  */
-
-/*  Typedefs  */
-
-typedef unsigned char   BYTE;
-
-/*  The structure for key information */
-typedef struct {
-    BYTE  direction;                /* Key used for encrypting or decrypting? */
-    int   keyLen;                   /* Length of the key  */
-    char  keyMaterial[MAX_KEY_SIZE+1];  /* Raw key data in ASCII, e.g., user input or KAT values */
-	int   Nr;                       /* key-length-dependent number of rounds */
-	u32   rk[4*(MAXNR + 1)];        /* key schedule */
-	u32   ek[4*(MAXNR + 1)];        /* CFB1 key schedule (encryption only) */
-} keyInstance;
-
-/*  The structure for cipher information */
-typedef struct {                    /* changed order of the components */
-    BYTE  mode;                     /* MODE_ECB, MODE_CBC, or MODE_CFB1 */
-    BYTE  IV[MAX_IV_SIZE];          /* A possible Initialization Vector for ciphering */
-} cipherInstance;
-
-/*  Function prototypes  */
-
-int makeKey(keyInstance *key, BYTE direction, int keyLen, char *keyMaterial);
-
-/* FIXME: Accept the keyMaterial as a byte sequence. */
-int makeKey2(keyInstance *key, BYTE direction, int keyLen, char *keyMaterial);
-
-int cipherInit(cipherInstance *cipher, BYTE mode, char *IV);
-
-int blockEncrypt(cipherInstance *cipher, keyInstance *key,
-        BYTE *input, int inputLen, BYTE *outBuffer);
-
-int padEncrypt(cipherInstance *cipher, keyInstance *key,
-		BYTE *input, int inputOctets, BYTE *outBuffer);
-
-int blockDecrypt(cipherInstance *cipher, keyInstance *key,
-        BYTE *input, int inputLen, BYTE *outBuffer);
-
-int padDecrypt(cipherInstance *cipher, keyInstance *key,
-		BYTE *input, int inputOctets, BYTE *outBuffer);
-
-#ifdef INTERMEDIATE_VALUE_KAT
-int cipherUpdateRounds(cipherInstance *cipher, keyInstance *key,
-        BYTE *input, int inputLen, BYTE *outBuffer, int Rounds);
-#endif /* INTERMEDIATE_VALUE_KAT */
-
-#endif /* __RIJNDAEL_API_FST_H */
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_add.c b/src/dashbls/depends/relic/src/bn/relic_bn_add.c
deleted file mode 100644
index be62c3f694e2..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_add.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision addition and subtraction functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Adds two multiple precision integers, where a >= b.
- *
- * @param[out] c        - the result.
- * @param[in] a         - the first multiple precision integer to add.
- * @param[in] b         - the second multiple precision integer to add.
- */
-static void bn_add_imp(bn_t c, const bn_t a, const bn_t b) {
-	int max, min;
-	dig_t carry;
-
-	max = a->used;
-	min = b->used;
-
-	if (min == 0) {
-		bn_copy(c, a);
-		return;
-	}
-
-	RLC_TRY {
-		/* Grow the result. */
-		bn_grow(c, max);
-
-		if (a->used == b->used) {
-			carry = bn_addn_low(c->dp, a->dp, b->dp, max);
-		} else {
-			carry = bn_addn_low(c->dp, a->dp, b->dp, min);
-			carry = bn_add1_low(c->dp + min, a->dp + min, carry, max - min);
-		}
-		if (carry) {
-			bn_grow(c, max + 1);
-			c->dp[max] = carry;
-		}
-		c->used = max + carry;
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-/**
- * Subtracts two multiple precision integers, where a >= b.
- *
- * @param[out] c        - the result.
- * @param[in] a         - the first multiple precision integer to subtract.
- * @param[in] b         - the second multiple precision integer to subtract.
- */
-static void bn_sub_imp(bn_t c, const bn_t a, const bn_t b) {
-	int max, min;
-	dig_t carry;
-
-	max = a->used;
-	min = b->used;
-
-	if (min == 0) {
-		bn_copy(c, a);
-		return;
-	}
-
-	RLC_TRY {
-		/* Grow the destination to accomodate the result. */
-		bn_grow(c, max);
-
-		if (a->used == b->used) {
-			carry = bn_subn_low(c->dp, a->dp, b->dp, min);
-		} else {
-			carry = bn_subn_low(c->dp, a->dp, b->dp, min);
-			carry = bn_sub1_low(c->dp + min, a->dp + min, carry, max - min);
-		}
-		c->used = max;
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_add(bn_t c, const bn_t a, const bn_t b) {
-	int sa, sb;
-
-	sa = a->sign;
-	sb = b->sign;
-
-	if (sa == sb) {
-		/* If the signs are equal, copy the sign and add. */
-		c->sign = sa;
-		if (bn_cmp_abs(a, b) == RLC_LT) {
-			bn_add_imp(c, b, a);
-		} else {
-			bn_add_imp(c, a, b);
-		}
-	} else {
-		/* If the signs are different, subtract. */
-		if (bn_cmp_abs(a, b) == RLC_LT) {
-			bn_sub_imp(c, b, a);
-			c->sign = sb;
-		} else {
-			bn_sub_imp(c, a, b);
-			c->sign = sa;
-		}
-	}
-}
-
-void bn_add_dig(bn_t c, const bn_t a, dig_t b) {
-	dig_t carry;
-
-	RLC_TRY {
-		bn_grow(c, a->used);
-
-		if (a->sign == RLC_POS) {
-			carry = bn_add1_low(c->dp, a->dp, b, a->used);
-			if (carry) {
-				bn_grow(c, a->used + 1);
-				c->dp[a->used] = carry;
-			}
-			c->used = a->used + carry;
-			c->sign = RLC_POS;
-		} else {
-			/* If a < 0 && |a| >= b, compute c = -(|a| - b). */
-			if (a->used > 1 || a->dp[0] >= b) {
-				carry = bn_sub1_low(c->dp, a->dp, b, a->used);
-				c->used = a->used;
-				c->sign = RLC_NEG;
-			} else {
-				/* If a < 0 && |a| < b. */
-				if (a->used == 1) {
-					c->dp[0] = b - a->dp[0];
-				} else {
-					c->dp[0] = b;
-				}
-				c->used = 1;
-				c->sign = RLC_POS;
-			}
-		}
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-void bn_sub(bn_t c, const bn_t a, const bn_t b) {
-	int sa, sb;
-
-	sa = a->sign;
-	sb = b->sign;
-
-	if (sa != sb) {
-		/* If the signs are different, copy the sign of the first number and
-		 * add. */
-		c->sign = sa;
-		if (bn_cmp_abs(a, b) == RLC_LT) {
-			bn_add_imp(c, b, a);
-		} else {
-			bn_add_imp(c, a, b);
-		}
-	} else {
-		/* If the signs are equal, adjust the sign and subtract. */
-		if (bn_cmp_abs(a, b) != RLC_LT) {
-			bn_sub_imp(c, a, b);
-			c->sign = sa;
-		} else {
-			bn_sub_imp(c, b, a);
-			c->sign = (sa == RLC_POS) ? RLC_NEG : RLC_POS;
-		}
-	}
-}
-
-void bn_sub_dig(bn_t c, const bn_t a, dig_t b) {
-	dig_t carry;
-
-	RLC_TRY {
-		bn_grow(c, a->used);
-
-		/* If a < 0, compute c = -(|a| + b). */
-		if (a->sign == RLC_NEG) {
-			carry = bn_add1_low(c->dp, a->dp, b, a->used);
-			if (carry) {
-				bn_grow(c, a->used + 1);
-				c->dp[a->used] = carry;
-			}
-			c->used = a->used + carry;
-			c->sign = RLC_NEG;
-		} else {
-			/* If a > 0 && |a| >= b, compute c = (|a| - b). */
-			if (a->used > 1 || a->dp[0] >= b) {
-				carry = bn_sub1_low(c->dp, a->dp, b, a->used);
-				c->used = a->used;
-				c->sign = RLC_POS;
-			} else {
-				/* If a > 0 && a < b. */
-				if (a->used == 1) {
-					c->dp[0] = b - a->dp[0];
-				} else {
-					c->dp[0] = b;
-				}
-				c->used = 1;
-				c->sign = RLC_NEG;
-			}
-		}
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_cmp.c b/src/dashbls/depends/relic/src/bn/relic_bn_cmp.c
deleted file mode 100644
index 2ac8fc73d4a7..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_cmp.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision comparison functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int bn_cmp_abs(const bn_t a, const bn_t b) {
-	if (bn_is_zero(a) && bn_is_zero(b)) {
-		return RLC_EQ;
-	}
-
-	if (a->used > b->used) {
-		return RLC_GT;
-	}
-
-	if (a->used < b->used) {
-		return RLC_LT;
-	}
-
-	return dv_cmp(a->dp, b->dp, a->used);
-}
-
-int bn_cmp_dig(const bn_t a, dig_t b) {
-	if (a->sign == RLC_NEG) {
-		return RLC_LT;
-	}
-
-	if (a->used > 1) {
-		return RLC_GT;
-	}
-
-	if (a->dp[0] > b) {
-		return RLC_GT;
-	}
-
-	if (a->dp[0] < b) {
-		return RLC_LT;
-	}
-
-	return RLC_EQ;
-}
-
-int bn_cmp(const bn_t a, const bn_t b) {
-	if (bn_is_zero(a) && bn_is_zero(b)) {
-		return RLC_EQ;
-	}
-
-	if (a->sign == RLC_POS && b->sign == RLC_NEG) {
-		return RLC_GT;
-	}
-	if (a->sign == RLC_NEG && b->sign == RLC_POS) {
-		return RLC_LT;
-	}
-
-	if (a->sign == RLC_NEG) {
-		return bn_cmp_abs(b, a);
-	}
-
-	return bn_cmp_abs(a, b);
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_div.c b/src/dashbls/depends/relic/src/bn/relic_bn_div.c
deleted file mode 100644
index dc12f7363847..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_div.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision division functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Divides two multiple precision integers, computing the quotient and the
- * remainder.
- *
- * @param[out] c		- the quotient.
- * @param[out] d		- the remainder.
- * @param[in] a			- the dividend.
- * @param[in] b			- the the divisor.
- */
-static void bn_div_imp(bn_t c, bn_t d, const bn_t a, const bn_t b) {
-	bn_t q, x, y, r;
-	int sign;
-
-	bn_null(q);
-	bn_null(x);
-	bn_null(y);
-	bn_null(r);
-
-	/* If |a| < |b|, we're done. */
-	if (bn_cmp_abs(a, b) == RLC_LT) {
-		if (bn_sign(a) == bn_sign(b)) {
-			if (c != NULL) {
-				bn_zero(c);
-			}
-			if (d != NULL) {
-				bn_copy(d, a);
-			}
-		} else {
-			if (c != NULL) {
-				bn_set_dig(c, 1);
-				bn_neg(c, c);
-			}
-			if (d != NULL) {
-				bn_add(d, a, b);
-			}
-		}
-		return;
-	}
-
-	RLC_TRY {
-		/* Be conservative about space for scratch memory, many attempts to
-		 * optimize these had invalid reads. */
-		bn_new_size(x, a->used + 1);
-		bn_new_size(q, a->used + 1);
-		bn_new_size(y, a->used + 1);
-		bn_new_size(r, a->used + 1);
-		bn_zero(q);
-		bn_zero(r);
-		bn_abs(x, a);
-		bn_abs(y, b);
-
-		/* Find the sign. */
-		sign = (a->sign == b->sign ? RLC_POS : RLC_NEG);
-
-		bn_divn_low(q->dp, r->dp, x->dp, a->used, y->dp, b->used);
-
-		q->used = a->used - b->used + 1;
-		q->sign = sign;
-		bn_trim(q);
-
-		r->used = b->used;
-		r->sign = b->sign;
-		bn_trim(r);
-
-		/* We have the quotient in q and the remainder in r. */
-		if (c != NULL) {
-			if ((bn_is_zero(r)) || (bn_sign(a) == bn_sign(b))) {
-				bn_copy(c, q);
-			} else {
-				bn_sub_dig(c, q, 1);
-			}
-		}
-
-		if (d != NULL) {
-			if ((bn_is_zero(r)) || (bn_sign(a) == bn_sign(b))) {
-				bn_copy(d, r);
-			} else {
-				bn_sub(d, b, r);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r);
-		bn_free(q);
-		bn_free(x);
-		bn_free(y);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_div(bn_t c, const bn_t a, const bn_t b) {
-	if (bn_is_zero(b)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	bn_div_imp(c, NULL, a, b);
-}
-
-void bn_div_rem(bn_t c, bn_t d, const bn_t a, const bn_t b) {
-	if (bn_is_zero(b)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	bn_div_imp(c, d, a, b);
-}
-
-void bn_div_dig(bn_t c, const bn_t a, dig_t b) {
-	bn_t q;
-	dig_t r;
-
-	bn_null(q);
-
-	if (b == 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (b == 1 || bn_is_zero(a) == 1) {
-		if (c != NULL) {
-			bn_copy(c, a);
-		}
-		return;
-	}
-
-	RLC_TRY {
-		bn_new_size(q, a->used);
-		bn_div1_low(q->dp, &r, (const dig_t *)a->dp, a->used, b);
-
-		if (c != NULL) {
-			q->used = a->used;
-			q->sign = a->sign;
-			bn_trim(q);
-			bn_copy(c, q);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(q);
-	}
-}
-
-void bn_div_rem_dig(bn_t c, dig_t *d, const bn_t a, dig_t b) {
-	bn_t q;
-	dig_t r;
-
-	bn_null(q);
-
-	if (b == 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (b == 1 || bn_is_zero(a) == 1) {
-		if (d != NULL) {
-			*d = 0;
-		}
-		if (c != NULL) {
-			bn_copy(c, a);
-		}
-		return;
-	}
-
-	RLC_TRY {
-		bn_new_size(q, a->used);
-		bn_div1_low(q->dp, &r, (const dig_t *)a->dp, a->used, b);
-
-		if (c != NULL) {
-			q->used = a->used;
-			q->sign = a->sign;
-			bn_trim(q);
-			bn_copy(c, q);
-		}
-
-		if (d != NULL) {
-			*d = r;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(q);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_factor.c b/src/dashbls/depends/relic/src/bn/relic_bn_factor.c
deleted file mode 100644
index 52ffa8f3093c..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_factor.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of prime factorization algorithms.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int bn_factor(bn_t c, const bn_t a) {
-	bn_t t0, t1;
-	int result;
-	unsigned int i, tests;
-
-	bn_null(t0);
-	bn_null(t1);
-
-	result = 1;
-
-	if (bn_is_even(a)) {
-		bn_set_dig(c, 2);
-		return 1;
-	}
-
-	RLC_TRY {
-		bn_new(t0);
-		bn_new(t1);
-
-		bn_set_dig(t0, 2);
-
-#if WSIZE == 8
-		tests = 255;
-#else
-		tests = 65535;
-#endif
-		for (i = 2; i < tests; i++) {
-			bn_set_dig(t1, i);
-			bn_mxp(t0, t0, t1, a);
-		}
-
-		bn_sub_dig(t0, t0, 1);
-		bn_gcd(t1, t0, a);
-		if (bn_cmp_dig(t1, 1) == RLC_GT && bn_cmp(t1, a) == RLC_LT) {
-			bn_copy(c, t1);
-		} else {
-			result = 0;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t0);
-		bn_free(t1);
-	}
-	return result;
-}
-
-int bn_is_factor(bn_t c, const bn_t a) {
-	bn_t t;
-	int result;
-
-	bn_null(t);
-	result = 1;
-
-	RLC_TRY {
-		bn_new(t);
-
-		bn_mod(t, a, c);
-
-		if (!bn_is_zero(t)) {
-			result = 0;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_gcd.c b/src/dashbls/depends/relic/src/bn/relic_bn_gcd.c
deleted file mode 100644
index 27fd4197a302..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_gcd.c
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision addition and subtraction functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if BN_GCD == BASIC || !defined(STRIP)
-
-void bn_gcd_basic(bn_t c, const bn_t a, const bn_t b) {
-	bn_t u, v;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		return;
-	}
-
-	bn_null(u);
-	bn_null(v);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-
-		bn_abs(u, a);
-		bn_abs(v, b);
-		while (!bn_is_zero(v)) {
-			bn_copy(c, v);
-			bn_mod(v, u, v);
-			bn_copy(u, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-	}
-}
-
-void bn_gcd_ext_basic(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b) {
-	bn_t u, v, x_1, y_1, q, r;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		bn_zero(d);
-		if (e != NULL) {
-			bn_set_dig(e, 1);
-		}
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		bn_set_dig(d, 1);
-		if (e != NULL) {
-			bn_zero(e);
-		}
-		return;
-	}
-
-	bn_null(u);
-	bn_null(v);
-	bn_null(x_1);
-	bn_null(y_1);
-	bn_null(q);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-		bn_new(x_1);
-		bn_new(y_1);
-		bn_new(q);
-		bn_new(r);
-
-		bn_abs(u, a);
-		bn_abs(v, b);
-
-		bn_zero(x_1);
-		bn_set_dig(y_1, 1);
-
-		if (e != NULL) {
-			bn_set_dig(d, 1);
-			bn_zero(e);
-
-			while (!bn_is_zero(v)) {
-				bn_div_rem(q, r, u, v);
-
-				bn_copy(u, v);
-				bn_copy(v, r);
-
-				bn_mul(c, q, x_1);
-				bn_sub(r, d, c);
-				bn_copy(d, x_1);
-				bn_copy(x_1, r);
-
-				bn_mul(c, q, y_1);
-				bn_sub(r, e, c);
-				bn_copy(e, y_1);
-				bn_copy(y_1, r);
-			}
-		} else {
-			bn_set_dig(d, 1);
-
-			while (!bn_is_zero(v)) {
-				bn_div_rem(q, r, u, v);
-
-				bn_copy(u, v);
-				bn_copy(v, r);
-
-				bn_mul(c, q, x_1);
-				bn_sub(r, d, c);
-				bn_copy(d, x_1);
-				bn_copy(x_1, r);
-			}
-		}
-		bn_copy(c, u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-		bn_free(x_1);
-		bn_free(y_1);
-		bn_free(q);
-		bn_free(r);
-	}
-}
-
-#endif
-
-#if BN_GCD == LEHME || !defined(STRIP)
-
-void bn_gcd_lehme(bn_t c, const bn_t a, const bn_t b) {
-	bn_t x, y, u, v, t0, t1, t2, t3;
-	dig_t _x, _y, q, _q, t, _t;
-	dis_t _a, _b, _c, _d;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		return;
-	}
-
-	bn_null(x);
-	bn_null(y);
-	bn_null(u);
-	bn_null(v);
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(t2);
-	bn_null(t3);
-
-	/*
-	 * Taken from Handbook of Hyperelliptic and Elliptic Cryptography.
-	 */
-	RLC_TRY {
-		bn_new(x);
-		bn_new(y);
-		bn_new(u);
-		bn_new(v);
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(t2);
-		bn_new(t3);
-
-		if (bn_cmp(a, b) == RLC_GT) {
-			bn_abs(x, a);
-			bn_abs(y, b);
-		} else {
-			bn_abs(x, b);
-			bn_abs(y, a);
-		}
-		while (y->used > 1) {
-			bn_rsh(u, x, bn_bits(x) - RLC_DIG);
-			_x = u->dp[0];
-			bn_rsh(v, y, bn_bits(x) - RLC_DIG);
-			_y = v->dp[0];
-			_a = _d = 1;
-			_b = _c = 0;
-			t = 0;
-			if (_y != 0) {
-				q = _x / _y;
-				t = _x % _y;
-			}
-			if (t >= ((dig_t)1 << (RLC_DIG / 2))) {
-				while (1) {
-					_q = _y / t;
-					_t = _y % t;
-					if (_t < ((dig_t)1 << (RLC_DIG / 2))) {
-						break;
-					}
-					_x = _y;
-					_y = t;
-					t = _a - q * _c;
-					_a = _c;
-					_c = t;
-					t = _b - q * _d;
-					_b = _d;
-					_d = t;
-					t = _t;
-					q = _q;
-				}
-			}
-			if (_b == 0) {
-				bn_mod(t0, x, y);
-				bn_copy(x, y);
-				bn_copy(y, t0);
-			} else {
-				bn_rsh(u, x, bn_bits(x) - 2 * RLC_DIG);
-				bn_rsh(v, y, bn_bits(x) - 2 * RLC_DIG);
-				if (_a < 0) {
-					bn_mul_dig(t0, u, -_a);
-					bn_neg(t0, t0);
-				} else {
-					bn_mul_dig(t0, u, _a);
-				}
-				if (_b < 0) {
-					bn_mul_dig(t1, v, -_b);
-					bn_neg(t1, t1);
-				} else {
-					bn_mul_dig(t1, v, _b);
-				}
-				if (_c < 0) {
-					bn_mul_dig(t2, u, -_c);
-					bn_neg(t2, t2);
-				} else {
-					bn_mul_dig(t2, u, _c);
-				}
-				if (_d < 0) {
-					bn_mul_dig(t3, v, -_d);
-					bn_neg(t3, t3);
-				} else {
-					bn_mul_dig(t3, v, _d);
-				}
-				bn_add(u, t0, t1);
-				bn_add(v, t2, t3);
-				bn_rsh(t0, u, bn_bits(u) - RLC_DIG);
-				_x = t0->dp[0];
-				bn_rsh(t1, v, bn_bits(u) - RLC_DIG);
-				_y = t1->dp[0];
-				t = 0;
-				if (_y != 0) {
-					q = _x / _y;
-					t = _x % _y;
-				}
-				if (t >= ((dig_t)1 << RLC_DIG / 2)) {
-					while (1) {
-						_q = _y / t;
-						_t = _y % t;
-						if (_t < ((dig_t)1 << RLC_DIG / 2)) {
-							break;
-						}
-						_x = _y;
-						_y = t;
-						t = _a - q * _c;
-						_a = _c;
-						_c = t;
-						t = _b - q * _d;
-						_b = _d;
-						_d = t;
-						t = _t;
-						q = _q;
-					}
-				}
-				if (_a < 0) {
-					bn_mul_dig(t0, x, -_a);
-					bn_neg(t0, t0);
-				} else {
-					bn_mul_dig(t0, x, _a);
-				}
-				if (_b < 0) {
-					bn_mul_dig(t1, y, -_b);
-					bn_neg(t1, t1);
-				} else {
-					bn_mul_dig(t1, y, _b);
-				}
-				if (_c < 0) {
-					bn_mul_dig(t2, x, -_c);
-					bn_neg(t2, t2);
-				} else {
-					bn_mul_dig(t2, x, _c);
-				}
-				if (_d < 0) {
-					bn_mul_dig(t3, y, -_d);
-					bn_neg(t3, t3);
-				} else {
-					bn_mul_dig(t3, y, _d);
-				}
-				bn_add(x, t0, t1);
-				bn_add(y, t2, t3);
-			}
-		}
-		bn_gcd_ext_dig(c, u, v, x, y->dp[0]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		bn_free(y);
-		bn_free(u);
-		bn_free(v);
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(t2);
-		bn_free(t3);
-	}
-}
-
-void bn_gcd_ext_lehme(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b) {
-	bn_t x, y, u, v, t0, t1, t2, t3, t4;
-	dig_t _x, _y, q, _q, t, _t;
-	dis_t _a, _b, _c, _d;
-	int swap;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		bn_zero(d);
-		if (e != NULL) {
-			bn_set_dig(e, 1);
-		}
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		bn_set_dig(d, 1);
-		if (e != NULL) {
-			bn_zero(e);
-		}
-		return;
-	}
-
-	bn_null(x);
-	bn_null(y);
-	bn_null(u);
-	bn_null(v);
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(t2);
-	bn_null(t3);
-	bn_null(t4);
-
-	/*
-	 * Taken from Handbook of Hyperelliptic and Elliptic Cryptography.
-	 */
-	RLC_TRY {
-		bn_new(x);
-		bn_new(y);
-		bn_new(u);
-		bn_new(v);
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(t2);
-		bn_new(t3);
-		bn_new(t4);
-
-		if (bn_cmp(a, b) != RLC_LT) {
-			bn_abs(x, a);
-			bn_abs(y, b);
-			swap = 0;
-		} else {
-			bn_abs(x, b);
-			bn_abs(y, a);
-			swap = 1;
-		}
-
-		bn_zero(t4);
-		bn_set_dig(d, 1);
-
-		while (y->used > 1) {
-			bn_rsh(u, x, bn_bits(x) - RLC_DIG);
-			_x = u->dp[0];
-			bn_rsh(v, y, bn_bits(x) - RLC_DIG);
-			_y = v->dp[0];
-			_a = _d = 1;
-			_b = _c = 0;
-			t = 0;
-			if (_y != 0) {
-				q = _x / _y;
-				t = _x % _y;
-			}
-			if (t >= ((dig_t)1 << (RLC_DIG / 2))) {
-				while (1) {
-					_q = _y / t;
-					_t = _y % t;
-					if (_t < ((dig_t)1 << (RLC_DIG / 2))) {
-						break;
-					}
-					_x = _y;
-					_y = t;
-					t = _a - q * _c;
-					_a = _c;
-					_c = t;
-					t = _b - q * _d;
-					_b = _d;
-					_d = t;
-					t = _t;
-					q = _q;
-				}
-			}
-			if (_b == 0) {
-				bn_div_rem(t1, t0, x, y);
-				bn_copy(x, y);
-				bn_copy(y, t0);
-				bn_mul(t1, t1, d);
-				bn_sub(t1, t4, t1);
-				bn_copy(t4, d);
-				bn_copy(d, t1);
-			} else {
-				bn_rsh(u, x, bn_bits(x) - 2 * RLC_DIG);
-				bn_rsh(v, y, bn_bits(x) - 2 * RLC_DIG);
-				if (_a < 0) {
-					bn_mul_dig(t0, u, -_a);
-					bn_neg(t0, t0);
-				} else {
-					bn_mul_dig(t0, u, _a);
-				}
-				if (_b < 0) {
-					bn_mul_dig(t1, v, -_b);
-					bn_neg(t1, t1);
-				} else {
-					bn_mul_dig(t1, v, _b);
-				}
-				if (_c < 0) {
-					bn_mul_dig(t2, u, -_c);
-					bn_neg(t2, t2);
-				} else {
-					bn_mul_dig(t2, u, _c);
-				}
-				if (_d < 0) {
-					bn_mul_dig(t3, v, -_d);
-					bn_neg(t3, t3);
-				} else {
-					bn_mul_dig(t3, v, _d);
-				}
-				bn_add(u, t0, t1);
-				bn_add(v, t2, t3);
-				bn_rsh(t0, u, bn_bits(u) - RLC_DIG);
-				_x = t0->dp[0];
-				bn_rsh(t1, v, bn_bits(u) - RLC_DIG);
-				_y = t1->dp[0];
-				t = 0;
-				if (_y != 0) {
-					q = _x / _y;
-					t = _x % _y;
-				}
-				if (t >= ((dig_t)1 << RLC_DIG / 2)) {
-					while (1) {
-						_q = _y / t;
-						_t = _y % t;
-						if (_t < ((dig_t)1 << RLC_DIG / 2)) {
-							break;
-						}
-						_x = _y;
-						_y = t;
-						t = _a - q * _c;
-						_a = _c;
-						_c = t;
-						t = _b - q * _d;
-						_b = _d;
-						_d = t;
-						t = _t;
-						q = _q;
-					}
-				}
-				if (_a < 0) {
-					bn_mul_dig(t0, x, -_a);
-					bn_neg(t0, t0);
-				} else {
-					bn_mul_dig(t0, x, _a);
-				}
-				if (_b < 0) {
-					bn_mul_dig(t1, y, -_b);
-					bn_neg(t1, t1);
-				} else {
-					bn_mul_dig(t1, y, _b);
-				}
-				if (_c < 0) {
-					bn_mul_dig(t2, x, -_c);
-					bn_neg(t2, t2);
-				} else {
-					bn_mul_dig(t2, x, _c);
-				}
-				if (_d < 0) {
-					bn_mul_dig(t3, y, -_d);
-					bn_neg(t3, t3);
-				} else {
-					bn_mul_dig(t3, y, _d);
-				}
-				bn_add(x, t0, t1);
-				bn_add(y, t2, t3);
-
-				if (_a < 0) {
-					bn_mul_dig(t0, t4, -_a);
-					bn_neg(t0, t0);
-				} else {
-					bn_mul_dig(t0, t4, _a);
-				}
-				if (_b < 0) {
-					bn_mul_dig(t1, d, -_b);
-					bn_neg(t1, t1);
-				} else {
-					bn_mul_dig(t1, d, _b);
-				}
-				if (_c < 0) {
-					bn_mul_dig(t2, t4, -_c);
-					bn_neg(t2, t2);
-				} else {
-					bn_mul_dig(t2, t4, _c);
-				}
-				if (_d < 0) {
-					bn_mul_dig(t3, d, -_d);
-					bn_neg(t3, t3);
-				} else {
-					bn_mul_dig(t3, d, _d);
-				}
-				bn_add(t4, t0, t1);
-				bn_add(d, t2, t3);
-			}
-		}
-		bn_gcd_ext_dig(c, u, v, x, y->dp[0]);
-		if (!swap) {
-			bn_mul(t0, t4, u);
-			bn_mul(t1, d, v);
-			bn_add(t4, t0, t1);
-			bn_mul(x, b, t4);
-			bn_sub(x, c, x);
-			bn_div(d, x, a);
-		} else {
-			bn_mul(t0, t4, u);
-			bn_mul(t1, d, v);
-			bn_add(d, t0, t1);
-			bn_mul(x, a, d);
-			bn_sub(x, c, x);
-			bn_div(t4, x, b);
-		}
-		if (e != NULL) {
-			bn_copy(e, t4);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		bn_free(y);
-		bn_free(u);
-		bn_free(v);
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(t2);
-		bn_free(t3);
-		bn_free(t4);
-	}
-}
-
-#endif
-
-#if BN_GCD == STEIN || !defined(STRIP)
-
-void bn_gcd_stein(bn_t c, const bn_t a, const bn_t b) {
-	bn_t u, v, t;
-	int shift;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		return;
-	}
-
-	bn_null(u);
-	bn_null(v);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-		bn_new(t);
-
-		bn_abs(u, a);
-		bn_abs(v, b);
-
-		shift = 0;
-		while (bn_is_even(u) && bn_is_even(v)) {
-			bn_hlv(u, u);
-			bn_hlv(v, v);
-			shift++;
-		}
-		while (!bn_is_zero(u)) {
-			while (bn_is_even(u)) {
-				bn_hlv(u, u);
-			}
-			while (bn_is_even(v)) {
-				bn_hlv(v, v);
-			}
-			bn_sub(t, u, v);
-			bn_abs(t, t);
-			bn_hlv(t, t);
-			if (bn_cmp(u, v) != RLC_LT) {
-				bn_copy(u, t);
-			} else {
-				bn_copy(v, t);
-			}
-		}
-		bn_lsh(c, v, shift);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-		bn_free(t);
-	}
-}
-
-void bn_gcd_ext_stein(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b) {
-	bn_t x, y, u, v, _a, _b, _e;
-	int shift, found;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		bn_zero(d);
-		if (e != NULL) {
-			bn_set_dig(e, 1);
-		}
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		bn_set_dig(d, 1);
-		if (e != NULL) {
-			bn_zero(e);
-		}
-		return;
-	}
-
-	bn_null(x);
-	bn_null(y);
-	bn_null(u);
-	bn_null(v);
-	bn_null(_a);
-	bn_null(_b);
-	bn_null(_e);
-
-	RLC_TRY {
-		bn_new(x);
-		bn_new(y);
-		bn_new(u);
-		bn_new(v);
-		bn_new(_a);
-		bn_new(_b);
-		bn_new(_e);
-
-		bn_abs(x, a);
-		bn_abs(y, b);
-
-		/* g = 1. */
-		shift = 0;
-		/* While x and y are both even, x = x/2 and y = y/2, g = 2g. */
-		while (bn_is_even(x) && bn_is_even(y)) {
-			bn_hlv(x, x);
-			bn_hlv(y, y);
-			shift++;
-		}
-
-		bn_copy(u, x);
-		bn_copy(v, y);
-
-		/* u = x, y = v, A = 1, B = 0, C = 0, D = 1. */
-		bn_set_dig(_a, 1);
-		bn_zero(_b);
-		bn_zero(d);
-		bn_set_dig(_e, 1);
-
-		found = 0;
-		while (!found) {
-			/* While u is even, u = u/2. */
-			while ((u->dp[0] & 0x01) == 0) {
-				bn_hlv(u, u);
-				/* If A = B = 0 (mod 2) then A = A/2, B = B/2. */
-				if ((_a->dp[0] & 0x01) == 0 && (_b->dp[0] & 0x01) == 0) {
-					bn_hlv(_a, _a);
-					bn_hlv(_b, _b);
-				} else {
-					/* Otherwise A = (A + y)/2, B = (B - x)/2. */
-					bn_add(_a, _a, y);
-					bn_hlv(_a, _a);
-					bn_sub(_b, _b, x);
-					bn_hlv(_b, _b);
-				}
-			}
-			/* While v is even, v = v/2. */
-			while ((v->dp[0] & 0x01) == 0) {
-				bn_hlv(v, v);
-				/* If C = D = 0 (mod 2) then C = C/2, D = D/2. */
-				if ((d->dp[0] & 0x01) == 0 && (_e->dp[0] & 0x01) == 0) {
-					bn_hlv(d, d);
-					bn_hlv(_e, _e);
-				} else {
-					/* Otherwise C = (C + y)/2, D = (D - x)/2. */
-					bn_add(d, d, y);
-					bn_hlv(d, d);
-					bn_sub(_e, _e, x);
-					bn_hlv(_e, _e);
-				}
-			}
-			/* If u >= v then u = u - v, A = A - C, B = B - D. */
-			if (bn_cmp(u, v) != RLC_LT) {
-				bn_sub(u, u, v);
-				bn_sub(_a, _a, d);
-				bn_sub(_b, _b, _e);
-			} else {
-				/* Otherwise, v = v - u, C = C - a, D = D - B. */
-				bn_sub(v, v, u);
-				bn_sub(d, d, _a);
-				bn_sub(_e, _e, _b);
-			}
-			/* If u = 0 then d = C, e = D and return (d, e, g * v). */
-			if (bn_is_zero(u)) {
-				bn_lsh(c, v, shift);
-				found = 1;
-			}
-		}
-		if (e != NULL) {
-			bn_copy(e, _e);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		bn_free(y);
-		bn_free(u);
-		bn_free(v);
-		bn_free(_a);
-		bn_free(_b);
-		bn_free(_e);
-	}
-}
-
-#endif
-
-void bn_gcd_ext_mid(bn_t c, bn_t d, bn_t e, bn_t f, const bn_t a, const bn_t b) {
-	bn_t p, q, r, s, t, u, v, x, w, y, z;
-
-	if (bn_is_zero(a)) {
-		bn_abs(c, b);
-		bn_zero(d);
-		bn_zero(e);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_abs(c, a);
-		bn_set_dig(d, 1);
-		bn_set_dig(e, 1);
-		return;
-	}
-
-	bn_null(q);
-	bn_null(r);
-	bn_null(s);
-	bn_null(t);
-	bn_null(u);
-	bn_null(v);
-	bn_null(x);
-	bn_null(w);
-	bn_null(y);
-	bn_null(z);
-
-	RLC_TRY {
-		bn_new(p);
-		bn_new(q);
-		bn_new(r);
-		bn_new(s);
-		bn_new(t);
-		bn_new(u);
-		bn_new(v);
-		bn_new(x);
-		bn_new(w);
-		bn_new(y);
-		bn_new(z);
-
-		if (bn_cmp_abs(a, b) == RLC_GT) {
-			bn_abs(u, a);
-			bn_abs(v, b);
-		} else {
-			bn_abs(u, b);
-			bn_abs(v, a);
-		}
-
-		bn_srt(p, u);
-
-		bn_set_dig(x, 1);
-		bn_zero(t);
-
-		int wait = 0;
-		while (!bn_is_zero(v)) {
-			bn_div_rem(q, r, u, v);
-
-			bn_copy(u, v);
-			bn_copy(v, r);
-
-			bn_mul(s, q, x);
-			bn_sub(s, t, s);
-			bn_copy(t, x);
-			bn_copy(x, s);
-
-			if (wait) {
-				bn_copy(e, r);
-				bn_neg(f, x);
-				wait = 0;
-			}
-			if (bn_cmp(u, p) != RLC_LT) {
-				bn_copy(c, r);
-				bn_neg(d, x);
-				bn_copy(w, u);
-				bn_neg(y, t);
-				wait = 1;
-			}
-		}
-		/* Compute r as the norm of vector (w, y). */
-		bn_sqr(s, w);
-		bn_sqr(t, y);
-		bn_add(t, t, s);
-
-		/* Compute q as the norm of vector (e, f). */
-		bn_sqr(r, e);
-		bn_sqr(q, f);
-		bn_add(q, q, r);
-
-		/* Output (e, f) as the vector of smaller norm. */
-		if (bn_cmp(t, q) == RLC_LT) {
-			bn_copy(e, w);
-			bn_copy(f, y);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(p);
-		bn_free(q);
-		bn_free(r);
-		bn_free(s);
-		bn_free(t);
-		bn_free(u);
-		bn_free(v);
-		bn_free(x);
-		bn_free(w);
-		bn_free(y);
-		bn_free(z);
-	}
-}
-
-void bn_gcd_dig(bn_t c, const bn_t a, dig_t b) {
-	dig_t _u, _v, _t = 0;
-
-	if (bn_is_zero(a)) {
-		bn_set_dig(c, b);
-		return;
-	}
-
-	if (b == 0) {
-		bn_abs(c, a);
-		return;
-	}
-
-	bn_mod_dig(&(c->dp[0]), a, b);
-	_v = c->dp[0];
-	_u = b;
-	while (_v != 0) {
-		_t = _v;
-		_v = _u % _v;
-		_u = _t;
-	}
-	bn_set_dig(c, _u);
-}
-
-void bn_gcd_ext_dig(bn_t c, bn_t d, bn_t e, const bn_t a, const dig_t b) {
-	bn_t u, v, x1, y1, q, r;
-	dig_t _v, _q, _t, _u;
-
-	if (d == NULL && e == NULL) {
-		bn_gcd_dig(c, a, b);
-		return;
-	}
-
-	if (bn_is_zero(a)) {
-		bn_set_dig(c, b);
-		bn_zero(d);
-		if (e != NULL) {
-			bn_set_dig(e, 1);
-		}
-		return;
-	}
-
-	if (b == 0) {
-		bn_abs(c, a);
-		bn_set_dig(d, 1);
-		if (e != NULL) {
-			bn_zero(e);
-		}
-		return;
-	}
-
-	bn_null(u);
-	bn_null(v);
-	bn_null(x1);
-	bn_null(y1);
-	bn_null(q);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-		bn_new(x1);
-		bn_new(y1);
-		bn_new(q);
-		bn_new(r);
-
-		bn_abs(u, a);
-		bn_set_dig(v, b);
-
-		bn_zero(x1);
-		bn_set_dig(y1, 1);
-		bn_set_dig(d, 1);
-
-		if (e != NULL) {
-			bn_zero(e);
-		}
-
-		bn_div_rem(q, r, u, v);
-
-		bn_copy(u, v);
-		bn_copy(v, r);
-
-		bn_mul(c, q, x1);
-		bn_sub(r, d, c);
-		bn_copy(d, x1);
-		bn_copy(x1, r);
-
-		if (e != NULL) {
-			bn_mul(c, q, y1);
-			bn_sub(r, e, c);
-			bn_copy(e, y1);
-			bn_copy(y1, r);
-		}
-
-		_v = v->dp[0];
-		_u = u->dp[0];
-		while (_v != 0) {
-			_q = _u / _v;
-			_t = _u % _v;
-
-			_u = _v;
-			_v = _t;
-
-			bn_mul_dig(c, x1, _q);
-			bn_sub(r, d, c);
-			bn_copy(d, x1);
-			bn_copy(x1, r);
-
-			if (e != NULL) {
-				bn_mul_dig(c, y1, _q);
-				bn_sub(r, e, c);
-				bn_copy(e, y1);
-				bn_copy(y1, r);
-			}
-		}
-		bn_set_dig(c, _u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-		bn_free(x1);
-		bn_free(y1);
-		bn_free(q);
-		bn_free(r);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_inv.c b/src/dashbls/depends/relic/src/bn/relic_bn_inv.c
deleted file mode 100644
index 947f7c3e244d..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_inv.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer modular inversion.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_mod_inv(bn_t c, const bn_t a, const bn_t b) {
-	bn_t t, u;
-
-	bn_null(t);
-	bn_null(u);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(u);
-
-		bn_copy(u, b);
-		bn_gcd_ext(t, c, NULL, a, b);
-
-		if (bn_sign(c) == RLC_NEG) {
-			bn_add(c, c, u);
-		}
-
-		if (bn_cmp_dig(t, 1) != RLC_EQ) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-		bn_free(u);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_lcm.c b/src/dashbls/depends/relic/src/bn/relic_bn_lcm.c
deleted file mode 100644
index 98b061936f13..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_lcm.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of least common multiple.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_lcm(bn_t c, const bn_t a, const bn_t b) {
-	bn_t u, v;
-
-	bn_null(u);
-	bn_null(v);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-
-		bn_gcd(u, a, b);
-
-		if (bn_cmp_abs(a, b) == RLC_LT) {
-			bn_div(v, a, u);
-			bn_mul(c, b, v);
-		} else {
-			bn_div(v, b, u);
-			bn_mul(c, a, v);
-		}
-		c->sign = RLC_POS;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_mem.c b/src/dashbls/depends/relic/src/bn/relic_bn_mem.c
deleted file mode 100644
index f378432adafe..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_mem.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer memory management routines.
- *
- * @ingroup bn
- */
-
-#include <errno.h>
-
-#if ALLOC != AUTO
-#include <malloc.h>
-#endif
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_make(bn_t a, int digits) {
-	if (digits < 0) {
-		RLC_THROW(ERR_NO_VALID);
-	}
-	/* Allocate at least one digit. */
-	digits = RLC_MAX(digits, 1);
-
-#if ALLOC == DYNAMIC
-	if (digits % RLC_BN_SIZE != 0) {
-		/* Pad the number of digits to a multiple of the block. */
-		digits += (RLC_BN_SIZE - digits % RLC_BN_SIZE);
-	}
-
-	if (a != NULL) {
-		a->dp = NULL;
-#if ALIGN == 1
-		a->dp = (dig_t *)malloc(digits * sizeof(dig_t));
-#elif OPSYS == WINDOWS
-		a->dp = _aligned_malloc(digits * sizeof(dig_t), ALIGN);
-#else
-		int r = posix_memalign((void **)&a->dp, ALIGN, digits * sizeof(dig_t));
-		if (r == ENOMEM) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		if (r == EINVAL) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-#endif /* ALIGN */
-	}
-
-	if (a->dp == NULL) {
-		free((void *)a);
-		RLC_THROW(ERR_NO_MEMORY);
-	}
-#else
-	/* Verify if the number of digits is sane. */
-	if (digits > RLC_BN_SIZE) {
-		RLC_THROW(ERR_NO_PRECI);
-		return;
-	} else {
-		digits = RLC_BN_SIZE;
-	}
-#endif
-	if (a != NULL) {
-		a->used = 1;
-		a->dp[0] = 0;
-		a->alloc = digits;
-		a->sign = RLC_POS;
-	}
-}
-
-void bn_clean(bn_t a) {
-#if ALLOC == DYNAMIC
-	if (a != NULL) {
-		if (a->dp != NULL) {
-#if OPSYS == WINDOWS && ALIGN > 1
-			_aligned_free(a->dp);
-#else
-			free(a->dp);
-#endif
-			a->dp = NULL;
-		}
-		a->alloc = 0;
-	}
-#endif
-	if (a != NULL) {
-		a->used = 0;
-		a->sign = RLC_POS;
-	}
-}
-
-void bn_grow(bn_t a, int digits) {
-#if ALLOC == DYNAMIC
-	dig_t *t;
-
-	if (a->alloc < digits) {
-		/* At least add RLC_BN_SIZE more digits. */
-		digits += (RLC_BN_SIZE * 2) - (digits % RLC_BN_SIZE);
-		t = (dig_t *)realloc(a->dp, (RLC_DIG / 8) * digits);
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-			return;
-		}
-		a->dp = t;
-		/* Set the newly allocated digits to zero. */
-		a->alloc = digits;
-	}
-#elif ALLOC == AUTO
-	if (digits > RLC_BN_SIZE) {
-		RLC_THROW(ERR_NO_PRECI);
-		return;
-	}
-	(void)a;
-#endif
-}
-
-void bn_trim(bn_t a) {
-	if (a->used <= a->alloc) {
-		while (a->used > 0 && a->dp[a->used - 1] == 0) {
-			--(a->used);
-		}
-		/* Zero can't be negative. */
-		if (a->used <= 0) {
-			a->used = 1;
-			a->dp[0] = 0;
-			a->sign = RLC_POS;
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_mod.c b/src/dashbls/depends/relic/src/bn/relic_bn_mod.c
deleted file mode 100644
index e0d0e6cd1d8a..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_mod.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer modular reduction
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_mod_2b(bn_t c, const bn_t a, int b) {
-	int i, first, d;
-
-	if (b <= 0) {
-		bn_zero(c);
-		return;
-	}
-
-	if (b >= (int)(a->used * RLC_DIG)) {
-		bn_copy(c, a);
-		return;
-	}
-
-	bn_copy(c, a);
-
-	RLC_RIP(b, d, b);
-
-	first = (d) + (b == 0 ? 0 : 1);
-	for (i = first; i < c->used; i++)
-		c->dp[i] = 0;
-
-	c->dp[d] &= RLC_MASK(b);
-
-	bn_trim(c);
-}
-
-void bn_mod_dig(dig_t *c, const bn_t a, dig_t b) {
-	bn_div_rem_dig(NULL, c, a, b);
-}
-
-void bn_mod_basic(bn_t c, const bn_t a, const bn_t m) {
-	bn_div_rem(NULL, c, a, m);
-}
-
-#if BN_MOD == BARRT || !defined(STRIP)
-
-void bn_mod_pre_barrt(bn_t u, const bn_t m) {
-	bn_set_2b(u, m->used * 2 * RLC_DIG);
-	bn_div(u, u, m);
-}
-
-void bn_mod_barrt(bn_t c, const bn_t a, const bn_t m, const bn_t u) {
-	unsigned long mu;
-	bn_t q, t;
-
-	bn_null(q);
-	bn_null(t);
-
-	if (bn_cmp(a, m) == RLC_LT) {
-		bn_copy(c, a);
-		return;
-	}
-	RLC_TRY {
-		bn_new(q);
-		bn_new(t);
-		bn_zero(t);
-
-		mu = m->used;
-
-		bn_rsh(q, a, (mu - 1) * RLC_DIG);
-
-		if (mu > ((dig_t)1) << (RLC_DIG - 1)) {
-			bn_mul(t, q, u);
-		} else {
-			if (q->used > u->used) {
-				bn_muld_low(t->dp, q->dp, q->used, u->dp, u->used,
-						mu, q->used + u->used);
-			} else {
-				bn_muld_low(t->dp, u->dp, u->used, q->dp, q->used,
-						mu - (u->used - q->used), q->used + u->used);
-			}
-			t->used = q->used + u->used;
-			bn_trim(t);
-		}
-
-		bn_rsh(q, t, (mu + 1) * RLC_DIG);
-
-		if (q->used > m->used) {
-			bn_muld_low(t->dp, q->dp, q->used, m->dp, m->used, 0, q->used + 1);
-		} else {
-			bn_muld_low(t->dp, m->dp, m->used, q->dp, q->used, 0, mu + 1);
-		}
-		t->used = mu + 1;
-		bn_trim(t);
-
-		bn_mod_2b(q, t, RLC_DIG * (mu + 1));
-		bn_mod_2b(t, a, RLC_DIG * (mu + 1));
-		bn_sub(t, t, q);
-
-		if (bn_sign(t) == RLC_NEG) {
-			bn_set_dig(q, (dig_t)1);
-			bn_lsh(q, q, (mu + 1) * RLC_DIG);
-			bn_add(t, t, q);
-		}
-
-		while (bn_cmp(t, m) != RLC_LT) {
-			bn_sub(t, t, m);
-		}
-
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(q);
-		bn_free(t);
-
-	}
-}
-
-#endif /* BN_MOD == BARRT || !defined(STRIP) */
-
-#if BN_MOD == MONTY || (defined(WITH_FP) && FP_RDC == MONTY) || !defined(STRIP)
-
-void bn_mod_pre_monty(bn_t u, const bn_t m) {
-	dig_t x, b;
-	b = m->dp[0];
-
-	if ((b & 0x01) == 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	x = (((b + 2) & 4) << 1) + b;				/* here x*a==1 mod 2**4 */
-	x *= (dig_t)2 - b * x;						/* here x*a==1 mod 2**8 */
-#if WSIZE > 8
-	x *= (dig_t)2 - b * x;						/* here x*a==1 mod 2**16 */
-#endif
-#if WSIZE > 16
-	x *= (dig_t)2 - b * x;						/* here x*a==1 mod 2**32 */
-#endif
-#if WSIZE > 32
-	x *= (dig_t)2 - b * x;						/* here x*a==1 mod 2**64 */
-#endif
-	/* u = -1/m0 (mod 2^RLC_DIG) */
-	bn_set_dig(u, -x);
-}
-
-void bn_mod_monty_conv(bn_t c, const bn_t a, const bn_t m) {
-	bn_copy(c, a);
-	while (bn_sign(c) == RLC_NEG) {
-		bn_add(c, c, m);
-	}
-	bn_lsh(c, c, m->used * RLC_DIG);
-	bn_mod(c, c, m);
-}
-
-void bn_mod_monty_back(bn_t c, const bn_t a, const bn_t m) {
-	bn_t u;
-
-	bn_null(u);
-
-	RLC_TRY {
-		bn_new(u);
-
-		bn_mod_pre_monty(u, m);
-		bn_mod_monty(c, a, m, u);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(u);
-	}
-}
-
-#if BN_MUL == BASIC || !defined(STRIP)
-
-void bn_mod_monty_basic(bn_t c, const bn_t a, const bn_t m, const bn_t u) {
-	int digits, i;
-	dig_t r, u0, *tmp;
-	bn_t t;
-
-	bn_null(t);
-	digits = 2 * m->used;
-
-	RLC_TRY {
-		bn_new_size(t, digits);
-		bn_zero(t);
-		bn_copy(t, a);
-
-		u0 = u->dp[0];
-		tmp = t->dp;
-
-		for (i = 0; i < m->used; i++, tmp++) {
-			r = (dig_t)(*tmp * u0);
-			*tmp = bn_mula_low(tmp, m->dp, r, m->used);
-		}
-		if (bn_addn_low(t->dp, t->dp, tmp, m->used)) {
-			bn_subn_low(t->dp, t->dp, m->dp, m->used);
-		}
-		t->used = m->used;
-		bn_trim(t);
-
-		if (bn_cmp_abs(t, m) != RLC_LT) {
-			bn_sub(t, t, m);
-		}
-
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif /* BN_MUL == BASIC || !defined(STRIP) */
-
-#if BN_MUL == COMBA || !defined(STRIP)
-
-void bn_mod_monty_comba(bn_t c, const bn_t a, const bn_t m, const bn_t u) {
-	int digits;
-	bn_t t;
-
-	bn_null(t);
-	digits = 2 * m->used;
-
-	RLC_TRY {
-		bn_new_size(t, digits);
-		bn_zero(t);
-
-		bn_modn_low(t->dp, a->dp, a->used, m->dp, m->used, u->dp[0]);
-		t->used = m->used;
-
-		bn_trim(t);
-		if (bn_cmp_abs(t, m) != RLC_LT) {
-			bn_sub(t, t, m);
-		}
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif /* BN_MUL == COMBA || !defined(STRIP) */
-
-#endif /* BN_MOD == MONTY || (WITH_FP && FP_RDC == MONTY) || !defined(STRIP) */
-
-#if BN_MOD == PMERS || !defined(STRIP)
-
-void bn_mod_pre_pmers(bn_t u, const bn_t m) {
-	int bits;
-
-	bits = bn_bits(m);
-
-	bn_set_2b(u, bits);
-	bn_sub(u, u, m);
-}
-
-void bn_mod_pmers(bn_t c, const bn_t a, const bn_t m, const bn_t u) {
-	bn_t q, t, r;
-	int bits;
-
-	bn_null(q);
-	bn_null(t);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(q);
-		bn_new(t);
-		bn_new(r);
-
-		bn_copy(t, a);
-
-		bits = bn_bits(m);
-
-		bn_rsh(q, t, bits);
-		bn_mod_2b(r, t, bits);
-
-		while (!bn_is_zero(q)) {
-			if (u -> used == 1) {
-				bn_mul_dig(t, q, u->dp[0]);
-			} else {
-				bn_mul(t, q, u);
-			}
-			bn_rsh(q, t, bits);
-			bn_mod_2b(t, t, bits);
-
-			bn_add(r, r, t);
-		}
-		while (bn_cmp_abs(r, m) != RLC_LT) {
-			bn_sub(r, r, m);
-		}
-
-		bn_copy(c, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(q);
-		bn_free(r);
-	}
-}
-
-#endif /* BN_MOD == PMERS || !defined(STRIP) */
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_mul.c b/src/dashbls/depends/relic/src/bn/relic_bn_mul.c
deleted file mode 100644
index d58fe1b6d317..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_mul.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if BN_KARAT > 0 || !defined(STRIP)
-
-/**
- * Multiplies two multiple precision integers using recursive Karatsuba
- * multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first multiple precision integer.
- * @param[in] b				- the second multiple precision integer.
- * @param[in] level			- the number of Karatsuba steps to apply.
- */
-static void bn_mul_karat_imp(bn_t c, const bn_t a, const bn_t b, int level) {
-	bn_t a0, a1, b0, b1, a0b0, a1b1, t;
-
-	/* Compute half the digits of a or b. */
-	int h = RLC_MIN(a->used, b->used) >> 1;
-
-	bn_null(a0);
-	bn_null(a1);
-	bn_null(b0);
-	bn_null(b1);
-	bn_null(a0b0);
-	bn_null(a1b1);
-	bn_null(t);
-
-	RLC_TRY {
-		/* Allocate the temp variables. */
-		bn_new_size(a0, h);
-		bn_new_size(b0, h);
-		bn_new_size(a1, a->used - h);
-		bn_new_size(b1, b->used - h);
-		bn_new(a0b0);
-		bn_new(a1b1);
-		bn_new(t);
-
-		/* a = a1 || a0, b = b1 || b0 */
-		a0->used = b0->used = h;
-		a1->used = a->used - h;
-		b1->used = b->used - h;
-		dv_copy(a0->dp, a->dp, h);
-		dv_copy(a1->dp, a->dp + h, a->used - h);
-		dv_copy(b0->dp, b->dp, h);
-		dv_copy(b1->dp, b->dp + h, b->used - h);
-		bn_trim(a0);
-		bn_trim(b0);
-		bn_trim(a1);
-		bn_trim(b1);
-
-		/* a0b0 = a0 * b0 and a1b1 = a1 * b1 */
-		if (level <= 1) {
-#if BN_MUL == BASIC
-			bn_mul_basic(a0b0, a0, b0);
-			bn_mul_basic(a1b1, a1, b1);
-#elif BN_MUL == COMBA
-			bn_mul_comba(a0b0, a0, b0);
-			bn_mul_comba(a1b1, a1, b1);
-#endif
-		} else {
-			bn_mul_karat_imp(a0b0, a0, b0, level - 1);
-			bn_mul_karat_imp(a1b1, a1, b1, level - 1);
-		}
-
-		/* t = (a1 + a0) */
-		bn_add(a1, a1, a0);
-		/* t2 = (b1 + b0) */
-		bn_add(b1, b1, b0);
-
-		/* t = (a1 + a0)*(b1 + b0) */
-		if (level <= 1) {
-#if BN_MUL == BASIC
-			bn_mul_basic(t, a1, b1);
-#elif BN_MUL == COMBA
-			bn_mul_comba(t, a1, b1);
-#endif
-		} else {
-			bn_mul_karat_imp(t, a1, b1, level - 1);
-		}
-		/* t2 = (a0*b0 + a1*b1) */
-		bn_sub(t, t, a0b0);
-
-		/* t = (a1 + a0)*(b1 + b0) - (a0*b0 + a1*b1) */
-		bn_sub(t, t, a1b1);
-
-		/* t = (a1 + a0)*(b1 + b0) - (a0*b0 + a1*b1) << h digits */
-		bn_lsh(t, t, h * RLC_DIG);
-
-		/* t2 = a1 * b1 << 2*h digits */
-		bn_lsh(a1b1, a1b1, 2 * h * RLC_DIG);
-
-		/* t = t + a0*b0 */
-		bn_add(t, t, a0b0);
-
-		/* c = t + a1*b1 */
-		bn_add(t, t, a1b1);
-
-		t->sign = a->sign ^ b->sign;
-		bn_copy(c, t);
-		bn_trim(c);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a0);
-		bn_free(a1);
-		bn_free(b0);
-		bn_free(b1);
-		bn_free(a0b0);
-		bn_free(a1b1);
-		bn_free(t);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_mul_dig(bn_t c, const bn_t a, dig_t b) {
-	RLC_TRY {
-		bn_grow(c, a->used + 1);
-		c->sign = a->sign;
-		c->dp[a->used] = bn_mul1_low(c->dp, a->dp, b, a->used);
-		c->used = a->used + 1;
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-#if BN_MUL == BASIC || !defined(STRIP)
-
-void bn_mul_basic(bn_t c, const bn_t a, const bn_t b) {
-	int i;
-	bn_t t;
-	dig_t carry;
-
-	bn_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		bn_new_size(t, a->used + b->used);
-		bn_zero(t);
-		t->used = a->used + b->used;
-
-		for (i = 0; i < a->used; i++) {
-			carry = bn_mula_low(t->dp + i, b->dp, *(a->dp + i), b->used);
-			*(t->dp + i + b->used) = carry;
-		}
-		t->sign = a->sign ^ b->sign;
-		bn_trim(t);
-
-		/* Swap c and t. */
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif
-
-#if BN_MUL == COMBA || !defined(STRIP)
-
-void bn_mul_comba(bn_t c, const bn_t a, const bn_t b) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		bn_new_size(t, a->used + b->used);
-		t->used = a->used + b->used;
-
-		if (a->used == b->used) {
-			bn_muln_low(t->dp, a->dp, b->dp, a->used);
-		} else {
-			if (a->used > b->used) {
-				bn_muld_low(t->dp, a->dp, a->used, b->dp, b->used, 0,
-						a->used + b->used);
-			} else {
-				bn_muld_low(t->dp, b->dp, b->used, a->dp, a->used, 0,
-						a->used + b->used);
-			}
-		}
-
-		t->sign = a->sign ^ b->sign;
-		bn_trim(t);
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-
-void bn_mul_karat(bn_t c, const bn_t a, const bn_t b) {
-	bn_mul_karat_imp(c, a, b, BN_KARAT);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_mxp.c b/src/dashbls/depends/relic/src/bn/relic_bn_mxp.c
deleted file mode 100644
index d0c4ac8434cd..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_mxp.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision exponentiation functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Size of precomputation table.
- */
-#define RLC_TABLE_SIZE			64
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if BN_MXP == BASIC || !defined(STRIP)
-
-void bn_mxp_basic(bn_t c, const bn_t a, const bn_t b, const bn_t m) {
-	int i, l;
-	bn_t t, u, r;
-
-	if (bn_cmp_dig(m, 1) == RLC_EQ) {
-		bn_zero(c);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(t);
-	bn_null(u);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(u);
-		bn_new(r);
-
-		bn_mod_pre(u, m);
-
-		l = bn_bits(b);
-
-#if BN_MOD == MONTY
-		bn_mod_monty_conv(t, a, m);
-#else
-		bn_copy(t, a);
-#endif
-
-		bn_copy(r, t);
-
-		for (i = l - 2; i >= 0; i--) {
-			bn_sqr(r, r);
-			bn_mod(r, r, m, u);
-			if (bn_get_bit(b, i)) {
-				bn_mul(r, r, t);
-				bn_mod(r, r, m, u);
-			}
-		}
-
-#if BN_MOD == MONTY
-		bn_mod_monty_back(r, r, m);
-#endif
-
-		if (bn_sign(b) == RLC_NEG) {
-			bn_mod_inv(c, r, m);
-		} else {
-			bn_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(u);
-		bn_free(r);
-	}
-}
-
-#endif
-
-#if BN_MXP == SLIDE || !defined(STRIP)
-
-void bn_mxp_slide(bn_t c, const bn_t a, const bn_t b, const bn_t m) {
-	bn_t tab[RLC_TABLE_SIZE], t, u, r;
-	int i, j, l, w = 1;
-	uint8_t *win = RLC_ALLOCA(uint8_t, bn_bits(b));
-
-	if (win == NULL) {
-		RLC_THROW(ERR_NO_MEMORY);
-		return;
-	}
-
-	if (bn_cmp_dig(m, 1) == RLC_EQ) {
-		RLC_FREE(win);
-		bn_zero(c);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		RLC_FREE(win);
-		bn_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(t);
-	bn_null(u);
-	bn_null(r);
-	/* Initialize table. */
-	for (i = 0; i < RLC_TABLE_SIZE; i++) {
-		bn_null(tab[i]);
-	}
-
-	/* Find window size. */
-	i = bn_bits(b);
-	if (i <= 21) {
-		w = 2;
-	} else if (i <= 32) {
-		w = 3;
-	} else if (i <= 128) {
-		w = 4;
-	} else if (i <= 256) {
-		w = 5;
-	} else if (i <= 512) {
-		w = 6;
-	} else {
-		w = 7;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (w - 1)); i++) {
-			bn_new(tab[i]);
-		}
-
-		bn_new(t);
-		bn_new(u);
-		bn_new(r);
-		bn_mod_pre(u, m);
-
-#if BN_MOD == MONTY
-		bn_set_dig(r, 1);
-		bn_mod_monty_conv(r, r, m);
-		bn_mod_monty_conv(t, a, m);
-#else /* BN_MOD == BARRT || BN_MOD == RADIX */
-		bn_set_dig(r, 1);
-		bn_copy(t, a);
-#endif
-
-		bn_copy(tab[0], t);
-		bn_sqr(t, tab[0]);
-		bn_mod(t, t, m, u);
-		/* Create table. */
-		for (i = 1; i < 1 << (w - 1); i++) {
-			bn_mul(tab[i], tab[i - 1], t);
-			bn_mod(tab[i], tab[i], m, u);
-		}
-
-		l = bn_bits(b);
-		bn_rec_slw(win, &l, b, w);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				bn_sqr(r, r);
-				bn_mod(r, r, m, u);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					bn_sqr(r, r);
-					bn_mod(r, r, m, u);
-				}
-				bn_mul(r, r, tab[win[i] >> 1]);
-				bn_mod(r, r, m, u);
-			}
-		}
-		bn_trim(r);
-#if BN_MOD == MONTY
-		bn_mod_monty_back(r, r, m);
-#endif
-
-		if (bn_sign(b) == RLC_NEG) {
-			bn_mod_inv(c, r, m);
-		} else {
-			bn_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (w - 1)); i++) {
-			bn_free(tab[i]);
-		}
-		bn_free(u);
-		bn_free(t);
-		bn_free(r);
-		RLC_FREE(win);
-	}
-}
-
-#endif
-
-#if BN_MXP == MONTY || !defined(STRIP)
-
-void bn_mxp_monty(bn_t c, const bn_t a, const bn_t b, const bn_t m) {
-	bn_t tab[2], u;
-	dig_t mask;
-	int i, j, t;
-
-	if (bn_cmp_dig(m, 1) == RLC_EQ) {
-		bn_zero(c);
-		return;
-	}
-
-	if (bn_is_zero(b)) {
-		bn_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(tab[0]);
-	bn_null(tab[1]);
-	bn_null(u);
-
-	RLC_TRY {
-		bn_new(u);
-		bn_mod_pre(u, m);
-
-		bn_new(tab[0]);
-		bn_new(tab[1]);
-
-#if BN_MOD == MONTY
-		bn_set_dig(tab[0], 1);
-		bn_mod_monty_conv(tab[0], tab[0], m);
-		bn_mod_monty_conv(tab[1], a, m);
-#else
-		bn_set_dig(tab[0], 1);
-		bn_mod(tab[1], a, m);
-#endif
-
-		bn_grow(tab[0], m->alloc);
-		bn_grow(tab[1], m->alloc);
-		for (i = bn_bits(b) - 1; i >= 0; i--) {
-			j = bn_get_bit(b, i);
-			dv_swap_cond(tab[0]->dp, tab[1]->dp, m->alloc, j ^ 1);
-			mask = -(j ^ 1);
-			t = (tab[0]->used ^ tab[1]->used) & mask;
-			tab[0]->used ^= t;
-			tab[1]->used ^= t;
-			t = (tab[0]->sign ^ tab[1]->sign) & mask;
-			tab[0]->sign ^= t;
-			tab[1]->sign ^= t;
-			bn_mul(tab[0], tab[0], tab[1]);
-			bn_mod(tab[0], tab[0], m, u);
-			bn_sqr(tab[1], tab[1]);
-			bn_mod(tab[1], tab[1], m, u);
-			dv_swap_cond(tab[0]->dp, tab[1]->dp, m->alloc, j ^ 1);
-			mask = -(j ^ 1);
-			t = (tab[0]->used ^ tab[1]->used) & mask;
-			tab[0]->used ^= t;
-			tab[1]->used ^= t;
-			t = (tab[0]->sign ^ tab[1]->sign) & mask;
-			tab[0]->sign ^= t;
-			tab[1]->sign ^= t;
-		}
-
-#if BN_MOD == MONTY
-		bn_mod_monty_back(u, tab[0], m);
-#else
-		bn_copy(u, tab[0]);
-#endif
-
-		/* Silly branchless code, since called functions not constant-time. */
-		bn_mod_inv(tab[0], u, m);
-		dv_swap_cond(u->dp, tab[0]->dp, RLC_BN_DIGS, bn_sign(b) == RLC_NEG);
-		if (bn_sign(b) == RLC_NEG) {
-			u->sign = tab[0]->sign;
-			if (bn_cmp_dig(tab[1], 1) != RLC_EQ) {
-				bn_zero(c);
-				RLC_THROW(ERR_NO_VALID);
-			}
-		}
-		bn_add(tab[1], u, m);
-		dv_swap_cond(u->dp, tab[1]->dp, RLC_BN_DIGS, bn_sign(b) == RLC_NEG && bn_sign(u) == RLC_NEG);
-		u->sign = RLC_POS;
-		bn_copy(c, u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(tab[1]);
-		bn_free(tab[0]);
-		bn_free(u);
-	}
-}
-
-#endif
-
-void bn_mxp_dig(bn_t c, const bn_t a, dig_t b, const bn_t m) {
-	int i, l;
-	bn_t t, u, r;
-
-	if (bn_cmp_dig(m, 1) == RLC_EQ) {
-		bn_zero(c);
-		return;
-	}
-
-	if (b == 0) {
-		bn_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(t);
-	bn_null(u);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(u);
-		bn_new(r);
-
-		bn_mod_pre(u, m);
-
-		l = util_bits_dig(b);
-
-#if BN_MOD == MONTY
-		bn_mod_monty_conv(t, a, m);
-#else
-		bn_copy(t, a);
-#endif
-
-		bn_copy(r, t);
-
-		for (i = l - 2; i >= 0; i--) {
-			bn_sqr(r, r);
-			bn_mod(r, r, m, u);
-			if (b & ((dig_t)1 << i)) {
-				bn_mul(r, r, t);
-				bn_mod(r, r, m, u);
-			}
-		}
-
-#if BN_MOD == MONTY
-		bn_mod_monty_back(c, r, m);
-#else
-		bn_copy(c, r);
-#endif
-		/* Exponent is unsigned, so no need to invert if negative. */
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(u);
-		bn_free(r);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_prime.c b/src/dashbls/depends/relic/src/bn/relic_bn_prime.c
deleted file mode 100644
index c89afa10cfd6..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_prime.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime number generation and testing functions.
- *
- * Strong prime generation is based on Gordon's Algorithm, taken from Handbook
- * of Applied Cryptography.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Number of trial division tests.
- */
-#define BASIC_TESTS	((int)(sizeof(primes)/sizeof(dig_t)))
-
-/**
- * Small prime numbers table.
- */
-static const dig_t primes[] = {
-	0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013,
-	0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035,
-	0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059,
-	0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F, 0x0083,
-	0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD,
-	0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF,
-#if WSIZE > 8
-	0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107,
-	0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137,
-
-	0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167,
-	0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199,
-	0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9,
-	0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7,
-	0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239,
-	0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265,
-	0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293,
-	0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF,
-
-	0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301,
-	0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B,
-	0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371,
-	0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD,
-	0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5,
-	0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419,
-	0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449,
-	0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B,
-
-	0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7,
-	0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503,
-	0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529,
-	0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F,
-	0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3,
-	0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7,
-	0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623,
-	0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653,
-
-	0x0655, 0x065B, 0x0665, 0x0679, 0x067F, 0x0683, 0x0685, 0x069D,
-	0x06A1, 0x06A3, 0x06AD, 0x06B9, 0x06BB, 0x06C5, 0x06CD, 0x06D3,
-	0x06D9, 0x06DF, 0x06F1, 0x06F7, 0x06FB, 0x06FD, 0x0709, 0x0713,
-	0x071F, 0x0727, 0x0737, 0x0745, 0x074B, 0x074F, 0x0751, 0x0755,
-	0x0757, 0x0761, 0x076D, 0x0773, 0x0779, 0x078B, 0x078D, 0x079D,
-	0x079F, 0x07B5, 0x07BB, 0x07C3, 0x07C9, 0x07CD, 0x07CF, 0x07D3,
-	0x07DB, 0x07E1, 0x07EB, 0x07ED, 0x07F7, 0x0805, 0x080F, 0x0815,
-	0x0821, 0x0823, 0x0827, 0x0829, 0x0833, 0x083F, 0x0841, 0x0851,
-
-	0x0853, 0x0859, 0x085D, 0x085F, 0x0869, 0x0871, 0x0883, 0x089B,
-	0x089F, 0x08A5, 0x08AD, 0x08BD, 0x08BF, 0x08C3, 0x08CB, 0x08DB,
-	0x08DD, 0x08E1, 0x08E9, 0x08EF, 0x08F5, 0x08F9, 0x0905, 0x0907,
-	0x091D, 0x0923, 0x0925, 0x092B, 0x092F, 0x0935, 0x0943, 0x0949,
-	0x094D, 0x094F, 0x0955, 0x0959, 0x095F, 0x096B, 0x0971, 0x0977,
-	0x0985, 0x0989, 0x098F, 0x099B, 0x09A3, 0x09A9, 0x09AD, 0x09C7,
-	0x09D9, 0x09E3, 0x09EB, 0x09EF, 0x09F5, 0x09F7, 0x09FD, 0x0A13,
-	0x0A1F, 0x0A21, 0x0A31, 0x0A39, 0x0A3D, 0x0A49, 0x0A57, 0x0A61,
-
-	0x0A63, 0x0A67, 0x0A6F, 0x0A75, 0x0A7B, 0x0A7F, 0x0A81, 0x0A85,
-	0x0A8B, 0x0A93, 0x0A97, 0x0A99, 0x0A9F, 0x0AA9, 0x0AAB, 0x0AB5,
-	0x0ABD, 0x0AC1, 0x0ACF, 0x0AD9, 0x0AE5, 0x0AE7, 0x0AED, 0x0AF1,
-	0x0AF3, 0x0B03, 0x0B11, 0x0B15, 0x0B1B, 0x0B23, 0x0B29, 0x0B2D,
-	0x0B3F, 0x0B47, 0x0B51, 0x0B57, 0x0B5D, 0x0B65, 0x0B6F, 0x0B7B,
-	0x0B89, 0x0B8D, 0x0B93, 0x0B99, 0x0B9B, 0x0BB7, 0x0BB9, 0x0BC3,
-	0x0BCB, 0x0BCF, 0x0BDD, 0x0BE1, 0x0BE9, 0x0BF5, 0x0BFB, 0x0C07,
-	0x0C0B, 0x0C11, 0x0C25, 0x0C2F, 0x0C31, 0x0C41, 0x0C5B, 0x0C5F,
-
-	0x0C61, 0x0C6D, 0x0C73, 0x0C77, 0x0C83, 0x0C89, 0x0C91, 0x0C95,
-	0x0C9D, 0x0CB3, 0x0CB5, 0x0CB9, 0x0CBB, 0x0CC7, 0x0CE3, 0x0CE5,
-	0x0CEB, 0x0CF1, 0x0CF7, 0x0CFB, 0x0D01, 0x0D03, 0x0D0F, 0x0D13,
-	0x0D1F, 0x0D21, 0x0D2B, 0x0D2D, 0x0D3D, 0x0D3F, 0x0D4F, 0x0D55,
-	0x0D69, 0x0D79, 0x0D81, 0x0D85, 0x0D87, 0x0D8B, 0x0D8D, 0x0DA3,
-	0x0DAB, 0x0DB7, 0x0DBD, 0x0DC7, 0x0DC9, 0x0DCD, 0x0DD3, 0x0DD5,
-	0x0DDB, 0x0DE5, 0x0DE7, 0x0DF3, 0x0DFD, 0x0DFF, 0x0E09, 0x0E17,
-	0x0E1D, 0x0E21, 0x0E27, 0x0E2F, 0x0E35, 0x0E3B, 0x0E4B, 0x0E57,
-#endif
-};
-
-#if BN_MOD == PMERS
-
-/**
- * Computes c = a ^ b mod m.
- *
- * @param c				- the result.
- * @param a				- the basis.
- * @param b				- the exponent.
- * @param m				- the modulus.
- */
-static void bn_exp(bn_t c, const bn_t a, const bn_t b, const bn_t m) {
-	int i, l;
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		l = bn_bits(b);
-
-		bn_copy(t, a);
-
-		for (i = l - 2; i >= 0; i--) {
-			bn_sqr(t, t);
-			bn_mod(t, t, m);
-			if (bn_get_bit(b, i)) {
-				bn_mul(t, t, a);
-				bn_mod(t, t, m);
-			}
-		}
-
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_get_prime(int pos) {
-	if (pos >= BASIC_TESTS) {
-		return 0;
-	}
-	return primes[pos];
-}
-
-int bn_is_prime(const bn_t a) {
-	int result;
-
-	result = 0;
-	if (!bn_is_prime_basic(a)) {
-		goto end;
-	}
-
-	if (!bn_is_prime_rabin(a)) {
-		goto end;
-	}
-
-	result = 1;
-  end:
-	return result;
-}
-
-int bn_is_prime_basic(const bn_t a) {
-	dig_t t;
-	int i, result;
-
-	result = 1;
-
-	if (bn_cmp_dig(a, 1) == RLC_EQ) {
-		return 0;
-	}
-
-	/* Trial division. */
-	for (i = 0; i < BASIC_TESTS; i++) {
-		bn_mod_dig(&t, a, primes[i]);
-		if (t == 0 && bn_cmp_dig(a, primes[i]) != RLC_EQ) {
-			result = 0;
-			break;
-		}
-	}
-	return result;
-}
-
-int bn_is_prime_rabin(const bn_t a) {
-	bn_t t, n1, y, r;
-	int i, s, j, result, b, tests = 0, cmp2;
-
-	tests = 0;
-	result = 1;
-
-	bn_null(t);
-	bn_null(n1);
-	bn_null(y);
-	bn_null(r);
-
-	cmp2 = bn_cmp_dig(a, 2);
-	if (cmp2 == RLC_LT) {
-		/* Numbers 1 or smaller are not prime */
-		return 0;
-	}
-	if (cmp2 == RLC_EQ) {
-		/* The number 2 is prime */
-		return 1;
-	}
-
-	if (bn_is_even(a) == 1) {
-		/* Even numbers > 2 are not prime */
-		return 0;
-	}
-
-	RLC_TRY {
-		/*
-		 * These values are taken from Table 4.4 inside Handbook of Applied
-		 * Cryptography.
-		 */
-		b = bn_bits(a);
-		if (b >= 1300) {
-			tests = 2;
-		} else if (b >= 850) {
-			tests = 3;
-		} else if (b >= 650) {
-			tests = 4;
-		} else if (b >= 550) {
-			tests = 5;
-		} else if (b >= 450) {
-			tests = 6;
-		} else if (b >= 400) {
-			tests = 7;
-		} else if (b >= 350) {
-			tests = 8;
-		} else if (b >= 300) {
-			tests = 9;
-		} else if (b >= 250) {
-			tests = 12;
-		} else if (b >= 200) {
-			tests = 15;
-		} else if (b >= 150) {
-			tests = 18;
-		} else {
-			tests = 27;
-		}
-
-		bn_new(t);
-		bn_new(n1);
-		bn_new(y);
-		bn_new(r);
-
-		/* r = (n - 1)/2^s. */
-		bn_sub_dig(n1, a, 1);
-		bn_copy(r, n1);
-		s = 0;
-		while (bn_is_even(r)) {
-			s++;
-			bn_rsh(r, r, 1);
-		}
-
-		for (i = 0; i < tests; i++) {
-			/* Fix the basis as the first few primes. */
-			bn_set_dig(t, primes[i]);
-
-			/* Ensure t <= n - 2 as per HAC */
-			if( bn_cmp(t, n1) != RLC_LT ) {
-				result = 1;
-				break;
-			}
-
-			/* y = b^r mod a. */
-#if BN_MOD != PMERS
-			bn_mxp(y, t, r, a);
-#else
-			bn_exp(y, t, r, a);
-#endif
-
-			if (bn_cmp_dig(y, 1) != RLC_EQ && bn_cmp(y, n1) != RLC_EQ) {
-				j = 1;
-				while ((j <= (s - 1)) && bn_cmp(y, n1) != RLC_EQ) {
-					bn_sqr(y, y);
-					bn_mod(y, y, a);
-
-					/* If y == 1 then composite. */
-					if (bn_cmp_dig(y, 1) == RLC_EQ) {
-						result = 0;
-						break;
-					}
-					++j;
-				}
-
-				/* If y != n1 then composite. */
-				if (bn_cmp(y, n1) != RLC_EQ) {
-					result = 0;
-					break;
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		result = 0;
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r);
-		bn_free(y);
-		bn_free(n1);
-		bn_free(t);
-	}
-	return result;
-}
-
-int bn_is_prime_solov(const bn_t a) {
-	bn_t t0, t1, t2;
-	int i, result;
-
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(t2);
-
-	result = 1;
-
-	RLC_TRY {
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(t2);
-
-		for (i = 0; i < 100; i++) {
-			/* Generate t0, 2 <= t0, <= a - 2. */
-			do {
-				bn_rand(t0, RLC_POS, bn_bits(a));
-				bn_mod(t0, t0, a);
-			} while (bn_cmp_dig(t0, 2) == RLC_LT);
-			/* t2 = a - 1. */
-			bn_copy(t2, a);
-			bn_sub_dig(t2, t2, 1);
-			/* t1 = (a - 1)/2. */
-			bn_rsh(t1, t2, 1);
-			/* t1 = t0^(a - 1)/2 mod a. */
-#if BN_MOD != PMERS
-			bn_mxp(t1, t0, t1, a);
-#else
-			bn_exp(t1, t0, t1, a);
-#endif
-			/* If t1 != 1 and t1 != n - 1 return 0 */
-			if (bn_cmp_dig(t1, 1) != RLC_EQ && bn_cmp(t1, t2) != RLC_EQ) {
-				result = 0;
-				break;
-			}
-
-			/* t2 = (t0|a). */
-			bn_smb_jac(t2, t0, a);
-			if (bn_sign(t2) == RLC_NEG) {
-				bn_add(t2, t2, a);
-			}
-			/* If t1 != t2 (mod a) return 0. */
-			bn_mod(t1, t1, a);
-			bn_mod(t2, t2, a);
-			if (bn_cmp(t1, t2) != RLC_EQ) {
-				result = 0;
-				break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		result = 0;
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(t2);
-	}
-	return result;
-}
-
-#if BN_GEN == BASIC || !defined(STRIP)
-
-void bn_gen_prime_basic(bn_t a, int bits) {
-	while (1) {
-		do {
-			bn_rand(a, RLC_POS, bits);
-		} while (bn_bits(a) != bits);
-		if (bn_is_prime(a)) {
-			return;
-		}
-	}
-}
-
-#endif
-
-#if BN_GEN == SAFEP || !defined(STRIP)
-
-void bn_gen_prime_safep(bn_t a, int bits) {
-	while (1) {
-		do {
-			bn_rand(a, RLC_POS, bits);
-		} while (bn_bits(a) != bits);
-		/* Check if (a - 1)/2 is prime. */
-		bn_sub_dig(a, a, 1);
-		bn_rsh(a, a, 1);
-		if (bn_is_prime(a)) {
-			/* Restore a. */
-			bn_lsh(a, a, 1);
-			bn_add_dig(a, a, 1);
-			if (bn_is_prime(a)) {
-				/* Should be prime now. */
-				return;
-			}
-		}
-	}
-}
-
-#endif
-
-#if BN_GEN == STRON || !defined(STRIP)
-
-void bn_gen_prime_stron(bn_t a, int bits) {
-	dig_t i, j;
-	int found, k;
-	bn_t r, s, t;
-
-	bn_null(r);
-	bn_null(s);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(r);
-		bn_new(s);
-		bn_new(t);
-
-		do {
-			do {
-				/* Generate two large primes r and s. */
-				bn_rand(s, RLC_POS, bits / 2 - RLC_DIG / 2);
-				bn_rand(t, RLC_POS, bits / 2 - RLC_DIG / 2);
-			} while (!bn_is_prime(s) || !bn_is_prime(t));
-			found = 1;
-			bn_rand(a, RLC_POS, bits / 2 - bn_bits(t) - 1);
-			i = a->dp[0];
-			bn_dbl(t, t);
-			do {
-				/* Find first prime r = 2 * i * t + 1. */
-				bn_mul_dig(r, t, i);
-				bn_add_dig(r, r, 1);
-				i++;
-				if (bn_bits(r) > bits / 2 - 1) {
-					found = 0;
-					break;
-				}
-			} while (!bn_is_prime(r));
-			if (found == 0) {
-				continue;
-			}
-			/* Compute t = 2 * (s^(r-2) mod r) * s - 1. */
-			bn_sub_dig(t, r, 2);
-#if BN_MOD != PMERS
-			bn_mxp(t, s, t, r);
-#else
-			bn_exp(t, s, t, r);
-#endif
-
-			bn_mul(t, t, s);
-			bn_dbl(t, t);
-			bn_sub_dig(t, t, 1);
-
-			k = bits - bn_bits(r);
-			k -= bn_bits(s);
-			bn_rand(a, RLC_POS, k);
-			j = a->dp[0];
-			do {
-				/* Find first prime a = t + 2 * j * r * s. */
-				bn_mul(a, r, s);
-				bn_mul_dig(a, a, j);
-				bn_dbl(a, a);
-				bn_add(a, a, t);
-				j++;
-				if (bn_bits(a) > bits) {
-					found = 0;
-					break;
-				}
-			} while (!bn_is_prime(a));
-		} while (found == 0 && bn_bits(a) != bits);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r);
-		bn_free(s);
-		bn_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_rec.c b/src/dashbls/depends/relic/src/bn/relic_bn_rec.c
deleted file mode 100644
index 3922173cb79c..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_rec.c
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer recoding functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Returns a maximum of eight contiguous bits from a multiple precision integer.
- *
- * @param[in] a				- the multiple precision integer.
- * @param[in] from			- the first bit position.
- * @param[in] to			- the last bit position, inclusive.
- * @return the bits in the chosen positions.
- */
-static char get_bits(const bn_t a, int from, int to) {
-	int f, t;
-	dig_t mf, mt;
-
-	RLC_RIP(from, f, from);
-	RLC_RIP(to, t, to);
-
-	if (f == t) {
-		/* Same digit. */
-
-		mf = RLC_MASK(from);
-		if (to + 1 >= RLC_DIG) {
-			mt = RLC_DMASK;
-		} else {
-			mt = RLC_MASK(to + 1);
-		}
-
-		mf = mf ^ mt;
-
-		return ((a->dp[f] & (mf)) >> from);
-	} else {
-		mf = RLC_MASK(RLC_DIG - from) << from;
-		mt = RLC_MASK(to + 1);
-
-		return ((a->dp[f] & mf) >> from) |
-				((a->dp[t] & mt) << (RLC_DIG - from));
-	}
-}
-
-/**
- * Constant C for the partial reduction modulo (t^m - 1)/(t - 1).
- */
-#define MOD_C		8
-
-/**
- * Constant 2^C.
- */
-#define MOD_2TC		(1 << MOD_C)
-
-/**
- * Mask to calculate reduction modulo 2^C.
- */
-#define MOD_CMASK	(MOD_2TC - 1)
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_rec_win(uint8_t *win, int *len, const bn_t k, int w) {
-	int i, j, l;
-
-	l = bn_bits(k);
-
-	if (*len < RLC_CEIL(l, w)) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	memset(win, 0, *len);
-
-	j = 0;
-	for (i = 0; i < l - w; i += w) {
-		win[j++] = get_bits(k, i, i + w - 1);
-	}
-	win[j++] = get_bits(k, i, bn_bits(k) - 1);
-	*len = j;
-}
-
-void bn_rec_slw(uint8_t *win, int *len, const bn_t k, int w) {
-	int i, j, l, s;
-
-	l = bn_bits(k);
-
-	if (*len < l) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	memset(win, 0, *len);
-
-	i = l - 1;
-	j = 0;
-	while (i >= 0) {
-		if (!bn_get_bit(k, i)) {
-			i--;
-			win[j++] = 0;
-		} else {
-			s = RLC_MAX(i - w + 1, 0);
-			while (!bn_get_bit(k, s)) {
-				s++;
-			}
-			win[j++] = get_bits(k, s, i);
-			i = s - 1;
-		}
-	}
-	*len = j;
-}
-
-void bn_rec_naf(int8_t *naf, int *len, const bn_t k, int w) {
-	int i, l;
-	bn_t t;
-	dig_t t0, mask;
-	int8_t u_i;
-
-	if (*len < (bn_bits(k) + 1)) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_abs(t, k);
-
-		mask = RLC_MASK(w);
-		l = (1 << w);
-
-		memset(naf, 0, *len);
-
-		i = 0;
-		if (w == 2) {
-			while (!bn_is_zero(t)) {
-				if (!bn_is_even(t)) {
-					bn_get_dig(&t0, t);
-					u_i = 2 - (t0 & mask);
-					if (u_i < 0) {
-						bn_add_dig(t, t, -u_i);
-					} else {
-						bn_sub_dig(t, t, u_i);
-					}
-					*naf = u_i;
-				} else {
-					*naf = 0;
-				}
-				bn_hlv(t, t);
-				i++;
-				naf++;
-			}
-		} else {
-			while (!bn_is_zero(t)) {
-				if (!bn_is_even(t)) {
-					bn_get_dig(&t0, t);
-					u_i = t0 & mask;
-					if (u_i > l / 2) {
-						u_i = (int8_t)(u_i - l);
-					}
-					if (u_i < 0) {
-						bn_add_dig(t, t, -u_i);
-					} else {
-						bn_sub_dig(t, t, u_i);
-					}
-					*naf = u_i;
-				} else {
-					*naf = 0;
-				}
-				bn_hlv(t, t);
-				i++;
-				naf++;
-			}
-		}
-		*len = i;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void bn_rec_tnaf_get(uint8_t *t, int8_t *beta, int8_t *gama, int8_t u, int w) {
-	if (u == -1) {
-		switch (w) {
-			case 2:
-			case 3:
-				*t = 2;
-				break;
-			case 4:
-				*t = 10;
-				break;
-			case 5:
-			case 6:
-				*t = 26;
-				break;
-			case 7:
-			case 8:
-				*t = 90;
-				break;
-		}
-	} else {
-		switch (w) {
-			case 2:
-				*t = 2;
-				break;
-			case 3:
-			case 4:
-			case 5:
-				*t = 6;
-				break;
-			case 6:
-			case 7:
-				*t = 38;
-				break;
-			case 8:
-				*t = 166;
-				break;
-		}
-	}
-
-	beta[0] = 1;
-	gama[0] = 0;
-
-	if (w >= 3) {
-		beta[1] = 1;
-		gama[1] = (int8_t)-u;
-	}
-
-	if (w >= 4) {
-		beta[1] = -3;
-		beta[2] = -1;
-		beta[3] = 1;
-		gama[1] = gama[2] = gama[3] = (int8_t)u;
-	}
-
-	if (w >= 5) {
-		beta[4] = -3;
-		beta[5] = -1;
-		beta[6] = beta[7] = 1;
-		gama[4] = gama[5] = gama[6] = (int8_t)(2 * u);
-		gama[7] = (int8_t)(-3 * u);
-	}
-
-	if (w >= 6) {
-		beta[1] = beta[8] = beta[14] = 3;
-		beta[2] = beta[9] = beta[15] = 5;
-		beta[3] = -5;
-		beta[4] = beta[10] = beta[11] = -3;
-		beta[5] = beta[12] = -1;
-		beta[6] = beta[7] = beta[13] = 1;
-		gama[1] = gama[2] = 0;
-		gama[3] = gama[4] = gama[5] = gama[6] = (int8_t)(2 * u);
-		gama[7] = gama[8] = gama[9] = (int8_t)(-3 * u);
-		gama[10] = (int8_t)(4 * u);
-		gama[11] = gama[12] = gama[13] = (int8_t)(-u);
-		gama[14] = gama[15] = (int8_t)(-u);
-	}
-
-	if (w >= 7) {
-		beta[3] = beta[22] = beta[29] = 7;
-		beta[4] = beta[16] = beta[23] = -5;
-		beta[5] = beta[10] = beta[17] = beta[24] = -3;
-		beta[6] = beta[11] = beta[18] = beta[25] = beta[30] = -1;
-		beta[7] = beta[12] = beta[14] = beta[19] = beta[26] = beta[31] = 1;
-		beta[8] = beta[13] = beta[20] = beta[27] = 3;
-		beta[9] = beta[21] = beta[28] = 5;
-		beta[15] = -7;
-		gama[3] = 0;
-		gama[4] = gama[5] = gama[6] = (int8_t)(-3 * u);
-		gama[11] = gama[12] = gama[13] = (int8_t)(4 * u);
-		gama[14] = (int8_t)(-6 * u);
-		gama[15] = gama[16] = gama[17] = gama[18] = (int8_t)u;
-		gama[19] = gama[20] = gama[21] = gama[22] = (int8_t)u;
-		gama[23] = gama[24] = gama[25] = gama[26] = (int8_t)(-2 * u);
-		gama[27] = gama[28] = gama[29] = (int8_t)(-2 * u);
-		gama[30] = gama[31] = (int8_t)(5 * u);
-	}
-
-	if (w == 8) {
-		beta[10] = beta[17] = beta[48] = beta[55] = beta[62] = 7;
-		beta[11] = beta[18] = beta[49] = beta[56] = beta[63] = 9;
-		beta[12] = beta[22] = beta[29] = -3;
-		beta[36] = beta[43] = beta[50] = -3;
-		beta[13] = beta[23] = beta[30] = beta[37] = -1;
-		beta[44] = beta[51] = beta[58] = -1;
-		beta[14] = beta[24] = beta[31] = beta[38] = 1;
-		beta[45] = beta[52] = beta[59] = 1;
-		beta[15] = beta[32] = beta[39] = beta[46] = beta[53] = beta[60] = 3;
-		beta[16] = beta[40] = beta[47] = beta[54] = beta[61] = 5;
-		beta[19] = beta[57] = 11;
-		beta[20] = beta[27] = beta[34] = beta[41] = -7;
-		beta[21] = beta[28] = beta[35] = beta[42] = -5;
-		beta[25] = -11;
-		beta[26] = beta[33] = -9;
-		gama[10] = gama[11] = (int8_t)(-3 * u);
-		gama[12] = gama[13] = gama[14] = gama[15] = (int8_t)(-6 * u);
-		gama[16] = gama[17] = gama[18] = gama[19] = (int8_t)(-6 * u);
-		gama[20] = gama[21] = gama[22] = (int8_t)(8 * u);
-		gama[23] = gama[24] = (int8_t)(8 * u);
-		gama[25] = gama[26] = gama[27] = gama[28] = (int8_t)(5 * u);
-		gama[29] = gama[30] = gama[31] = gama[32] = (int8_t)(5 * u);
-		gama[33] = gama[34] = gama[35] = gama[36] = (int8_t)(2 * u);
-		gama[37] = gama[38] = gama[39] = gama[40] = (int8_t)(2 * u);
-		gama[41] = gama[42] = gama[43] = gama[44] = (int8_t)(-1 * u);
-		gama[45] = gama[46] = gama[47] = gama[48] = (int8_t)(-1 * u);
-		gama[49] = (int8_t)(-1 * u);
-		gama[50] = gama[51] = gama[52] = gama[53] = (int8_t)(-4 * u);
-		gama[54] = gama[55] = gama[56] = gama[57] = (int8_t)(-4 * u);
-		gama[58] = gama[59] = gama[60] = (int8_t)(-7 * u);
-		gama[61] = gama[62] = gama[63] = (int8_t)(-7 * u);
-	}
-}
-
-void bn_rec_tnaf_mod(bn_t r0, bn_t r1, const bn_t k, int u, int m) {
-	bn_t t, t0, t1, t2, t3;
-
-	bn_null(t);
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(t2);
-	bn_null(t3);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(t2);
-		bn_new(t3);
-
-		/* (a0, a1) = (1, 0). */
-		bn_set_dig(t0, 1);
-		bn_zero(t1);
-		/* (b0, b1) = (0, 0). */
-		bn_zero(t2);
-		bn_zero(t3);
-		/* (r0, r1) = (k, 0). */
-		bn_abs(r0, k);
-		bn_zero(r1);
-
-		for (int i = 0; i < m; i++) {
-			if (!bn_is_even(r0)) {
-				/* r0 = r0 - 1. */
-				bn_sub_dig(r0, r0, 1);
-				/* (b0, b1) = (b0 + a0, b1 + a1). */
-				bn_add(t2, t2, t0);
-				bn_add(t3, t3, t1);
-			}
-
-			bn_hlv(t, r0);
-			/* r0 = r1 + mu * r0 / 2. */
-			if (u == -1) {
-				bn_sub(r0, r1, t);
-			} else {
-				bn_add(r0, r1, t);
-			}
-			/* r1 = - r0 / 2. */
-			bn_neg(r1, t);
-
-			bn_dbl(t, t1);
-			/* a1 = a0 + mu * a1. */
-			if (u == -1) {
-				bn_sub(t1, t0, t1);
-			} else {
-				bn_add(t1, t0, t1);
-			}
-			/* a0 = - 2 * a1. */
-			bn_neg(t0, t);
-		}
-
-		/*r 0 = r0 + b0, r1 = r1 + b1. */
-		bn_add(r0, r0, t2);
-		bn_add(r1, r1, t3);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(t2);
-		bn_free(t3);
-	}
-}
-
-void bn_rec_tnaf(int8_t *tnaf, int *len, const bn_t k, int8_t u, int m, int w) {
-	int i, l;
-	bn_t tmp, r0, r1;
-	int8_t beta[64], gama[64];
-	uint8_t t_w;
-	dig_t t0, t1, mask;
-	int s, t, u_i;
-
-	bn_null(r0);
-	bn_null(r1);
-	bn_null(tmp);
-
-	if (*len < (bn_bits(k) + 1)) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(r0);
-		bn_new(r1);
-		bn_new(tmp);
-
-		memset(tnaf, 0, *len);
-
-		bn_rec_tnaf_get(&t_w, beta, gama, u, w);
-		bn_abs(tmp, k);
-		bn_rec_tnaf_mod(r0, r1, tmp, u, m);
-
-		mask = RLC_MASK(w);
-		l = 1 << w;
-
-		i = 0;
-		while (!bn_is_zero(r0) || !bn_is_zero(r1)) {
-			while ((r0->dp[0] & 1) == 0) {
-				tnaf[i++] = 0;
-				/* tmp = r0. */
-				bn_hlv(tmp, r0);
-				/* r0 = r1 + mu * r0 / 2. */
-				if (u == -1) {
-					bn_sub(r0, r1, tmp);
-				} else {
-					bn_add(r0, r1, tmp);
-				}
-				/* r1 = - r0 / 2. */
-				bn_copy(r1, tmp);
-				r1->sign = tmp->sign ^ 1;
-			}
-			/* If r0 is odd. */
-			if (w == 2) {
-				t0 = r0->dp[0];
-				if (bn_sign(r0) == RLC_NEG) {
-					t0 = l - t0;
-				}
-				t1 = r1->dp[0];
-				if (bn_sign(r1) == RLC_NEG) {
-					t1 = l - t1;
-				}
-				u_i = 2 - ((t0 - 2 * t1) & mask);
-				tnaf[i++] = u_i;
-				if (u_i < 0) {
-					bn_add_dig(r0, r0, -u_i);
-				} else {
-					bn_sub_dig(r0, r0, u_i);
-				}
-			} else {
-				/* t0 = r0 mod_s 2^w. */
-				t0 = r0->dp[0];
-				if (bn_sign(r0) == RLC_NEG) {
-					t0 = l - t0;
-				}
-				/* t1 = r1 mod_s 2^w. */
-				t1 = r1->dp[0];
-				if (bn_sign(r1) == RLC_NEG) {
-					t1 = l - t1;
-				}
-				/* u = r0 + r1 * (t_w) mod_s 2^w. */
-				u_i = (t0 + t_w * t1) & mask;
-
-				if (u_i >= (l / 2)) {
-					/* If u < 0, s = -1 and u = -u. */
-					u_i = (int8_t)(u_i - l);
-					tnaf[i++] = u_i;
-					u_i = (int8_t)(-u_i >> 1);
-					t = -beta[u_i];
-					s = -gama[u_i];
-				} else {
-					/* If u > 0, s = 1. */
-					tnaf[i++] = u_i;
-					u_i = (int8_t)(u_i >> 1);
-					t = beta[u_i];
-					s = gama[u_i];
-				}
-				/* r0 = r0 - s * beta_u. */
-				if (t > 0) {
-					bn_sub_dig(r0, r0, t);
-				} else {
-					bn_add_dig(r0, r0, -t);
-				}
-				/* r1 = r1 - s * gama_u. */
-				if (s > 0) {
-					bn_sub_dig(r1, r1, s);
-				} else {
-					bn_add_dig(r1, r1, -s);
-				}
-			}
-			/* tmp = r0. */
-			bn_hlv(tmp, r0);
-			/* r0 = r1 + mu * r0 / 2. */
-			if (u == -1) {
-				bn_sub(r0, r1, tmp);
-			} else {
-				bn_add(r0, r1, tmp);
-			}
-			/* r1 = - r0 / 2. */
-			bn_copy(r1, tmp);
-			r1->sign = tmp->sign ^ 1;
-		}
-		*len = i;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r0);
-		bn_free(r1);
-		bn_free(tmp);
-	}
-}
-
-void bn_rec_rtnaf(int8_t *tnaf, int *len, const bn_t k, int8_t u, int m, int w) {
-	int i, l;
-	bn_t tmp, r0, r1;
-	int8_t beta[64], gama[64];
-	uint8_t t_w;
-	dig_t t0, t1, mask;
-	int s, t, u_i;
-
-	bn_null(r0);
-	bn_null(r1);
-	bn_null(tmp);
-
-	if (*len < (bn_bits(k) + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(r0);
-		bn_new(r1);
-		bn_new(tmp);
-
-		memset(tnaf, 0, *len);
-
-		bn_rec_tnaf_get(&t_w, beta, gama, u, w);
-		bn_abs(tmp, k);
-		bn_rec_tnaf_mod(r0, r1, tmp, u, m);
-		mask = RLC_MASK(w);
-		l = RLC_CEIL(m + 2, (w - 1));
-
-		i = 0;
-		while (i < l) {
-			/* If r0 is odd. */
-			if (w == 2) {
-				t0 = r0->dp[0];
-				if (bn_sign(r0) == RLC_NEG) {
-					t0 = (1 << w) - t0;
-				}
-				t1 = r1->dp[0];
-				if (bn_sign(r1) == RLC_NEG) {
-					t1 = (1 << w) - t1;
-				}
-				u_i = ((t0 - 2 * t1) & mask) - 2;
-				tnaf[i++] = u_i;
-				if (u_i < 0) {
-					bn_add_dig(r0, r0, -u_i);
-				} else {
-					bn_sub_dig(r0, r0, u_i);
-				}
-			} else {
-				/* t0 = r0 mod_s 2^w. */
-				t0 = r0->dp[0];
-				if (bn_sign(r0) == RLC_NEG) {
-					t0 = (1 << w) - t0;
-				}
-				/* t1 = r1 mod_s 2^w. */
-				t1 = r1->dp[0];
-				if (bn_sign(r1) == RLC_NEG) {
-					t1 = (1 << w) - t1;
-				}
-				/* u = r0 + r1 * (t_w) mod_s 2^w. */
-				u_i = ((t0 + t_w * t1) & mask) - (1 << (w - 1));
-				if (u_i < 0) {
-					/* If u < 0, s = -1 and u = -u. */
-					tnaf[i++] = u_i;
-					u_i = (int8_t)(-u_i >> 1);
-					t = -beta[u_i];
-					s = -gama[u_i];
-				} else {
-					/* If u > 0, s = 1. */
-					tnaf[i++] = u_i;
-					u_i = (int8_t)(u_i >> 1);
-					t = beta[u_i];
-					s = gama[u_i];
-				}
-				/* r0 = r0 - s * beta_u. */
-				if (t > 0) {
-					bn_sub_dig(r0, r0, t);
-				} else {
-					bn_add_dig(r0, r0, -t);
-				}
-				/* r1 = r1 - s * gama_u. */
-				if (s > 0) {
-					bn_sub_dig(r1, r1, s);
-				} else {
-					bn_add_dig(r1, r1, -s);
-				}
-			}
-			for (int j = 0; j < (w - 1); j++) {
-				/* tmp = r0. */
-				bn_hlv(tmp, r0);
-				/* r0 = r1 + mu * r0 / 2. */
-				if (u == -1) {
-					bn_sub(r0, r1, tmp);
-				} else {
-					bn_add(r0, r1, tmp);
-				}
-				/* r1 = - r0 / 2. */
-				bn_copy(r1, tmp);
-				r1->sign = tmp->sign ^ 1;
-			}
-		}
-		s = r0->dp[0];
-		t = r1->dp[0];
-		if (bn_sign(r0) == RLC_NEG) {
-			s = -s;
-		}
-		if (bn_sign(r1) == RLC_NEG) {
-			t = -t;
-		}
-		if (s != 0 && t != 0) {
-			for (int j = 0; j < (1 << (w - 2)); j++) {
-				if (beta[j] == s && gama[j] == t) {
-					tnaf[i++] = 2 * j + 1;
-					break;
-				}
-			}
-			for (int j = 0; j < (1 << (w - 2)); j++) {
-				if (beta[j] == -s && gama[j] == -t) {
-					tnaf[i++] = -(2 * j + 1);
-					break;
-				}
-			}
-		} else {
-			if (t != 0) {
-				tnaf[i++] = t;
-			} else {
-				tnaf[i++] = s;
-			}
-		}
-		*len = i;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r0);
-		bn_free(r1);
-		bn_free(tmp);
-	}
-}
-
-void bn_rec_reg(int8_t *naf, int *len, const bn_t k, int n, int w) {
-	int i, l;
-	bn_t t;
-	dig_t t0, mask;
-	int8_t u_i;
-
-	bn_null(t);
-
-	mask = RLC_MASK(w);
-	l = RLC_CEIL(n, w - 1);
-
-	if (*len <= l) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-		bn_abs(t, k);
-
-		memset(naf, 0, *len);
-
-		i = 0;
-		if (w == 2) {
-			for (i = 0; i < l; i++) {
-				u_i = (t->dp[0] & mask) - 2;
-				t->dp[0] -= u_i;
-				naf[i] = u_i;
-				bn_hlv(t, t);
-			}
-			bn_get_dig(&t0, t);
-			naf[i] = t0;
-		} else {
-			for (i = 0; i < l; i++) {
-				u_i = (t->dp[0] & mask) - (1 << (w - 1));
-				t->dp[0] -= u_i;
-				naf[i] = u_i;
-				bn_rsh(t, t, w - 1);
-			}
-			bn_get_dig(&t0, t);
-			naf[i] = t0;
-		}
-		*len = l + 1;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void bn_rec_jsf(int8_t *jsf, int *len, const bn_t k, const bn_t l) {
-	bn_t n0, n1;
-	dig_t l0, l1;
-	int8_t u0, u1, d0, d1;
-	int i, j, offset;
-
-	if (*len < (2 * bn_bits(k) + 1)) {
-		*len = 0;
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	bn_null(n0);
-	bn_null(n1);
-
-	RLC_TRY {
-		bn_new(n0);
-		bn_new(n1);
-
-		bn_abs(n0, k);
-		bn_abs(n1, l);
-
-		i = bn_bits(k);
-		j = bn_bits(l);
-		offset = RLC_MAX(i, j) + 1;
-
-		memset(jsf, 0, *len);
-
-		i = 0;
-		d0 = d1 = 0;
-		while (!(bn_is_zero(n0) && d0 == 0) || !(bn_is_zero(n1) && d1 == 0)) {
-			bn_get_dig(&l0, n0);
-			bn_get_dig(&l1, n1);
-			/* For reduction modulo 8. */
-			l0 = (l0 + d0) & RLC_MASK(3);
-			l1 = (l1 + d1) & RLC_MASK(3);
-
-			if (l0 % 2 == 0) {
-				u0 = 0;
-			} else {
-				u0 = 2 - (l0 & RLC_MASK(2));
-				if ((l0 == 3 || l0 == 5) && ((l1 & RLC_MASK(2)) == 2)) {
-					u0 = (int8_t)-u0;
-				}
-			}
-			jsf[i] = u0;
-			if (l1 % 2 == 0) {
-				u1 = 0;
-			} else {
-				u1 = 2 - (l1 & RLC_MASK(2));
-				if ((l1 == 3 || l1 == 5) && ((l0 & RLC_MASK(2)) == 2)) {
-					u1 = (int8_t)-u1;
-				}
-			}
-			jsf[i + offset] = u1;
-
-			if (d0 + d0 == 1 + u0) {
-				d0 = (int8_t)(1 - d0);
-			}
-			if (d1 + d1 == 1 + u1) {
-				d1 = (int8_t)(1 - d1);
-			}
-
-			i++;
-			bn_hlv(n0, n0);
-			bn_hlv(n1, n1);
-		}
-		*len = i;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n0);
-		bn_free(n1);
-	}
-
-}
-
-void bn_rec_glv(bn_t k0, bn_t k1, const bn_t k, const bn_t n, const bn_t *v1,
-		const bn_t *v2) {
-	bn_t t, b1, b2;
-	int r1, r2, bits;
-
-	bn_null(b1);
-	bn_null(b2);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(b1);
-		bn_new(b2);
-		bn_new(t);
-
-		bn_abs(t, k);
-		bits = bn_bits(n);
-
-		bn_mul(b1, t, v1[0]);
-		r1 = bn_get_bit(b1, bits);
-		bn_rsh(b1, b1, bits + 1);
-		bn_add_dig(b1, b1, r1);
-
-		bn_mul(b2, t, v2[0]);
-		r2 = bn_get_bit(b2, bits);
-		bn_rsh(b2, b2, bits + 1);
-		bn_add_dig(b2, b2, r2);
-
-		bn_mul(k0, b1, v1[1]);
-		bn_mul(k1, b2, v2[1]);
-		bn_add(k0, k0, k1);
-		bn_sub(k0, t, k0);
-
-		bn_mul(k1, b1, v1[2]);
-		bn_mul(t, b2, v2[2]);
-		bn_add(k1, k1, t);
-		bn_neg(k1, k1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(b1);
-		bn_free(b2);
-		bn_free(t);
-	}
-}
-
-void bn_rec_frb(bn_t *ki, int sub, const bn_t k, const bn_t x, const bn_t n,
-		int bls) {
-	int i, l;
-	bn_t u[4], v[4];
-
-	RLC_TRY {
-		for (i = 0; i < 4; i++) {
-			bn_null(u[i]);
-			bn_null(v[i]);
-			bn_new(u[i]);
-			bn_new(v[i]);
-		}
-
-		if (bls) {
-			bn_abs(v[0], k);
-			bn_abs(u[0], x);
-
-			for (i = 0; i < sub; i++) {
-				bn_mod(ki[i], v[0], u[0]);
-				bn_div(v[0], v[0], u[0]);
-				if ((bn_sign(x) == RLC_NEG) && (i % 2 != 0)) {
-					bn_neg(ki[i], ki[i]);
-				}
-				if (bn_sign(k) == RLC_NEG) {
-					bn_neg(ki[i], ki[i]);
-				}
-			}
-		} else {
-			bn_copy(v[1], x);
-			bn_copy(v[2], x);
-			bn_copy(v[3], x);
-
-			/* t = 2x^2. */
-			bn_sqr(u[3], x);
-			bn_dbl(u[3], u[3]);
-
-			/* v0 = 2x^2 + 3x + 1. */
-			bn_mul_dig(v[0], x, 3);
-			bn_add_dig(v[0], v[0], 1);
-			bn_add(v[0], v[0], u[3]);
-
-			/* v3 = -(2x^2 + x). */
-			bn_add(v[3], v[3], u[3]);
-			bn_neg(v[3], v[3]);
-
-			/* v1 = 12x^3 + 8x^2 + x, v2 = 6x^3 + 4x^2 + x. */
-			bn_dbl(u[3], u[3]);
-			bn_add(v[2], v[2], u[3]);
-			bn_dbl(u[3], u[3]);
-			bn_add(v[1], v[1], u[3]);
-			bn_rsh(u[3], u[3], 2);
-			bn_mul(u[3], u[3], x);
-			bn_mul_dig(u[3], u[3], 3);
-			bn_add(v[2], v[2], u[3]);
-			bn_dbl(u[3], u[3]);
-			bn_add(v[1], v[1], u[3]);
-
-			for (i = 0; i < 4; i++) {
-				bn_mul(v[i], v[i], k);
-				bn_div(v[i], v[i], n);
-				if (bn_sign(v[i]) == RLC_NEG) {
-					bn_add_dig(v[i], v[i], 1);
-				}
-				bn_zero(ki[i]);
-			}
-
-			/* u0 = x + 1, u1 = 2x + 1, u2 = 2x, u3 = x - 1. */
-			bn_dbl(u[2], x);
-			bn_add_dig(u[1], u[2], 1);
-			bn_sub_dig(u[3], x, 1);
-			bn_add_dig(u[0], x, 1);
-			bn_copy(ki[0], k);
-			for (i = 0; i < 4; i++) {
-				bn_mul(u[i], u[i], v[i]);
-				bn_mod(u[i], u[i], n);
-				bn_add(ki[0], ki[0], n);
-				bn_sub(ki[0], ki[0], u[i]);
-				bn_mod(ki[0], ki[0], n);
-			}
-
-			/* u0 = x, u1 = -x, u2 = 2x + 1, u3 = 4x + 2. */
-			bn_copy(u[0], x);
-			bn_neg(u[1], x);
-			bn_dbl(u[2], x);
-			bn_add_dig(u[2], u[2], 1);
-			bn_dbl(u[3], u[2]);
-			for (i = 0; i < 4; i++) {
-				bn_mul(u[i], u[i], v[i]);
-				bn_mod(u[i], u[i], n);
-				bn_add(ki[1], ki[1], n);
-				bn_sub(ki[1], ki[1], u[i]);
-				bn_mod(ki[1], ki[1], n);
-			}
-
-			/* u0 = x, u1 = -(x + 1), u2 = 2x + 1, u3 = -(2x - 1). */
-			bn_copy(u[0], x);
-			bn_add_dig(u[1], x, 1);
-			bn_neg(u[1], u[1]);
-			bn_dbl(u[2], x);
-			bn_add_dig(u[2], u[2], 1);
-			bn_sub_dig(u[3], u[2], 2);
-			bn_neg(u[3], u[3]);
-			for (i = 0; i < 4; i++) {
-				bn_mul(u[i], u[i], v[i]);
-				bn_mod(u[i], u[i], n);
-				bn_add(ki[2], ki[2], n);
-				bn_sub(ki[2], ki[2], u[i]);
-				bn_mod(ki[2], ki[2], n);
-			}
-
-			/* u0 = -2x, u1 = -x, u2 = 2x + 1, u3 = x - 1. */
-			bn_dbl(u[0], x);
-			bn_neg(u[0], u[0]);
-			bn_dbl(u[2], x);
-			bn_add_dig(u[2], u[2], 1);
-			bn_sub_dig(u[3], x, 1);
-			bn_neg(u[1], x);
-			for (i = 0; i < 4; i++) {
-				bn_mul(u[i], u[i], v[i]);
-				bn_mod(u[i], u[i], n);
-				bn_add(ki[3], ki[3], n);
-				bn_sub(ki[3], ki[3], u[i]);
-				bn_mod(ki[3], ki[3], n);
-			}
-
-			for (i = 0; i < 4; i++) {
-				l = bn_bits(ki[i]);
-				bn_sub(ki[i], n, ki[i]);
-				if (bn_bits(ki[i]) > l) {
-					bn_sub(ki[i], ki[i], n);
-					ki[i]->sign = RLC_POS;
-				} else {
-					ki[i]->sign = RLC_NEG;
-				}
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		for (i = 0; i < 4; i++) {
-			bn_free(u[i]);
-			bn_free(v[i]);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_shift.c b/src/dashbls/depends/relic/src/bn/relic_bn_shift.c
deleted file mode 100644
index bf010d9ab0a3..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_shift.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision arithmetic shift functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_dbl(bn_t c, const bn_t a) {
-	dig_t carry;
-
-	RLC_TRY {
-		bn_grow(c, a->used + 1);
-
-		c->used = a->used;
-		carry = bn_lsh1_low(c->dp, a->dp, c->used);
-
-		/* If there is an additional carry. */
-		if (carry != 0) {
-			c->dp[c->used] = carry;
-			(c->used)++;
-		}
-
-		c->sign = a->sign;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-void bn_hlv(bn_t c, const bn_t a) {
-	bn_copy(c, a);
-	bn_rsh1_low(c->dp, c->dp, c->used);
-	bn_trim(c);
-}
-
-void bn_lsh(bn_t c, const bn_t a, int bits) {
-	int digits;
-	dig_t carry;
-
-	bn_copy(c, a);
-
-	if (bits <= 0) {
-		return;
-	}
-
-	RLC_RIP(bits, digits, bits);
-
-	RLC_TRY {
-		bn_grow(c, c->used + digits + (bits > 0));
-
-		c->used = a->used + digits;
-		c->sign = a->sign;
-		if (digits > 0) {
-			dv_lshd(c->dp, a->dp, c->used, digits);
-		}
-
-		if (bits > 0) {
-			if (c != a) {
-				carry = bn_lshb_low(c->dp + digits, a->dp, a->used, bits);
-			} else {
-				carry = bn_lshb_low(c->dp + digits, c->dp + digits, c->used - digits, bits);
-			}
-			if (carry != 0) {
-				c->dp[c->used] = carry;
-				(c->used)++;
-			}
-		}
-		bn_trim(c);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-void bn_rsh(bn_t c, const bn_t a, int bits) {
-	int digits = 0;
-
-	bn_copy(c, a);
-
-	if (bits <= 0) {
-		return;
-	}
-
-	RLC_RIP(bits, digits, bits);
-
-	if (digits > 0) {
-		dv_rshd(c->dp, a->dp, a->used, digits);
-	}
-	c->used = a->used - digits;
-	c->sign = a->sign;
-
-	if (c->used > 0 && bits > 0) {
-		if (digits == 0 && c != a) {
-			bn_rshb_low(c->dp, a->dp + digits, a->used - digits, bits);
-		} else {
-			bn_rshb_low(c->dp, c->dp, c->used, bits);
-		}
-	}
-	bn_trim(c);
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_smb.c b/src/dashbls/depends/relic/src/bn/relic_bn_smb.c
deleted file mode 100644
index 1fc9776947c8..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_smb.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Legendre and Jacobi symbols.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_smb_leg(bn_t c, const bn_t a, const bn_t b) {
-	bn_t t;
-
-	bn_null(t);
-
-	if (bn_sign(b) == RLC_NEG) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (bn_cmp(a, b) == RLC_EQ) {
-		bn_zero(c);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-
-		/* t = (b - 1)/2. */
-		bn_sub_dig(t, b, 1);
-		bn_rsh(t, t, 1);
-		bn_mxp(c, a, t, b);
-		bn_sub_dig(t, b, 1);
-		if (bn_cmp(c, t) == RLC_EQ) {
-			bn_set_dig(c, 1);
-			bn_neg(c, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void bn_smb_jac(bn_t c, const bn_t a, const bn_t b) {
-	bn_t t0, t1, r;
-	int t, h;
-
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(r);
-
-	/* Argument b must be odd. */
-	if (bn_is_even(b) || bn_sign(b) == RLC_NEG) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(r);
-		t = 1;
-
-		if (bn_sign(a) == RLC_NEG) {
-			bn_add(t0, a, b);
-		} else {
-			bn_copy(t0, a);
-		}
-		bn_copy(t1, b);
-
-		while (1) {
-			/* t0 = a mod b. */
-			bn_mod(t0, t0, t1);
-			/* If a = 0 then if n = 1 return t else return 0. */
-			if (bn_is_zero(t0)) {
-				if (bn_cmp_dig(t1, 1) == RLC_EQ) {
-					bn_set_dig(c, 1);
-					if (t == -1) {
-						bn_neg(c, c);
-					}
-					break;
-				} else {
-					bn_zero(c);
-					break;
-				}
-			}
-			/* Write t0 as 2^h * t0. */
-			h = 0;
-			while (bn_is_even(t0)) {
-				h++;
-				bn_rsh(t0, t0, 1);
-			}
-			/* If h != 0 (mod 2) and n != +-1 (mod 8) then t = -t. */
-			bn_mod_2b(r, t1, 3);
-			if ((h % 2 != 0) && (bn_cmp_dig(r, 1) != RLC_EQ) &&
-					(bn_cmp_dig(r, 7) != RLC_EQ)) {
-				t = -t;
-			}
-			/* If t0 != 1 (mod 4) and n != 1 (mod 4) then t = -t. */
-			bn_mod_2b(r, t0, 2);
-			if (bn_cmp_dig(r, 1) != RLC_EQ) {
-				bn_mod_2b(r, t1, 2);
-				if (bn_cmp_dig(r, 1) != RLC_EQ) {
-					t = -t;
-				}
-			}
-			bn_copy(r, t0);
-			bn_copy(t0, t1);
-			bn_copy(t1, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(r);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_sqr.c b/src/dashbls/depends/relic/src/bn/relic_bn_sqr.c
deleted file mode 100644
index 2e38203c6b1d..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_sqr.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision arithmetic squaring
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if BN_KARAT > 0 || !defined(STRIP)
-
-/**
- * Computes the square of a multiple precision integer using recursive Karatsuba
- * squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the multiple precision integer to square.
- * @param[in] level			- the number of Karatsuba steps to apply.
- */
-static void bn_sqr_karat_imp(bn_t c, const bn_t a, int level) {
-	bn_t a0, a1, a0a0, a1a1, t;
-	int h = a->used >> 1;
-
-	bn_null(a0);
-	bn_null(a1);
-	bn_null(a0a0);
-	bn_null(a1a1);
-	bn_null(t);
-
-	RLC_TRY {
-		/* Allocate the temp variables. */
-		bn_new_size(a0, h);
-		bn_new_size(a1, a->used - h);
-		bn_new(a0a0);
-		bn_new(a1a1);
-		bn_new(t);
-
-		/* a = a1 || a0 */
-		a0->used = h;
-		a1->used = a->used - h;
-		dv_copy(a0->dp, a->dp, h);
-		dv_copy(a1->dp, a->dp + h, a->used - h);
-		bn_trim(a0);
-		bn_trim(a1);
-
-		if (level <= 1) {
-			/* a0a0 = a0 * a0 and a1a1 = a1 * a1 */
-#if BN_SQR == BASIC
-			bn_sqr_basic(a0a0, a0);
-			bn_sqr_basic(a1a1, a1);
-#elif BN_SQR == COMBA
-			bn_sqr_comba(a0a0, a0);
-			bn_sqr_comba(a1a1, a1);
-#elif BN_SQR == MULTP
-			bn_mul_comba(a0a0, a0, a0);
-			bn_mul_comba(a1a1, a1, a1);
-#endif
-		} else {
-			bn_sqr_karat_imp(a0a0, a0, level - 1);
-			bn_sqr_karat_imp(a1a1, a1, level - 1);
-		}
-
-		/* t = (a1 + a0) */
-		bn_add(t, a1, a0);
-
-		if (level <= 1) {
-			/* t = (a1 + a0)*(a1 + a0) */
-#if BN_SQR == BASIC
-			bn_sqr_basic(t, t);
-#elif BN_SQR == COMBA
-			bn_sqr_comba(t, t);
-#elif BN_SQR == MULTP
-			bn_mul_comba(t, t, t);
-#endif
-		} else {
-			bn_sqr_karat_imp(t, t, level - 1);
-		}
-
-		/* t2 = (a0*a0 + a1*a1) */
-		bn_add(a0, a0a0, a1a1);
-		/* t = (a1 + a0)*(b1 + b0) - (a0*a0 + a1*a1) */
-		bn_sub(t, t, a0);
-
-		/* t = (a1 + a0)*(a1 + a0) - (a0*a0 + a1*a1) << h digits */
-		bn_lsh(t, t, h * RLC_DIG);
-
-		/* t2 = a1 * b1 << 2*h digits */
-		bn_lsh(a1a1, a1a1, 2 * h * RLC_DIG);
-
-		/* t = t + a0*a0 */
-		bn_add(t, t, a0a0);
-		/* c = t + a1*a1 */
-		bn_add(t, t, a1a1);
-
-		t->sign = RLC_POS;
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a0);
-		bn_free(a1);
-		bn_free(a0a0);
-		bn_free(a1a1);
-		bn_free(t);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if BN_SQR == BASIC || !defined(STRIP)
-
-void bn_sqr_basic(bn_t c, const bn_t a) {
-	int i;
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new_size(t, 2 * a->used);
-		bn_zero(t);
-
-		for (i = 0; i < a->used - 1; i++) {
-			t->dp[a->used + i + 1] =
-					bn_sqra_low(t->dp + 2 * i, a->dp + i, a->used - i);
-		}
-		bn_sqra_low(t->dp + 2 * i, a->dp + i, 1);
-
-		t->used = 2 * a->used;
-		t->sign = RLC_POS;
-		bn_trim(t);
-		bn_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif
-
-#if BN_SQR == COMBA || !defined(STRIP)
-
-void bn_sqr_comba(bn_t c, const bn_t a) {
-	int digits;
-	bn_t t;
-
-	bn_null(t);
-
-	digits = 2 * a->used;
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		bn_new_size(t, digits);
-		t->used = digits;
-
-		bn_sqrn_low(t->dp, a->dp, a->used);
-
-		t->sign = RLC_POS;
-		bn_trim(t);
-		bn_copy(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-
-void bn_sqr_karat(bn_t c, const bn_t a) {
-	bn_sqr_karat_imp(c, a, BN_KARAT);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_srt.c b/src/dashbls/depends/relic/src/bn/relic_bn_srt.c
deleted file mode 100644
index ae347bf47fe8..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_srt.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer square root extraction.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_srt(bn_t c, bn_t a) {
-	bn_t h, l, m, t;
-	int bits, cmp;
-
-	if (bn_sign(a) == RLC_NEG) {
-		RLC_THROW(ERR_NO_VALID);
-	}
-
-	bits = bn_bits(a);
-	bits += (bits % 2);
-
-	bn_null(h);
-	bn_null(l);
-	bn_null(m);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(h);
-		bn_new(l);
-		bn_new(m);
-		bn_new(t);
-
-		bn_set_2b(h, bits >> 1);
-		bn_set_2b(l, (bits >> 1) - 1);
-
-		/* Trivial binary search approach. */
-		do {
-			bn_add(m, h, l);
-			bn_hlv(m, m);
-			bn_sqr(t, m);
-			cmp = bn_cmp(t, a);
-			bn_sub(t, h, l);
-
-			if (cmp == RLC_GT) {
-				bn_copy(h, m);
-			} else if (cmp == RLC_LT) {
-				bn_copy(l, m);
-			}
-		} while (bn_cmp_dig(t, 1) == RLC_GT && cmp != RLC_EQ);
-
-		bn_copy(c, m);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(h);
-		bn_free(l);
-		bn_free(m);
-		bn_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/bn/relic_bn_util.c b/src/dashbls/depends/relic/src/bn/relic_bn_util.c
deleted file mode 100644
index d438b94ace11..000000000000
--- a/src/dashbls/depends/relic/src/bn/relic_bn_util.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision utilities.
- *
- * @ingroup bn
- */
-
-#include <inttypes.h>
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Statistical distance 1/2^\lambda between sampling and uniform distribution.
- */
-#define RAND_DIST		40
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_copy(bn_t c, const bn_t a) {
-	if (c->dp == a->dp) {
-		return;
-	}
-
-	bn_grow(c, a->used);
-	dv_copy(c->dp, a->dp, a->used);
-
-	c->used = a->used;
-	c->sign = a->sign;
-}
-
-void bn_abs(bn_t c, const bn_t a) {
-	if (c->dp != a->dp) {
-		bn_copy(c, a);
-	}
-	c->sign = RLC_POS;
-}
-
-void bn_neg(bn_t c, const bn_t a) {
-	if (c->dp != a->dp) {
-		bn_copy(c, a);
-	}
-	if (!bn_is_zero(c)) {
-		c->sign = a->sign ^ 1;
-	}
-}
-
-int bn_sign(const bn_t a) {
-	return a->sign;
-}
-
-void bn_zero(bn_t a) {
-	a->sign = RLC_POS;
-	a->used = 1;
-	dv_zero(a->dp, a->alloc);
-}
-
-int bn_is_zero(const bn_t a) {
-	if (a->used == 0) {
-		return 1;
-	}
-	if ((a->used == 1) && (a->dp[0] == 0)) {
-		return 1;
-	}
-	return 0;
-}
-
-int bn_is_even(const bn_t a) {
-	if (bn_is_zero(a)) {
-		return 1;
-	}
-	if ((a->dp[0] & 0x01) == 0) {
-		return 1;
-	}
-	return 0;
-}
-
-int bn_bits(const bn_t a) {
-	int bits;
-
-	if (bn_is_zero(a)) {
-		return 0;
-	}
-
-	/* Bits in lower digits. */
-	bits = (a->used - 1) * RLC_DIG;
-
-	return bits + util_bits_dig(a->dp[a->used - 1]);
-}
-
-int bn_get_bit(const bn_t a, int bit) {
-	int d;
-
-	if (bit < 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return 0;
-	}
-
-	if (bit > bn_bits(a)) {
-		return 0;
-	}
-
-	RLC_RIP(bit, d, bit);
-
-	if (d >= a->used) {
-		return 0;
-	} else {
-		return (a->dp[d] >> bit) & (dig_t)1;
-	}
-}
-
-void bn_set_bit(bn_t a, int bit, int value) {
-	int d;
-
-	if (bit < 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_RIP(bit, d, bit);
-
-	bn_grow(a, d);
-
-	if (value == 1) {
-		a->dp[d] |= ((dig_t)1 << bit);
-		if ((d + 1) > a->used) {
-			a->used = d + 1;
-		}
-	} else {
-		a->dp[d] &= ~((dig_t)1 << bit);
-		bn_trim(a);
-	}
-}
-
-int bn_ham(const bn_t a) {
-	int c = 0;
-
-	for (int i = 0; i < bn_bits(a); i++) {
-		c += bn_get_bit(a, i);
-	}
-
-	return c;
-}
-
-void bn_get_dig(dig_t *c, const bn_t a) {
-	*c = a->dp[0];
-}
-
-void bn_set_dig(bn_t a, dig_t digit) {
-	bn_zero(a);
-	a->dp[0] = digit;
-	a->used = 1;
-	a->sign = RLC_POS;
-}
-
-void bn_set_2b(bn_t a, int b) {
-	int i, d;
-
-	if (b < 0) {
-		bn_zero(a);
-	} else {
-		RLC_RIP(b, d, b);
-
-		bn_grow(a, d + 1);
-		for (i = 0; i < d; i++) {
-			a->dp[i] = 0;
-		}
-		a->used = d + 1;
-		a->dp[d] = ((dig_t)1 << b);
-		a->sign = RLC_POS;
-	}
-}
-
-void bn_rand(bn_t a, int sign, int bits) {
-	int digits;
-
-	RLC_RIP(bits, digits, bits);
-	digits += (bits > 0 ? 1 : 0);
-
-	bn_grow(a, digits);
-
-	rand_bytes((uint8_t *)a->dp, digits * sizeof(dig_t));
-
-	a->used = digits;
-	a->sign = sign;
-	if (bits > 0) {
-		dig_t mask = ((dig_t)1 << (dig_t)bits) - 1;
-		a->dp[a->used - 1] &= mask;
-	}
-	bn_trim(a);
-}
-
-void bn_rand_mod(bn_t a, bn_t b) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		bn_copy(t, b);
-		do {
-			bn_rand(a, bn_sign(t), bn_bits(t) + RAND_DIST);
-			bn_mod(a, a, t);
-		} while (bn_is_zero(a) || bn_cmp_abs(a, t) != RLC_LT);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void bn_print(const bn_t a) {
-	int i;
-
-	if (a->sign == RLC_NEG) {
-		util_print("-");
-	}
-	if (a->used == 0) {
-		util_print("0\n");
-	} else {
-#if WSIZE == 64
-		util_print_dig(a->dp[a->used - 1], 0);
-		for (i = a->used - 2; i >= 0; i--) {
-			util_print_dig(a->dp[i], 1);
-		}
-#else
-		util_print_dig(a->dp[a->used - 1], 0);
-		for (i = a->used - 2; i >= 0; i--) {
-			util_print_dig(a->dp[i], 1);
-		}
-#endif
-		util_print("\n");
-	}
-}
-
-int bn_size_str(const bn_t a, int radix) {
-	int digits = 0;
-	bn_t t;
-
-	bn_null(t);
-
-	/* Check the radix. */
-	if (radix < 2 || radix > 64) {
-		RLC_THROW(ERR_NO_VALID);
-		return 0;
-	}
-
-	if (bn_is_zero(a)) {
-		return 2;
-	}
-
-	/* Binary case requires the bits, a sign and the null terminator. */
-	if (radix == 2) {
-		return bn_bits(a) + (a->sign == RLC_NEG ? 1 : 0) + 1;
-	}
-
-	if (a->sign == RLC_NEG) {
-		digits++;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-		bn_copy(t, a);
-
-		t->sign = RLC_POS;
-
-		while (!bn_is_zero(t)) {
-			bn_div_dig(t, t, (dig_t)radix);
-			digits++;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-	}
-
-	return digits + 1;
-}
-
-void bn_read_str(bn_t a, const char *str, int len, int radix) {
-	int sign, i, j;
-	char c;
-
-	bn_zero(a);
-
-	if (radix < 2 || radix > 64) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	j = 0;
-	if (str[0] == '-') {
-		j++;
-		sign = RLC_NEG;
-	} else {
-		sign = RLC_POS;
-	}
-
-	RLC_TRY {
-		bn_grow(a, RLC_CEIL(len * util_bits_dig(radix), RLC_DIG));
-
-		while (j < len) {
-			if (str[j] == 0) {
-				break;
-			}
-			c = (char)((radix < 36) ? RLC_UPP(str[j]) : str[j]);
-			for (i = 0; i < 64; i++) {
-				if (c == util_conv_char(i)) {
-					break;
-				}
-			}
-
-			if (i < radix) {
-				bn_mul_dig(a, a, (dig_t)radix);
-				bn_add_dig(a, a, (dig_t)i);
-			} else {
-				break;
-			}
-			j++;
-		}
-
-		a->sign = sign;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-void bn_write_str(char *str, int len, const bn_t a, int radix) {
-	bn_t t;
-	dig_t d;
-	int digits, l, i, j;
-	char c;
-
-	bn_null(t);
-
-	l = bn_size_str(a, radix);
-	if (len < l) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	if (radix < 2 || radix > 64) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (bn_is_zero(a) == 1) {
-		*str++ = '0';
-		*str = '\0';
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-		bn_copy(t, a);
-
-		j = 0;
-		if (t->sign == RLC_NEG) {
-			str[j] = '-';
-			j++;
-			t->sign = RLC_POS;
-		}
-
-		digits = 0;
-		while (!bn_is_zero(t) && j < len) {
-			bn_div_rem_dig(t, &d, t, (dig_t)radix);
-			str[j] = util_conv_char(d);
-			digits++;
-			j++;
-		}
-
-		/* Reverse the digits of the string. */
-		i = 0;
-		if (str[0] == '-') {
-			i = 1;
-		}
-
-		j = l - 2;
-		while (i < j) {
-			c = str[i];
-			str[i] = str[j];
-			str[j] = c;
-			++i;
-			--j;
-		}
-
-		str[l - 1] = '\0';
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-int bn_size_bin(const bn_t a) {
-	dig_t d;
-	int digits;
-
-	digits = (a->used - 1) * (RLC_DIG / 8);
-	d = a->dp[a->used - 1];
-
-	while (d != 0) {
-		d = d >> 8;
-		digits++;
-	}
-	return digits;
-}
-
-void bn_read_bin(bn_t a, const uint8_t *bin, int len) {
-	int i, j;
-	dig_t d = (RLC_DIG / 8);
-	int digs = (len % d == 0 ? len / d : len / d + 1);
-
-	bn_grow(a, digs);
-	bn_zero(a);
-	a->used = digs;
-
-	for (i = 0; i < digs - 1; i++) {
-		d = 0;
-		for (j = (RLC_DIG / 8) - 1; j >= 0; j--) {
-			d = d << 8;
-			d |= bin[len - 1 - (i * (RLC_DIG / 8) + j)];
-		}
-		a->dp[i] = d;
-	}
-	d = 0;
-	for (j = (RLC_DIG / 8) - 1; j >= 0; j--) {
-		if ((int)(i * (RLC_DIG / 8) + j) < len) {
-			d = d << 8;
-			d |= bin[len - 1 - (i * (RLC_DIG / 8) + j)];
-		}
-	}
-	a->dp[i] = d;
-
-	a->sign = RLC_POS;
-	bn_trim(a);
-}
-
-void bn_write_bin(uint8_t *bin, int len, const bn_t a) {
-	int size, k;
-	dig_t d;
-
-	size = bn_size_bin(a);
-
-	if (len < size) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	k = 0;
-	for (int i = 0; i < a->used - 1; i++) {
-		d = a->dp[i];
-		for (int j = 0; j < (int)(RLC_DIG / 8); j++) {
-			bin[len - 1 - k++] = d & 0xFF;
-			d = d >> 8;
-		}
-	}
-
-	d = a->dp[a->used - 1];
-	while (d != 0) {
-		bin[len - 1 - k++] = d & 0xFF;
-		d = d >> 8;
-	}
-
-	while (k < len) {
-		bin[len - 1 - k++] = 0;
-	}
-}
-
-int bn_size_raw(const bn_t a) {
-	return a->used;
-}
-
-void bn_read_raw(bn_t a, const dig_t *raw, int len) {
-	RLC_TRY {
-		bn_grow(a, len);
-		a->used = len;
-		a->sign = RLC_POS;
-		dv_copy(a->dp, raw, len);
-		bn_trim(a);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-}
-
-void bn_write_raw(dig_t *raw, int len, const bn_t a) {
-	int i, size;
-
-	size = a->used;
-
-	if (len < size) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	for (i = 0; i < size; i++) {
-		raw[i] = a->dp[i];
-	}
-	for (; i < len; i++) {
-		raw[i] = 0;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_bbs.c b/src/dashbls/depends/relic/src/cp/relic_cp_bbs.c
deleted file mode 100644
index 1236f7875e0f..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_bbs.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Boneh-Boyen short signature protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_bbs_gen(bn_t d, g2_t q, gt_t z) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* z = e(g1, g2). */
-		gt_get_gen(z);
-
-		pc_get_ord(n);
-
-		/* Use short scalars. */
-		do {
-			bn_rand(d, RLC_POS, 2 * pc_param_level());
-			bn_mod(d, d, n);
-		} while (bn_is_zero(d));
-
-		/* q = d * g2. */
-		g2_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_bbs_sig(g1_t s, uint8_t *msg, int len, int hash, bn_t d) {
-	bn_t m, n, r;
-	uint8_t h[RLC_MD_LEN];
-	int result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		bn_new(r);
-
-		pc_get_ord(n);
-
-		/* m = H(msg). */
-		if (hash) {
-			bn_read_bin(m, msg, len);
-		} else {
-			md_map(h, msg, len);
-			bn_read_bin(m, h, RLC_MD_LEN);
-		}
-		bn_mod(m, m, n);
-
-		/* m = 1/(m + d) mod n. */
-		bn_add(m, m, d);
-		bn_mod_inv(m, m, n);
-		/* s = 1/(m+d) * g1. */
-		g1_mul_gen(s, m);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-		bn_free(r);
-	}
-	return result;
-}
-
-int cp_bbs_ver(g1_t s, uint8_t *msg, int len, int hash, g2_t q, gt_t z) {
-	bn_t m, n;
-	g2_t g;
-	gt_t e;
-	uint8_t h[RLC_MD_LEN];
-	int result = 0;
-
-	bn_null(m);
-	bn_null(n);
-	g2_null(g);
-	gt_null(e);
-
-	if (!g1_is_valid(s)) {
-		return result;
-	}
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		g2_new(g);
-		gt_new(e);
-
-		pc_get_ord(n);
-
-		/* m = H(msg). */
-		if (hash) {
-			bn_read_bin(m, msg, len);
-		} else {
-			md_map(h, msg, len);
-			bn_read_bin(m, h, RLC_MD_LEN);
-		}
-		bn_mod(m, m, n);
-
-		g2_mul_gen(g, m);
-		g2_add(g, g, q);
-		g2_norm(g, g);
-
-		pc_map(e, s, g);
-
-		if (gt_cmp(e, z) == RLC_EQ) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-		g2_free(g);
-		gt_free(e);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_bdpe.c b/src/dashbls/depends/relic/src/cp/relic_cp_bdpe.c
deleted file mode 100644
index 2d60cd3c6b11..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_bdpe.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Benaloh's Dense Probabilistic Encryption cryptosystem.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_bdpe_gen(bdpe_t pub, bdpe_t prv, dig_t block, int bits) {
-	bn_t t, r;
-	int result = RLC_OK;
-
-	bn_null(t);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(r);
-
-		prv->t = pub->t = block;
-
-		/* Make sure that block size is prime. */
-		bn_set_dig(t, block);
-		if (bn_is_prime_basic(t) == 0) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-
-		/* Generate prime q such that gcd(block, (q - 1)) = 1. */
-		do {
-			bn_gen_prime(prv->q, bits / 2);
-			bn_sub_dig(prv->q, prv->q, 1);
-			bn_gcd_dig(t, prv->q, block);
-			bn_add_dig(prv->q, prv->q, 1);
-		} while (bn_cmp_dig(t, 1) != RLC_EQ);
-
-		/* Generate different primes p and q. */
-		do {
-			/* Compute p = block * (x * block + b) + 1, 0 < b < block random. */
-			bn_rand(prv->p, RLC_POS, bits / 2 - 2 * util_bits_dig(block));
-			bn_mul_dig(prv->p, prv->p, block);
-			bn_rand(t, RLC_POS, util_bits_dig(block));
-			bn_add_dig(prv->p, prv->p, t->dp[0]);
-
-			/* We know that block divides (p-1). */
-			bn_gcd_dig(t, prv->p, block);
-			bn_mul_dig(prv->p, prv->p, block);
-			bn_add_dig(prv->p, prv->p, 1);
-		} while (bn_cmp_dig(t, 1) != RLC_EQ || bn_is_prime(prv->p) == 0);
-
-		/* Compute t = (p-1)*(q-1). */
-		bn_sub_dig(prv->q, prv->q, 1);
-		bn_sub_dig(prv->p, prv->p, 1);
-		bn_mul(t, prv->p, prv->q);
-		bn_div_dig(t, t, block);
-
-		/* Restore factors p and q and compute n = p * q. */
-		bn_add_dig(prv->p, prv->p, 1);
-		bn_add_dig(prv->q, prv->q, 1);
-		bn_mul(pub->n, prv->p, prv->q);
-		bn_copy(prv->n, pub->n);
-
-		/* Select random y such that y^{(p-1)(q-1)}/block \neq 1 mod N. */
-		do {
-			bn_rand(pub->y, RLC_POS, bits);
-			bn_mxp(r, pub->y, t, pub->n);
-		} while (bn_cmp_dig(r, 1) == RLC_EQ);
-
-		bn_copy(prv->y, pub->y);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(r);
-	}
-
-	return result;
-}
-
-int cp_bdpe_enc(uint8_t *out, int *out_len, dig_t in, bdpe_t pub) {
-	bn_t m, u;
-	int size, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(u);
-
-	size = bn_size_bin(pub->n);
-
-	if (in > pub->t) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(u);
-
-		bn_set_dig(m, in);
-
-		bn_rand_mod(u, pub->n);
-		bn_mxp(m, pub->y, m, pub->n);
-		bn_mxp_dig(u, u, pub->t, pub->n);
-		bn_mul(m, m, u);
-		bn_mod(m, m, pub->n);
-
-		if (size <= *out_len) {
-			*out_len = size;
-			memset(out, 0, *out_len);
-			bn_write_bin(out, size, m);
-		} else {
-			result = RLC_ERR;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(u);
-	}
-
-	return result;
-}
-
-int cp_bdpe_dec(dig_t *out, uint8_t *in, int in_len, bdpe_t prv) {
-	bn_t m, t, z;
-	int size, result = RLC_OK;
-	dig_t i;
-
-	size = bn_size_bin(prv->n);
-
-	if (in_len < 0 || in_len != size) {
-		return RLC_ERR;
-	}
-
-	bn_null(m);
-	bn_null(t);
-	bn_null(z);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(t);
-		bn_new(z);
-
-		/* Compute t = (p-1)(q-1)/block. */
-		bn_mul(t, prv->p, prv->q);
-		bn_sub(t, t, prv->p);
-		bn_sub(t, t, prv->q);
-		bn_add_dig(t, t, 1);
-		bn_div_dig(t, t, prv->t);
-		bn_read_bin(m, in, in_len);
-		bn_mxp(m, m, t, prv->n);
-		bn_mxp(t, prv->y, t, prv->n);
-
-		for (i = 0; i < prv->t; i++) {
-			bn_mxp_dig(z, t, i, prv->n);
-			if (bn_cmp(z, m) == RLC_EQ) {
-				*out = i;
-				break;
-			}
-		}
-
-		if (i == prv->t) {
-			result = RLC_ERR;
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(t);
-		bn_free(z);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_bgn.c b/src/dashbls/depends/relic/src/cp/relic_cp_bgn.c
deleted file mode 100644
index a7c38193fdd2..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_bgn.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Freeman's prime-order version of the Boneh-Goh-Nissim
- * cryptosystem.
- *
- * @version $Id$
- * @ingroup cp
- */
-
-#include <limits.h>
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_bgn_gen(bgn_t pub, bgn_t prv) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-
-		bn_rand_mod(prv->x, n);
-		bn_rand_mod(prv->y, n);
-		bn_rand_mod(prv->z, n);
-
-		g1_mul_gen(pub->gx, prv->x);
-		g1_mul_gen(pub->gy, prv->y);
-		g1_mul_gen(pub->gz, prv->z);
-
-		g2_mul_gen(pub->hx, prv->x);
-		g2_mul_gen(pub->hy, prv->y);
-		g2_mul_gen(pub->hz, prv->z);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_bgn_enc1(g1_t out[2], dig_t in, bgn_t pub) {
-	bn_t r, n;
-	g1_t t;
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(r);
-	g1_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		g1_new(t);
-
-		pc_get_ord(n);
-		bn_rand_mod(r, n);
-
-		/* Compute c0 = (ym + r)G. */
-		g1_mul_dig(out[0], pub->gy, in);
-
-		g1_mul_gen(t, r);
-		g1_add(out[0], out[0], t);
-		g1_norm(out[0], out[0]);
-
-		/* Compute c1 = (zm + xr)G. */
-		g1_mul_dig(out[1], pub->gz, in);
-		g1_mul(t, pub->gx, r);
-		g1_add(out[1], out[1], t);
-		g1_norm(out[1], out[1]);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		g1_free(t);
-	}
-
-	return result;
-}
-
-int cp_bgn_dec1(dig_t *out, g1_t in[2], bgn_t prv) {
-	bn_t r, n;
-	g1_t s, t, u;
-	int i, result = RLC_ERR;
-
-	bn_null(n);
-	bn_null(r);
-	g1_null(s);
-	g1_null(t);
-	g1_null(u);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		g1_new(s);
-		g1_new(t);
-		g1_new(u);
-
-		pc_get_ord(n);
-		/* Compute T = x(ym + r)G - (zm + xr)G = m(xy - z)G. */
-		g1_mul(t, in[0], prv->x);
-		g1_sub(t, t, in[1]);
-		g1_norm(t, t);
-		/* Compute U = (xy - z)G and find m. */
-		bn_mul(r, prv->x, prv->y);
-		bn_sub(r, r, prv->z);
-		bn_mod(r, r, n);
-		g1_mul_gen(s, r);
-		g1_copy(u, s);
-
-		if (g1_is_infty(t) == 1){
-			*out = 0;
-			result = RLC_OK;
-		} else {
-			for (i = 0; i < INT_MAX; i++) {
-				if (g1_cmp(t, u) == RLC_EQ) {
-					*out = i + 1;
-					result = RLC_OK;
-					break;
-				}
-				g1_add(u, u, s);
-				g1_norm(u, u);
-			}
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		g1_free(s);
-		g1_free(t);
-		g1_free(u);
-	}
-
-	return result;
-}
-
-int cp_bgn_enc2(g2_t out[2], dig_t in, bgn_t pub) {
-	bn_t r, n;
-	g2_t t;
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(r);
-	g2_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		g2_new(t);
-
-		pc_get_ord(n);
-		bn_rand_mod(r, n);
-
-		/* Compute c0 = (ym + r)G. */
-		g2_mul_dig(out[0], pub->hy, in);
-		g2_mul_gen(t, r);
-		g2_add(out[0], out[0], t);
-		g2_norm(out[0], out[0]);
-
-		/* Compute c1 = (zm + xr)G. */
-		g2_mul_dig(out[1], pub->hz, in);
-		g2_mul(t, pub->hx, r);
-		g2_add(out[1], out[1], t);
-		g2_norm(out[1], out[1]);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		g2_free(t);
-	}
-
-	return result;
-}
-
-int cp_bgn_dec2(dig_t *out, g2_t in[2], bgn_t prv) {
-	bn_t r, n;
-	g2_t s, t, u;
-	int i, result = RLC_ERR;
-
-	bn_null(n);
-	bn_null(r);
-	g2_null(s);
-	g2_null(t);
-	g2_null(u);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		g2_new(s);
-		g2_new(t);
-		g2_new(u);
-
-		pc_get_ord(n);
-		/* Compute T = x(ym + r)G - (zm + xr)G = m(xy - z)G. */
-		g2_mul(t, in[0], prv->x);
-		g2_sub(t, t, in[1]);
-		g2_norm(t, t);
-		/* Compute U = (xy - z)G and find m. */
-		bn_mul(r, prv->x, prv->y);
-		bn_sub(r, r, prv->z);
-		bn_mod(r, r, n);
-		g2_mul_gen(s, r);
-		g2_copy(u, s);
-
-		if (g2_is_infty(t) == 1) {
-			*out = 0;
-			result = RLC_OK;
-		} else {
-			for (i = 0; i < INT_MAX; i++) {
-				if (g2_cmp(t, u) == RLC_EQ) {
-					*out = i + 1;
-					result = RLC_OK;
-					break;
-				}
-				g2_add(u, u, s);
-				g2_norm(u, u);
-			}
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		g2_free(s);
-		g2_free(t);
-		g2_free(u);
-	}
-
-	return result;
-}
-
-int cp_bgn_add(gt_t e[4], gt_t c[4], gt_t d[4]) {
-	for (int i = 0; i < 4; i++) {
-		gt_mul(e[i], c[i], d[i]);
-	}
-	return RLC_OK;
-}
-
-int cp_bgn_mul(gt_t e[4], g1_t c[2], g2_t d[2]) {
-	for (int i = 0; i < 2; i++) {
-		for (int j = 0; j < 2; j++) {
-			pc_map(e[2*i + j], c[i], d[j]);
-		}
-	}
-	return RLC_OK;
-}
-
-int cp_bgn_dec(dig_t *out, gt_t in[4], bgn_t prv) {
-	int i, result = RLC_ERR;
-	g1_t g;
-	g2_t h;
-	gt_t t[4];
-	bn_t n, r, s;
-
-	bn_null(n);
-	bn_null(r);
-	bn_null(s);
-	g1_null(g);
-	g2_null(h);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		bn_new(s);
-		g1_new(g);
-		g2_new(h);
-		for (i = 0; i < 4; i++) {
-			gt_null(t[i]);
-			gt_new(t[i]);
-		}
-
-		gt_exp(t[0], in[0], prv->x);
-		gt_exp(t[0], t[0], prv->x);
-
-		gt_mul(t[1], in[1], in[2]);
-		gt_exp(t[1], t[1], prv->x);
-		gt_inv(t[1], t[1]);
-
-		gt_mul(t[3], in[3], t[1]);
-		gt_mul(t[3], t[3], t[0]);
-
-		pc_get_ord(n);
-		g1_get_gen(g);
-		g2_get_gen(h);
-
-		bn_mul(r, prv->x, prv->y);
-		bn_sqr(r, r);
-
-		bn_mul(s, prv->x, prv->y);
-		bn_mul(s, s, prv->z);
-		bn_sub(r, r, s);
-		bn_sub(r, r, s);
-
-		bn_sqr(s, prv->z);
-		bn_add(r, r, s);
-		bn_mod(r, r, n);
-		pc_map(t[1], g, h);
-		gt_exp(t[1], t[1], r);
-
-		gt_copy(t[2], t[1]);
-
-		if (gt_is_unity(t[3]) == 1) {
-			*out = 0;
-			result = RLC_OK;
-		} else {
-			for (i = 0; i < INT_MAX; i++) {
-				if (gt_cmp(t[2], t[3]) == RLC_EQ) {
-					*out = i + 1;
-					result = RLC_OK;
-					break;
-				}
-				gt_mul(t[2], t[2], t[1]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		bn_free(s);
-		g1_free(g);
-		g2_free(h);
-		for (i = 0; i < 4; i++) {
-			gt_free(t[i]);
-		}
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_bls.c b/src/dashbls/depends/relic/src/cp/relic_cp_bls.c
deleted file mode 100644
index 2072a182a45e..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_bls.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Boneh-Lynn-Schacham short signature protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_bls_gen(bn_t d, g2_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(d, n);
-		g2_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_bls_sig(g1_t s, uint8_t *msg, int len, bn_t d) {
-	g1_t p;
-	int result = RLC_OK;
-
-	g1_null(p);
-
-	RLC_TRY {
-		g1_new(p);
-		g1_map(p, msg, len);
-		g1_mul_key(s, p, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		g1_free(p);
-	}
-	return result;
-}
-
-int cp_bls_ver(g1_t s, uint8_t *msg, int len, g2_t q) {
-	g1_t p[2];
-	g2_t r[2];
-	gt_t e;
-	int result = 0;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(r[0]);
-	g2_null(r[1]);
-	gt_null(e);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(r[0]);
-		g2_new(r[1]);
-		gt_new(e);
-
-		g1_map(p[0], msg, len);
-		g1_copy(p[1], s);
-		g2_copy(r[0], q);
-		g2_get_gen(r[1]);
-		g2_neg(r[1], r[1]);
-
-		pc_map_sim(e, p, r, 2);
-		if (gt_is_unity(e) && g2_is_valid(q)) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(r[0]);
-		g2_free(r[1]);
-		gt_free(e);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_cls.c b/src/dashbls/depends/relic/src/cp/relic_cp_cls.c
deleted file mode 100644
index 2c6b4f636eba..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_cls.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2018 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Camenisch-Lysyanskaya signature protocols.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_cls_gen(bn_t r, bn_t s, g2_t x, g2_t y) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(r, n);
-		bn_rand_mod(s, n);
-		g2_mul_gen(x, r);
-		g2_mul_gen(y, s);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cls_sig(g1_t a, g1_t b, g1_t c, uint8_t *msg, int len, bn_t r, bn_t s) {
-	bn_t m, n;
-	int result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-
-		g1_rand(a);
-		pc_get_ord(n);
-		bn_mul(m, r, s);
-		bn_mod(m, m, n);
-		g1_mul(b, a, s);
-		bn_read_bin(m, msg, len);
-		bn_mod(m, m, n);
-		bn_mul(m, m, s);
-		bn_mod(m, m, n);
-		bn_mul(m, m, r);
-		bn_mod(m, m, n);
-		bn_add(m, m, r);
-		bn_mod(m, m, n);
-		g1_mul(c, a, m);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cls_ver(g1_t a, g1_t b, g1_t c, uint8_t *msg, int len, g2_t x, g2_t y) {
-	g1_t p[2];
-	g2_t r[2];
-	gt_t e;
-	bn_t m, n;
-	int result = 1;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(r[0]);
-	g2_null(r[1]);
-	gt_null(e);
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(r[0]);
-		g2_new(r[1]);
-		gt_new(e);
-		bn_new(m);
-		bn_new(n);
-
-		if (g1_is_infty(a) || g1_is_infty(b) || g1_is_infty(c)) {
-			result = 0;
-		}
-
-		g1_copy(p[0], a);
-		g1_copy(p[1], b);
-		g2_copy(r[0], y);
-		g2_get_gen(r[1]);
-		g2_neg(r[1], r[1]);
-
-		pc_map_sim(e, p, r, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-
-		pc_get_ord(n);
-		bn_read_bin(m, msg, len);
-		bn_mod(m, m, n);
-		g1_mul(p[0], b, m);
-		g1_add(p[0], p[0], a);
-		g1_norm(p[0], p[0]);
-		g1_copy(p[1], c);
-		g2_copy(r[0], x);
-
-		pc_map_sim(e, p, r, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(r[0]);
-		g2_free(r[1]);
-		gt_free(e);
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cli_gen(bn_t t, bn_t u, bn_t v, g2_t x, g2_t y, g2_t z) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(t, n);
-		bn_rand_mod(u, n);
-		bn_rand_mod(v, n);
-		g2_mul_gen(x, t);
-		g2_mul_gen(y, u);
-		g2_mul_gen(z, v);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cli_sig(g1_t a, g1_t A, g1_t b, g1_t B, g1_t c, uint8_t *msg, int len,
-		bn_t r, bn_t t, bn_t u, bn_t v) {
-	bn_t m, n;
-	int result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-
-		/* Choose random a in G1. */
-		g1_rand(a);
-		/* Compute A = a^z, B = A^y. */
-		g1_mul(A, a, v);
-		g1_mul(b, a, u);
-		g1_mul(B, A, u);
-		/* Compute c = A^(xyr) = B^{xr}. */
-		pc_get_ord(n);
-		bn_mul(m, t, r);
-		bn_mod(m, m, n);
-		g1_mul(b, B, m);
-		/* Compute c = a^{x+xym}A^(xyr). */
-		bn_read_bin(m, msg, len);
-		bn_mod(m, m, n);
-		bn_mul(m, m, t);
-		bn_mod(m, m, n);
-		bn_mul(m, m, u);
-		bn_mod(m, m, n);
-		bn_add(m, m, t);
-		bn_mod(m, m, n);
-		g1_mul(c, a, m);
-		g1_add(c, c, b);
-		g1_norm(c, c);
-		/* Compute b = a^y. */
-		g1_mul(b, a, u);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cli_ver(g1_t a, g1_t A, g1_t b, g1_t B, g1_t c, uint8_t *msg, int len,
-		bn_t r, g2_t x, g2_t y, g2_t z) {
-	g1_t p[2];
-	g2_t q[2];
-	gt_t e;
-	bn_t m, n;
-	int result = 1;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(q[0]);
-	g2_null(q[1]);
-	gt_null(e);
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(q[0]);
-		g2_new(q[1]);
-		gt_new(e);
-		bn_new(m);
-		bn_new(n);
-
-		if (g1_is_infty(a) || g1_is_infty(A)) {
-			result = 0;
-		}
-		if (g1_is_infty(b) || g1_is_infty(B) || g1_is_infty(c)) {
-			result = 0;
-		}
-
-		/* Check that e(a, Z) = e(A, g) or that e(a, Z)e(A, -g) = 1. */
-		g1_copy(p[0], a);
-		g1_copy(p[1], A);
-		g2_copy(q[0], z);
-		g2_get_gen(q[1]);
-		g2_neg(q[1], q[1]);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-
-		/* Check e(a, Y) = e(b, g) and e(A, Y) = e(B, g) using same trick. */
-		g1_copy(p[1], b);
-		g2_copy(q[0], y);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-		g1_copy(p[0], A);
-		g1_copy(p[1], B);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-
-		/* Check that e(a, X)e(mb, X)e(rB, X) = e(c, g). */
-		pc_get_ord(n);
-		bn_read_bin(m, msg, len);
-		bn_mod(m, m, n);
-		g1_mul_sim(p[0], b, m, B, r);
-		g1_add(p[0], p[0], a);
-		g1_norm(p[0], p[0]);
-		g1_copy(p[1], c);
-		g2_copy(q[0], x);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(q[1]);
-		g2_free(q[0]);
-		gt_free(e);
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_clb_gen(bn_t t, bn_t u, bn_t v[], g2_t x, g2_t y, g2_t z[], int l) {
-	bn_t n;
-	int i, result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(t, n);
-		bn_rand_mod(u, n);
-		g2_mul_gen(x, t);
-		g2_mul_gen(y, u);
-		for (i = 1; i < l; i++) {
-			bn_rand_mod(v[i - 1], n);
-			g2_mul_gen(z[i - 1], v[i - 1]);
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_clb_sig(g1_t a, g1_t A[], g1_t b, g1_t B[], g1_t c, uint8_t *msgs[],
-		int lens[], bn_t t, bn_t u, bn_t v[], int l) {
-	bn_t m, n;
-	int i, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-
-		/* Choose random a in G1. */
-		g1_rand(a);
-		/* Compute A_i = a^z_i, B_i = A_i^y. */
-		for (i = 1; i < l; i++) {
-			g1_mul(A[i - 1], a, v[i - 1]);
-			g1_mul(B[i - 1], A[i - 1], u);
-		}
-		/* Compute c = a^(x+xym_0)\prod A_i^(xym_i) = B_i^(xm_i). */
-		pc_get_ord(n);
-		bn_read_bin(m, msgs[0], lens[0]);
-		bn_mod(m, m, n);
-		bn_mul(m, m, t);
-		bn_mod(m, m, n);
-		bn_mul(m, m, u);
-		bn_add(m, m, t);
-		bn_mod(m, m, n);
-		g1_mul(c, a, m);
-		/* This can be made faster with more interleaving. */
-		for (i = 1; i < l; i++) {
-			bn_read_bin(m, msgs[i], lens[i]);
-			bn_mod(m, m, n);
-			bn_mul(m, m, t);
-			bn_mod(m, m, n);
-			g1_mul(b, B[i - 1], m);
-			g1_add(c, c, b);
-		}
-		g1_norm(c, c);
-		/* Compute b = a^y. */
-		g1_mul(b, a, u);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_clb_ver(g1_t a, g1_t A[], g1_t b, g1_t B[], g1_t c, uint8_t *msgs[],
-		int lens[], g2_t x, g2_t y, g2_t z[], int l) {
-	g1_t p[2];
-	g2_t q[2];
-	gt_t e;
-	bn_t m, n;
-	int i, result = 1;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(q[0]);
-	g2_null(q[1]);
-	gt_null(e);
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(q[0]);
-		g2_new(q[1]);
-		gt_new(e);
-		bn_new(m);
-		bn_new(n);
-
-		if (g1_is_infty(a) || g1_is_infty(b) || g1_is_infty(c)) {
-			result = 0;
-		}
-		for (i = 1; i < l; i++) {
-			if (g1_is_infty(A[i - 1]) || g1_is_infty(B[i - 1])) {
-				result = 0;
-			}
-		}
-
-		/* Check that e(a, Z_i) = e(A_i, g) or that e(a, Z_i)e(A_i, -g) = 1. */
-		g1_copy(p[0], a);
-		g2_get_gen(q[1]);
-		g2_neg(q[1], q[1]);
-		for (i = 1; i < l; i++) {
-			g1_copy(p[1], A[i - 1]);
-			g2_copy(q[0], z[i - 1]);
-			pc_map_sim(e, p, q, 2);
-			if (!gt_is_unity(e)) {
-				result = 0;
-			}
-		}
-
-		/* Check e(a, Y) = e(b, g) and e(A_i, Y) = e(B_i, g) using the trick. */
-		g1_copy(p[1], b);
-		g2_copy(q[0], y);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-		for (i = 1; i < l; i++) {
-			g1_copy(p[0], A[i - 1]);
-			g1_copy(p[1], B[i - 1]);
-			pc_map_sim(e, p, q, 2);
-			if (!gt_is_unity(e)) {
-				result = 0;
-			}
-		}
-
-		/* Check that e(a, X)e(m_0b, X)\prod e(m_iB, X) = e(c, g). */
-		pc_get_ord(n);
-		bn_read_bin(m, msgs[0], lens[0]);
-		bn_mod(m, m, n);
-		g1_mul(p[0], b, m);
-		g1_add(p[0], p[0], a);
-		for (i = 1; i < l; i++) {
-			bn_read_bin(m, msgs[i], lens[i]);
-			bn_mod(m, m, n);
-			g1_mul(p[1], B[i - 1], m);
-			g1_add(p[0], p[0], p[1]);
-		}
-		g1_norm(p[0], p[0]);
-		g1_copy(p[1], c);
-		g2_copy(q[0], x);
-		pc_map_sim(e, p, q, 2);
-		if (!gt_is_unity(e)) {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(q[0]);
-		g2_free(q[1]);
-		gt_free(e);
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_cmlhs.c b/src/dashbls/depends/relic/src/cp/relic_cp_cmlhs.c
deleted file mode 100644
index ecdc96baf783..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_cmlhs.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of context-hiding linearly homomophic signature protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_cmlhs_init(g1_t h) {
-	g1_rand(h);
-	return RLC_OK;
-}
-
-int cp_cmlhs_gen(bn_t x[], gt_t hs[], int len, uint8_t prf[], int plen,
-		bn_t sk, g2_t pk, bn_t d, g2_t y) {
-	g1_t g1;
-	g2_t g2;
-	gt_t gt;
-	bn_t n;
-	int result = RLC_OK;
-
-	g1_null(g1);
-	g2_null(g2);
-	gt_null(gt);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		g1_new(g1);
-		g2_new(g2);
-		gt_new(gt);
-
-		pc_get_ord(n);
-		g1_get_gen(g1);
-		g2_get_gen(g2);
-		pc_map(gt, g1, g2);
-
-		rand_bytes(prf, plen);
-		cp_bls_gen(sk, pk);
-
-		pc_get_ord(n);
-		/* Generate elements for n tags. */
-		for (int i = 0; i < len; i++) {
-			bn_rand_mod(x[i], n);
-			gt_exp(hs[i], gt, x[i]);
-		}
-
-		bn_rand_mod(d, n);
-		g2_mul_gen(y, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		g1_free(g1);
-		g2_free(g2);
-		gt_free(gt);
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_cmlhs_sig(g1_t sig, g2_t z, g1_t a, g1_t c, g1_t r, g2_t s, bn_t msg,
-		char *data, int label, bn_t x, g1_t h, uint8_t prf[], int plen,
-		bn_t d, bn_t sk) {
-	bn_t k, m, n;
-	g1_t t;
-	uint8_t mac[RLC_MD_LEN];
-	int len, dlen = strlen(data), result = RLC_OK;
-	uint8_t *buf = RLC_ALLOCA(uint8_t, 1 + 8 * RLC_PC_BYTES + dlen);
-
-	bn_null(k);
-	bn_null(m);
-	bn_null(n);
-	g1_null(t);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(m);
-		bn_new(n);
-		g1_new(t);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		pc_get_ord(n);
-		/* Generate r and s. */
-		bn_rand_mod(k, n);
-		bn_rand_mod(m, n);
-
-		/* Compute S = -g2^s, C = g1^s. */
-		g2_mul_gen(s, m);
-		g2_neg(s, s);
-		g1_mul_gen(c, m);
-		/* Compute R = g1^(r - ys). */
-		bn_mul(m, d, m);
-		bn_mod(m, m, n);
-		bn_sub(m, k, m);
-		bn_mod(m, m, n);
-		g1_mul_gen(r, m);
-
-		/* Compute A = g1^(x + r) * \prod H_j^(y * m_j). */
-		bn_add(k, x, k);
-		bn_mod(k, k, n);
-		g1_mul_gen(a, k);
-		bn_mul(k, d, msg);
-		bn_mod(k, k, n);
-		g1_mul(t, h, k);
-		g1_add(a, a, t);
-		g1_norm(a, a);
-		/* Compute z = F_K(delta), Z = g2^z, A = A^(1/z). */
-		md_hmac(mac, (const uint8_t *)data, dlen, prf, plen);
-		bn_read_bin(k, mac, RLC_MD_LEN);
-		bn_mod(k, k, n);
-		g2_mul_gen(z, k);
-		bn_mod_inv(k, k, n);
-		g1_mul(a, a, k);
-
-		/* Compute C = C * sum H_j^m_j. */
-		bn_mod(k, msg, n);
-		g1_mul(t, h, k);
-		g1_add(c, c, t);
-		g1_norm(c, c);
-
-		len = g2_size_bin(z, 0);
-		g2_write_bin(buf, len, z, 0);
-		memcpy(buf + len, data, dlen);
-		cp_bls_sig(sig, buf, len + dlen, sk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		bn_free(m);
-		bn_free(n);
-		g1_free(t);
-		RLC_FREE(buf);
-	}
-	return result;
-}
-
-int cp_cmlhs_fun(g1_t a, g1_t c, g1_t as[], g1_t cs[], dig_t f[], int len) {
-	int result = RLC_OK;
-
-	g1_mul_sim_dig(a, as, f, len);
-	g1_mul_sim_dig(c, cs, f, len);
-
-	return result;
-}
-
-int cp_cmlhs_evl(g1_t r, g2_t s, g1_t rs[], g2_t ss[], dig_t f[], int len) {
-	int result = RLC_OK;
-
-	g1_mul_sim_dig(r, rs, f, len);
-	g2_mul_sim_dig(s, ss, f, len);
-
-	return result;
-}
-
-int cp_cmlhs_ver(g1_t r, g2_t s, g1_t sig[], g2_t z[], g1_t a[], g1_t c[],
-		bn_t msg, char *data, g1_t h, int label[], gt_t *hs[],
-		dig_t *f[], int flen[], g2_t y[], g2_t pk[], int slen) {
-	g1_t g1;
-	g2_t g2;
-	gt_t e, u, v;
-	bn_t k, n;
-	int len, dlen = strlen(data), result = 1;
-	uint8_t *buf = RLC_ALLOCA(uint8_t, 1 + 8 * RLC_PC_BYTES + dlen);
-
-	g1_null(g1);
-	g2_null(g2);
-	gt_null(e);
-	gt_null(u);
-	gt_null(v);
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(g1);
-		g2_new(g2);
-		gt_new(e);
-		gt_new(u);
-		gt_new(v);
-		bn_new(k);
-		bn_new(n);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		pc_get_ord(n);
-		g1_get_gen(g1);
-		g2_get_gen(g2);
-
-		for (int i = 0; i < slen; i++) {
-			len = g2_size_bin(z[i], 0);
-			g2_write_bin(buf, len, z[i], 0);
-			memcpy(buf + len, data, dlen);
-			if (cp_bls_ver(sig[i], buf, len + dlen, pk[i]) == 0) {
-				result = 0;
-			}
-		}
-
-		pc_map_sim(e, a, z, slen);
-		pc_map_sim(u, c, y, slen);
-		pc_map(v, r, g2);
-		gt_mul(u, u, v);
-
-		for (int i = 0; i < slen; i++) {
-			for (int j = 0; j < flen[i]; j++) {
-				gt_exp_dig(v, hs[i][label[j]], f[i][j]);
-				gt_mul(u, u, v);
-			}
-		}
-		if (gt_cmp(e, u) != RLC_EQ) {
-			result = 0;
-		}
-
-		pc_map(e, g1, s);
-		g1_set_infty(g1);
-		for (int i = 0; i < slen; i++) {
-			g1_add(g1, g1, c[i]);
-		}
-		g1_norm(g1, g1);
-		pc_map(u, g1, g2);
-		gt_mul(e, e, u);
-
-		g1_mul(g1, h, msg);
-		pc_map(v, g1, g2);
-		if (gt_cmp(e, v) != RLC_EQ) {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(g1);
-		g2_free(g2);
-		gt_free(e);
-		gt_free(u);
-		gt_free(v);
-		bn_free(k);
-		bn_free(n);
-		RLC_FREE(buf);
-	}
-	return result;
-}
-
-void cp_cmlhs_off(gt_t vk, g1_t h, int label[], gt_t *hs[], dig_t *f[],
-		int flen[], g2_t y[], g2_t pk[], int slen) {
-	gt_t v;
-
-	gt_null(v);
-
-	RLC_TRY {
-		gt_new(v);
-
-		gt_set_unity(vk);
-		for (int i = 0; i < slen; i++) {
-			for (int j = 0; j < flen[i]; j++) {
-				gt_exp_dig(v, hs[i][label[j]], f[i][j]);
-				gt_mul(vk, vk, v);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		gt_free(v);
-	}
-}
-
-int cp_cmlhs_onv(g1_t r, g2_t s, g1_t sig[], g2_t z[], g1_t a[], g1_t c[],
-		bn_t msg, char *data, g1_t h, gt_t vk, g2_t y[], g2_t pk[], int slen) {
-	g1_t g1;
-	g2_t g2;
-	gt_t e, u, v;
-	bn_t k, n;
-	int len, dlen = strlen(data), result = 1;
-	uint8_t *buf = RLC_ALLOCA(uint8_t, 1 + 8 * RLC_FP_BYTES + dlen);
-
-	g1_null(g1);
-	g2_null(g2);
-	gt_null(e);
-	gt_null(u);
-	gt_null(v);
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(g1);
-		g2_new(g2);
-		gt_new(e);
-		gt_new(u);
-		gt_new(v);
-		bn_new(k);
-		bn_new(n);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		pc_get_ord(n);
-		g1_get_gen(g1);
-		g2_get_gen(g2);
-
-		for (int i = 0; i < slen; i++) {
-			len = g2_size_bin(z[i], 0);
-			g2_write_bin(buf, len, z[i], 0);
-			memcpy(buf + len, data, dlen);
-			if (cp_bls_ver(sig[i], buf, len + dlen, pk[i]) == 0) {
-				result = 0;
-			}
-		}
-
-		pc_map_sim(e, a, z, slen);
-		pc_map_sim(u, c, y, slen);
-		pc_map(v, r, g2);
-		gt_mul(u, u, v);
-		gt_mul(u, u, vk);
-
-		if (gt_cmp(e, u) != RLC_EQ) {
-			result = 0;
-		}
-
-		pc_map(e, g1, s);
-		g1_set_infty(g1);
-		for (int i = 0; i < slen; i++) {
-			g1_add(g1, g1, c[i]);
-		}
-		g1_norm(g1, g1);
-		pc_map(u, g1, g2);
-		gt_mul(e, e, u);
-
-		g1_mul(g1, h, msg);
-		pc_map(v, g1, g2);
-		if (gt_cmp(e, v) != RLC_EQ) {
-			result = 0;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g1_free(g1);
-		g2_free(g2);
-		gt_free(e);
-		gt_free(u);
-		gt_free(v);
-		bn_free(k);
-		bn_free(n);
-		RLC_FREE(buf);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ecdh.c b/src/dashbls/depends/relic/src/cp/relic_cp_ecdh.c
deleted file mode 100755
index 7479fa955f35..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ecdh.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the ECDH protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ecdh_gen(bn_t d, ec_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(d, n);
-		ec_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_ecdh_key(uint8_t *key, int key_len, bn_t d, ec_t q) {
-	ec_t p;
-	bn_t x, h;
-	int l, result = RLC_OK;
-	uint8_t _x[RLC_FC_BYTES];
-
-	ec_null(p);
-	bn_null(x);
-	bn_null(h);
-
-	RLC_TRY {
-		ec_new(p);
-		bn_new(x);
-		bn_new(h);
-
-		ec_curve_get_cof(h);
-		if (bn_bits(h) < RLC_DIG) {
-			ec_mul_dig(p, q, h->dp[0]);
-		} else {
-			ec_mul(p, q, h);
-		}
-		ec_mul(p, p, d);
-		if (ec_is_infty(p)) {
-			result = RLC_ERR;
-		}
-		ec_get_x(x, p);
-		l = bn_size_bin(x);
-		bn_write_bin(_x, l, x);
-		md_kdf(key, key_len, _x, l);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ec_free(p);
-		bn_free(x);
-		bn_free(h);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ecdsa.c b/src/dashbls/depends/relic/src/cp/relic_cp_ecdsa.c
deleted file mode 100644
index c42db5182274..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ecdsa.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the ECDSA protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ecdsa_gen(bn_t d, ec_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(d, n);
-		ec_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_ecdsa_sig(bn_t r, bn_t s, uint8_t *msg, int len, int hash, bn_t d) {
-	bn_t n, k, x, e;
-	ec_t p;
-	uint8_t h[RLC_MD_LEN];
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(x);
-	bn_null(e);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(x);
-		bn_new(e);
-		ec_new(p);
-
-		ec_curve_get_ord(n);
-		do {
-			do {
-				bn_rand_mod(k, n);
-				ec_mul_gen(p, k);
-				ec_get_x(x, p);
-				bn_mod(r, x, n);
-			} while (bn_is_zero(r));
-
-			if (!hash) {
-				md_map(h, msg, len);
-				msg = h;
-				len = RLC_MD_LEN;
-			}
-			if (8 * len > bn_bits(n)) {
-				len = RLC_CEIL(bn_bits(n), 8);
-				bn_read_bin(e, msg, len);
-				bn_rsh(e, e, 8 * len - bn_bits(n));
-			} else {
-				bn_read_bin(e, msg, len);
-			}
-
-			bn_mul(s, d, r);
-			bn_mod(s, s, n);
-			bn_add(s, s, e);
-			bn_mod(s, s, n);
-			bn_mod_inv(k, k, n);
-			bn_mul(s, s, k);
-			bn_mod(s, s, n);
-		} while (bn_is_zero(s));
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(k);
-		bn_free(x);
-		bn_free(e);
-		ec_free(p);
-	}
-	return result;
-}
-
-int cp_ecdsa_ver(bn_t r, bn_t s, uint8_t *msg, int len, int hash, ec_t q) {
-	bn_t n, k, e, v;
-	ec_t p;
-	uint8_t h[RLC_MD_LEN];
-	int cmp, result = 0;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(e);
-	bn_null(v);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(e);
-		bn_new(v);
-		bn_new(k);
-		ec_new(p);
-
-		ec_curve_get_ord(n);
-
-		if (bn_sign(r) == RLC_POS && bn_sign(s) == RLC_POS &&
-				!bn_is_zero(r) && !bn_is_zero(s) && ec_on_curve(q)) {
-			if (bn_cmp(r, n) == RLC_LT && bn_cmp(s, n) == RLC_LT) {
-				bn_mod_inv(k, s, n);
-
-				if (!hash) {
-					md_map(h, msg, len);
-					msg = h;
-					len = RLC_MD_LEN;
-				}
-
-				if (8 * len > bn_bits(n)) {
-					len = RLC_CEIL(bn_bits(n), 8);
-					bn_read_bin(e, msg, len);
-					bn_rsh(e, e, 8 * len - bn_bits(n));
-				} else {
-					bn_read_bin(e, msg, len);
-				}
-
-				bn_mul(e, e, k);
-				bn_mod(e, e, n);
-				bn_mul(v, r, k);
-				bn_mod(v, v, n);
-
-				ec_mul_sim_gen(p, e, q, v);
-				ec_get_x(v, p);
-
-				bn_mod(v, v, n);
-
-				cmp = dv_cmp_const(v->dp, r->dp, RLC_MIN(v->used, r->used));
-				result = (cmp == RLC_NE ? 0 : 1);
-
-				if (v->used != r->used) {
-					result = 0;
-				}
-
-				if (ec_is_infty(p)) {
-					result = 0;
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(e);
-		bn_free(v);
-		bn_free(k);
-		ec_free(p);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ecies.c b/src/dashbls/depends/relic/src/cp/relic_cp_ecies.c
deleted file mode 100644
index 74b756997991..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ecies.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the ECIES cryptosystem.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ecies_gen(bn_t d, ec_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(d, n);
-		ec_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_ecies_enc(ec_t r, uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		ec_t q) {
-	bn_t k, n, x;
-	ec_t p;
-	int l, result = RLC_OK, size = RLC_CEIL(RLC_MAX(128, ec_param_level()), 8);
-	uint8_t _x[RLC_FC_BYTES + 1], iv[RLC_BC_LEN] = { 0 };
-	uint8_t key[2 * 8 * (RLC_FC_BYTES + 1)];
-
-	bn_null(k);
-	bn_null(n);
-	bn_null(x);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-		bn_new(x);
-		ec_new(p);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(k, n);
-
-		ec_mul_gen(r, k);
-		ec_mul(p, q, k);
-		ec_get_x(x, p);
-		l = bn_size_bin(x);
-		if (bn_bits(x) % 8 == 0) {
-			/* Compatibility with BouncyCastle. */
-			l = l + 1;
-		}
-		bn_write_bin(_x, l, x);
-		md_kdf(key, 2 * size, _x, l);
-		l = *out_len;
-		if (bc_aes_cbc_enc(out, out_len, in, in_len, key, size, iv)
-				!= RLC_OK || (*out_len + RLC_MD_LEN) > l) {
-			result = RLC_ERR;
-		} else {
-			md_hmac(out + *out_len, out, *out_len, key + size, size);
-			*out_len += RLC_MD_LEN;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-		bn_free(x);
-		ec_free(p);
-	}
-
-	return result;
-}
-
-int cp_ecies_dec(uint8_t *out, int *out_len, ec_t r, uint8_t *in, int in_len,
-		bn_t d) {
-	ec_t p;
-	bn_t x;
-
-	int l, result = RLC_OK, size = RLC_CEIL(RLC_MAX(128, ec_param_level()), 8);
-	uint8_t _x[RLC_FC_BYTES + 1], h[RLC_MD_LEN], iv[RLC_BC_LEN] = { 0 };
-	uint8_t key[2 * 8 * (RLC_FC_BYTES + 1)];
-
-	bn_null(x);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(x);
-		ec_new(p);
-
-		ec_mul(p, r, d);
-		ec_get_x(x, p);
-		l = bn_size_bin(x);
-		if (bn_bits(x) % 8 == 0) {
-			/* Compatibility with BouncyCastle. */
-			l = l + 1;
-		}
-		bn_write_bin(_x, l, x);
-		md_kdf(key, 2 * size, _x, l);
-		md_hmac(h, in, in_len - RLC_MD_LEN, key + size, size);
-		if (util_cmp_const(h, in + in_len - RLC_MD_LEN, RLC_MD_LEN)) {
-			result = RLC_ERR;
-		} else {
-			if (bc_aes_cbc_dec(out, out_len, in, in_len - RLC_MD_LEN, key, size, iv)
-					!= RLC_OK) {
-				result = RLC_ERR;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		ec_free(p);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ecmqv.c b/src/dashbls/depends/relic/src/cp/relic_cp_ecmqv.c
deleted file mode 100644
index 5d40116fb14f..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ecmqv.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the ECMQV protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ecmqv_gen(bn_t d, ec_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(d, n);
-		ec_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_ecmqv_key(uint8_t *key, int key_len, bn_t d1, bn_t d2, ec_t q2u,
-		ec_t q1v, ec_t q2v) {
-	ec_t p;
-	bn_t x, n, s;
-	int l, result = RLC_OK;
-	uint8_t _x[RLC_FC_BYTES];
-
-	ec_null(p);
-	bn_null(x);
-	bn_null(n);
-	bn_null(s);
-
-	RLC_TRY {
-		ec_new(p);
-		bn_new(x);
-		bn_new(n);
-		bn_new(s);
-
-		ec_curve_get_ord(n);
-		l = bn_bits(n);
-		l = (l % 2) ? (l + 1) / 2 : l / 2;
-
-		ec_get_x(x, q2u);
-		bn_mod_2b(x, x, l);
-
-		bn_set_bit(x, l, 1);
-
-		bn_mul(s, x, d1);
-		bn_mod(s, s, n);
-		bn_add(s, s, d2);
-		bn_mod(s, s, n);
-
-		ec_get_x(x, q2v);
-		bn_mod_2b(x, x, l);
-
-		bn_set_bit(x, l, 1);
-
-		bn_mul(x, x, s);
-		bn_mod(x, x, n);
-
-		ec_mul_sim(p, q2v, s, q1v, x);
-
-		ec_get_x(x, p);
-		l = bn_size_bin(x);
-		bn_write_bin(_x, l, x);
-		md_kdf(key, key_len, _x, l);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		ec_free(p);
-		bn_free(x);
-		bn_free(n);
-		bn_free(s);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ecss.c b/src/dashbls/depends/relic/src/cp/relic_cp_ecss.c
deleted file mode 100644
index 0ff291033844..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ecss.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Schnorr protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ecss_gen(bn_t d, ec_t q) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(d, n);
-		ec_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_ecss_sig(bn_t e, bn_t s, uint8_t *msg, int len, bn_t d) {
-	bn_t n, k, x, r;
-	ec_t p;
-	uint8_t hash[RLC_MD_LEN];
-	uint8_t *m = RLC_ALLOCA(uint8_t, len + RLC_FC_BYTES);
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(x);
-	bn_null(r);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(x);
-		bn_new(r);
-		ec_new(p);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		ec_curve_get_ord(n);
-		do {
-			bn_rand_mod(k, n);
-			ec_mul_gen(p, k);
-			ec_get_x(x, p);
-			bn_mod(r, x, n);
-		} while (bn_is_zero(r));
-
-		memcpy(m, msg, len);
-		bn_write_bin(m + len, RLC_FC_BYTES, r);
-		md_map(hash, m, len + RLC_FC_BYTES);
-
-		if (8 * RLC_MD_LEN > bn_bits(n)) {
-			len = RLC_CEIL(bn_bits(n), 8);
-			bn_read_bin(e, hash, len);
-			bn_rsh(e, e, 8 * RLC_MD_LEN - bn_bits(n));
-		} else {
-			bn_read_bin(e, hash, RLC_MD_LEN);
-		}
-
-		bn_mod(e, e, n);
-
-		bn_mul(s, d, e);
-		bn_mod(s, s, n);
-		bn_sub(s, n, s);
-		bn_add(s, s, k);
-		bn_mod(s, s, n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(k);
-		bn_free(x);
-		bn_free(r);
-		ec_free(p);
-		RLC_FREE(m);
-	}
-	return result;
-}
-
-int cp_ecss_ver(bn_t e, bn_t s, uint8_t *msg, int len, ec_t q) {
-	bn_t n, ev, rv;
-	ec_t p;
-	uint8_t hash[RLC_MD_LEN];
-	uint8_t *m = RLC_ALLOCA(uint8_t, len + RLC_FC_BYTES);
-	int result = 0;
-
-	bn_null(n);
-	bn_null(ev);
-	bn_null(rv);
-	ec_null(p);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(ev);
-		bn_new(rv);
-		ec_new(p);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		ec_curve_get_ord(n);
-
-		if (bn_sign(e) == RLC_POS && bn_sign(s) == RLC_POS && !bn_is_zero(s)) {
-			if (bn_cmp(e, n) == RLC_LT && bn_cmp(s, n) == RLC_LT) {
-				ec_mul_sim_gen(p, s, q, e);
-				ec_get_x(rv, p);
-
-				bn_mod(rv, rv, n);
-
-				memcpy(m, msg, len);
-				bn_write_bin(m + len, RLC_FC_BYTES, rv);
-				md_map(hash, m, len + RLC_FC_BYTES);
-
-				if (8 * RLC_MD_LEN > bn_bits(n)) {
-					len = RLC_CEIL(bn_bits(n), 8);
-					bn_read_bin(ev, hash, len);
-					bn_rsh(ev, ev, 8 * RLC_MD_LEN - bn_bits(n));
-				} else {
-					bn_read_bin(ev, hash, RLC_MD_LEN);
-				}
-
-				bn_mod(ev, ev, n);
-
-				result = dv_cmp_const(ev->dp, e->dp, RLC_MIN(ev->used, e->used));
-				result = (result == RLC_NE ? 0 : 1);
-
-				if (ev->used != e->used) {
-					result = 0;
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(ev);
-		bn_free(rv);
-		ec_free(p);
-		RLC_FREE(m);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ers.c b/src/dashbls/depends/relic/src/cp/relic_cp_ers.c
deleted file mode 100644
index 5a60d7b5ddc7..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ers.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of extendable ring signatures.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ers_gen(ec_t pp) {
-	ec_rand(pp);
-	return RLC_OK;
-}
-
-int cp_ers_gen_key(bn_t sk, ec_t pk) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(sk, n);
-		ec_mul_gen(pk, sk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_ers_sig(bn_t td, ers_t p, uint8_t *msg, int len, bn_t sk, ec_t pk,
-		ec_t pp) {
-	bn_t n;
-	ec_t t, y[2];
-	int result = RLC_OK;
-
-	bn_null(n);
-	ec_null(t);
-	ec_null(y[0]);
-	ec_null(y[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		ec_new(t);
-		ec_new(y[0]);
-		ec_new(y[1]);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(td, n);
-		ec_mul_gen(t, td);
-		ec_sub(t, pp, t);
-		ec_norm(p->h, t);
-
-		ec_copy(p->pk, pk);
-		ec_copy(y[0], p->h);
-		ec_copy(y[1], p->pk);
-		cp_sokor_sig(p->c, p->r, msg, len, y, sk, 0);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		ec_free(t);
-		ec_free(y[0]);
-		ec_free(y[1]);
-	}
-	return result;
-}
-
-int cp_ers_ver(bn_t td, ers_t *s, int size, uint8_t *msg, int len, ec_t pp) {
-	bn_t n;
-	ec_t t, y[2];
-	int flag = 0, result = 0;
-
-	bn_null(n);
-	ec_null(t);
-	ec_null(y[0]);
-	ec_null(y[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		ec_new(t);
-		ec_new(y[0]);
-		ec_new(y[1]);
-
-		ec_curve_get_ord(n);
-		ec_mul_gen(t, td);
-
-		for (int i = 0; i < size; i++) {
-            ec_add(t, t, s[i]->h);
-        }
-		if (ec_cmp(pp, t) == RLC_EQ) {
-			flag = 1;
-			for (int i = 0; i < size; i++) {
-				ec_copy(y[0], s[i]->h);
-				ec_copy(y[1], s[i]->pk);
-				flag &= cp_sokor_ver(s[i]->c, s[i]->r, msg, len, y);
-	        }
-		}
-		result = flag;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		ec_free(t);
-		ec_free(y[0]);
-		ec_free(y[1]);
-	}
-	return result;
-}
-
-int cp_ers_ext(bn_t td, ers_t *p, int *size, uint8_t *msg, int len, ec_t pk,
-		ec_t pp) {
-	bn_t n, r;
-	ec_t y[2];
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(r);
-	ec_null(y[0]);
-	ec_null(y[1]);
-
-	for (int i = 0; i < *size; i++) {
-		if (ec_cmp(pk, p[i]->pk) == RLC_EQ) {
-			return RLC_ERR;
-		}
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		ec_new(y[0]);
-		ec_new(y[1]);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(r, n);
-		bn_sub(td, td, r);
-		bn_mod(td, td, n);
-		ec_mul_gen(p[*size]->h, r);
-
-		ec_copy(p[*size]->pk, pk);
-		ec_copy(y[0], p[*size]->h);
-		ec_copy(y[1], p[*size]->pk);
-		cp_sokor_sig(p[*size]->c, p[*size]->r, msg, len, y, r, 1);
-		(*size)++;
-		result = RLC_OK;
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		ec_free(y[0]);
-		ec_free(y[1]);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_etrs.c b/src/dashbls/depends/relic/src/cp/relic_cp_etrs.c
deleted file mode 100644
index d5a78a9dd59a..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_etrs.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of extendable ring signatures.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_etrs_gen(ec_t pp) {
-	ec_rand(pp);
-	return RLC_OK;
-}
-
-int cp_etrs_gen_key(bn_t sk, ec_t pk) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(sk, n);
-		ec_mul_gen(pk, sk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_etrs_sig(bn_t *td, bn_t *y, int max, etrs_t p, uint8_t *msg, int len,
-		bn_t sk, ec_t pk, ec_t pp) {
-	bn_t n, l, u, v, z;
-	ec_t t, w[2];
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(l);
-	bn_null(u);
-	bn_null(v);
-	bn_null(z);
-	ec_null(t);
-	ec_null(w[0]);
-	ec_null(w[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(l);
-		bn_new(u);
-		bn_new(v);
-		bn_new(z);
-		ec_new(t);
-		ec_new(w[0]);
-		ec_new(w[1]);
-
-		ec_curve_get_ord(n);
-
-		for(int i = 0; i < max; i++) {
-			bn_rand_mod(y[i], n);
-			bn_rand_mod(td[i], n);
-		}
-		bn_rand_mod(p->y, n);
-
-		bn_set_dig(l, 1);
-		for(int j = 0; j < max; j++) {
-			bn_mod_inv(v, y[j], n);
-			bn_sub(u, y[j], p->y);
-			bn_mul(u, u, v);
-			bn_mod(u, u, n);
-			bn_mul(l, l, u);
-			bn_mod(l, l, n);
-		}
-		ec_mul(p->h, pp, l);
-		for(int i = 0; i < max; i++) {
-			ec_mul_gen(t, td[i]);
-			bn_mod_inv(v, y[i], n);
-			bn_mul(u, v, p->y);
-			bn_mod(l, u, n);
-			for(int j = 0; j < max; j++) {
-				if (j != i) {
-					bn_sub(v, y[j], y[i]);
-					bn_mod(v, v, n);
-					bn_mod_inv(v, v, n);
-					bn_sub(u, y[j], p->y);
-					bn_mul(u, u, v);
-					bn_mod(u, u, n);
-					bn_mul(l, l, u);
-					bn_mod(l, l, n);
-				}
-			}
-			ec_mul(t, t, l);
-			ec_add(p->h, p->h, t);
-		}
-		ec_norm(p->h, p->h);
-
-		ec_copy(p->pk, pk);
-		ec_copy(w[0], p->h);
-		ec_copy(w[1], p->pk);
-		cp_sokor_sig(p->c, p->r, msg, len, w, sk, 0);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(l);
-		bn_free(u);
-		bn_free(v);
-		bn_free(z);
-		ec_free(t);
-		ec_free(w[0]);
-		ec_free(w[1]);
-	}
-	return result;
-}
-
-int cp_etrs_ver(int thres, bn_t *td, bn_t *y, int max, etrs_t *s, int size,
-		uint8_t *msg, int len, ec_t pp) {
-	int i, flag = 0, result = 0;
-	bn_t l, n, u, v;
-	ec_t t, w[2];
-
-	int d = max + size - thres;
-	bn_t *_y = RLC_ALLOCA(bn_t, d);
-	ec_t *_t = RLC_ALLOCA(ec_t, d);
-
-	bn_null(l);
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	ec_null(t);
-	ec_null(w[0]);
-	ec_null(w[1]);
-
-	RLC_TRY {
-		bn_new(l);
-		bn_new(n);
-		bn_new(u);
-		bn_new(v);
-		ec_new(t);
-		ec_new(w[0]);
-		ec_new(w[1]);
-		if (_y == NULL || _t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < d; i++) {
-			bn_new(_y[i]);
-			ec_new(_t[i]);
-		}
-
-		for (i = 0; i < max; i++) {
-			bn_copy(_y[i], y[i]);
-			ec_mul_gen(_t[i], td[i]);
-		}
-		for (; i < d; i++) {
-			bn_copy(_y[i], s[i - max]->y);
-			ec_copy(_t[i], s[i - max]->h);
-		}
-
-		ec_curve_get_ord(n);
-
-		flag = 1;
-		ec_set_infty(w[0]);
-		for(i = 0; i < d; i++) {
-			bn_set_dig(l, 1);
-			for(int j = 0; j < d; j++) {
-				if (j != i) {
-					bn_sub(v, _y[j], _y[i]);
-					bn_mod(v, v, n);
-					bn_mod_inv(v, v, n);
-					bn_mul(u, _y[j], v);
-					bn_mod(u, u, n);
-					bn_mul(l, l, u);
-					bn_mod(l, l, n);
-				}
-			}
-
-			ec_mul(t, _t[i], l);
-			ec_add(w[0], w[0], t);
-		}
-		ec_norm(w[0], w[0]);
-		flag &= ec_cmp(w[0], pp) != RLC_EQ;
-
-		for (int i = 0; i < size; i++) {
-			ec_copy(w[0], s[i]->h);
-			ec_copy(w[1], s[i]->pk);
-			flag &= cp_sokor_ver(s[i]->c, s[i]->r, msg, len, w);
-        }
-		result = flag;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(l);
-		bn_free(n);
-		bn_free(u);
-		bn_free(v);
-		ec_free(t);
-		ec_free(w[0]);
-		ec_free(w[1]);
-		for (int i = 0; i < d; i++) {
-			bn_free(_y[i]);
-			ec_free(_t[i]);
-		}
-		RLC_FREE(_y);
-		RLC_FREE(_t);
-	}
-	return result;
-}
-
-int cp_etrs_ext(bn_t *td, bn_t *y, int max, etrs_t *p, int *size, uint8_t *msg, int len,
-		ec_t pk, ec_t pp) {
-	bn_t n, r;
-	ec_t w[2];
-	int i, result = RLC_OK;
-
-	bn_null(n);
-	bn_null(r);
-	ec_null(w[0]);
-	ec_null(w[1]);
-
-	for (int i = 0; i < *size; i++) {
-		if (ec_cmp(pk, p[i]->pk) == RLC_EQ) {
-			return RLC_ERR;
-		}
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		ec_new(w[0]);
-		ec_new(w[1]);
-
-		for (i = 0; i < max; i++) {
-			if (!bn_is_zero(td[i])) {
-				break;
-			}
-		}
-		bn_copy(r, td[i]);
-
-		ec_curve_get_ord(n);
-		ec_mul_gen(p[*size]->h, td[i]);
-		bn_copy(p[*size]->y, y[i]);
-
-		bn_zero(td[i]);
-		bn_zero(y[i]);
-
-		ec_copy(p[*size]->pk, pk);
-		ec_copy(w[0], p[*size]->h);
-		ec_copy(w[1], p[*size]->pk);
-		cp_sokor_sig(p[*size]->c, p[*size]->r, msg, len, w, r, 1);
-		(*size)++;
-		result = RLC_OK;
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		ec_free(w[0]);
-		ec_free(w[1]);
-	}
-	return result;
-}
-
-int cp_etrs_uni(int thres, bn_t *td, bn_t *y, int max, etrs_t *p, int *size,
-		uint8_t *msg, int len, bn_t sk, ec_t pk, ec_t pp) {
-	int i, result = 0;
-	bn_t l, n, u, v;
-	ec_t t, w[2];
-
-	int d = max + *size;
-	bn_t *_y = RLC_ALLOCA(bn_t, d);
-	ec_t *_t = RLC_ALLOCA(ec_t, d);
-
-	bn_null(l);
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	ec_null(t);
-	ec_null(w[0]);
-	ec_null(w[1]);
-
-	RLC_TRY {
-		bn_new(l);
-		bn_new(n);
-		bn_new(u);
-		bn_new(v);
-		ec_new(t);
-		ec_new(w[0]);
-		ec_new(w[1]);
-		if (_y == NULL || _t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < d; i++) {
-			bn_new(_y[i]);
-			ec_new(_t[i]);
-		}
-
-		for (i = 0; i < max; i++) {
-			bn_copy(_y[i], y[i]);
-			ec_mul_gen(_t[i], td[i]);
-		}
-		for (; i < d; i++) {
-			bn_copy(_y[i], p[i - max]->y);
-			ec_copy(_t[i], p[i - max]->h);
-		}
-
-		ec_curve_get_ord(n);
-		bn_rand_mod(p[*size]->y, n);
-
-		ec_set_infty(p[*size]->h);
-		for(i = 0; i < d; i++) {
-			bn_set_dig(l, 1);
-			for(int j = 0; j < d; j++) {
-				if (j != i) {
-					bn_sub(v, _y[j], _y[i]);
-					bn_mod(v, v, n);
-					bn_mod_inv(v, v, n);
-					bn_sub(u, _y[j], p[*size]->y);
-					bn_mul(u, u, v);
-					bn_mod(u, u, n);
-					bn_mul(l, l, u);
-					bn_mod(l, l, n);
-				}
-			}
-			ec_mul(t, _t[i], l);
-			ec_add(p[*size]->h, p[*size]->h, t);
-		}
-		ec_norm(p[*size]->h, p[*size]->h);
-
-		ec_copy(p[*size]->pk, pk);
-		ec_copy(w[0], p[*size]->h);
-		ec_copy(w[1], p[*size]->pk);
-		cp_sokor_sig(p[*size]->c, p[*size]->r, msg, len, w, sk, 0);
-		(*size)++;
-		result = RLC_OK;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(l);
-		bn_free(n);
-		bn_free(u);
-		bn_free(v);
-		ec_free(t);
-		ec_free(w[0]);
-		ec_free(w[1]);
-		for (int i = 0; i < d; i++) {
-			bn_free(_y[i]);
-			ec_free(_t[i]);
-		}
-		RLC_FREE(_y);
-		RLC_FREE(_t);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ghpe.c b/src/dashbls/depends/relic/src/cp/relic_cp_ghpe.c
deleted file mode 100644
index d69edb8be0c9..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ghpe.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Damgård-Jurik-Nielsen Generalized Homomorphic
- * Probabilistic Encryption.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ghpe_gen(bn_t pub, bn_t prv, int bits) {
-	int result = RLC_OK;
-	bn_t p, q, r;
-
-	bn_null(p);
-	bn_null(q);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(p);
-		bn_new(q);
-		bn_new(r);
-
-		/* Generate primes p and q of equivalent length. */
-		do {
-			bn_gen_prime(p, bits / 2);
-			bn_mod_2b(r, p, 2);
-		} while (bn_cmp_dig(r, 3) != RLC_EQ);
-
-		do {
-			bn_gen_prime(q, bits / 2);
-			bn_mod_2b(r, q, 2);
-		} while (bn_cmp(p, q) == RLC_EQ || bn_cmp_dig(r, 3) != RLC_EQ);
-
-		/* Compute n = pq and l = \phi(n). */
-		bn_sub_dig(p, p, 1);
-		bn_sub_dig(q, q, 1);
-		bn_mul(prv, p, q);
-		bn_add_dig(p, p, 1);
-		bn_add_dig(q, q, 1);
-		bn_mul(pub, p, q);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(p);
-		bn_free(q);
-		bn_free(r);
-	}
-
-	return result;
-}
-
-int cp_ghpe_enc(bn_t c, bn_t m, bn_t pub, int s) {
-	bn_t g, r, t;
-	int result = RLC_OK;
-
-	bn_null(g);
-	bn_null(r);
-	bn_null(t);
-
-	if (pub == NULL || bn_bits(m) > s * bn_bits(pub)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(g);
-		bn_new(r);
-		bn_new(t);
-
-		/* Generate r in Z_n^*. */
-		bn_rand_mod(r, pub);
-		/* Compute c = (g^m)(r^n) mod n^2. */
-		bn_add_dig(g, pub, 1);
-
-		/* t = n^(s + 1). */
-		bn_copy(t, pub);
-		for (int i = 0; i < s; i++) {
-			bn_mul(t, t, pub);
-		}
-
-		bn_mxp(c, g, m, t);
-		for (int i = 0; i < s; i++) {
-			bn_mxp(r, r, pub, t);
-		}
-
-		bn_mul(c, c, r);
-		bn_mod(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(g);
-		bn_free(r);
-		bn_free(t);
-	}
-
-	return result;
-}
-
-int cp_ghpe_dec(bn_t m, bn_t c, bn_t pub, bn_t prv, int s) {
-	bn_t i, l, r, t, u, v, x;
-	int result = RLC_OK;
-	dig_t fk;
-
-	if (bn_bits(c) > (s + 1) * bn_bits(pub)) {
-		return RLC_ERR;
-	}
-
-	bn_null(i);
-	bn_null(l);
-	bn_null(r);
-	bn_null(t);
-	bn_null(u);
-	bn_null(v);
-	bn_null(x);
-
-	RLC_TRY {
-		bn_new(i);
-		bn_new(l);
-		bn_new(r);
-		bn_new(t);
-		bn_new(u);
-		bn_new(v);
-		bn_new(x);
-
-		/* t = n^(s + 1). */
-		bn_sqr(t, pub);
-		for (int i = 1; i < s; i++) {
-			bn_mul(t, t, pub);
-		}
-
-		/* Compute (c^l mod n^(s + 1)) * u mod n. */
-		bn_mxp(m, c, prv, t);
-
-		bn_zero(i);
-		bn_copy(t, pub);
-		for (int j = 1; j <= s; j++) {
-			/* u = t1 = L(c mod n^(j+1)). */
-			bn_mul(r, t, pub);
-			bn_mod(u, m, r);
-			bn_sub_dig(u, u, 1);
-			bn_div(u, u, pub);
-			/* v = t2 = i. */
-			bn_copy(v, i);
-			bn_copy(l, pub);
-			fk = 1;
-			for (int k = 2; k <= j; k++) {
-				bn_sub_dig(i, i, 1);
-				/* Accumulate fk = f!. */
-				fk = fk * k;
-				/* t2 = t2 * i mod n^j. */
-				bn_mul(v, v, i);
-				bn_mod(v, v, t);
-				/* t1 = t1 - t2 * n^(k-1)/k! mod n^j. */
-				bn_mul(x, v, l);
-				bn_div_dig(x, x, fk);
-				bn_mod(x, x, t);
-				bn_sub(u, u, x);
-				while (bn_sign(u) == RLC_NEG) {
-					bn_add(u, u, t);
-				}
-				bn_mod(u, u, t);
-				bn_mul(l, l, pub);
-			}
-			if (j < s) {
-				bn_copy(t, r);
-				bn_copy(i, u);
-			}
-		}
-		bn_mod_inv(v, prv, t);
-		bn_mul(m, u, v);
-		bn_mod(m, m, t);
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(i);
-		bn_free(l);
-		bn_free(r);
-		bn_free(t);
-		bn_free(u);
-		bn_free(v);
-		bn_free(x);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_ibe.c b/src/dashbls/depends/relic/src/cp/relic_cp_ibe.c
deleted file mode 100644
index 8e6b8d50ff00..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_ibe.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Boneh-Franklin indentity-based encryption.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_ibe_gen(bn_t master, g1_t pub) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(master, n);
-
-		/* K_pub = sG. */
-		g1_mul_gen(pub, master);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_ibe_gen_prv(g2_t prv, char *id, bn_t master) {
-	g2_map(prv, (uint8_t *)id, strlen(id));
-	g2_mul(prv, prv, master);
-	return RLC_OK;
-}
-
-int cp_ibe_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len, char *id,
-		g1_t pub) {
-	int l, result = RLC_OK;
-	uint8_t *buf = NULL, h[RLC_MD_LEN];
-	bn_t n;
-	bn_t r;
-	g1_t p;
-	g2_t q;
-	gt_t e;
-
-	bn_null(n);
-	bn_null(r);
-	g1_null(p);
-	g2_null(q);
-	gt_null(e);
-
-	if (pub == NULL || in_len <= 0 || in_len > RLC_MD_LEN ) {
-		return RLC_ERR;
-	}
-
-	l = 1 + 2 * RLC_FP_BYTES;
-	if (*out_len < (in_len + l)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		g1_new(p);
-		g2_new(q);
-		gt_new(e);
-
-		/* Allocate size for storing the output. */
-		l = gt_size_bin(e, 0);
-		buf = RLC_ALLOCA(uint8_t, l);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		pc_get_ord(n);
-
-		/* q = H_1(ID). */
-		g2_map(q, (uint8_t *)id, strlen(id));
-
-		/* e = e(K_pub, q). */
-		pc_map(e, pub, q);
-
-		/* h = H_2(e^r). */
-		bn_rand_mod(r, n);
-		gt_exp(e, e, r);
-		gt_write_bin(buf, l, e, 0);
-		md_map(h, buf, l);
-
-		/* P = [k]G. */
-		g1_mul_gen(p, r);
-		g1_write_bin(out, *out_len, p, 0);
-
-		for (l = 0; l < RLC_MIN(in_len, RLC_MD_LEN); l++) {
-			out[l + (2 * RLC_FP_BYTES + 1)] = in[l] ^ h[l];
-		}
-
-		*out_len = in_len + (2 * RLC_FP_BYTES + 1);
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		g1_free(p);
-		g2_free(q);
-		gt_free(e);
-		RLC_FREE(buf);
-	}
-	return result;
-}
-
-int cp_ibe_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len, g2_t prv) {
-	int l, result = RLC_OK;
-	uint8_t *buf = NULL, h[RLC_MD_LEN];
-	g1_t p;
-	gt_t e;
-
-	g1_null(p);
-	gt_null(e);
-
-	l = 2 * RLC_FP_BYTES + 1;
-	if (prv == NULL || in_len <= l || in_len > (RLC_MD_LEN + l)) {
-		return RLC_ERR;
-	}
-
-	if (*out_len < (in_len - l)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		g1_new(p);
-		gt_new(e);
-
-		g1_read_bin(p, in, l);
-
-		pc_map(e, p, prv);
-
-		/* Allocate size for storing the output. */
-		l = gt_size_bin(e, 0);
-		buf = RLC_ALLOCA(uint8_t, l);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		gt_write_bin(buf, l, e, 0);
-		md_map(h, buf, l);
-
-		in_len -= (2 * RLC_FP_BYTES + 1);
-		for (l = 0; l < RLC_MIN(in_len, RLC_MD_LEN); l++) {
-			out[l] = in[l + (2 * RLC_FP_BYTES + 1)] ^ h[l];
-		}
-
-		*out_len = in_len;
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		g1_free(p);
-		gt_free(e);
-		RLC_FREE(buf);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_mklhs.c b/src/dashbls/depends/relic/src/cp/relic_cp_mklhs.c
deleted file mode 100644
index bb4b3a4991a5..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_mklhs.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multi-key linearly homomophic signature protocol.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_mklhs_gen(bn_t sk, g2_t pk) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(sk, n);
-		g2_mul_gen(pk, sk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_mklhs_sig(g1_t s, bn_t m, char *data, char *id, char *tag, bn_t sk) {
-	bn_t n;
-	g1_t a;
-	int result = RLC_OK;
-	uint8_t *str = RLC_ALLOCA(uint8_t,
-		strlen(id) + RLC_MAX(strlen(data), strlen(tag)));
-
-	bn_null(n);
-	g1_null(a);
-
-	RLC_TRY {
-		bn_new(n);
-		g1_new(a);
-
-		pc_get_ord(n);
-		g1_mul_gen(a, m);
-
-		memcpy(str, data, strlen(data));
-		memcpy(str + strlen(data), id, strlen(id));
-		g1_map(s, str, strlen(data) + strlen(id));
-		g1_add(s, s, a);
-
-		memcpy(str, id, strlen(id));
-		memcpy(str + strlen(id), tag, strlen(tag));
-		g1_map(a, str, strlen(id) + strlen(tag));
-		g1_add(s, s, a);
-		g1_norm(s, s);
-		g1_mul_key(s, s, sk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		RLC_FREE(str);
-		bn_free(n);
-		g1_free(a);
-	}
-	return result;
-}
-
-int cp_mklhs_fun(bn_t mu, bn_t m[], dig_t f[], int len) {
-	bn_t n, t;
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(t);
-
-		pc_get_ord(n);
-		bn_zero(mu);
-		for (int i = 0; i < len; i++) {
-			bn_mul_dig(t, m[i], f[i]);
-			bn_add(mu, mu, t);
-			bn_mod(mu, mu, n);
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(t);
-	}
-	return result;
-}
-
-int cp_mklhs_evl(g1_t sig, g1_t s[], dig_t f[], int len) {
-	int result = RLC_OK;
-
-	g1_mul_sim_dig(sig, s, f, len);
-
-	return result;
-}
-
-int cp_mklhs_ver(g1_t sig, bn_t m, bn_t mu[], char *data, char *id[],
-		char *tag[], dig_t *f[], int flen[], g2_t pk[], int slen) {
-	bn_t t, n;
-	g1_t d, *g = RLC_ALLOCA(g1_t, slen);
-	g2_t g2;
-	gt_t c, e;
-	int imax = 0, lmax = 0, fmax = 0, ver1 = 0, ver2 = 0;
-	for (int i = 0; i < slen; i++) {
-		fmax = RLC_MAX(fmax, flen[i]);
-		imax = RLC_MAX(imax, strlen(id[i]));
-		for (int j = 0; j < flen[i]; j++) {
-			lmax = RLC_MAX(lmax, strlen(tag[j]));
-		}
-	}
-	g1_t *h = RLC_ALLOCA(g1_t, fmax);
-	uint8_t *str = RLC_ALLOCA(uint8_t, imax + RLC_MAX(strlen(data), lmax));
-
-	bn_null(t);
-	bn_null(n);
-	g1_null(d);
-	g2_null(g2);
-	gt_null(c);
-	gt_null(e);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(n);
-		g1_new(d);
-		g2_new(g2);
-		gt_new(c);
-		gt_new(e);
-		if (g == NULL || h == NULL) {
-			RLC_FREE(g);
-			RLC_FREE(h);
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		bn_zero(t);
-		pc_get_ord(n);
-		for (int j = 0; j < slen; j++) {
-			g1_null(g[j]);
-			g1_new(g[j]);
-			bn_add(t, t, mu[j]);
-			bn_mod(t, t, n);
-		}
-		for (int j = 0; j < fmax; j++) {
-			g1_null(h[j]);
-			g1_new(h[j]);
-		}
-
-		if (bn_cmp(m, t) == RLC_EQ) {
-			ver1 = 1;
-		}
-
-		for (int i = 0; i < slen; i++) {
-			memcpy(str, data, strlen(data));
-			memcpy(str + strlen(data), id[i], strlen(id[i]));
-			g1_map(d, str, strlen(data) + strlen(id[i]));
-			memcpy(str, id[i], strlen(id[i]));
-			for (int j = 0; j < flen[i]; j++) {
-				memcpy(str + strlen(id[i]), tag[j], strlen(tag[j]));
-				g1_map(h[j], str, strlen(id[i]) + strlen(tag[j]));
-				g1_add(h[j], h[j], d);
-			}
-			g1_norm_sim(h, h, slen);
-			g1_mul_sim_dig(g[i], h, f[i], flen[i]);
-			g1_mul_gen(h[0], mu[i]);
-			g1_add(g[i], g[i], h[0]);
-		}
-		g1_norm_sim(g, g, slen);
-
-		g2_get_gen(g2);
-		pc_map(e, sig, g2);
-		pc_map_sim(c, g, pk, slen);
-		if (gt_cmp(c, e) == RLC_EQ) {
-			ver2 = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(n);
-		g1_free(d);
-		g2_free(g2);
-		gt_free(c);
-		gt_free(e);
-		for (int j = 0; j < slen; j++) {
-			g1_free(g[j]);
-		}
-		for (int j = 0; j < fmax; j++) {
-			g1_free(h[j]);
-		}
-		RLC_FREE(g);
-		RLC_FREE(h);
-		RLC_FREE(str);
-	}
-	return (ver1 && ver2);
-}
-
-int cp_mklhs_off(g1_t h[], dig_t ft[], char *id[], char *tag[], dig_t *f[],
-		int flen[],	int slen) {
-	int imax = 0, lmax = 0, fmax = 0, result = RLC_OK;
-	for (int i = 0; i < slen; i++) {
-		fmax = RLC_MAX(fmax, flen[i]);
-		imax = RLC_MAX(imax, strlen(id[i]));
-		for (int j = 0; j < flen[i]; j++) {
-			lmax = RLC_MAX(lmax, strlen(tag[j]));
-		}
-	}
-	g1_t *_h = RLC_ALLOCA(g1_t, fmax);
-	uint8_t *str = RLC_ALLOCA(uint8_t, imax + lmax);
-
-	RLC_TRY {
-		if (_h == NULL) {
-			RLC_FREE(_h);
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		for (int j = 0; j < fmax; j++) {
-			g1_null(_h[j]);
-			g1_new(_h[j]);
-		}
-
-		for (int i = 0; i < slen; i++) {
-			ft[i] = 0;
-			memcpy(str, id[i], strlen(id[i]));
-			for (int j = 0; j < flen[i]; j++) {
-				memcpy(str + strlen(id[i]), tag[j], strlen(tag[j]));
-				g1_map(_h[j], str, strlen(id[i]) + strlen(tag[j]));
-				ft[i] += f[i][j];
-			}
-			g1_mul_sim_dig(h[i], _h, f[i], flen[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		for (int j = 0; j < fmax; j++) {
-			g1_free(_h[j]);
-		}
-		RLC_FREE(_h);
-		RLC_FREE(str);
-	}
-	return result;
-}
-
-int cp_mklhs_onv(g1_t sig, bn_t m, bn_t mu[], char *data, char *id[], g1_t h[],
-		dig_t ft[], g2_t pk[], int slen) {
-	bn_t t, n;
-	g1_t d, g1, *g = RLC_ALLOCA(g1_t, slen);
-	g2_t g2;
-	gt_t c, e;
-	int ver1 = 0, ver2 = 0, imax = 0;
-	for (int i = 0; i < slen; i++) {
-		imax = RLC_MAX(imax, strlen(id[i]));
-	}
-	uint8_t *str = RLC_ALLOCA(uint8_t, strlen(data) + imax);
-
-	bn_null(t);
-	bn_null(n);
-	g1_null(d);
-	g1_null(g1);
-	g2_null(g2);
-	gt_null(c);
-	gt_null(e);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(n);
-		g1_new(d);
-		g1_new(g1);
-		g2_new(g2);
-		gt_new(c);
-		gt_new(e);
-		if (g == NULL) {
-			RLC_FREE(g);
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		bn_zero(t);
-		pc_get_ord(n);
-		for (int j = 0; j < slen; j++) {
-			g1_null(g[j]);
-			g1_new(g[j]);
-			bn_add(t, t, mu[j]);
-			bn_mod(t, t, n);
-		}
-
-		if (bn_cmp(m, t) == RLC_EQ) {
-			ver1 = 1;
-		}
-
-		for (int i = 0; i < slen; i++) {
-			memcpy(str, data, strlen(data));
-			memcpy(str + strlen(data), id[i], strlen(id[i]));
-			g1_map(d, str, strlen(data) + strlen(id[i]));
-			g1_mul_dig(g[i], d, ft[i]);
-			g1_add(g[i], g[i], h[i]);
-			g1_mul_gen(g1, mu[i]);
-			g1_add(g[i], g[i], g1);
-		}
-		g1_norm_sim(g, g, slen);
-
-		g2_get_gen(g2);
-		pc_map(e, sig, g2);
-		pc_map_sim(c, g, pk, slen);
-		if (gt_cmp(c, e) == RLC_EQ) {
-			ver2 = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(n);
-		g1_free(d);
-		g1_free(g1);
-		g2_free(g2);
-		gt_free(c);
-		gt_free(e);
-		for (int j = 0; j < slen; j++) {
-			g1_free(g[j]);
-		}
-		RLC_FREE(g);
-		RLC_FREE(str);
-	}
-	return (ver1 && ver2);
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_mpss.c b/src/dashbls/depends/relic/src/cp/relic_cp_mpss.c
deleted file mode 100644
index 1d3b4b6d2526..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_mpss.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multi-party Pointcheval-Sanders signature protocols.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_mpss_gen(bn_t r[2], bn_t s[2], g2_t h, g2_t x[2], g2_t y[2]) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Generate keys for PS and secret share them. */
-		g2_rand(h);
-		g2_get_ord(n);
-
-		bn_rand_mod(r[0], n);
-		bn_rand_mod(r[1], n);
-		g2_mul(x[0], h, r[0]);
-		g2_mul(x[1], h, r[1]);
-
-		bn_rand_mod(s[0], n);
-		bn_rand_mod(s[1], n);
-		g2_mul(y[0], h, s[0]);
-		g2_mul(y[1], h, s[1]);
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_mpss_bct(g2_t x[2], g2_t y[2]) {
-	/* Add public values and replicate. */
-	g2_add(x[0], x[0], x[1]);
-	g2_norm(x[0], x[0]);
-	g2_copy(x[1], x[0]);
-	g2_add(y[0], y[0], y[1]);
-	g2_norm(y[0], y[0]);
-	g2_copy(y[1], y[0]);
-	return RLC_OK;
-}
-
-int cp_mpss_sig(g1_t a, g1_t b[2], bn_t m[2], bn_t r[2], bn_t s[2], mt_t mul_tri[2], mt_t sm_tri[2]) {
-	int result = RLC_OK;
-	bn_t n, d[2], e[2];
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		for (int i = 0; i < 2; i++) {
-			bn_null(d[i]);
-			bn_null(e[i]);
-			bn_new(d[i]);
-			bn_new(e[i]);
-		}
-		/* Compute d = (xm + y) in MPC. */
-		g1_get_ord(n);
-		mt_mul_lcl(d[0], e[0], m[0], s[0], n, mul_tri[0]);
-		mt_mul_lcl(d[1], e[1], m[1], s[1], n, mul_tri[1]);
-		mt_mul_bct(d, e, n);
-		mt_mul_mpc(d[0], d[0], e[0], n, mul_tri[0], 0);
-		mt_mul_mpc(d[1], d[1], e[1], n, mul_tri[1], 1);
-		bn_add(d[0], d[0], r[0]);
-		bn_mod(d[0], d[0], n);
-		bn_add(d[1], d[1], r[1]);
-		bn_mod(d[1], d[1], n);
-		/* Compute signature in MPC. */
-		g1_rand(b[0]);
-		g1_rand(b[1]);
-		g1_add(a, b[0], b[1]);
-		g1_norm(a, a);
-		g1_mul(b[0], a, d[0]);
-		g1_mul(b[1], a, d[1]);
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < 2; i++) {
-			bn_free(d[i]);
-			bn_free(e[i]);
-		}
-	}
-	return result;
-}
-
-int cp_mpss_ver(gt_t e, g1_t a, g1_t b[2], bn_t m[2], g2_t h, g2_t x, g2_t y,
-		mt_t sm_tri[2], pt_t pc_tri[2]) {
-	int result = 0;
-	bn_t n, d[2], r[2];
-	g1_t p[2], q[2];
-	g2_t z[2], w[2];
-	gt_t alpha[2], beta[2];
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		for (int i = 0; i < 2; i++) {
-			bn_null(d[i]);
-			bn_null(r[i]);
-			g1_null(p[i]);
-			g1_null(q[i]);
-			g2_null(z[i]);
-			g2_null(w[i]);
-			gt_null(alpha[i]);
-			gt_null(beta[i]);
-			bn_new(d[i]);
-			bn_new(r[i]);
-			g1_new(p[i]);
-			g1_new(q[i]);
-			g2_new(z[i]);
-			g2_new(w[i]);
-			gt_new(alpha[i]);
-			gt_new(beta[i]);
-		}
-		g1_get_ord(n);
-		/* Compute Z = X + [m] * Y. */
-		g2_mul(z[0], y, m[0]);
-		g2_mul(z[1], y, m[1]);
-		g2_add(z[0], z[0], x);
-		g2_norm(z[0], z[0]);
-
-		/* Compute [P] = [sigma_1'] = [r] * [sigma_1] in MPC. */
-
-		bn_rand_mod(r[0], n);
-		bn_rand_mod(r[1], n);
-
-		g1_neg(p[0], a);
-		g1_copy(p[1], b[0]);
-		g2_copy(w[0], z[0]);
-		g2_copy(w[1], h);
-		pc_map_sim(beta[0], p, w, 2);
-
-		g1_neg(q[0], a);
-		g1_copy(q[1], b[1]);
-		g2_copy(w[0], z[1]);
-		g2_copy(w[1], h);
-		pc_map_sim(beta[1], q, w, 2);
-
-		/* Compute [alpha] = e([r] * [sigma_2, H]).  */
-		gt_exp_lcl(d[0], alpha[0], r[0], beta[0], sm_tri[0]);
-		gt_exp_lcl(d[1], alpha[1], r[1], beta[1], sm_tri[1]);
-		/* Broadcast public values. */
-		gt_exp_bct(d, alpha);
-		gt_exp_mpc(beta[0], d[0], alpha[0], sm_tri[0], 0);
-		gt_exp_mpc(beta[1], d[1], alpha[1], sm_tri[1], 1);
-
-		if (g1_is_infty(a)) {
-			gt_rand(e);
-		} else {
-			/* Now combine shares and multiply. */
-			gt_mul(e, beta[0], beta[1]);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < 2; i++) {
-			bn_free(d[i]);
-			bn_free(r[i]);
-			g1_free(p[i]);
-			g1_free(q[i]);
-			g2_free(z[i]);
-			g2_free(w[i]);
-			gt_free(alpha[i]);
-			gt_free(beta[i]);
-		}
-	}
-	return result;
-}
-
-int cp_mpsb_gen(bn_t r[2], bn_t s[][2], g2_t h, g2_t x[2], g2_t y[][2], int l) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Generate keys for PS and secret share them. */
-		g2_rand(h);
-		g2_get_ord(n);
-
-		bn_rand_mod(r[0], n);
-		bn_rand_mod(r[1], n);
-		g2_mul(x[0], h, r[0]);
-		g2_mul(x[1], h, r[1]);
-
-		for (int i = 0; i < l; i++) {
-			bn_rand_mod(s[i][0], n);
-			bn_rand_mod(s[i][1], n);
-			g2_mul(y[i][0], h, s[i][0]);
-			g2_mul(y[i][1], h, s[i][1]);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_mpsb_bct(g2_t x[2], g2_t y[][2], int l) {
-	/* Add public values and replicate. */
-	g2_add(x[0], x[0], x[1]);
-	g2_norm(x[0], x[0]);
-	g2_copy(x[1], x[0]);
-	for (int i = 0; i < l; i++) {
-		g2_add(y[i][0], y[i][0], y[i][1]);
-		g2_norm(y[i][0], y[i][0]);
-		g2_copy(y[i][1], y[i][0]);
-	}
-	return RLC_OK;
-}
-
-int cp_mpsb_sig(g1_t a, g1_t b[2], bn_t m[][2], bn_t r[2], bn_t s[][2],
-		mt_t mul_tri[2], mt_t sm_tri[2], int l) {
-	int result = RLC_OK;
-	bn_t n, d[2], e[2], t[2];
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		for (int i = 0; i < 2; i++) {
-			bn_null(d[i]);
-			bn_null(e[i]);
-			bn_null(t[i]);
-			bn_new(d[i]);
-			bn_new(e[i]);
-			bn_new(t[i]);
-		}
-		/* Compute d = (y_im_i + x) in MPC. */
-		g1_get_ord(n);
-		bn_zero(t[0]);
-		for (int i = 0; i < l; i++) {
-			bn_add(d[0], s[i][0], s[i][1]);
-			bn_add(d[1], m[i][0], m[i][1]);
-			bn_mul(t[1], d[0], d[1]);
-			bn_mod(t[1], t[1], n);
-			bn_add(t[0], t[0], t[1]);
-			bn_mod(t[0], t[0], n);
-		}
-		bn_rand_mod(t[1], n);
-		bn_sub(t[0], t[0], t[1]);
-		if (bn_sign(t[0]) == RLC_NEG) {
-			bn_add(t[0], t[0], n);
-		}
-		bn_add(d[0], t[0], r[0]);
-		bn_mod(d[0], d[0], n);
-		bn_add(d[1], t[1], r[1]);
-		bn_mod(d[1], d[1], n);
-		/* Compute signature in MPC. */
-		g1_rand(b[0]);
-		g1_rand(b[1]);
-		g1_add(a, b[0], b[1]);
-		g1_norm(a, a);
-		g1_mul(b[0], a, d[0]);
-		g1_mul(b[1], a, d[1]);
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < 2; i++) {
-			bn_free(d[i]);
-			bn_free(e[i]);
-			bn_free(t[i]);
-		}
-	}
-	return result;
-}
-
-int cp_mpsb_ver(gt_t e, g1_t a, g1_t b[2], bn_t m[][2], g2_t h, g2_t x,
-		g2_t y[][2], bn_t v[][2], mt_t sm_tri[2], pt_t pc_tri[2], int l) {
-	int result = 0;
-	bn_t n, _t, t[2], d[2], r[2], *_m = RLC_ALLOCA(bn_t, 2 * l);
-	g1_t p[2], q[2];
-	g2_t w[2], z[2], *_y = RLC_ALLOCA(g2_t, 2 * l);
-	gt_t alpha[2], beta[2];
-
-	bn_null(n);
-	bn_null(_t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_t);
-		for (int i = 0; i < 2; i++) {
-			bn_null(d[i]);
-			bn_null(r[i]);
-			bn_null(t[i]);
-			g1_null(p[i]);
-			g1_null(q[i]);
-			g2_null(w[i]);
-			gt_null(alpha[i]);
-			gt_null(beta[i]);
-			bn_new(d[i]);
-			bn_new(r[i]);
-			bn_new(t[i]);
-			g1_new(p[i]);
-			g1_new(q[i]);
-			g2_new(w[i]);
-			g2_new(z[i]);
-			gt_new(alpha[i]);
-			gt_new(beta[i]);
-			for (int j = 0; j < l; j++) {
-				g2_null(_y[l*i + j]);
-				g2_new(_y[l*i + j]);
-				bn_null(_m[l*i + j]);
-				bn_new(_m[l*i + j]);
-			}
-		}
-		g1_get_ord(n);
-		if (v == NULL) {
-			for (int i = 0; i < 2; i++) {
-				for (int j = 0; j < l; j++) {
-					bn_copy(_m[l*i + j], m[j][i]);
-					g2_copy(_y[l*i + j], y[j][i]);
-				}
-			}
-			/* Compute Z = X + [m] * Y. */
-			for (int i = 0; i < 2; i++) {
-				g2_mul_sim_lot(z[i], &_y[l*i], &_m[l*i], l);
-			}
-		} else {
-			/* Compute Z = X + [m] * [y_i] * G. */
-			bn_zero(t[0]);
-			for (int i = 0; i < l; i++) {
-				bn_add(d[0], v[i][0], v[i][1]);
-				bn_add(d[1], m[i][0], m[i][1]);
-				bn_mul(t[1], d[0], d[1]);
-				bn_mod(t[1], t[1], n);
-				bn_add(t[0], t[0], t[1]);
-				bn_mod(t[0], t[0], n);
-			}
-			bn_rand_mod(t[1], n);
-			bn_sub(t[0], t[0], t[1]);
-			if (bn_sign(t[0]) == RLC_NEG) {
-				bn_add(t[0], t[0], n);
-			}
-			g2_mul(z[0], h, t[0]);
-			g2_mul(z[1], h, t[1]);
-		}
-		g2_add(z[0], z[0], x);
-		g2_norm(z[0], z[0]);
-
-		/* Compute [P] = [sigma_1'] = [r] * [sigma_1] in MPC. */
-		bn_rand_mod(r[0], n);
-		bn_rand_mod(r[1], n);
-
-		g1_neg(p[0], a);
-		g1_copy(p[1], b[0]);
-		g2_copy(w[0], z[0]);
-		g2_copy(w[1], h);
-		pc_map_sim(beta[0], p, w, 2);
-
-		g1_neg(q[0], a);
-		g1_copy(q[1], b[1]);
-		g2_copy(w[0], z[1]);
-		g2_copy(w[1], h);
-		pc_map_sim(beta[1], q, w, 2);
-
-		/* Compute [alpha] = e([r] * [sigma_2, H]).  */
-		gt_exp_lcl(d[0], alpha[0], r[0], beta[0], sm_tri[0]);
-		gt_exp_lcl(d[1], alpha[1], r[1], beta[1], sm_tri[1]);
-		/* Broadcast public values. */
-		gt_exp_bct(d, alpha);
-		gt_exp_mpc(beta[0], d[0], alpha[0], sm_tri[0], 0);
-		gt_exp_mpc(beta[1], d[1], alpha[1], sm_tri[1], 1);
-
-		if (g1_is_infty(a)) {
-			gt_rand(e);
-		} else {
-			/* Now combine shares and multiply. */
-			gt_mul(e, beta[0], beta[1]);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_t);
-		for (int i = 0; i < 2; i++) {
-			bn_free(d[i]);
-			bn_free(r[i]);
-			bn_free(t[i]);
-			g1_free(p[i]);
-			g1_free(q[i]);
-			g2_free(w[i]);
-			g2_free(z[i]);
-			gt_free(alpha[i]);
-			gt_free(beta[i]);
-			for (int j = 0; j < l; j++) {
-				g2_free(_y[l*i + j]);
-				bn_free(_m[l*i + j]);
-			}
-		}
-		RLC_FREE(_y);
-		RLC_FREE(_m);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_pcdel.c b/src/dashbls/depends/relic/src/cp/relic_cp_pcdel.c
deleted file mode 100644
index a8ded35e5279..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_pcdel.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing delegation protocols.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_pdpub_gen(bn_t c, bn_t r, g1_t u1, g2_t u2, g2_t v2, gt_t e) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Generate random c, U1, r, U2. */
-		pc_get_ord(n);
-		bn_rand(c, RLC_POS, 50);
-		g1_rand(u1);
-		bn_rand_mod(r, n);
-		g2_rand(u2);
-		/* Compute gamma = e(U1, U2) and V2 = [1/r2]U2. */
-		bn_mod_inv(n, r, n);
-		g2_mul(v2, u2, n);
-		pc_map(e, u1, u2);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_pdpub_ask(g1_t v1, g2_t w2, g1_t p, g2_t q, bn_t c, bn_t r, g1_t u1, g2_t u2, g2_t v2) {
-	int result = RLC_OK;
-
-	/* Compute V1 = [r](P - U1). */
-	g1_sub(v1, p, u1);
-	g1_mul(v1, v1, r);
-	/* Compute W2 = [c]Q + U2. */
-	g2_mul(w2, q, c);
-	g2_add(w2, w2, u2);
-
-	return result;
-}
-
-int cp_pdpub_ans(gt_t g[3], g1_t p, g2_t q, g1_t v1, g2_t v2, g2_t w2) {
-	int result = RLC_OK;
-	pc_map(g[0], p, q);
-	pc_map(g[1], p, w2);
-	pc_map(g[2], v1, v2);
-	return result;
-}
-
-int cp_pdpub_ver(gt_t r, gt_t g[3], bn_t c, gt_t e) {
-	int result = 1;
-	gt_t t;
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		result &= gt_is_valid(g[0]);
-		result &= gt_is_valid(g[2]);
-
-		gt_exp(t, g[0], c);
-		gt_mul(t, t, g[2]);
-		gt_mul(t, t, e);
-
-		if (!result || gt_cmp(t, g[1]) != RLC_EQ) {
-			gt_set_unity(r);
-		} else {
-			gt_copy(r, g[0]);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		gt_free(t);
-	}
-	return result;
-}
-
-int cp_pdprv_gen(bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4], gt_t e[2]) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(r[2], n);
-		bn_rand(c, RLC_POS, 50);
-		for (int i = 0; i < 2; i++) {
-			/* Generate random c, r, Ui. */
-			g1_rand(u1[i]);
-			bn_rand_mod(r[i], n);
-			g2_rand(u2[i]);
-			/* Compute gamma = e(U1, U2) and V2 = [1/r2]U2. */
-			pc_get_ord(n);
-			bn_mod_inv(n, r[i], n);
-			g2_mul(v2[i], u2[i], n);
-			pc_map(e[i], u1[i], u2[i]);
-		}
-		g2_mul(v2[2], u2[0], r[2]);
-		g2_neg(v2[2], v2[2]);
-		g2_mul(v2[3], u2[1], r[2]);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_pdprv_ask(g1_t v1[3], g2_t w2[4], g1_t p, g2_t q, bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4]) {
-	int result = RLC_OK;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_mod_inv(n, r[2], n);
-		g1_mul(v1[2], p, n);
-		for (int i = 0; i < 2; i++) {
-			/* Compute V1 = [r](A - Ui). */
-			g1_sub(v1[i], p, u1[i]);
-			g1_mul(v1[i], v1[i], r[i]);
-		}
-		g2_mul(w2[0], q, r[2]);
-		g2_add(w2[2], w2[0], v2[2]);
-		g2_mul(w2[3], w2[0], c);
-		g2_add(w2[3], w2[3], v2[3]);
-		g2_copy(w2[0], v2[0]);
-		g2_copy(w2[1], v2[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_pdprv_ans(gt_t g[4], g1_t v1[3], g2_t w2[4]) {
-	int result = RLC_OK;
-	pc_map(g[0], v1[0], w2[0]);
-	pc_map(g[1], v1[1], w2[1]);
-	pc_map(g[2], v1[2], w2[2]);
-	pc_map(g[3], v1[2], w2[3]);
-	return result;
-}
-
-int cp_pdprv_ver(gt_t r, gt_t g[4], bn_t c, gt_t e[2]) {
-	int result = 1;
-	gt_t t;
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		result &= gt_is_valid(g[0]);
-		result &= gt_is_valid(g[1]);
-		result &= gt_is_valid(g[2]);
-
-		gt_mul(t, g[0], g[2]);
-		gt_mul(r, t, e[0]);
-		gt_exp(t, r, c);
-		gt_mul(t, t, g[1]);
-		gt_mul(t, t, e[1]);
-
-		if (!result || gt_cmp(t, g[3]) != RLC_EQ) {
-			gt_set_unity(r);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		gt_free(t);
-	}
-	return result;
-}
-
-int cp_lvpub_gen(bn_t r, g1_t u1, g2_t u2, g2_t v2, gt_t e) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Generate random c, U1, r, U2. */
-		pc_get_ord(n);
-		g1_rand(u1);
-		bn_rand_mod(r, n);
-		g2_rand(u2);
-		/* Compute gamma = e(U1, U2) and V2 = [1/r2]U2. */
-		bn_mod_inv(n, r, n);
-		g2_mul(v2, u2, n);
-		pc_map(e, u1, u2);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_lvpub_ask(bn_t c, g1_t v1, g2_t w2, g1_t p, g2_t q, bn_t r, g1_t u1, g2_t u2, g2_t v2) {
-	int result = RLC_OK;
-
-	/* Sample random c. */
-	bn_rand(c, RLC_POS, 50);
-	/* Compute V1 = [r](P - U1). */
-	g1_sub(v1, p, u1);
-	g1_mul(v1, v1, r);
-	/* Compute W2 = [c]Q + U_2. */
-	g2_mul(w2, q, c);
-	g2_add(w2, w2, u2);
-
-	return result;
-}
-
-int cp_lvpub_ans(gt_t g[2], g1_t p, g2_t q, g1_t v1, g2_t v2, g2_t w2) {
-	int result = RLC_OK;
-	g1_t _p[2];
-	g2_t _q[2];
-
-	g1_null(_p[0]);
-	g1_null(_p[1]);
-	g2_null(_q[0]);
-	g2_null(_q[1]);
-
-	RLC_TRY {
-		g1_new(_p[0]);
-		g1_new(_p[1]);
-		g2_new(_q[0]);
-		g2_new(_q[1]);
-
-		g1_copy(_p[0], p);
-		g1_copy(_p[1], v1);
-		g2_copy(_q[0], w2);
-		g2_neg(_q[1], v2);
-		pc_map_sim(g[1], _p, _q, 2);
-		pc_map(g[0], p, q);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g1_free(_p[0]);
-		g1_free(_p[1]);
-		g2_free(_q[0]);
-		g2_free(_q[1]);
-	}
-
-	return result;
-}
-
-int cp_lvpub_ver(gt_t r, gt_t g[2], bn_t c, gt_t e) {
-	int result = 1;
-	gt_t t;
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		result &= gt_is_valid(g[0]);
-
-		gt_exp(t, g[0], c);
-		gt_inv(t, t);
-		gt_mul(t, t, g[1]);
-
-		if (!result || gt_cmp(t, e) != RLC_EQ) {
-			gt_set_unity(r);
-		} else {
-			gt_copy(r, g[0]);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		gt_free(t);
-	}
-	return result;
-}
-
-int cp_lvprv_gen(bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4], gt_t e[2]) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(r[2], n);
-		bn_rand(c, RLC_POS, 50);
-		for (int i = 0; i < 2; i++) {
-			/* Generate random c, r, Ui. */
-			g1_rand(u1[i]);
-			bn_rand_mod(r[i], n);
-			g2_rand(u2[i]);
-			/* Compute gamma = e(U1, U2) and V2 = [1/r2]U2. */
-			pc_get_ord(n);
-			bn_mod_inv(n, r[i], n);
-			g2_mul(v2[i], u2[i], n);
-			pc_map(e[i], u1[i], u2[i]);
-		}
-		g2_mul(v2[2], u2[0], r[2]);
-		g2_neg(v2[2], v2[2]);
-		g2_mul(v2[3], u2[1], r[2]);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_lvprv_ask(g1_t v1[3], g2_t w2[4], g1_t p, g2_t q, bn_t c, bn_t r[3], g1_t u1[2], g2_t u2[2], g2_t v2[4]) {
-	int result = RLC_OK;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_mod_inv(n, r[2], n);
-		g1_mul(v1[2], p, n);
-		for (int i = 0; i < 2; i++) {
-			/* Compute V1 = [r](A - Ui). */
-			g1_sub(v1[i], p, u1[i]);
-			g1_mul(v1[i], v1[i], r[i]);
-		}
-		g2_mul(w2[0], q, r[2]);
-		g2_add(w2[2], w2[0], v2[2]);
-		g2_mul(w2[3], w2[0], c);
-		g2_add(w2[3], w2[3], v2[3]);
-		g2_copy(w2[0], v2[0]);
-		g2_copy(w2[1], v2[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-
-	return result;
-}
-
-int cp_lvprv_ans(gt_t g[4], g1_t v1[3], g2_t w2[4]) {
-	int result = RLC_OK;
-	g1_t _p[2];
-	g2_t _q[2];
-
-	g1_null(_p[0]);
-	g1_null(_p[1]);
-	g2_null(_q[0]);
-	g2_null(_q[1]);
-
-	RLC_TRY {
-		g1_new(_p[0]);
-		g1_new(_p[1]);
-		g2_new(_q[0]);
-		g2_new(_q[1]);
-
-		g1_copy(_p[0], v1[0]);
-		g1_copy(_p[1], v1[2]);
-		g2_copy(_q[0], w2[0]);
-		g2_copy(_q[1], w2[2]);
-		pc_map_sim(g[0], _p, _q, 2);
-		pc_map(g[1], v1[1], w2[1]);
-		pc_map(g[2], v1[2], w2[3]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g1_free(_p[0]);
-		g1_free(_p[1]);
-		g2_free(_q[0]);
-		g2_free(_q[1]);
-	}
-	return result;
-}
-
-int cp_lvprv_ver(gt_t r, gt_t g[4], bn_t c, gt_t e[2]) {
-	int result = 1;
-	gt_t t;
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		result &= gt_is_valid(g[0]);
-		result &= gt_is_valid(g[1]);
-
-		gt_mul(r, g[0], e[0]);
-		gt_exp(t, r, c);
-		gt_mul(t, t, g[1]);
-		gt_mul(t, t, e[1]);
-
-		if (!result || gt_cmp(t, g[2]) != RLC_EQ) {
-			gt_set_unity(r);
-		}
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		gt_free(t);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_phpe.c b/src/dashbls/depends/relic/src/cp/relic_cp_phpe.c
deleted file mode 100644
index c10e0f453b81..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_phpe.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Paillier's Homomorphic Probabilistic Encryption.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_phpe_gen(bn_t pub, phpe_t prv, int bits) {
-	int result = RLC_OK;
-
-	/* Generate primes p and q of equivalent length. */
-	do {
-		bn_gen_prime(prv->p, bits / 2);
-		bn_gen_prime(prv->q, bits / 2);
-	} while (bn_cmp(prv->p, prv->q) == RLC_EQ);
-
-	/* Compute n = pq and l = \phi(n). */
-	bn_mul(prv->n, prv->p, prv->q);
-
-#ifdef CP_CRT
-	/* Fix g = n + 1. */
-	bn_add_dig(pub, prv->n, 1);
-
-	/* Precompute dp = 1/(pow(g, p-1, p^2)//p mod p. */
-	bn_sqr(prv->dp, prv->p);
-	bn_sub_dig(prv->p, prv->p, 1);
-	bn_mxp(prv->dp, pub, prv->p, prv->dp);
-	bn_sub_dig(prv->dp, prv->dp, 1);
-	bn_div(prv->dp, prv->dp, prv->p);
-	/* Precompute dq = 1/(pow(g, q-1, q^2)//q mod q. */
-	bn_sqr(prv->dq, prv->q);
-	bn_sub_dig(prv->q, prv->q, 1);
-	bn_mxp(prv->dq, pub, prv->q, prv->dq);
-	bn_sub_dig(prv->dq, prv->dq, 1);
-	bn_div(prv->dq, prv->dq, prv->q);
-
-	/* Restore p and q. */
-	bn_add_dig(prv->p, prv->p, 1);
-	bn_add_dig(prv->q, prv->q, 1);
-	bn_mod_inv(prv->dp, prv->dp, prv->p);
-	bn_mod_inv(prv->dq, prv->dq, prv->q);
-
-	/* qInv = q^(-1) mod p. */
-	bn_mod_inv(prv->qi, prv->q, prv->p);
-#endif
-
-	bn_copy(pub, prv->n);
-	return result;
-}
-
-int cp_phpe_enc(bn_t c, bn_t m, bn_t pub) {
-	bn_t g, r, s;
-	int result = RLC_OK;
-
-	bn_null(g);
-	bn_null(r);
-	bn_null(s);
-
-	if (pub == NULL || bn_bits(m) > bn_bits(pub)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(g);
-		bn_new(r);
-		bn_new(s);
-
-		/* Generate r in Z_n^*. */
-		bn_rand_mod(r, pub);
-		/* Compute c = (g^m)(r^n) mod n^2. */
-		bn_add_dig(g, pub, 1);
-		bn_sqr(s, pub);
-		bn_mxp(c, g, m, s);
-		bn_mxp(r, r, pub, s);
-		bn_mul(c, c, r);
-		bn_mod(c, c, s);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(g);
-		bn_free(r);
-		bn_free(s);
-	}
-
-	return result;
-}
-
-int cp_phpe_dec(bn_t m, bn_t c, phpe_t prv) {
-	bn_t s, t, u, v;
-	int result = RLC_OK;
-
-	if (prv == NULL || bn_bits(c) > 2 * bn_bits(prv->n)) {
-		return RLC_ERR;
-	}
-
-	bn_null(s);
-	bn_null(t);
-	bn_null(u);
-	bn_null(v);
-
-	RLC_TRY {
-		bn_new(s);
-		bn_new(t);
-		bn_new(u);
-		bn_new(v);
-
-#if !defined(CP_CRT)
-		bn_sub_dig(s, prv->p, 1);
-		bn_sub_dig(t, prv->q, 1);
-		bn_mul(s, s, t);
-		/* Compute (c^l mod n^2) * u mod n. */
-		bn_sqr(t, prv->n);
-		bn_mxp(m, c, s, t);
-
-		bn_sub_dig(m, m, 1);
-		bn_div(m, m, prv->n);
-		bn_mod_inv(t, s, prv->n);
-		bn_mul(m, m, t);
-		bn_mod(m, m, prv->n);
-#else
-
-#if MULTI == OPENMP
-		omp_set_num_threads(CORES);
-		#pragma omp parallel copyin(core_ctx) firstprivate(c, prv)
-		{
-			#pragma omp sections
-			{
-				#pragma omp section
-				{
-#endif
-					/* Compute m_p = (c^(p-1) mod p^2) * dp mod p. */
-					bn_sub_dig(t, prv->p, 1);
-					bn_sqr(s, prv->p);
-					bn_mxp(s, c, t, s);
-					bn_sub_dig(s, s, 1);
-					bn_div(s, s, prv->p);
-					bn_mul(s, s, prv->dp);
-					bn_mod(s, s, prv->p);
-#if MULTI == OPENMP
-				}
-				#pragma omp section
-				{
-#endif
-					/* Compute m_q = (c^(q-1) mod q^2) * dq mod q. */
-					bn_sub_dig(v, prv->q, 1);
-					bn_sqr(u, prv->q);
-					bn_mxp(u, c, v, u);
-					bn_sub_dig(u, u, 1);
-					bn_div(u, u, prv->q);
-					bn_mul(u, u, prv->dq);
-					bn_mod(u, u, prv->q);
-#if MULTI == OPENMP
-				}
-			}
-		}
-#endif
-
-		/* m = (m_p - m_q) mod p. */
-		bn_sub(m, s, u);
-		while (bn_sign(m) == RLC_NEG) {
-			bn_add(m, m, prv->p);
-		}
-		bn_mod(m, m, prv->p);
-		/* m1 = qInv(m_p - m_q) mod p. */
-		bn_mul(m, m, prv->qi);
-		bn_mod(m, m, prv->p);
-		/* m = m2 + m1 * q. */
-		bn_mul(m, m, prv->q);
-		bn_add(m, m, u);
-		bn_mod(m, m, prv->n);
-#endif
-	} RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(s);
-		bn_free(t);
-		bn_free(u);
-		bn_free(v);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_pok.c b/src/dashbls/depends/relic/src/cp/relic_cp_pok.c
deleted file mode 100644
index 236408875d42..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_pok.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of protocols for proof of knowledge of discrete logarithms.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/*
- * Source: "Proof Systems for General Statements about Discrete Logarithms"
- * Authors: Jan Camenisc, Markus Stadler (1997)
- */
-
-int cp_pokdl_prv(bn_t c, bn_t r, ec_t y, bn_t x) {
-	bn_t n, v;
-	ec_t t;
-	int l, result = RLC_OK;
-	uint8_t *buf, bin[3 * (RLC_FC_BYTES + 1)] = { 0 }, h[RLC_MD_LEN];
-
-	bn_null(n);
-	bn_null(v);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v);
-		ec_new(t);
-
-		buf = bin;
-		ec_curve_get_ord(n);
-		ec_curve_get_gen(t);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		buf += l;
-		l = ec_size_bin(y, 1);
-		ec_write_bin(buf, l, y, 1);
-		buf += l;
-
-		bn_rand_mod(v, n);
-		ec_mul_gen(t, v);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		md_map(h, bin, sizeof(bin));
-		bn_read_bin(c, h, RLC_MD_LEN);
-		bn_mod(c, c, n);
-		bn_mul(r, c, x);
-		bn_sub(r, v, r);
-		bn_mod(r, r, n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v);
-		ec_free(t);
-	}
-	return result;
-}
-
-int cp_pokdl_ver(bn_t c, bn_t r, ec_t y) {
-	bn_t n, v;
-	ec_t t;
-	int l, result = 0;
-	uint8_t *buf, bin[3 * (RLC_FC_BYTES + 1)] = { 0 }, h[RLC_MD_LEN];
-
-	bn_null(n);
-	bn_null(v);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v);
-		ec_new(t);
-
-		buf = bin;
-		ec_curve_get_ord(n);
-		ec_curve_get_gen(t);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		buf += l;
-		l = ec_size_bin(y, 1);
-		ec_write_bin(buf, l, y, 1);
-		buf += l;
-
-		/* Compute t' = [r]G + [c]Y. */
-		ec_mul_sim_gen(t, r, y, c);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		md_map(h, bin, sizeof(bin));
-		bn_read_bin(v, h, RLC_MD_LEN);
-		bn_mod(v, v, n);
-		if (bn_cmp(v, c) == RLC_EQ) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v);
-		ec_free(t);
-	}
-	return result;
-}
-
-int cp_pokor_prv(bn_t c[2], bn_t r[2], ec_t y[2], bn_t x) {
-	bn_t n, v[2], z;
-	ec_t t;
-	int l, result = RLC_OK;
-	uint8_t *buf, bin[6 * (RLC_FC_BYTES + 1)] = { 0 }, h[RLC_MD_LEN];
-
-	bn_null(n);
-	bn_null(v[0]);
-	bn_null(v[1]);
-	bn_null(z);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v[0]);
-		bn_new(v[1]);
-		bn_new(z);
-		ec_new(t);
-
-		buf = bin;
-		ec_curve_get_ord(n);
-		bn_rand_mod(c[0], n);
-
-		for (int i = 0; i < 2; i++) {
-			bn_rand_mod(v[i], n);
-			ec_curve_get_gen(t);
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-			l = ec_size_bin(y[i], 1);
-			ec_write_bin(buf, l, y[i], 1);
-			buf += l;
-
-			if (i == 0) {
-				/* T1 = [w]Y1 + [v1]G. */
-				ec_mul_sim_gen(t, v[i], y[i], c[i]);
-			} else {
-				/* T2 = [v2]G. */
-				ec_mul_gen(t, v[i]);
-			}
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-		}
-		md_map(h, bin, sizeof(bin));
-		bn_read_bin(z, h, RLC_MD_LEN);
-		bn_mod(z, z, n);
-
-		bn_sub(c[1], z, c[0]);
-		bn_mod(c[1], c[1], n);
-
-		bn_copy(r[0], v[0]);
-		bn_mul(r[1], c[1], x);
-		bn_sub(r[1], v[1], r[1]);
-		bn_mod(r[1], r[1], n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v[0]);
-		bn_free(v[1]);
-		bn_free(z);
-		ec_free(t);
-	}
-	return result;
-}
-
-int cp_pokor_ver(bn_t c[2], bn_t r[2], ec_t y[2]) {
-	bn_t n, v[2], z;
-	ec_t t;
-	int l, result = 0;
-	uint8_t *buf, bin[6 * (RLC_FC_BYTES + 1)] = { 0 }, h[RLC_MD_LEN];
-
-	bn_null(n);
-	bn_null(v[0]);
-	bn_null(v[1]);
-	bn_null(z);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v[0]);
-		bn_new(v[1]);
-		bn_new(z);
-		ec_new(t);
-
-		buf = bin;
-		ec_curve_get_ord(n);
-
-		for (int i = 0; i < 2; i++) {
-			ec_curve_get_gen(t);
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-			l = ec_size_bin(y[i], 1);
-			ec_write_bin(buf, l, y[i], 1);
-			buf += l;
-
-			ec_mul_sim_gen(t, r[i], y[i], c[i]);
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-		}
-		md_map(h, bin, sizeof(bin));
-		bn_read_bin(z, h, RLC_MD_LEN);
-		bn_mod(z, z, n);
-
-		bn_sub(z, z, c[0]);
-		bn_sub(z, z, c[1]);
-		bn_mod(z, z, n);
-
-		if (bn_is_zero(z)) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v[0]);
-		bn_free(v[1]);
-		bn_free(z);
-		ec_free(t);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_pss.c b/src/dashbls/depends/relic/src/cp/relic_cp_pss.c
deleted file mode 100644
index 3eb18a3c934e..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_pss.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Pointcheval-Sanders signature protocols.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_pss_gen(bn_t r, bn_t s, g2_t g, g2_t x, g2_t y) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(r, n);
-		bn_rand_mod(s, n);
-		g2_rand(g);
-		g2_mul(x, g, r);
-		g2_mul(y, g, s);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_pss_sig(g1_t a, g1_t b, bn_t m, bn_t r, bn_t s) {
-	bn_t n, t;
-	int result = RLC_OK;
-
-	bn_null(n);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(t);
-
-		g1_get_ord(n);
-		bn_mul(t, m, s);
-		bn_mod(t, t, n);
-		bn_add(t, t, r);
-		bn_mod(t, t, n);
-		g1_rand(a);
-		g1_mul(b, a, t);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(t);
-	}
-	return result;
-}
-
-int cp_pss_ver(g1_t a, g1_t b, bn_t m, g2_t g, g2_t x, g2_t y) {
-	g1_t p[2];
-	g2_t r[2];
-	gt_t e;
-	int result = 0;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(r[0]);
-	g2_null(r[1]);
-	gt_null(e);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(r[0]);
-		g2_new(r[1]);
-		gt_new(e);
-
-		g1_copy(p[0], a);
-		g1_copy(p[1], b);
-		g2_copy(r[1], g);
-		g2_neg(r[1], r[1]);
-
-		g2_mul(r[0], y, m);
-		g2_add(r[0], r[0], x);
-		g2_norm(r[0], r[0]);
-
-		pc_map_sim(e, p, r, 2);
-		if (gt_is_unity(e) && !g1_is_infty(a)) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(r[0]);
-		g2_free(r[1]);
-		gt_free(e);
-	}
-	return result;
-}
-
-int cp_psb_gen(bn_t r, bn_t s[], g2_t g, g2_t x, g2_t y[], int l) {
-	bn_t n;
-	int i, result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(r, n);
-		g2_rand(g);
-		g2_mul(x, g, r);
-		for (i = 0; i < l; i++) {
-			bn_rand_mod(s[i], n);
-			g2_mul(y[i], g, s[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_psb_sig(g1_t a, g1_t b, bn_t ms[], bn_t r, bn_t s[], int l) {
-	bn_t m, n, t;
-	int i, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		bn_new(t);
-
-		/* Choose random a in G1. */
-		g1_rand(a);
-		/* Compute b = a^x+\sum y_im_i. */
-		pc_get_ord(n);
-
-		bn_copy(t, r);
-		for (i = 0; i < l; i++) {
-			bn_mod(m, ms[i], n);
-			bn_mul(m, m, s[i]);
-			bn_mod(m, m, n);
-			bn_add(t, t, m);
-			bn_mod(t, t, n);
-		}
-		g1_mul(b, a, t);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-		bn_free(t);
-	}
-	return result;
-}
-
-int cp_psb_ver(g1_t a, g1_t b, bn_t ms[], g2_t g, g2_t x, g2_t y[], int l) {
-	g1_t p[2];
-	g2_t q[2];
-	gt_t e;
-	bn_t m, n;
-	int result = 0;
-
-	g1_null(p[0]);
-	g1_null(p[1]);
-	g2_null(q[0]);
-	g2_null(q[1]);
-	gt_null(e);
-	bn_null(m);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(p[0]);
-		g1_new(p[1]);
-		g2_new(q[0]);
-		g2_new(q[1]);
-		gt_new(e);
-		bn_new(m);
-		bn_new(n);
-
-		/* Check that e(a, x \prod y_i^m_i) = e(b, g). */
-		g1_copy(p[0], a);
-		g1_copy(p[1], b);
-
-		pc_get_ord(n);
-		g2_mul_sim_lot(q[0], y, ms, l);
-		g2_add(q[0], q[0], x);
-		g2_norm(q[0], q[0]);
-		g2_copy(q[1], g);
-		g2_neg(q[1], q[1]);
-		pc_map_sim(e, p, q, 2);
-		if (!g1_is_infty(a) && gt_is_unity(e)) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		g1_free(p[0]);
-		g1_free(p[1]);
-		g2_free(q[0]);
-		g2_free(q[1]);
-		gt_free(e);
-		bn_free(m);
-		bn_free(n);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_rabin.c b/src/dashbls/depends/relic/src/cp/relic_cp_rabin.c
deleted file mode 100644
index d945f7eef38b..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_rabin.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Rabin cryptosystem.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Length in bytes of added redundancy.
- */
-#define RABIN_PAD_LEN		8
-
-/**
- * Byte used as padding unit in ciphertext.
- */
-#define RABIN_PAD			(0xFF)
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_rabin_gen(rabin_t pub, rabin_t prv, int bits) {
-	bn_t r;
-	int result = RLC_OK;
-
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(r);
-
-		/* Generate different primes p and q. */
-		do {
-			bn_gen_prime(prv->p, bits / 2);
-			bn_mod_2b(r, prv->p, 2);
-		} while (bn_cmp_dig(r, 3) != RLC_EQ);
-
-		do {
-			bn_gen_prime(prv->q, bits / 2);
-			bn_mod_2b(r, prv->q, 2);
-		} while (bn_cmp(prv->p, prv->q) == RLC_EQ ||
-				bn_cmp_dig(r, 3) != RLC_EQ);
-
-		/* Swap p and q so that p is smaller. */
-		if (bn_cmp(prv->p, prv->q) != RLC_LT) {
-			bn_copy(r, prv->p);
-			bn_copy(prv->p, prv->q);
-			bn_copy(prv->q, r);
-		}
-
-		bn_gcd_ext(r, prv->dp, prv->dq, prv->p, prv->q);
-		if (bn_cmp_dig(r, 1) != RLC_EQ) {
-			result = RLC_ERR;
-		}
-
-		bn_mul(prv->n, prv->p, prv->q);
-		bn_copy(pub->n, prv->n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(r);
-	}
-
-	return result;
-}
-
-int cp_rabin_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		rabin_t pub) {
-	bn_t m, t;
-	int size, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(t);
-
-	size = bn_size_bin(pub->n);
-
-	if (in_len <= 0 || in_len > (size - RABIN_PAD_LEN - 2)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(t);
-		bn_zero(m);
-
-		/* EB = 00 | FF || D || SUFFIX */
-		bn_lsh(m, m, 8);
-		bn_add_dig(m, m, RABIN_PAD);
-		bn_lsh(m, m, in_len * 8);
-		bn_read_bin(t, in, in_len);
-		bn_add(m, m, t);
-		bn_mod_2b(t, m, 8 * RABIN_PAD_LEN);
-		bn_lsh(m, m, 8 * RABIN_PAD_LEN);
-		bn_add(m, m, t);
-
-		bn_sqr(m, m);
-		bn_mod(m, m, pub->n);
-
-		if (size <= *out_len) {
-			*out_len = size;
-			memset(out, 0, *out_len);
-			bn_write_bin(out, size, m);
-		} else {
-			result = RLC_ERR;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(t);
-	}
-
-	return result;
-}
-
-int cp_rabin_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len,
-		rabin_t prv) {
-	bn_t m, m0, m1, t, n;
-	int size, result = RLC_OK;
-	uint8_t pad;
-
-	if (in_len < RABIN_PAD_LEN) {
-		return RLC_ERR;
-	}
-
-	bn_null(m);
-	bn_null(m0);
-	bn_null(m1);
-	bn_null(n);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(m0);
-		bn_new(m1);
-		bn_new(n);
-		bn_new(t);
-
-		bn_read_bin(m, in, in_len);
-
-		bn_add_dig(t, prv->p, 1);
-		bn_rsh(t, t, 2);
-		bn_mxp(m0, m, t, prv->p);
-
-		bn_add_dig(t, prv->q, 1);
-		bn_rsh(t, t, 2);
-		bn_mxp(m1, m, t, prv->q);
-
-		bn_mul(m, prv->dp, prv->p);
-		bn_mul(m, m, m1);
-		bn_mul(t, prv->dq, prv->q);
-		bn_mul(t, t, m0);
-		bn_add(m0, m, t);
-		bn_mod(m0, m0, prv->n);
-		if (bn_sign(m0) == RLC_NEG) {
-			bn_add(m0, m0, prv->n);
-		}
-		bn_sub(m1, m, t);
-		bn_mod(m1, m1, prv->n);
-		if (bn_sign(m1) == RLC_NEG) {
-			bn_add(m1, m1, prv->n);
-		}
-
-		bn_mod_2b(m, m0, 8 * RABIN_PAD_LEN);
-		bn_rsh(t, m0, 8 * RABIN_PAD_LEN);
-		bn_mod_2b(t, t, 8 * RABIN_PAD_LEN);
-		if (bn_cmp(t, m) == RLC_EQ) {
-			bn_rsh(m, m0, 8 * RABIN_PAD_LEN);
-		} else {
-			bn_sub(m0, prv->n, m0);
-			bn_mod_2b(m, m0, 8 * RABIN_PAD_LEN);
-			bn_rsh(t, m0, 8 * RABIN_PAD_LEN);
-			bn_mod_2b(t, t, 8 * RABIN_PAD_LEN);
-			if (bn_cmp(t, m) == RLC_EQ) {
-				bn_rsh(m, m0, 8 * RABIN_PAD_LEN);
-			} else {
-				bn_mod_2b(m, m1, 8 * RABIN_PAD_LEN);
-				bn_rsh(t, m1, 8 * RABIN_PAD_LEN);
-				bn_mod_2b(t, t, 8 * RABIN_PAD_LEN);
-				if (bn_cmp(t, m) == RLC_EQ) {
-					bn_rsh(m, m1, 8 * RABIN_PAD_LEN);
-				} else {
-					bn_sub(m1, prv->n, m1);
-					bn_mod_2b(m, m1, 8 * RABIN_PAD_LEN);
-					bn_rsh(t, m1, 8 * RABIN_PAD_LEN);
-					bn_mod_2b(t, t, 8 * RABIN_PAD_LEN);
-					if (bn_cmp(t, m) == RLC_EQ) {
-						bn_rsh(m, m1, 8 * RABIN_PAD_LEN);
-					} else {
-						result = RLC_ERR;
-					}
-				}
-			}
-		}
-
-		if (result == RLC_OK) {
-			size = bn_size_bin(prv->n);
-			size--;
-			bn_rsh(t, m, 8 * size);
-
-			if (!bn_is_zero(t)) {
-				result = RLC_ERR;
-			} else {
-				do {
-					size--;
-					bn_rsh(t, m, 8 * size);
-					pad = (uint8_t)t->dp[0];
-				} while (pad == 0);
-
-				if (pad != RABIN_PAD) {
-					result = RLC_ERR;
-				} else {
-					bn_mod_2b(m, m, size * 8);
-				}
-			}
-
-			if (size <= *out_len) {
-				*out_len = size;
-				memset(out, 0, size);
-				bn_write_bin(out, size, m);
-			} else {
-				result = RLC_ERR;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(m0);
-		bn_free(m1);
-		bn_free(n);
-		bn_free(t);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_rsa.c b/src/dashbls/depends/relic/src/cp/relic_cp_rsa.c
deleted file mode 100644
index e8e7a7ca9e0d..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_rsa.c
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the RSA cryptosystem.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Length of chosen padding scheme.
- */
-#if CP_RSAPD == PKCS1
-#define RSA_PAD_LEN		(11)
-#elif CP_RSAPD == PKCS2
-#define RSA_PAD_LEN		(2 * RLC_MD_LEN + 2)
-#else
-#define RSA_PAD_LEN		(2)
-#endif
-
-/**
- * Identifier for encrypted messages.
- */
-#define RSA_PUB			(02)
-
-/**
- * Identifier for signed messages.
- */
-#define RSA_PRV			(01)
-
-/**
- * Byte used as padding unit.
- */
-#define RSA_PAD			(0xFF)
-
-/**
- * Byte used as padding unit in PSS signatures.
- */
-#define RSA_PSS			(0xBC)
-
-/**
- * Identifier for encryption.
- */
-#define RSA_ENC				1
-
-/**
- * Identifier for decryption.
- */
-#define RSA_DEC				2
-
-/**
- * Identifier for signature.
- */
-#define RSA_SIG				3
-
-/**
- * Identifier for verification.
- */
-#define RSA_VER				4
-
-/**
- * Identifier for second encryption step.
- */
-#define RSA_ENC_FIN			5
-
-/**
- * Identifier for second sining step.
- */
-#define RSA_SIG_FIN			6
-
-/**
- * Identifier for signature of a precomputed hash.
- */
-#define RSA_SIG_HASH		7
-
-/**
- * Identifier for verification of a precomputed hash.
- */
-#define RSA_VER_HASH		8
-
-#if CP_RSAPD == BASIC
-
-/**
- * Applies or removes simple encryption padding.
- *
- * @param[out] m		- the buffer to pad.
- * @param[out] p_len	- the number of added pad bytes.
- * @param[in] m_len		- the message length in bytes.
- * @param[in] k_len		- the key length in bytes.
- * @param[in] operation	- flag to indicate the operation type.
- * @return RLC_ERR if errors occurred, RLC_OK otherwise.
- */
-static int pad_basic(bn_t m, int *p_len, int m_len, int k_len, int operation) {
-	uint8_t pad = 0;
-	int result = RLC_ERR;
-	bn_t t;
-
-	RLC_TRY {
-		bn_null(t);
-		bn_new(t);
-
-		switch (operation) {
-			case RSA_ENC:
-			case RSA_SIG:
-			case RSA_SIG_HASH:
-				/* EB = 00 | FF | D. */
-				bn_zero(m);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, RSA_PAD);
-				/* Make room for the real message. */
-				bn_lsh(m, m, m_len * 8);
-				result = RLC_OK;
-				break;
-			case RSA_DEC:
-			case RSA_VER:
-			case RSA_VER_HASH:
-				/* EB = 00 | FF | D. */
-				m_len = k_len - 1;
-				bn_rsh(t, m, 8 * m_len);
-				if (bn_is_zero(t)) {
-					*p_len = 1;
-					do {
-						(*p_len)++;
-						m_len--;
-						bn_rsh(t, m, 8 * m_len);
-						pad = (uint8_t)t->dp[0];
-					} while (pad == 0 && m_len > 0);
-					if (pad == RSA_PAD) {
-						result = RLC_OK;
-					}
-					bn_mod_2b(m, m, (k_len - *p_len) * 8);
-				}
-				break;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-	return result;
-}
-
-#endif
-
-#if CP_RSAPD == PKCS1
-
-/**
- * ASN.1 identifier of the hash function SHA-224.
- */
-static const uint8_t sh224_id[] =
-		{ 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-			0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c };
-
-/**
- * ASN.1 identifier of the hash function SHA-256.
- */
-static const uint8_t sh256_id[] =
-		{ 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-			0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 };
-
-/**
- * ASN.1 identifier of the hash function SHA-384.
- */
-static const uint8_t sh384_id[] =
-		{ 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-			0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 };
-
-/**
- * ASN.1 identifier of the hash function SHA-512.
- */
-static const uint8_t sh512_id[] =
-		{ 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
-			0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 };
-
-/**
- * Returns a pointer to the ASN.1 identifier of a hash function according to the
- * PKCS#1 v1.5 padding standard.
- *
- * @param[in] md			- the hash function.
- * @param[in, out] len		- the length of the identifier.
- * @return The pointer to the hash function identifier.
- */
-static uint8_t *hash_id(int md, int *len) {
-	switch (md) {
-		case SH224:
-			*len = sizeof(sh224_id);
-			return (uint8_t *)sh224_id;
-		case SH256:
-			*len = sizeof(sh256_id);
-			return (uint8_t *)sh256_id;
-		case SH384:
-			*len = sizeof(sh384_id);
-			return (uint8_t *)sh384_id;
-		case SH512:
-			*len = sizeof(sh512_id);
-			return (uint8_t *)sh512_id;
-		default:
-			RLC_THROW(ERR_NO_VALID);
-			return NULL;
-	}
-}
-
-/**
- * Applies or removes a PKCS#1 v1.5 encryption padding.
- *
- * @param[out] m		- the buffer to pad.
- * @param[out] p_len	- the number of added pad bytes.
- * @param[in] m_len		- the message length in bytes.
- * @param[in] k_len		- the key length in bytes.
- * @param[in] operation	- flag to indicate the operation type.
- * @return RLC_ERR if errors occurred, RLC_OK otherwise.
- */
-static int pad_pkcs1(bn_t m, int *p_len, int m_len, int k_len, int operation) {
-	uint8_t *id, pad = 0;
-	int len, result = RLC_ERR;
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		switch (operation) {
-			case RSA_ENC:
-				/* EB = 00 | 02 | PS | 00 | D. */
-				bn_zero(m);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, RSA_PUB);
-
-				*p_len = k_len - 3 - m_len;
-				for (int i = 0; i < *p_len; i++) {
-					bn_lsh(m, m, 8);
-					do {
-						rand_bytes(&pad, 1);
-					} while (pad == 0);
-					bn_add_dig(m, m, pad);
-				}
-				/* Make room for the zero and real message. */
-				bn_lsh(m, m, (m_len + 1) * 8);
-				result = RLC_OK;
-				break;
-			case RSA_DEC:
-				m_len = k_len - 1;
-				bn_rsh(t, m, 8 * m_len);
-				if (bn_is_zero(t)) {
-					*p_len = m_len;
-					m_len--;
-					bn_rsh(t, m, 8 * m_len);
-					pad = (uint8_t)t->dp[0];
-					if (pad == RSA_PUB) {
-						do {
-							m_len--;
-							bn_rsh(t, m, 8 * m_len);
-							pad = (uint8_t)t->dp[0];
-						} while (pad != 0 && m_len > 0);
-						/* Remove padding and trailing zero. */
-						*p_len -= (m_len - 1);
-						bn_mod_2b(m, m, (k_len - *p_len) * 8);
-						result = (m_len > 0 ? RLC_OK : RLC_ERR);
-					}
-				}
-				break;
-			case RSA_SIG:
-				/* EB = 00 | 01 | PS | 00 | D. */
-				id = hash_id(MD_MAP, &len);
-				bn_zero(m);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, RSA_PRV);
-
-				*p_len = k_len - 3 - m_len - len;
-				for (int i = 0; i < *p_len; i++) {
-					bn_lsh(m, m, 8);
-					bn_add_dig(m, m, RSA_PAD);
-				}
-				/* Make room for the zero and hash id. */
-				bn_lsh(m, m, 8 * (len + 1));
-				bn_read_bin(t, id, len);
-				bn_add(m, m, t);
-				/* Make room for the real message. */
-				bn_lsh(m, m, m_len * 8);
-				result = RLC_OK;
-				break;
-			case RSA_SIG_HASH:
-				/* EB = 00 | 01 | PS | 00 | D. */
-				bn_zero(m);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, RSA_PRV);
-
-				*p_len = k_len - 3 - m_len;
-				for (int i = 0; i < *p_len; i++) {
-					bn_lsh(m, m, 8);
-					bn_add_dig(m, m, RSA_PAD);
-				}
-				/* Make room for the zero and hash. */
-				bn_lsh(m, m, 8 * (m_len + 1));
-				result = RLC_OK;
-				break;
-			case RSA_VER:
-				m_len = k_len - 1;
-				bn_rsh(t, m, 8 * m_len);
-				if (bn_is_zero(t)) {
-					m_len--;
-					bn_rsh(t, m, 8 * m_len);
-					pad = (uint8_t)t->dp[0];
-					if (pad == RSA_PRV) {
-						int counter = 0;
-						do {
-							counter++;
-							m_len--;
-							bn_rsh(t, m, 8 * m_len);
-							pad = (uint8_t)t->dp[0];
-						} while (pad == RSA_PAD && m_len > 0);
-						/* Remove padding and trailing zero. */
-						id = hash_id(MD_MAP, &len);
-						bn_rsh(t, m, 8 * m_len);
-						bn_mod_2b(t, t, 8);
-						if (bn_is_zero(t)) {
-							m_len -= len;
-							bn_rsh(t, m, 8 * m_len);
-							int r = 0;
-							for (int i = 0; i < len; i++) {
-								pad = (uint8_t)t->dp[0];
-								r |= pad ^ id[len - i - 1];
-								bn_rsh(t, t, 8);
-							}
-							*p_len = k_len - m_len;
-							bn_mod_2b(m, m, m_len * 8);
-							if (r == 0 && m_len == RLC_MD_LEN && counter >= 8) {
-								result = RLC_OK;
-							}
-						}
-					}
-				}
-				break;
-			case RSA_VER_HASH:
-				m_len = k_len - 1;
-				bn_rsh(t, m, 8 * m_len);
-				if (bn_is_zero(t)) {
-					m_len--;
-					bn_rsh(t, m, 8 * m_len);
-					pad = (uint8_t)t->dp[0];
-					if (pad == RSA_PRV) {
-						int counter = 0;
-						do {
-							counter++;
-							m_len--;
-							bn_rsh(t, m, 8 * m_len);
-							pad = (uint8_t)t->dp[0];
-						} while (pad == RSA_PAD && m_len > 0);
-						/* Remove padding and trailing zero. */
-						*p_len = k_len - m_len;
-						bn_rsh(t, m, 8 * m_len);
-						bn_mod_2b(t, t, 8);
-						if (bn_is_zero(t)) {
-							bn_mod_2b(m, m, m_len * 8);
-							if (m_len == RLC_MD_LEN && counter >= 8) {
-								result = RLC_OK;
-							}
-						}
-					}
-				}
-				break;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-	return result;
-}
-
-#endif
-
-#if CP_RSAPD == PKCS2
-
-/**
- * Applies or removes a PKCS#1 v2.1 encryption padding.
- *
- * @param[out] m		- the buffer to pad.
- * @param[out] p_len	- the number of added pad bytes.
- * @param[in] m_len		- the message length in bytes.
- * @param[in] k_len		- the key length in bytes.
- * @param[in] operation	- flag to indicate the operation type.
- * @return RLC_ERR if errors occurred, RLC_OK otherwise.
- */
-static int pad_pkcs2(bn_t m, int *p_len, int m_len, int k_len, int operation) {
-        uint8_t pad, h1[RLC_MD_LEN], h2[RLC_MD_LEN];
-        /* MSVC does not allow dynamic stack arrays */
-        uint8_t *mask = RLC_ALLOCA(uint8_t, k_len);
-	int result = RLC_ERR;
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		switch (operation) {
-			case RSA_ENC:
-				/* DB = lHash | PS | 01 | D. */
-				md_map(h1, NULL, 0);
-				bn_read_bin(m, h1, RLC_MD_LEN);
-				*p_len = k_len - 2 * RLC_MD_LEN - 2 - m_len;
-				bn_lsh(m, m, *p_len * 8);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, 0x01);
-				/* Make room for the real message. */
-				bn_lsh(m, m, m_len * 8);
-				result = RLC_OK;
-				break;
-			case RSA_ENC_FIN:
-				/* EB = 00 | maskedSeed | maskedDB. */
-				rand_bytes(h1, RLC_MD_LEN);
-				md_mgf(mask, k_len - RLC_MD_LEN - 1, h1, RLC_MD_LEN);
-				bn_read_bin(t, mask, k_len - RLC_MD_LEN - 1);
-				for (int i = 0; i < t->used; i++) {
-					m->dp[i] ^= t->dp[i];
-				}
-				bn_write_bin(mask, k_len - RLC_MD_LEN - 1, m);
-				md_mgf(h2, RLC_MD_LEN, mask, k_len - RLC_MD_LEN - 1);
-				for (int i = 0; i < RLC_MD_LEN; i++) {
-					h1[i] ^= h2[i];
-				}
-				bn_read_bin(t, h1, RLC_MD_LEN);
-				bn_lsh(t, t, 8 * (k_len - RLC_MD_LEN - 1));
-				bn_add(t, t, m);
-				bn_copy(m, t);
-				result = RLC_OK;
-				break;
-			case RSA_DEC:
-				m_len = k_len - 1;
-				bn_rsh(t, m, 8 * m_len);
-				if (bn_is_zero(t)) {
-					m_len -= RLC_MD_LEN;
-					bn_rsh(t, m, 8 * m_len);
-					bn_write_bin(h1, RLC_MD_LEN, t);
-					bn_mod_2b(m, m, 8 * m_len);
-					bn_write_bin(mask, m_len, m);
-					md_mgf(h2, RLC_MD_LEN, mask, m_len);
-					for (int i = 0; i < RLC_MD_LEN; i++) {
-						h1[i] ^= h2[i];
-					}
-					md_mgf(mask, k_len - RLC_MD_LEN - 1, h1, RLC_MD_LEN);
-					bn_read_bin(t, mask, k_len - RLC_MD_LEN - 1);
-					for (int i = 0; i < t->used; i++) {
-						m->dp[i] ^= t->dp[i];
-					}
-					m_len -= RLC_MD_LEN;
-					bn_rsh(t, m, 8 * m_len);
-					bn_write_bin(h2, RLC_MD_LEN, t);
-					md_map(h1, NULL, 0);
-					pad = 0;
-					for (int i = 0; i < RLC_MD_LEN; i++) {
-						pad |= h1[i] ^ h2[i];
-					}
-					bn_mod_2b(m, m, 8 * m_len);
-					*p_len = bn_size_bin(m);
-					(*p_len)--;
-					bn_rsh(t, m, *p_len * 8);
-					if (pad == 0 && bn_cmp_dig(t, 1) == RLC_EQ) {
-						result = RLC_OK;
-					}
-					bn_mod_2b(m, m, *p_len * 8);
-					*p_len = k_len - *p_len;
-				}
-				break;
-			case RSA_SIG:
-			case RSA_SIG_HASH:
-				/* M' = 00 00 00 00 00 00 00 00 | H(M). */
-				bn_zero(m);
-				bn_lsh(m, m, 64);
-				/* Make room for the real message. */
-				bn_lsh(m, m, RLC_MD_LEN * 8);
-				result = RLC_OK;
-				break;
-			case RSA_SIG_FIN:
-				memset(mask, 0, 8);
-				bn_write_bin(mask + 8, RLC_MD_LEN, m);
-				md_map(h1, mask, RLC_MD_LEN + 8);
-				bn_read_bin(m, h1, RLC_MD_LEN);
-				md_mgf(mask, k_len - RLC_MD_LEN - 1, h1, RLC_MD_LEN);
-				bn_read_bin(t, mask, k_len - RLC_MD_LEN - 1);
-				t->dp[0] ^= 0x01;
-				/* m_len is now the size in bits of the modulus. */
-				bn_lsh(t, t, 8 * RLC_MD_LEN);
-				bn_add(m, t, m);
-				bn_lsh(m, m, 8);
-				bn_add_dig(m, m, RSA_PSS);
-				for (int i = m_len - 1; i < 8 * k_len; i++) {
-					bn_set_bit(m, i, 0);
-				}
-				result = RLC_OK;
-				break;
-			case RSA_VER:
-			case RSA_VER_HASH:
-				bn_mod_2b(t, m, 8);
-				pad = (uint8_t)t->dp[0];
-				if (pad == RSA_PSS) {
-					int r = 1;
-					for (int i = m_len; i < 8 * k_len; i++) {
-						if (bn_get_bit(m, i) != 0) {
-							r = 0;
-						}
-					}
-					bn_rsh(m, m, 8);
-					bn_mod_2b(t, m, 8 * RLC_MD_LEN);
-					bn_write_bin(h2, RLC_MD_LEN, t);
-					bn_rsh(m, m, 8 * RLC_MD_LEN);
-					bn_write_bin(h1, RLC_MD_LEN, t);
-					md_mgf(mask, k_len - RLC_MD_LEN - 1, h1, RLC_MD_LEN);
-					bn_read_bin(t, mask, k_len - RLC_MD_LEN - 1);
-					for (int i = 0; i < t->used; i++) {
-						m->dp[i] ^= t->dp[i];
-					}
-					m->dp[0] ^= 0x01;
-					for (int i = m_len - 1; i < 8 * k_len; i++) {
-						bn_set_bit(m, i - ((RLC_MD_LEN + 1) * 8), 0);
-					}
-					if (r == 1 && bn_is_zero(m)) {
-						result = RLC_OK;
-					}
-					bn_read_bin(m, h2, RLC_MD_LEN);
-					*p_len = k_len - RLC_MD_LEN;
-				}
-				break;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-
-        RLC_FREE(mask);
-
-	return result;
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_rsa_gen(rsa_t pub, rsa_t prv, int bits) {
-	bn_t t, r;
-	int result = RLC_OK;
-
-	if (pub == NULL || prv == NULL || bits == 0) {
-		return RLC_ERR;
-	}
-
-	bn_null(t);
-	bn_null(r);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_new(r);
-
-		/* Generate different primes p and q. */
-		do {
-			bn_gen_prime(prv->crt->p, bits / 2);
-			bn_gen_prime(prv->crt->q, bits / 2);
-		} while (bn_cmp(prv->crt->p, prv->crt->q) == RLC_EQ);
-
-		/* Swap p and q so that p is smaller. */
-		if (bn_cmp(prv->crt->p, prv->crt->q) != RLC_LT) {
-			bn_copy(t, prv->crt->p);
-			bn_copy(prv->crt->p, prv->crt->q);
-			bn_copy(prv->crt->q, t);
-		}
-
-		/* n = pq. */
-		bn_mul(pub->crt->n, prv->crt->p, prv->crt->q);
-		bn_copy(prv->crt->n, pub->crt->n);
-		bn_sub_dig(prv->crt->p, prv->crt->p, 1);
-		bn_sub_dig(prv->crt->q, prv->crt->q, 1);
-
-		/* phi(n) = (p - 1)(q - 1). */
-		bn_mul(t, prv->crt->p, prv->crt->q);
-
-		bn_set_2b(pub->e, 16);
-		bn_add_dig(pub->e, pub->e, 1);
-
-#if !defined(CP_CRT)
-		/* d = e^(-1) mod phi(n). */
-		bn_gcd_ext(r, prv->d, NULL, pub->e, t);
-		if (bn_sign(prv->d) == RLC_NEG) {
-			bn_add(prv->d, prv->d, t);
-		}
-		if (bn_cmp_dig(r, 1) == RLC_EQ) {
-			/* Restore p and q. */
-			bn_add_dig(prv->crt->p, prv->crt->p, 1);
-			bn_add_dig(prv->crt->q, prv->crt->q, 1);
-			result = RLC_OK;
-		}
-#else
-		/* d = e^(-1) mod phi(n). */
-		bn_gcd_ext(r, prv->d, NULL, pub->e, t);
-		if (bn_sign(prv->d) == RLC_NEG) {
-			bn_add(prv->d, prv->d, t);
-		}
-
-		if (bn_cmp_dig(r, 1) == RLC_EQ) {
-			/* dP = d mod (p - 1). */
-			bn_mod(prv->crt->dp, prv->d, prv->crt->p);
-			/* dQ = d mod (q - 1). */
-			bn_mod(prv->crt->dq, prv->d, prv->crt->q);
-			/* Restore p and q. */
-			bn_add_dig(prv->crt->p, prv->crt->p, 1);
-			bn_add_dig(prv->crt->q, prv->crt->q, 1);
-			/* qInv = q^(-1) mod p. */
-			bn_mod_inv(prv->crt->qi, prv->crt->q, prv->crt->p);
-
-			result = RLC_OK;
-		}
-#endif /* CP_CRT */
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		bn_free(r);
-	}
-
-	return result;
-}
-
-int cp_rsa_enc(uint8_t *out, int *out_len, uint8_t *in, int in_len, rsa_t pub) {
-	bn_t m, eb;
-	int size, pad_len, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(eb);
-
-	size = bn_size_bin(pub->crt->n);
-
-	if (pub == NULL || in_len <= 0 || in_len > (size - RSA_PAD_LEN)) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(eb);
-
-		bn_zero(m);
-		bn_zero(eb);
-
-#if CP_RSAPD == BASIC
-		if (pad_basic(eb, &pad_len, in_len, size, RSA_ENC) == RLC_OK) {
-#elif CP_RSAPD == PKCS1
-		if (pad_pkcs1(eb, &pad_len, in_len, size, RSA_ENC) == RLC_OK) {
-#elif CP_RSAPD == PKCS2
-		if (pad_pkcs2(eb, &pad_len, in_len, size, RSA_ENC) == RLC_OK) {
-#endif
-			bn_read_bin(m, in, in_len);
-			bn_add(eb, eb, m);
-
-#if CP_RSAPD == PKCS2
-			pad_pkcs2(eb, &pad_len, in_len, size, RSA_ENC_FIN);
-#endif
-			bn_mxp(eb, eb, pub->e, pub->crt->n);
-
-			if (size <= *out_len) {
-				*out_len = size;
-				memset(out, 0, *out_len);
-				bn_write_bin(out, size, eb);
-			} else {
-				result = RLC_ERR;
-			}
-		} else {
-			result = RLC_ERR;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(eb);
-	}
-
-	return result;
-}
-
-int cp_rsa_dec(uint8_t *out, int *out_len, uint8_t *in, int in_len, rsa_t prv) {
-	bn_t m, eb;
-	int size, pad_len, result = RLC_OK;
-
-	bn_null(m);
-	bn_null(eb);
-
-	size = bn_size_bin(prv->crt->n);
-
-	if (prv == NULL || in_len != size || in_len < RSA_PAD_LEN) {
-		return RLC_ERR;
-	}
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(eb);
-
-		bn_read_bin(eb, in, in_len);
-#if !defined(CP_CRT)
-		bn_mxp(eb, eb, prv->d, prv->crt->n);
-#else
-
-		bn_copy(m, eb);
-
-#if MULTI == OPENMP
-		omp_set_num_threads(CORES);
-		#pragma omp parallel copyin(core_ctx) firstprivate(prv)
-		{
-			#pragma omp sections
-			{
-				#pragma omp section
-				{
-#endif
-					/* m1 = c^dP mod p. */
-					bn_mxp(eb, eb, prv->crt->dp, prv->crt->p);
-
-#if MULTI == OPENMP
-				}
-				#pragma omp section
-				{
-#endif
-					/* m2 = c^dQ mod q. */
-					bn_mxp(m, m, prv->crt->dq, prv->crt->q);
-
-#if MULTI == OPENMP
-				}
-			}
-		}
-#endif
-		/* m1 = m1 - m2 mod p. */
-		bn_sub(eb, eb, m);
-		while (bn_sign(eb) == RLC_NEG) {
-			bn_add(eb, eb, prv->crt->p);
-		}
-		bn_mod(eb, eb, prv->crt->p);
-		/* m1 = qInv(m1 - m2) mod p. */
-		bn_mul(eb, eb, prv->crt->qi);
-		bn_mod(eb, eb, prv->crt->p);
-		/* m = m2 + m1 * q. */
-		bn_mul(eb, eb, prv->crt->q);
-		bn_add(eb, eb, m);
-
-#endif /* CP_CRT */
-
-		if (bn_cmp(eb, prv->crt->n) != RLC_LT) {
-			result = RLC_ERR;
-		}
-#if CP_RSAPD == BASIC
-		if (pad_basic(eb, &pad_len, in_len, size, RSA_DEC) == RLC_OK) {
-#elif CP_RSAPD == PKCS1
-		if (pad_pkcs1(eb, &pad_len, in_len, size, RSA_DEC) == RLC_OK) {
-#elif CP_RSAPD == PKCS2
-		if (pad_pkcs2(eb, &pad_len, in_len, size, RSA_DEC) == RLC_OK) {
-#endif
-			size = size - pad_len;
-
-			if (size <= *out_len) {
-				memset(out, 0, size);
-				bn_write_bin(out, size, eb);
-				*out_len = size;
-			} else {
-				result = RLC_ERR;
-			}
-		} else {
-			result = RLC_ERR;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(eb);
-	}
-
-	return result;
-}
-
-int cp_rsa_sig(uint8_t *sig, int *sig_len, uint8_t *msg, int msg_len, int hash, rsa_t prv) {
-	bn_t m, eb;
-	int pad_len, size, result = RLC_OK;
-	uint8_t h[RLC_MD_LEN];
-
-	if (prv == NULL || msg_len < 0) {
-		return RLC_ERR;
-	}
-
-	pad_len = (!hash ? RLC_MD_LEN : msg_len);
-
-#if CP_RSAPD == PKCS2
-	size = bn_bits(prv->crt->n) - 1;
-	size = (size / 8) + (size % 8 > 0);
-	if (pad_len > (size - 2)) {
-		return RLC_ERR;
-	}
-#else
-	size = bn_size_bin(prv->crt->n);
-	if (pad_len > (size - RSA_PAD_LEN)) {
-		return RLC_ERR;
-	}
-#endif
-
-	bn_null(m);
-	bn_null(eb);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(eb);
-
-		bn_zero(m);
-		bn_zero(eb);
-
-		int operation = (!hash ? RSA_SIG : RSA_SIG_HASH);
-
-#if CP_RSAPD == BASIC
-		if (pad_basic(eb, &pad_len, pad_len, size, operation) == RLC_OK) {
-#elif CP_RSAPD == PKCS1
-		if (pad_pkcs1(eb, &pad_len, pad_len, size, operation) == RLC_OK) {
-#elif CP_RSAPD == PKCS2
-		if (pad_pkcs2(eb, &pad_len, pad_len, size, operation) == RLC_OK) {
-#endif
-			if (!hash) {
-				md_map(h, msg, msg_len);
-				bn_read_bin(m, h, RLC_MD_LEN);
-				bn_add(eb, eb, m);
-			} else {
-				bn_read_bin(m, msg, msg_len);
-				bn_add(eb, eb, m);
-			}
-
-#if CP_RSAPD == PKCS2
-			pad_pkcs2(eb, &pad_len, bn_bits(prv->crt->n), size, RSA_SIG_FIN);
-#endif
-
-			bn_copy(m, eb);
-
-#if !defined(CP_CRT)
-			bn_mxp(eb, eb, prv->d, prv->crt->n);
-#else  /* CP_CRT */
-
-#if MULTI == OPENMP
-			omp_set_num_threads(CORES);
-			#pragma omp parallel copyin(core_ctx) firstprivate(prv)
-			{
-				#pragma omp sections
-				{
-					#pragma omp section
-					{
-#endif
-						/* m1 = c^dP mod p. */
-						bn_mxp(eb, eb, prv->crt->dp, prv->crt->p);
-#if MULTI == OPENMP
-					}
-					#pragma omp section
-					{
-#endif
-						/* m2 = c^dQ mod q. */
-						bn_mxp(m, m, prv->crt->dq, prv->crt->q);
-#if MULTI == OPENMP
-					}
-				}
-			}
-#endif
-			/* m1 = m1 - m2 mod p. */
-			bn_sub(eb, eb, m);
-			while (bn_sign(eb) == RLC_NEG) {
-				bn_add(eb, eb, prv->crt->p);
-			}
-			bn_mod(eb, eb, prv->crt->p);
-			/* m1 = qInv(m1 - m2) mod p. */
-			bn_mul(eb, eb, prv->crt->qi);
-			bn_mod(eb, eb, prv->crt->p);
-			/* m = m2 + m1 * q. */
-			bn_mul(eb, eb, prv->crt->q);
-			bn_add(eb, eb, m);
-			bn_mod(eb, eb, prv->crt->n);
-
-#endif /* CP_CRT */
-
-			size = bn_size_bin(prv->crt->n);
-
-			if (size <= *sig_len) {
-				memset(sig, 0, size);
-				bn_write_bin(sig, size, eb);
-				*sig_len = size;
-			} else {
-				result = RLC_ERR;
-			}
-		} else {
-			result = RLC_ERR;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(eb);
-	}
-
-	return result;
-}
-
-int cp_rsa_ver(uint8_t *sig, int sig_len, uint8_t *msg, int msg_len, int hash, rsa_t pub) {
-	bn_t m, eb;
-	int size, pad_len, result;
-	uint8_t *h1 = RLC_ALLOCA(uint8_t, RLC_MAX(msg_len, RLC_MD_LEN) + 8);
-	uint8_t *h2 = RLC_ALLOCA(uint8_t, RLC_MAX(msg_len, RLC_MD_LEN));
-
-	/* We suppose that the signature is invalid. */
-	result = 0;
-
-	if (h1 == NULL || h2 == NULL) {
-		RLC_FREE(h1);
-		RLC_FREE(h2);
-		return 0;
-	}
-
-	if (pub == NULL || msg_len < 0) {
-		return 0;
-	}
-
-	pad_len = (!hash ? RLC_MD_LEN : msg_len);
-
-#if CP_RSAPD == PKCS2
-	size = bn_bits(pub->crt->n) - 1;
-	if (size % 8 == 0) {
-		size = size / 8 - 1;
-	} else {
-		size = bn_size_bin(pub->crt->n);
-	}
-	if (pad_len > (size - 2)) {
-		return 0;
-	}
-#else
-	size = bn_size_bin(pub->crt->n);
-	if (pad_len > (size - RSA_PAD_LEN)) {
-		return 0;
-	}
-#endif
-
-	bn_null(m);
-	bn_null(eb);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(eb);
-
-		bn_read_bin(eb, sig, sig_len);
-
-		bn_mxp(eb, eb, pub->e, pub->crt->n);
-
-		int operation = (!hash ? RSA_VER : RSA_VER_HASH);
-
-#if CP_RSAPD == BASIC
-		if (pad_basic(eb, &pad_len, RLC_MD_LEN, size, operation) == RLC_OK) {
-#elif CP_RSAPD == PKCS1
-		if (pad_pkcs1(eb, &pad_len, RLC_MD_LEN, size, operation) == RLC_OK) {
-#elif CP_RSAPD == PKCS2
-		if (pad_pkcs2(eb, &pad_len, bn_bits(pub->crt->n), size, operation) == RLC_OK) {
-#endif
-
-#if CP_RSAPD == PKCS2
-			memset(h1, 0, 8);
-
-			if (!hash) {
-				md_map(h1 + 8, msg, msg_len);
-				md_map(h2, h1, RLC_MD_LEN + 8);
-
-				memset(h1, 0, RLC_MD_LEN);
-				bn_write_bin(h1, size - pad_len, eb);
-				/* Everything went ok, so signature status is changed. */
-				result = util_cmp_const(h1, h2, RLC_MD_LEN);
-			} else {
-				memcpy(h1 + 8, msg, msg_len);
-				md_map(h2, h1, RLC_MD_LEN + 8);
-
-				memset(h1, 0, msg_len);
-				bn_write_bin(h1, size - pad_len, eb);
-
-				/* Everything went ok, so signature status is changed. */
-				result = util_cmp_const(h1, h2, msg_len);
-			}
-#else
-			memset(h1, 0, RLC_MAX(msg_len, RLC_MD_LEN));
-			bn_write_bin(h1, size - pad_len, eb);
-
-			if (!hash) {
-				md_map(h2, msg, msg_len);
-				/* Everything went ok, so signature status is changed. */
-				result = util_cmp_const(h1, h2, RLC_MD_LEN);
-			} else {
-				/* Everything went ok, so signature status is changed. */
-				result = util_cmp_const(h1, msg, msg_len);
-			}
-#endif
-			result = (result == RLC_EQ ? 1 : 0);
-		} else {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = 0;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(eb);
-		RLC_FREE(h1);
-		RLC_FREE(h2);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_sok.c b/src/dashbls/depends/relic/src/cp/relic_cp_sok.c
deleted file mode 100644
index 118590a8333d..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_sok.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of protocols for proof of knowledge of discrete logarithms.
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/*
- * Source: "Efficient Group Signature for Large Groups"
- * Authors: Jan Camenisch, Markus Stadler
- */
-
-int cp_sokdl_sig(bn_t c, bn_t s, uint8_t *msg, int len, ec_t y, bn_t x) {
-	bn_t n, r;
-	ec_t t;
-	uint8_t h[RLC_MD_LEN];
-	uint8_t *buf, *m = RLC_ALLOCA(uint8_t, len + 3 * (RLC_FC_BYTES + 1));
-	int l, result = RLC_OK;
-
-	bn_null(n);
-	bn_null(r);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(r);
-		ec_new(t);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		buf = m;
-		ec_curve_get_ord(n);
-		ec_curve_get_gen(t);
-		memcpy(buf, msg, len);
-		buf += len;
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		buf += l;
-		l = ec_size_bin(y, 1);
-		ec_write_bin(buf, l, y, 1);
-		buf += l;
-
-		bn_rand_mod(r, n);
-		ec_mul_gen(t, r);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		buf += l;
-
-		md_map(h, m, len + 3 * (RLC_FC_BYTES + 1));
-		bn_read_bin(c, h, RLC_MD_LEN);
-		bn_mod(c, c, n);
-
-		bn_mul(s, c, x);
-		bn_sub(s, r, s);
-		bn_mod(s, s, n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(r);
-		ec_free(t);
-		RLC_FREE(m);
-	}
-	return result;
-}
-
-int cp_sokdl_ver(bn_t c, bn_t s, uint8_t *msg, int len, ec_t y) {
-	bn_t n, v;
-	ec_t t;
-	uint8_t h[RLC_MD_LEN];
-	uint8_t *buf, *m = RLC_ALLOCA(uint8_t, len + 3 * (RLC_FC_BYTES + 1));
-	int l, result = 0;
-
-	bn_null(n);
-	bn_null(v);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v);
-		ec_new(t);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		buf = m;
-		ec_curve_get_ord(n);
-		ec_curve_get_gen(t);
-		memcpy(buf, msg, len);
-		buf += len;
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-		buf += l;
-		l = ec_size_bin(y, 1);
-		ec_write_bin(buf, l, y, 1);
-		buf += l;
-
-		/* Compute t' = [r]G + [c]Y. */
-		ec_mul_sim_gen(t, s, y, c);
-		l = ec_size_bin(t, 1);
-		ec_write_bin(buf, l, t, 1);
-
-		md_map(h, m, len + 3 * (RLC_FC_BYTES + 1));
-		bn_read_bin(v, h, RLC_MD_LEN);
-		bn_mod(v, v, n);
-
-		if (bn_cmp(v, c) == RLC_EQ) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v);
-		ec_free(t);
-		RLC_FREE(m);
-	}
-	return result;
-}
-
-int cp_sokor_sig(bn_t c[2], bn_t s[2], uint8_t *msg, int len, ec_t y[2],
-		bn_t x, int first) {
-	bn_t n, v[2], z;
-	ec_t g, t[2];
-	uint8_t h[RLC_MD_LEN];
-	uint8_t *buf, *m = RLC_ALLOCA(uint8_t, len + 6 * (RLC_FC_BYTES + 1));
-	int l, result = RLC_OK;
-	int one = 1 ^ first;
-	int zero = 0 ^ first;
-
-	bn_null(n);
-	bn_null(v[0]);
-	bn_null(v[1]);
-	bn_null(z);
-	ec_null(g);
-	ec_null(t[0]);
-	ec_null(t[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v[0]);
-		bn_new(v[1]);
-		bn_new(z);
-		ec_new(g);
-		ec_new(t[0]);
-		ec_new(t[1]);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		buf = m;
-		ec_curve_get_ord(n);
-		ec_curve_get_gen(g);
-		bn_rand_mod(c[zero], n);
-		memcpy(buf, msg, len);
-		buf += len;
-
-		bn_rand_mod(v[0], n);
-		bn_rand_mod(v[1], n);
-		if (first) {
-			ec_mul_gen(t[0], v[0]);
-			ec_mul_sim_gen(t[1], v[1], y[1], c[zero]);
-		} else {
-			/* T1 = [w]Y1 + [v1]G. */
-			ec_mul_sim_gen(t[0], v[0], y[0], c[zero]);
-			/* T2 = [v2]G. */
-			ec_mul_gen(t[1], v[1]);
-		}
-
-		for (int i = 0; i < 2; i++) {
-			l = ec_size_bin(g, 1);
-			ec_write_bin(buf, l, g, 1);
-			buf += l;
-			l = ec_size_bin(y[i], 1);
-			ec_write_bin(buf, l, y[i], 1);
-			buf += l;
-			l = ec_size_bin(t[i], 1);
-			ec_write_bin(buf, l, t[i], 1);
-			buf += l;
-		}
-		md_map(h, m, len + 6 * (RLC_FC_BYTES + 1));
-		bn_read_bin(z, h, RLC_MD_LEN);
-		bn_mod(z, z, n);
-
-		bn_sub(c[one], z, c[zero]);
-		bn_mod(c[one], c[one], n);
-
-		bn_copy(s[zero], v[zero]);
-		bn_mul(s[one], c[one], x);
-		bn_sub(s[one], v[one], s[one]);
-		bn_mod(s[one], s[one], n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v[0]);
-		bn_free(v[1]);
-		bn_free(z);
-		ec_free(g);
-		ec_free(t[0]);
-		ec_free(t[1]);
-		RLC_FREE(m);
-	}
-	return result;
-}
-
-int cp_sokor_ver(bn_t c[2], bn_t s[2], uint8_t *msg, int len, ec_t y[2]) {
-	bn_t n, v[2], z;
-	ec_t t;
-	uint8_t h[RLC_MD_LEN];
-	uint8_t *buf, *m = RLC_ALLOCA(uint8_t, len + 6 * (RLC_FC_BYTES + 1));
-	int l, result = 0;
-
-	bn_null(n);
-	bn_null(v[0]);
-	bn_null(v[1]);
-	bn_null(z);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(v[0]);
-		bn_new(v[1]);
-		bn_new(z);
-		ec_new(t);
-		if (m == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		buf = m;
-		ec_curve_get_ord(n);
-		memcpy(buf, msg, len);
-		buf += len;
-
-		for (int i = 0; i < 2; i++) {
-			ec_curve_get_gen(t);
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-			l = ec_size_bin(y[i], 1);
-			ec_write_bin(buf, l, y[i], 1);
-			buf += l;
-
-			ec_mul_sim_gen(t, s[i], y[i], c[i]);
-			l = ec_size_bin(t, 1);
-			ec_write_bin(buf, l, t, 1);
-			buf += l;
-		}
-		md_map(h, m, len + 6 * (RLC_FC_BYTES + 1));
-		bn_read_bin(z, h, RLC_MD_LEN);
-		bn_mod(z, z, n);
-
-		bn_sub(z, z, c[0]);
-		bn_sub(z, z, c[1]);
-		bn_mod(z, z, n);
-
-		if (bn_is_zero(z)) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(v[0]);
-		bn_free(v[1]);
-		bn_free(z);
-		ec_free(t);
-		RLC_FREE(m);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_sokaka.c b/src/dashbls/depends/relic/src/cp/relic_cp_sokaka.c
deleted file mode 100644
index 303fab91247c..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_sokaka.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Sakai-Ohgishi-Kasahara Identity-Based Non-Interactive
- * Authenticated Key Agreement scheme.
- *
- * @ingroup test
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_sokaka_gen(bn_t master) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		pc_get_ord(n);
-		bn_rand_mod(master, n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_sokaka_gen_prv(sokaka_t k, char *id, bn_t master) {
-	if (pc_map_is_type1()) {
-		g1_map(k->s1, (uint8_t *)id, strlen(id));
-		g1_mul(k->s1, k->s1, master);
-	} else {
-		g1_map(k->s1, (uint8_t *)id, strlen(id));
-		g1_mul(k->s1, k->s1, master);
-		g2_map(k->s2, (uint8_t *)id, strlen(id));
-		g2_mul(k->s2, k->s2, master);
-	}
-	return RLC_OK;
-}
-
-int cp_sokaka_key(uint8_t *key, unsigned int key_len, char *id1,
-		sokaka_t k, char *id2) {
-	int len1 = strlen(id1), len2 = strlen(id2);
-	int size, first = 0, result = RLC_OK;
-	uint8_t *buf;
-	g1_t p;
-	g2_t q;
-	gt_t e;
-
-	g1_null(p);
-	g2_null(q);
-	gt_null(e);
-
-	RLC_TRY {
-		g1_new(p);
-		g2_new(q);
-		gt_new(e);
-		size = gt_size_bin(e, 0);
-		buf = RLC_ALLOCA(uint8_t, size);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		if (len1 == len2) {
-			if (strncmp(id1, id2, len1) == 0) {
-				RLC_THROW(ERR_NO_VALID);
-			}
-			first = (strncmp(id1, id2, len1) < 0 ? 1 : 2);
-		} else {
-			if (len1 < len2) {
-				if (strncmp(id1, id2, len1) == 0) {
-					first = 1;
-				} else {
-					first = (strncmp(id1, id2, len1) < 0 ? 1 : 2);
-				}
-			} else {
-				if (strncmp(id1, id2, len2) == 0) {
-					first = 2;
-				} else {
-					first = (strncmp(id1, id2, len2) < 0 ? 1 : 2);
-				}
-			}
-		}
-
-		if (pc_map_is_type1()) {
-			g2_map(q, (uint8_t *)id2, len2);
-			pc_map(e, k->s1, q);
-		} else {
-			if (first == 1) {
-				g2_map(q, (uint8_t *)id2, len2);
-				pc_map(e, k->s1, q);
-			} else {
-				g1_map(p, (uint8_t *)id2, len2);
-				pc_map(e, p, k->s2);
-			}
-		}
-
-		/* Allocate size for storing the output. */
-		gt_write_bin(buf, size, e, 0);
-		md_kdf(key, key_len, buf, size);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		g1_free(p);
-		g2_free(q);
-		gt_free(e);
-		RLC_FREE(buf);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_vbnn.c b/src/dashbls/depends/relic/src/cp/relic_cp_vbnn.c
deleted file mode 100644
index c904d0f85fb1..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_vbnn.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2018 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the vBNN-IBS idenenty-based signature algorithm.
- *
- * Paper: "IMBAS: id-based multi-user broadcast authentication in wireless sensor networks"
- *
- * @version $Id$
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_vbnn_gen(bn_t msk, ec_t mpk) {
-	int result = RLC_OK;
-
-	/* order of the ECC group */
-	bn_t n;
-
-	/* zero variables */
-	bn_null(n);
-
-	RLC_TRY {
-		/* initialize variables */
-		bn_new(n);
-
-		/* get order of ECC group */
-		ec_curve_get_ord(n);
-
-		/* calculate master secret key */
-		bn_rand_mod(msk, n);
-
-		/* calculate master public key */
-		ec_mul_gen(mpk, msk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		/* free variables */
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_vbnn_gen_prv(bn_t sk, ec_t pk, bn_t msk, uint8_t *id, int id_len) {
-	uint8_t hash[RLC_MD_LEN];
-	int len, result = RLC_OK;
-	uint8_t *buf = NULL;
-	bn_t n, r;
-
-	/* zero variables */
-	bn_null(n);
-	bn_null(r);
-
-	RLC_TRY {
-		/* initialize variables */
-		bn_new(n);
-		bn_new(r);
-
-		/* get order of ECC group */
-		ec_curve_get_ord(n);
-
-		/* extract user key from id */
-		bn_rand_mod(r, n);
-
-		/* calculate R part of the user key */
-		ec_mul_gen(pk, r);
-
-		/* calculate s part of the user key */
-		len = id_len + ec_size_bin(pk, 1);
-		buf = RLC_ALLOCA(uint8_t, len);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		memcpy(buf, id, id_len);
-		ec_write_bin(buf + id_len, ec_size_bin(pk, 1), pk, 1);
-
-		md_map(hash, buf, len);
-		bn_read_bin(sk, hash, RLC_MD_LEN);
-		bn_mod(sk, sk, n);
-		bn_mul(sk, sk, msk);
-		bn_add(sk, sk, r);
-		bn_mod(sk, sk, n);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		/* free variables */
-		bn_free(n);
-		bn_free(r);
-		RLC_FREE(buf);
-	}
-	return result;
-}
-
-int cp_vbnn_sig(ec_t r, bn_t z, bn_t h, uint8_t *id, int id_len,
-		uint8_t *msg, int msg_len, bn_t sk, ec_t pk) {
-	int len, result = RLC_OK;
-	uint8_t *buf = NULL, *buf_i, hash[RLC_MD_LEN];
-	bn_t n, y;
-	ec_t t;
-
-	/* zero variables */
-	bn_null(n);
-	bn_null(y);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(y);
-		ec_new(t);
-
-		/* get order of ECC group */
-		ec_curve_get_ord(n);
-
-		bn_rand_mod(y, n);
-		ec_mul_gen(t, y);
-
-		/* calculate h part of the signature */
-		len = id_len + msg_len + ec_size_bin(t, 1) + ec_size_bin(pk, 1);
-		buf = RLC_ALLOCA(uint8_t, len);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		buf_i = buf;
-		memcpy(buf_i, id, id_len);
-		buf_i += id_len;
-		memcpy(buf_i, msg, msg_len);
-		buf_i += msg_len;
-		ec_write_bin(buf_i, ec_size_bin(pk, 1), pk, 1);
-		buf_i += ec_size_bin(pk, 1);
-		ec_write_bin(buf_i, ec_size_bin(t, 1), t, 1);
-
-		md_map(hash, buf, len);
-		bn_read_bin(h, hash, RLC_MD_LEN);
-		bn_mod(h, h, n);
-
-		/* calculate z part of the signature */
-		bn_mul(z, h, sk);
-		bn_add(z, z, y);
-		bn_mod(z, z, n);
-
-		/* calculate R part of the signature */
-		ec_copy(r, pk);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		/* free variables */
-		bn_free(n);
-		bn_free(y);
-		ec_free(t);
-		RLC_FREE(buf);
-	}
-	return result;
-}
-
-int cp_vbnn_ver(ec_t r, bn_t z, bn_t h, uint8_t *id, int id_len,
-		uint8_t *msg, int msg_len, ec_t mpk) {
-	int len, result = 0;
-	uint8_t *buf = NULL, *buf_i, hash[RLC_MD_LEN];
-	bn_t n, c, _h;
-	ec_t Z;
-	ec_t t;
-
-	/* zero variables */
-	bn_null(n);
-	bn_null(c);
-	bn_null(_h);
-	ec_null(Z);
-	ec_null(t);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(c);
-		bn_new(_h);
-		ec_new(Z);
-		ec_new(t);
-
-		/* calculate c */
-		len = id_len + msg_len + 2 * ec_size_bin(r, 1);
-		buf = RLC_ALLOCA(uint8_t, len);
-		if (buf == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		/* get order of ECC group */
-		ec_curve_get_ord(n);
-
-		buf_i = buf;
-		memcpy(buf_i, id, id_len);
-		buf_i += id_len;
-		ec_write_bin(buf_i, ec_size_bin(r, 1), r, 1);
-
-		len = id_len + ec_size_bin(r, 1);
-		md_map(hash, buf, len);
-		bn_read_bin(c, hash, RLC_MD_LEN);
-		bn_mod(c, c, n);
-
-		/* calculate Z */
-		ec_mul_gen(Z, z);
-		ec_mul(t, mpk, c);
-		ec_add(t, t, r);
-		ec_norm(t, t);
-		ec_mul(t, t, h);
-		ec_sub(Z, Z, t);
-		ec_norm(Z, Z);
-
-		/* calculate h_verify */
-		buf_i = buf;
-		memcpy(buf_i, id, id_len);
-		buf_i += id_len;
-		memcpy(buf_i, msg, msg_len);
-		buf_i += msg_len;
-		ec_write_bin(buf_i, ec_size_bin(r, 1), r, 1);
-		buf_i += ec_size_bin(r, 1);
-		ec_write_bin(buf_i, ec_size_bin(Z, 1), Z, 1);
-
-		len = id_len + msg_len + ec_size_bin(r, 1) + ec_size_bin(Z, 1);
-		md_map(hash, buf, len);
-		bn_read_bin(_h, hash, RLC_MD_LEN);
-		bn_mod(_h, _h, n);
-		RLC_FREE(buf);
-
-		if (bn_cmp(h, _h) == RLC_EQ) {
-			result = 1;
-		} else {
-			result = 0;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* free variables */
-		bn_free(n);
-		bn_free(c);
-		bn_free(_h);
-		ec_free(Z);
-		ec_free(t);
-		RLC_FREE(buf);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/cp/relic_cp_zss.c b/src/dashbls/depends/relic/src/cp/relic_cp_zss.c
deleted file mode 100644
index 2e0e70920f81..000000000000
--- a/src/dashbls/depends/relic/src/cp/relic_cp_zss.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Zhang-Safavi-Naini-Susilo short signature protocol.
-
- *
- * @ingroup cp
- */
-
-#include "relic.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int cp_zss_gen(bn_t d, g1_t q, gt_t z) {
-	bn_t n;
-	int result = RLC_OK;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* z = e(g1, g2). */
-		gt_get_gen(z);
-
-		pc_get_ord(n);
-
-		bn_rand_mod(d, n);
-		g1_mul_gen(q, d);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-	return result;
-}
-
-int cp_zss_sig(g2_t s, uint8_t *msg, int len, int hash, bn_t d) {
-	bn_t m, n, r, t;
-	uint8_t h[RLC_MD_LEN];
-	int result = RLC_OK;
-
-	bn_null(m);
-	bn_null(n);
-	bn_null(r);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		bn_new(r);
-		bn_new(t);
-
-		pc_get_ord(n);
-
-		/* m = H(msg). */
-		if (hash) {
-			bn_read_bin(m, msg, len);
-		} else {
-			md_map(h, msg, len);
-			bn_read_bin(m, h, RLC_MD_LEN);
-		}
-		bn_mod(m, m, n);
-
-        /* Compute (H(m) + d) and invert. */
-        bn_add(t, m, d);
-        bn_mod(t, t, n);
-		bn_mod_inv(t, t, n);
-
-		/* Compute the sinature. */
-		g2_mul_gen(s, t);
-	}
-	RLC_CATCH_ANY {
-		result = RLC_ERR;
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-		bn_free(r);
-		bn_free(t);
-	}
-	return result;
-}
-
-int cp_zss_ver(g2_t s, uint8_t *msg, int len, int hash, g1_t q, gt_t z) {
-	bn_t m, n;
-	g1_t g;
-	gt_t e;
-	uint8_t h[RLC_MD_LEN];
-	int result = 0;
-
-	bn_null(m);
-	bn_null(n);
-	g1_null(g);
-	gt_null(e);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		g1_new(g);
-		gt_new(e);
-
-		pc_get_ord(n);
-
-		/* m = H(msg). */
-		if (hash) {
-			bn_read_bin(m, msg, len);
-		} else {
-			md_map(h, msg, len);
-			bn_read_bin(m, h, RLC_MD_LEN);
-		}
-		bn_mod(m, m, n);
-
-		g1_mul_gen(g, m);
-		g1_add(g, g, q);
-		g1_norm(g, g);
-
-		pc_map(e, g, s);
-
-		if (gt_cmp(e, z) == RLC_EQ) {
-			result = 1;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(m);
-		bn_free(n);
-		g1_free(g);
-		gt_free(e);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/dv/relic_dv_mem.c b/src/dashbls/depends/relic/src/dv/relic_dv_mem.c
deleted file mode 100644
index 59373822c177..000000000000
--- a/src/dashbls/depends/relic/src/dv/relic_dv_mem.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the memory-management routines for temporary double
- * precision digit vectors.
- *
- * @ingroup dv
- */
-
-#include <stdlib.h>
-#include <errno.h>
-
-#if ALLOC != AUTO
-#include <malloc.h>
-#endif
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_dv.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ALLOC == DYNAMIC
-
-void dv_new_dynam(dv_t *a, int digits) {
-	if (digits > RLC_DV_DIGS) {
-		RLC_THROW(ERR_NO_PRECI);
-		return;
-	}
-#if ALIGN == 1
-	*a = malloc(digits * (RLC_DIG / 8));
-#elif OPSYS == WINDOWS
-	*a = _aligned_malloc(digits * (RLC_DIG / 8), ALIGN);
-#else
-	int r = posix_memalign((void **)a, ALIGN, digits * (RLC_DIG / 8));
-	if (r == ENOMEM) {
-		RLC_THROW(ERR_NO_MEMORY);
-	}
-	if (r == EINVAL) {
-		RLC_THROW(ERR_NO_CONFIG);
-	}
-#endif
-
-	if (*a == NULL) {
-		RLC_THROW(ERR_NO_MEMORY);
-	}
-}
-
-void dv_free_dynam(dv_t *a) {
-	if ((*a) != NULL) {
-#if OPSYS == WINDOWS && ALIGN > 1
-		_aligned_free(*a);
-#else
-		free(*a);
-#endif
-	}
-	(*a) = NULL;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/dv/relic_dv_util.c b/src/dashbls/depends/relic/src/dv/relic_dv_util.c
deleted file mode 100644
index d5329da3544a..000000000000
--- a/src/dashbls/depends/relic/src/dv/relic_dv_util.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the basic functions to temporary double precision digit
- * vectors.
- *
- * @ingroup dv
- */
-
-#include <inttypes.h>
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void dv_print(dig_t *a, int digits) {
-	int i;
-
-	/* Suppress possible unused parameter warning. */
-	(void)a;
-	for (i = digits - 1; i >= 0; i--) {
-		util_print_dig(a[i], 1);
-	}
-	util_print("\n");
-
-	return;
-}
-
-void dv_zero(dig_t *a, int digits) {
-	int i;
-
-#if ALLOC != DYNAMIC
-	if (digits > RLC_DV_DIGS) {
-		RLC_THROW(ERR_NO_PRECI);
-		return;
-	}
-#endif
-
-	for (i = 0; i < digits; i++, a++) {
-		(*a) = 0;
-	}
-
-	return;
-}
-
-void dv_copy(dig_t *c, const dig_t *a, int digits) {
-	memcpy(c, a, digits * sizeof(dig_t));
-}
-
-void dv_copy_cond(dig_t *c, const dig_t *a, int digits, dig_t cond) {
-	dig_t mask, t;
-
-	mask = -cond;
-	for (int i = 0; i < digits; i++) {
-		t = (a[i] ^ c[i]) & mask;
-		c[i] ^= t;
-	}
-}
-
-void dv_swap_cond(dig_t *c, dig_t *a, int digits, dig_t cond) {
-	dig_t mask, t;
-
-	mask = -cond;
-	for (int i = 0; i < digits; i++) {
-		t = (a[i] ^ c[i]) & mask;
-		a[i] ^= t;
-		c[i] ^= t;
-	}
-}
-
-int dv_cmp(const dig_t *a, const dig_t *b, int size) {
-	int i, r;
-
-	a += (size - 1);
-	b += (size - 1);
-
-	r = RLC_EQ;
-	for (i = 0; i < size; i++, --a, --b) {
-		if (*a != *b && r == RLC_EQ) {
-			r = (*a > *b ? RLC_GT : RLC_LT);
-		}
-	}
-	return r;
-}
-
-int dv_cmp_const(const dig_t *a, const dig_t *b, int size) {
-	dig_t r = 0;
-
-	for (int i = 0; i < size; i++) {
-		r |= a[i] ^ b[i];
-	}
-
-	return (r == 0 ? RLC_EQ : RLC_NE);
-}
-
-void dv_rshd(dig_t *c, const dig_t *a, int size, int digits) {
-	const dig_t *top;
-	dig_t *bot;
-	int i;
-
-	top = a + digits;
-	bot = c;
-
-	for (i = 0; i < size - digits; i++, top++, bot++) {
-		*bot = *top;
-	}
-	for (; i < size; i++, bot++) {
-		*bot = 0;
-	}
-}
-
-void dv_lshd(dig_t *c, const dig_t *a, int size, int digits) {
-	dig_t *top;
-	const dig_t *bot;
-	int i;
-
-	top = c + size - 1;
-	bot = a + size - 1 - digits;
-
-	for (i = 0; i < size - digits; i++, top--, bot--) {
-		*top = *bot;
-	}
-	for (i = 0; i < digits; i++, c++) {
-		*c = 0;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_add.c b/src/dashbls/depends/relic/src/eb/relic_eb_add.c
deleted file mode 100644
index c234e37fde74..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_add.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point addition on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_ADD == BASIC || !defined(STRIP)
-
-/**
- * Adds two points represented in affine coordinates on an ordinary binary
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the first point to add.
- * @param[in] q					- the second point to add.
- */
-static void eb_add_basic_imp(eb_t r, const eb_t p, const eb_t q) {
-	fb_t t0, t1, t2;
-
-	fb_null(t0);
-	fb_null(t1);
-	fb_null(t2);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-		fb_new(t2);
-
-		/* t0 = (y1 + y2). */
-		fb_add(t0, p->y, q->y);
-		/* t1 = (x1 + x2). */
-		fb_add(t1, p->x, q->x);
-
-		if (fb_is_zero(t1)) {
-			if (fb_is_zero(t0)) {
-				/* If t1 is zero and t0 is zero, p = q, should have doubled. */
-				eb_dbl_basic(r, p);
-			} else {
-				/* If t0 is not zero and t1 is zero, q = -p and r = infinity. */
-				eb_set_infty(r);
-			}
-		} else {
-			/* t2 = 1/(x1 + x2). */
-			fb_inv(t2, t1);
-			/* t0 = lambda = (y1 + y2)/(x1 + x2). */
-			fb_mul(t0, t0, t2);
-			/* t2 = lambda^2. */
-			fb_sqr(t2, t0);
-
-			/* t2 = lambda^2 + lambda + x1 + x2 + a. */
-			fb_add(t2, t2, t0);
-			fb_add(t2, t2, t1);
-
-			switch (eb_curve_opt_a()) {
-				case RLC_ZERO:
-					break;
-				case RLC_ONE:
-					fb_add_dig(t2, t2, (dig_t)1);
-					break;
-				case RLC_TINY:
-					fb_add_dig(t2, t2, eb_curve_get_a()[0]);
-					break;
-				default:
-					fb_add(t2, t2, eb_curve_get_a());
-					break;
-			}
-
-			/* y3 = lambda*(x3 + x1) + x3 + y1. */
-			fb_add(t1, t2, p->x);
-			fb_mul(t1, t1, t0);
-			fb_add(t1, t1, t2);
-			fb_add(r->y, p->y, t1);
-
-			/* x3 = lambda^2 + lambda + x1 + x2 + a. */
-			fb_copy(r->x, t2);
-			fb_copy(r->z, p->z);
-
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-		fb_free(t2);
-	}
-}
-
-#endif /* EB_ADD == BASIC */
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-#if defined(EB_MIXED) || !defined(STRIP)
-
-/**
- * Adds a point represented in affine coordinates to a point represented in
- * projective coordinates.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the affine point.
- * @param[in] q					- the projective point.
- */
-static void eb_add_projc_mix(eb_t r, const eb_t p, const eb_t q) {
-	fb_t t0, t1, t2, t3, t4, t5;
-
-	fb_null(t0);
-	fb_null(t1);
-	fb_null(t2);
-	fb_null(t3);
-	fb_null(t4);
-	fb_null(t5);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-		fb_new(t2);
-		fb_new(t3);
-		fb_new(t4);
-		fb_new(t5);
-
-		/* madd-2005-dl formulas: 7M + 4S + 9add + 1*4 + 3*2. */
-		/* http://www.hyperelliptic.org/EFD/g12o/auto-shortw-lopezdahab-1.html#addition-madd-2005-dl */
-
-		if (p->coord != BASIC) {
-			/* A = y1 + y2 * z1^2. */
-			fb_sqr(t0, p->z);
-			fb_mul(t0, t0, q->y);
-			fb_add(t0, t0, p->y);
-			/* B = x1 + x2 * z1. */
-			fb_mul(t1, p->z, q->x);
-			fb_add(t1, t1, p->x);
-		} else {
-			/* t0 = A = y1 + y2. */
-			fb_add(t0, p->y, q->y);
-			/* t1 = B = x1 + x2. */
-			fb_add(t1, p->x, q->x);
-		}
-
-		if (fb_is_zero(t1)) {
-			if (fb_is_zero(t0)) {
-				/* If t0 = 0 and t1 = 0, p = q, should have doubled! */
-				eb_dbl_projc(r, p);
-			} else {
-				/* If t0 = 0, r is infinity. */
-				eb_set_infty(r);
-			}
-		} else {
-			if (p->coord != BASIC) {
-				/* t2 = C = B * z1. */
-				fb_mul(t2, p->z, t1);
-				/* z3 = C^2. */
-				fb_sqr(r->z, t2);
-				/* t1 = B^2. */
-				fb_sqr(t1, t1);
-				/* t1 = A + B^2. */
-				fb_add(t1, t0, t1);
-			} else {
-				/* If z1 = 0, t2 = C = B. */
-				fb_copy(t2, t1);
-				/* z3 = B^2. */
-				fb_sqr(r->z, t1);
-				/* t1 = A + z3. */
-				fb_add(t1, t0, r->z);
-			}
-
-			/* t3 = D = x2 * z3. */
-			fb_mul(t3, r->z, q->x);
-
-			/* t4 = (y2 + x2). */
-			fb_add(t4, q->x, q->y);
-
-			/* z3 = A^2. */
-			fb_sqr(r->x, t0);
-
-			/* t1 = A + B^2 + a2 * C. */
-			switch (eb_curve_opt_a()) {
-				case RLC_ZERO:
-					break;
-				case RLC_ONE:
-					fb_add(t1, t1, t2);
-					break;
-				case RLC_TINY:
-					/* t5 = a2 * C. */
-					fb_mul_dig(t5, t2, eb_curve_get_a()[0]);
-					fb_add(t1, t1, t5);
-					break;
-				default:
-					/* t5 = a2 * C. */
-					fb_mul(t5, eb_curve_get_a(), t2);
-					fb_add(t1, t1, t5);
-					break;
-			}
-
-			/* t1 = C * (A + B^2 + a2 * C). */
-			fb_mul(t1, t1, t2);
-			/* x3 = A^2 + C * (A + B^2 + a2 * C). */
-			fb_add(r->x, r->x, t1);
-
-			/* t3 = D + x3. */
-			fb_add(t3, t3, r->x);
-			/* t2 = A * B. */
-			fb_mul(t2, t0, t2);
-			/* y3 = (D + x3) * (A * B + z3). */
-			fb_add(r->y, t2, r->z);
-			fb_mul(r->y, r->y, t3);
-			/* t0 = z3^2. */
-			fb_sqr(t0, r->z);
-			/* t0 = (y2 + x2) * z3^2. */
-			fb_mul(t0, t0, t4);
-			/* y3 = (D + x3) * (A * B + z3) + (y2 + x2) * z3^2. */
-			fb_add(r->y, r->y, t0);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-		fb_free(t2);
-		fb_free(t3);
-		fb_free(t4);
-		fb_free(t5);
-	}
-}
-
-#endif /* EB_MIXED */
-
-/**
- * Adds two points represented in projective coordinates on an ordinary binary
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the first point to add.
- * @param[in] q					- the second point to add.
- */
-static void eb_add_projc_imp(eb_t r, const eb_t p, const eb_t q) {
-#if defined(EB_MIXED) && defined(STRIP)
-	/* If code size is a problem, leave only the mixed version. */
-	eb_add_projc_mix(r, p, q);
-#else /* General addition. */
-
-#if defined(EB_MIXED) || !defined(STRIP)
-	/* Test if z2 = 1 only if mixed coordinates are turned on. */
-	if (q->coord == BASIC) {
-		eb_add_projc_mix(r, p, q);
-		return;
-	}
-#endif
-	fb_t t0, t1, t2, t3, t4, t5, t6, t7;
-
-	fb_null(t0);
-	fb_null(t1);
-	fb_null(t2);
-	fb_null(t3);
-	fb_null(t4);
-	fb_null(t5);
-	fb_null(t6);
-	fb_null(t7);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-		fb_new(t2);
-		fb_new(t3);
-		fb_new(t4);
-		fb_new(t5);
-		fb_new(t6);
-		fb_new(t7);
-
-		/* t0 = B = x2 * z1. */
-		fb_mul(t0, q->x, p->z);
-
-		/* A = x1 * z2 */
-		fb_mul(t1, p->x, q->z);
-
-		/* t2 = E = A + B. */
-		fb_add(t2, t1, t0);
-
-		/* t3 = D = B^2. */
-		fb_sqr(t3, t0);
-		/* t4 = C = A^2. */
-		fb_sqr(t4, t1);
-		/* t5 = F = C + D. */
-		fb_add(t5, t3, t4);
-
-		/* t6 = H = y2 * z1^2. */
-		fb_sqr(t6, p->z);
-		fb_mul(t6, t6, q->y);
-
-		/* t7 = G = y1 * z2^2. */
-		fb_sqr(t7, q->z);
-		fb_mul(t7, t7, p->y);
-
-		/* t3 = D + H. */
-		fb_add(t3, t3, t6);
-		/* t4 = C + G. */
-		fb_add(t4, t4, t7);
-		/* t6 = I = G + H. */
-		fb_add(t6, t7, t6);
-
-		/* If E is zero. */
-		if (fb_is_zero(t2)) {
-			if (fb_is_zero(t6)) {
-				/* If I is zero, p = q, should have doubled. */
-				eb_dbl_projc(r, p);
-			} else {
-				/* If I is not zero, q = -p, r = infinity. */
-				eb_set_infty(r);
-			}
-		} else {
-			/* t6 = J = I * E. */
-			fb_mul(t6, t6, t2);
-
-			/* z3 = F * z1 * z2. */
-			fb_mul(r->z, p->z, q->z);
-			fb_mul(r->z, t5, r->z);
-
-			/* t4 = B * (C + G). */
-			fb_mul(t4, t0, t4);
-			/* t2 = A * J. */
-			fb_mul(t2, t1, t6);
-			/* x3 = A * (D + H) + B * (C + G). */
-			fb_mul(r->x, t1, t3);
-			fb_add(r->x, r->x, t4);
-
-			/* t7 = F * G. */
-			fb_mul(t7, t7, t5);
-			/* Y3 = (A * J + F * G) * F + (J + z3) * x3. */
-			fb_add(r->y, t2, t7);
-			fb_mul(r->y, r->y, t5);
-			/* t7 = (J + z3) * x3. */
-			fb_add(t7, t6, r->z);
-			fb_mul(t7, t7, r->x);
-			fb_add(r->y, r->y, t7);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-		fb_free(t2);
-		fb_free(t3);
-		fb_free(t4);
-		fb_free(t5);
-		fb_free(t6);
-		fb_free(t7);
-	}
-#endif
-}
-
-#endif /* EB_ADD == PROJC */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_ADD == BASIC || !defined(STRIP)
-
-void eb_add_basic(eb_t r, const eb_t p, const eb_t q) {
-	if (eb_is_infty(p)) {
-		eb_copy(r, q);
-		return;
-	}
-
-	if (eb_is_infty(q)) {
-		eb_copy(r, p);
-		return;
-	}
-
-	eb_add_basic_imp(r, p, q);
-}
-
-void eb_sub_basic(eb_t r, const eb_t p, const eb_t q) {
-	eb_t t;
-
-	eb_null(t);
-
-	if (p == q) {
-		eb_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		eb_new(t);
-
-		eb_neg_basic(t, q);
-		eb_add_basic(r, p, t);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
-
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-void eb_add_projc(eb_t r, const eb_t p, const eb_t q) {
-	if (eb_is_infty(p)) {
-		eb_copy(r, q);
-		return;
-	}
-
-	if (eb_is_infty(q)) {
-		eb_copy(r, p);
-		return;
-	}
-
-	eb_add_projc_imp(r, p, q);
-}
-
-void eb_sub_projc(eb_t r, const eb_t p, const eb_t q) {
-	eb_t t;
-
-	eb_null(t);
-
-	if (p == q) {
-		eb_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		eb_new(t);
-
-		eb_neg_projc(t, q);
-		eb_add_projc(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_cmp.c b/src/dashbls/depends/relic/src/eb/relic_eb_cmp.c
deleted file mode 100644
index 36cce5c98474..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_cmp.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary elliptic curve point comparison.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_eb.h"
-#include "relic_conf.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int eb_cmp(const eb_t p, const eb_t q) {
-    eb_t r, s;
-    int result = RLC_NE;
-
-	if (eb_is_infty(p) && eb_is_infty(q)) {
-		return RLC_EQ;
-	}
-
-    eb_null(r);
-    eb_null(s);
-
-    RLC_TRY {
-        eb_new(r);
-        eb_new(s);
-
-        if ((p->coord == PROJC) && (q->coord == PROJC)) {
-            /* If the two points are not normalized, it is faster to compare
-             * x1 * z2 == x2 * z1 and y1 * z2^2 == y2 * z1^2. */
-            fb_mul(r->x, p->x, q->z);
-            fb_mul(s->x, q->x, p->z);
-            fb_sqr(r->z, p->z);
-            fb_sqr(s->z, q->z);
-            fb_mul(r->y, p->y, s->z);
-            fb_mul(s->y, q->y, r->z);
-        } else {
-            if (p->coord == BASIC) {
-                eb_copy(r, p);
-            } else {
-                eb_norm(r, p);
-            }
-
-            if (q->coord == BASIC) {
-                eb_copy(s, q);
-            } else {
-                eb_norm(s, q);
-            }
-        }
-
-        if ((fb_cmp(r->x, s->x) == RLC_EQ) && (fb_cmp(r->y, s->y) == RLC_EQ)) {
-            result = RLC_EQ;
-        }
-    } RLC_CATCH_ANY {
-        RLC_THROW(ERR_CAUGHT);
-    } RLC_FINALLY {
-        eb_free(r);
-        eb_free(s);
-    }
-
-    return result;
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_curve.c b/src/dashbls/depends/relic/src/eb/relic_eb_curve.c
deleted file mode 100644
index 9d829d824b1f..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_curve.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary elliptic curve utilities.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_eb.h"
-#include "relic_conf.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Detects an optimization based on the curve coefficients.
- *
- * @param opt		- the resulting optimization.
- * @param a			- the curve coefficient.
- */
-static void detect_opt(int *opt, fb_t a) {
-	if (fb_is_zero(a)) {
-		*opt = RLC_ZERO;
-	} else {
-		if (fb_cmp_dig(a, 1) == RLC_EQ) {
-			*opt = RLC_ONE;
-		} else {
-			if (fb_bits(a) <= RLC_DIG) {
-				*opt = RLC_TINY;
-			} else {
-				*opt = RLC_HUGE;
-			}
-		}
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void eb_curve_init(void) {
-	ctx_t *ctx = core_get();
-#ifdef EB_PRECO
-	for (int i = 0; i < RLC_EB_TABLE; i++) {
-		ctx->eb_ptr[i] = &(ctx->eb_pre[i]);
-	}
-#endif
-	fb_zero(ctx->eb_g.x);
-	fb_zero(ctx->eb_g.y);
-	fb_zero(ctx->eb_g.z);
-	bn_make(&(ctx->eb_r), RLC_FB_DIGS);
-	bn_make(&(ctx->eb_h), RLC_FB_DIGS);
-}
-
-void eb_curve_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		bn_clean(&(ctx->eb_r));
-		bn_clean(&(ctx->eb_h));
-	}
-}
-
-dig_t *eb_curve_get_a(void) {
-	return core_get()->eb_a;
-}
-
-int eb_curve_opt_a(void) {
-	return core_get()->eb_opt_a;
-}
-
-dig_t *eb_curve_get_b(void) {
-	return core_get()->eb_b;
-}
-
-int eb_curve_opt_b(void) {
-	return core_get()->eb_opt_b;
-}
-
-int eb_curve_is_kbltz(void) {
-	return core_get()->eb_is_kbltz;
-}
-
-void eb_curve_get_gen(eb_t g) {
-	eb_copy(g, &(core_get()->eb_g));
-}
-
-void eb_curve_get_ord(bn_t n) {
-	bn_copy(n, &(core_get()->eb_r));
-}
-
-void eb_curve_get_cof(bn_t h) {
-	bn_copy(h, &(core_get()->eb_h));
-}
-
-const eb_t *eb_curve_get_tab(void) {
-#if defined(EB_PRECO)
-
-	/* Return a meaningful pointer. */
-#if ALLOC == AUTO
-	return (const eb_t *)*(core_get()->eb_ptr);
-#else
-	return (const eb_t *)core_get()->eb_ptr;
-#endif
-
-#else
-	/* Return a null pointer. */
-	return NULL;
-#endif
-}
-
-void eb_curve_set(const fb_t a, const fb_t b, const eb_t g, const bn_t r,
-		const bn_t h) {
-	ctx_t *ctx = core_get();
-	fb_copy(ctx->eb_a, a);
-	fb_copy(ctx->eb_b, b);
-
-	detect_opt(&(ctx->eb_opt_a), ctx->eb_a);
-	detect_opt(&(ctx->eb_opt_b), ctx->eb_b);
-
-	if (fb_cmp_dig(ctx->eb_b, 1) == RLC_EQ) {
-		ctx->eb_is_kbltz = 1;
-	} else {
-		ctx->eb_is_kbltz = 0;
-	}
-
-	eb_norm(&(ctx->eb_g), g);
-	bn_copy(&(ctx->eb_r), r);
-	bn_copy(&(ctx->eb_h), h);
-
-#if defined(EB_PRECO)
-	eb_mul_pre((eb_t *)eb_curve_get_tab(), &(ctx->eb_g));
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_dbl.c b/src/dashbls/depends/relic/src/eb/relic_eb_dbl.c
deleted file mode 100644
index 58fc4e08cc37..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_dbl.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point doubling on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_ADD == BASIC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary binary
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the point to double.
- */
-static void eb_dbl_basic_imp(eb_t r, const eb_t p) {
-	fb_t t0, t1, t2;
-
-	fb_null(t0);
-	fb_null(t1);
-	fb_null(t2);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-		fb_new(t2);
-
-		/* t0 = 1/x1. */
-		fb_inv(t0, p->x);
-		/* t0 = y1/x1. */
-		fb_mul(t0, t0, p->y);
-		/* t0 = lambda = x1 + y1/x1. */
-		fb_add(t0, t0, p->x);
-		/* t1 = lambda^2. */
-		fb_sqr(t1, t0);
-		/* t2 = lambda^2 + lambda. */
-		fb_add(t2, t1, t0);
-
-		/* t2 = lambda^2 + lambda + a2. */
-		switch (eb_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fb_add_dig(t2, t2, (dig_t)1);
-				break;
-			case RLC_TINY:
-				fb_add_dig(t2, t2, eb_curve_get_a()[0]);
-				break;
-			default:
-				fb_add(t2, t2, eb_curve_get_a());
-				break;
-		}
-
-		/* t1 = x1 + x3. */
-		fb_add(t1, t2, p->x);
-
-		/* t1 = lambda * (x1 + x3). */
-		fb_mul(t1, t0, t1);
-
-		fb_copy(r->x, t2);
-		/* y3 = lambda * (x1 + x3) + x3 + y1. */
-		fb_add(t1, t1, r->x);
-		fb_add(r->y, t1, p->y);
-
-		fb_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-		fb_free(t2);
-	}
-}
-
-#endif /* EB_ADD == BASIC */
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-/**
- * Doubles a point represented in projective coordinates on an ordinary binary
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the point to double.
- */
-static void eb_dbl_projc_imp(eb_t r, const eb_t p) {
-	fb_t t0, t1;
-
-	fb_null(t0);
-	fb_null(t1);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-
-		/* t0 = B = x1^2. */
-		fb_sqr(t0, p->x);
-		/* C = B + y1. */
-		fb_add(r->y, t0, p->y);
-
-		if (p->coord != BASIC) {
-			/* A = x1 * z1. */
-			fb_mul(t1, p->x, p->z);
-			/* z3 = A^2. */
-			fb_sqr(r->z, t1);
-		} else {
-			/* if z1 = 1, A = x1. */
-			fb_copy(t1, p->x);
-			/* if z1 = 1, z3 = x1^2. */
-			fb_copy(r->z, t0);
-		}
-
-		/* t1 = D = A * C. */
-		fb_mul(t1, t1, r->y);
-
-		/* C^2 + D. */
-		fb_sqr(r->y, r->y);
-		fb_add(r->x, t1, r->y);
-
-		/* C^2 + D + a2 * z3. */
-		switch (eb_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fb_add(r->x, r->z, r->x);
-				break;
-			case RLC_TINY:
-				fb_mul_dig(r->y, r->z, eb_curve_get_a()[0]);
-				fb_add(r->x, r->y, r->x);
-				break;
-			default:
-				fb_mul(r->y, r->z, eb_curve_get_a());
-				fb_add(r->x, r->y, r->x);
-				break;
-		}
-
-		/* t1 = (D + z3). */
-		fb_add(t1, t1, r->z);
-		/* t0 = B^2. */
-		fb_sqr(t0, t0);
-		/* t0 = B^2 * z3. */
-		fb_mul(t0, t0, r->z);
-		/* y3 = (D + z3) * r3 + B^2 * z3. */
-		fb_mul(r->y, t1, r->x);
-		fb_add(r->y, r->y, t0);
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-	}
-}
-
-#endif /* EB_ADD == PROJC */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_ADD == BASIC || !defined(STRIP)
-
-void eb_dbl_basic(eb_t r, const eb_t p) {
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	eb_dbl_basic_imp(r, p);
-}
-
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-void eb_dbl_projc(eb_t r, const eb_t p) {
-
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	eb_dbl_projc_imp(r, p);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_frb.c b/src/dashbls/depends/relic/src/eb/relic_eb_frb.c
deleted file mode 100644
index eb8a6b33c2d0..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_frb.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Frobenius map on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if defined(EB_KBLTZ)
-
-void eb_frb(eb_t r, const eb_t p) {
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	fb_sqr(r->x, p->x);
-	fb_sqr(r->y, p->y);
-	if (p->coord != BASIC) {
-		fb_sqr(r->z, p->z);
-	} else {
-		fb_set_dig(r->z, 1);
-	}
-
-	r->coord = p->coord;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_hlv.c b/src/dashbls/depends/relic/src/eb/relic_eb_hlv.c
deleted file mode 100644
index b686a1215c00..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_hlv.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point doubling on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void eb_hlv(eb_t r, const eb_t p) {
-	fb_t l, t;
-
-	fb_null(l);
-	fb_null(t);
-
-	RLC_TRY {
-		fb_new(l);
-		fb_new(t);
-
-		/* Solve l^2 + l = u + a. */
-		switch (eb_curve_opt_a()) {
-			case RLC_ZERO:
-				fb_copy(t, p->x);
-				break;
-			case RLC_ONE:
-				fb_add_dig(t, p->x, (dig_t)1);
-				break;
-			case RLC_TINY:
-				fb_add_dig(t, p->x, eb_curve_get_a()[0]);
-				break;
-			default:
-				fb_add(t, p->x, eb_curve_get_a());
-				break;
-		}
-
-		fb_slv(l, t);
-
-		if (p->coord == BASIC) {
-			/* Compute t = v + u * lambda. */
-			fb_mul(t, l, p->x);
-			fb_add(t, t, p->y);
-		} else {
-			/* Compute t = u * (u + lambda_P + lambda). */
-			fb_add(t, l, p->y);
-			fb_add(t, t, p->x);
-			fb_mul(t, t, p->x);
-		}
-
-		/* If Tr(t) = 0 then lambda_P = lambda, u = sqrt(t + u). */
-		if (fb_trc(t) == 0) {
-			fb_copy(r->y, l);
-			fb_add(t, t, p->x);
-			fb_srt(r->x, t);
-		} else {
-			/* Else lambda_P = lambda + 1, u = sqrt(t). */
-			fb_add_dig(r->y, l, 1);
-			fb_srt(r->x, t);
-		}
-		fb_set_dig(r->z, 1);
-		r->coord = HALVE;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(l);
-		fb_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_map.c b/src/dashbls/depends/relic/src/eb/relic_eb_map.c
deleted file mode 100644
index 73116a78be8d..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_map.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of hashing to a binary elliptic curve.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void eb_map(eb_t p, const uint8_t *msg, int len) {
-	bn_t k;
-	fb_t t0, t1;
-	int i;
-	uint8_t digest[RLC_MD_LEN];
-
-	bn_null(k);
-	fb_null(t0);
-	fb_null(t1);
-
-	RLC_TRY {
-		bn_new(k);
-		fb_new(t0);
-		fb_new(t1);
-
-		md_map(digest, msg, len);
-		bn_read_bin(k, digest, RLC_MIN(RLC_FB_BYTES, RLC_MD_LEN));
-		fb_set_dig(p->z, 1);
-
-		i = 0;
-		while (1) {
-			bn_add_dig(k, k, 1);
-			bn_mod_2b(k, k, RLC_FB_BITS);
-			dv_copy(p->x, k->dp, RLC_FB_DIGS);
-
-			eb_rhs(t1, p);
-
-			/* t0 = 1/x1^2. */
-			fb_sqr(t0, p->x);
-			fb_inv(t0, t0);
-			/* t0 = t1/x1^2. */
-			fb_mul(t0, t0, t1);
-			/* Solve t1^2 + t1 = t0. */
-			if (fb_trc(t0) != 0) {
-				i++;
-			} else {
-				fb_slv(t1, t0);
-				/* x3 = x1, y3 = t1 * x1, z3 = 1. */
-				fb_mul(p->y, t1, p->x);
-				fb_set_dig(p->z, 1);
-
-				p->coord = BASIC;
-				break;
-			}
-		}
-		/* Now, multiply by cofactor to get the correct group. */
-		eb_curve_get_cof(k);
-		if (bn_bits(k) < RLC_DIG) {
-			eb_mul_dig(p, p, k->dp[0]);
-		} else {
-			eb_mul(p, p, k);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		fb_free(t0);
-		fb_free(t1);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_mul.c b/src/dashbls/depends/relic/src/eb/relic_eb_mul.c
deleted file mode 100644
index cd3cdb02ced2..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_mul.c
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point multiplication on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_MUL == LWNAF || !defined(STRIP)
-
-#if defined(EB_KBLTZ)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-TNAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void eb_mul_ltnaf_imp(eb_t r, const eb_t p, const bn_t k) {
-	int i, l, n;
-	int8_t tnaf[RLC_FB_BITS + 8], u;
-	eb_t t[1 << (EB_WIDTH - 2)];
-
-	if (eb_curve_opt_a() == RLC_ZERO) {
-		u = -1;
-	} else {
-		u = 1;
-	}
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		eb_tab(t, p, EB_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		l = sizeof(tnaf);
-		bn_rec_tnaf(tnaf, &l, k, u, RLC_FB_BITS, EB_WIDTH);
-
-		n = tnaf[l - 1];
-		if (n > 0) {
-			eb_copy(r, t[n / 2]);
-		} else {
-			eb_neg(r, t[-n / 2]);
-		}
-
-		for (i = l - 2; i >= 0; i--) {
-			eb_frb(r, r);
-
-			n = tnaf[i];
-			if (n > 0) {
-				eb_add(r, r, t[n / 2]);
-			}
-			if (n < 0) {
-				eb_sub(r, r, t[-n / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-#if defined(EB_PLAIN)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the
- * left-to-right w-NAF method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void eb_mul_lnaf_imp(eb_t r, const eb_t p, const bn_t k) {
-	int i, l, n;
-	int8_t naf[RLC_FB_BITS + 1];
-	eb_t t[1 << (EB_WIDTH - 2)];
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-			eb_set_infty(t[i]);
-			fb_set_dig(t[i]->z, 1);
-			t[i]->coord = BASIC;
-		}
-
-		/* Compute the precomputation table. */
-		eb_tab(t, p, EB_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, k, EB_WIDTH);
-
-		n = naf[l - 1];
-		if (n > 0) {
-			eb_copy(r, t[n / 2]);
-		}
-
-		for (i = l - 2; i >= 0; i--) {
-			eb_dbl(r, r);
-
-			n = naf[i];
-			if (n > 0) {
-				eb_add(r, r, t[n / 2]);
-			}
-			if (n < 0) {
-				eb_sub(r, r, t[-n / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-
-#endif /* EB_PLAIN */
-#endif /* EB_MUL == LWNAF */
-
-#if EB_MUL == RWNAF || !defined(STRIP)
-
-#if defined(EB_KBLTZ)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-TNAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void eb_mul_rtnaf_imp(eb_t r, const eb_t p, const bn_t k) {
-	int i, l, n;
-	int8_t tnaf[RLC_FB_BITS + 8], u;
-	eb_t t[1 << (EB_WIDTH - 2)];
-
-	if (eb_curve_opt_a() == RLC_ZERO) {
-		u = -1;
-	} else {
-		u = 1;
-	}
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-			eb_set_infty(t[i]);
-		}
-
-		/* Compute the w-TNAF representation of k. */
-		l = sizeof(tnaf);
-		bn_rec_tnaf(tnaf, &l, k, u, RLC_FB_BITS, EB_WIDTH);
-
-		eb_copy(r, p);
-		for (i = 0; i < l; i++) {
-			n = tnaf[i];
-			if (n > 0) {
-				eb_add(t[n / 2], t[n / 2], r);
-			}
-			if (n < 0) {
-				eb_sub(t[-n / 2], t[-n / 2], r);
-			}
-
-			/* We can avoid a function call here. */
-			fb_sqr(r->x, r->x);
-			fb_sqr(r->y, r->y);
-		}
-
-		eb_copy(r, t[0]);
-
-#if defined(EB_MIXED) && defined(STRIP) && (EB_WIDTH > 2)
-		eb_norm_sim(t + 1, (const eb_t *)t + 1, (1 << (EB_WIDTH - 2)) - 1);
-#endif
-
-#if EB_WIDTH == 3
-		eb_frb(t[0], t[1]);
-		if (u == 1) {
-			eb_sub(t[1], t[1], t[0]);
-		} else {
-			eb_add(t[1], t[1], t[0]);
-		}
-#endif
-
-#if EB_WIDTH == 4
-		eb_frb(t[0], t[3]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-
-		if (u == 1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_sub(t[3], t[0], t[3]);
-
-		eb_frb(t[0], t[1]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[1], t[0], t[1]);
-
-		eb_frb(t[0], t[2]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[2], t[0], t[2]);
-#endif
-
-#if EB_WIDTH == 5
-		eb_frb(t[0], t[3]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == 1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_sub(t[3], t[0], t[3]);
-
-		eb_frb(t[0], t[1]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[1], t[0], t[1]);
-
-		eb_frb(t[0], t[2]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[2], t[0], t[2]);
-
-		eb_frb(t[0], t[4]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[4]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == 1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[4], t[0], t[4]);
-
-		eb_frb(t[0], t[5]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[5]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_neg(t[0], t[0]);
-		eb_sub(t[5], t[0], t[5]);
-
-		eb_frb(t[0], t[6]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[6]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_neg(t[0], t[0]);
-		eb_add(t[6], t[0], t[6]);
-
-		eb_frb(t[0], t[7]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[7], t[0], t[7]);
-#endif
-
-#if EB_WIDTH == 6
-		eb_frb(t[0], t[1]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[0], t[0], t[1]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[1], t[0], t[1]);
-
-		eb_frb(t[0], t[2]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[0], t[0], t[2]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[2], t[0], t[2]);
-
-		eb_frb(t[0], t[3]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[3]);
-		eb_neg(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_sub(t[3], t[0], t[3]);
-
-		eb_frb(t[0], t[4]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[4]);
-		eb_neg(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[4], t[0], t[4]);
-
-		eb_frb(t[0], t[5]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[5]);
-		eb_neg(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[5], t[0], t[5]);
-
-		eb_frb(t[0], t[6]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[6]);
-		eb_neg(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[6], t[0], t[6]);
-
-		eb_frb(t[0], t[7]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[7], t[0], t[7]);
-
-		eb_frb(t[0], t[8]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[8], t[0], t[8]);
-
-		eb_frb(t[0], t[9]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[0], t[0], t[9]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_sub(t[0], t[0], t[9]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[9]);
-		eb_neg(t[9], t[0]);
-
-		eb_frb(t[0], t[10]);
-		eb_frb(t[0], t[0]);
-		eb_neg(t[0], t[0]);
-		eb_add(t[0], t[0], t[10]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[10], t[0], t[10]);
-
-		eb_frb(t[0], t[11]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_sub(t[11], t[0], t[11]);
-
-		eb_frb(t[0], t[12]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_add(t[12], t[0], t[12]);
-
-		eb_frb(t[0], t[13]);
-		eb_frb(t[0], t[0]);
-		eb_add(t[0], t[0], t[13]);
-		eb_neg(t[13], t[0]);
-
-		eb_frb(t[0], t[14]);
-		eb_frb(t[0], t[0]);
-		eb_neg(t[0], t[0]);
-		eb_add(t[14], t[0], t[14]);
-
-		eb_frb(t[0], t[15]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		eb_frb(t[0], t[0]);
-		if (u == -1) {
-			eb_neg(t[0], t[0]);
-		}
-		eb_sub(t[15], t[0], t[15]);
-#endif
-
-#if defined(EB_MIXED) && defined(STRIP) && (EB_WIDTH > 2)
-		eb_norm_sim(t + 1, (const eb_t *)t + 1, (1 << (EB_WIDTH - 2)) - 1);
-#endif
-
-		/* Add accumulators */
-		for (i = 1; i < (1 << (EB_WIDTH - 2)); i++) {
-			if (r->coord == BASIC) {
-				eb_add(r, t[i], r);
-			} else {
-				eb_add(r, r, t[i]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-
-#endif /* EB_KBLTZ */
-
-#if defined(EB_PLAIN)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the
- * right-to-left w-NAF method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void eb_mul_rnaf_imp(eb_t r, const eb_t p, const bn_t k) {
-	int i, l, n;
-	int8_t naf[RLC_FB_BITS + 1];
-	eb_t t[1 << (EB_WIDTH - 2)];
-
-	RLC_TRY {
-		/* Prepare the accumulator table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-			eb_set_infty(t[i]);
-		}
-
-		/* Compute the w-NAF representation of k. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, k, EB_WIDTH);
-
-		eb_copy(r, p);
-		for (i = 0; i < l; i++) {
-			n = naf[i];
-			if (n > 0) {
-				eb_add(t[n / 2], t[n / 2], r);
-			}
-			if (n < 0) {
-				eb_sub(t[-n / 2], t[-n / 2], r);
-			}
-
-			eb_dbl(r, r);
-		}
-
-		eb_copy(r, t[0]);
-
-#if EB_WIDTH >= 3
-		/* Compute 3 * T[1]. */
-		eb_dbl(t[0], t[1]);
-		eb_add(t[1], t[0], t[1]);
-#endif
-#if EB_WIDTH >= 4
-		/* Compute 5 * T[2]. */
-		eb_dbl(t[0], t[2]);
-		eb_dbl(t[0], t[0]);
-		eb_add(t[2], t[0], t[2]);
-
-		/* Compute 7 * T[3]. */
-		eb_dbl(t[0], t[3]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_sub(t[3], t[0], t[3]);
-#endif
-#if EB_WIDTH >= 5
-		/* Compute 9 * T[4]. */
-		eb_dbl(t[0], t[4]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_add(t[4], t[0], t[4]);
-
-		/* Compute 11 * T[5]. */
-		eb_dbl(t[0], t[5]);
-		eb_dbl(t[0], t[0]);
-		eb_add(t[0], t[0], t[5]);
-		eb_dbl(t[0], t[0]);
-		eb_add(t[5], t[0], t[5]);
-
-		/* Compute 13 * T[6]. */
-		eb_dbl(t[0], t[6]);
-		eb_add(t[0], t[0], t[6]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_add(t[6], t[0], t[6]);
-
-		/* Compute 15 * T[7]. */
-		eb_dbl(t[0], t[7]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_sub(t[7], t[0], t[7]);
-#endif
-#if EB_WIDTH == 6
-		for (i = 8; i < 15; i++) {
-			eb_mul_dig(t[i], t[i], 2 * i + 1);
-		}
-		eb_dbl(t[0], t[15]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_dbl(t[0], t[0]);
-		eb_sub(t[15], t[0], t[15]);
-#endif
-
-		/* Add accumulators */
-		for (i = 1; i < (1 << (EB_WIDTH - 2)); i++) {
-			if (r->coord == BASIC) {
-				eb_add(r, t[i], r);
-			} else {
-				eb_add(r, r, t[i]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the accumulator table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-
-#endif /* EB_PLAIN */
-#endif /* EB_MUL == RWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_MUL == BASIC || !defined(STRIP)
-
-void eb_mul_basic(eb_t r, const eb_t p, const bn_t k) {
-	eb_t t;
-
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	eb_null(t);
-
-	RLC_TRY {
-		eb_new(t);
-
-		eb_copy(t, p);
-		for (int i = bn_bits(k) - 2; i >= 0; i--) {
-			eb_dbl(t, t);
-			if (bn_get_bit(k, i)) {
-				eb_add(t, t, p);
-			}
-		}
-
-		eb_norm(r, t);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
-
-#endif
-
-#if EB_MUL == LODAH || !defined(STRIP)
-
-void eb_mul_lodah(eb_t r, const eb_t p, const bn_t k) {
-	int bits, i, j;
-	dv_t x1, z1, x2, z2, r1, r2, r3, r4, r5;
-	const dig_t *b;
-	bn_t t, n;
-
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(t);
-	dv_null(x1);
-	dv_null(z1);
-	dv_null(x2);
-	dv_null(z2);
-	dv_null(r1);
-	dv_null(r2);
-	dv_null(r3);
-	dv_null(r4);
-	dv_null(r5);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(t);
-		dv_new(x1);
-		dv_new(z1);
-		dv_new(x2);
-		dv_new(z2);
-		dv_new(r1);
-		dv_new(r2);
-		dv_new(r3);
-		dv_new(r4);
-		dv_new(r5);
-
-		fb_sqr(z2, p->x);
-		fb_sqr(x2, z2);
-		dv_zero(r5, 2 * RLC_FB_DIGS);
-
-		b = eb_curve_get_b();
-		eb_curve_get_ord(n);
-		bits = bn_bits(n);
-
-		bn_abs(t, k);
-		bn_add(t, t, n);
-		bn_add(n, t, n);
-		dv_swap_cond(t->dp, n->dp, RLC_MAX(t->used, n->used),
-			bn_get_bit(t, bits) == 0);
-		t->used = RLC_SEL(t->used, n->used, bn_get_bit(t, bits) == 0);
-
-		switch (eb_curve_opt_b()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fb_add_dig(x2, x2, (dig_t)1);
-				break;
-			case RLC_TINY:
-				fb_add_dig(x2, x2, b[0]);
-				break;
-			default:
-				fb_addn_low(x2, x2, b);
-				break;
-		}
-
-		/* Blind both points independently. */
-		fb_rand(z1);
-		fb_mul(x1, z1, p->x);
-		fb_rand(r1);
-		fb_mul(z2, z2, r1);
-		fb_mul(x2, x2, r1);
-
-		for (i = bits - 1; i >= 0; i--) {
-			j = bn_get_bit(t, i);
-			fb_mul(r1, x1, z2);
-			fb_mul(r2, x2, z1);
-			fb_add(r3, r1, r2);
-			fb_muln_low(r4, r1, r2);
-			dv_swap_cond(x1, x2, RLC_FB_DIGS, j ^ 1);
-			dv_swap_cond(z1, z2, RLC_FB_DIGS, j ^ 1);
-			fb_sqr(z1, r3);
-			fb_muln_low(r1, z1, p->x);
-			fb_addd_low(x1, r1, r4, 2 * RLC_FB_DIGS);
-			fb_rdcn_low(x1, x1);
-			fb_sqr(r1, z2);
-			fb_sqr(r2, x2);
-			fb_mul(z2, r1, r2);
-			switch (eb_curve_opt_b()) {
-				case RLC_ZERO:
-					fb_sqr(x2, r2);
-					break;
-				case RLC_ONE:
-					fb_add(r1, r1, r2);
-					fb_sqr(x2, r1);
-					break;
-				case RLC_TINY:
-					fb_sqr(r1, r1);
-					fb_sqrl_low(x2, r2);
-					fb_mul1_low(r5, r1, b[0]);
-					fb_addd_low(x2, x2, r5, RLC_FB_DIGS + 1);
-					fb_rdcn_low(x2, x2);
-					break;
-				default:
-					fb_sqr(r1, r1);
-					fb_sqrl_low(x2, r2);
-					fb_muln_low(r5, r1, b);
-					fb_addd_low(x2, x2, r5, 2 * RLC_FB_DIGS);
-					fb_rdcn_low(x2, x2);
-					break;
-			}
-			dv_swap_cond(x1, x2, RLC_FB_DIGS, j ^ 1);
-			dv_swap_cond(z1, z2, RLC_FB_DIGS, j ^ 1);
-		}
-
-		if (fb_is_zero(z1)) {
-			/* The point q is at infinity. */
-			eb_set_infty(r);
-		} else {
-			if (fb_is_zero(z2)) {
-				fb_copy(r->x, p->x);
-				fb_add(r->y, p->x, p->y);
-				fb_set_dig(r->z, 1);
-			} else {
-				/* r3 = z1 * z2. */
-				fb_mul(r3, z1, z2);
-				/* z1 = (x1 + x * z1). */
-				fb_mul(z1, z1, p->x);
-				fb_add(z1, z1, x1);
-				/* z2 = x * z2. */
-				fb_mul(z2, z2, p->x);
-				/* x1 = x1 * z2. */
-				fb_mul(x1, x1, z2);
-				/* z2 = (x2 + x * z2)(x1 + x * z1). */
-				fb_add(z2, z2, x2);
-				fb_mul(z2, z2, z1);
-
-				/* r4 = (x^2 + y) * z1 * z2 + (x2 + x * z2)(x1 + x * z1). */
-				fb_sqr(r4, p->x);
-				fb_add(r4, r4, p->y);
-				fb_mul(r4, r4, r3);
-				fb_add(r4, r4, z2);
-
-				/* r3 = (z1 * z2 * x)^{-1}. */
-				fb_mul(r3, r3, p->x);
-				fb_inv(r3, r3);
-				/* r4 = (x^2 + y) * z1 * z2 + (x2 + x * z2)(x1 + x * z1) * r3. */
-				fb_mul(r4, r4, r3);
-				/* x2 = x1 * x * z2 * (z1 * z2 * x)^{-1} = x1/z1. */
-				fb_mul(x2, x1, r3);
-				/* z2 = x + x1/z1. */
-				fb_add(z2, x2, p->x);
-
-				/* z2 = z2 * r4 + y. */
-				fb_mul(z2, z2, r4);
-				fb_add(z2, z2, p->y);
-
-				fb_copy(r->x, x2);
-				fb_copy(r->y, z2);
-				fb_set_dig(r->z, 1);
-			}
-		}
-
-		r->coord = BASIC;
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(t);
-		dv_free(x1);
-		dv_free(z1);
-		dv_free(x2);
-		dv_free(z2);
-		dv_free(r1);
-		dv_free(r2);
-		dv_free(r3);
-		dv_free(r4);
-		dv_free(r5);
-	}
-}
-
-#endif /* EB_MUL == LODAH */
-
-#if EB_MUL == LWNAF || !defined(STRIP)
-
-void eb_mul_lwnaf(eb_t r, const eb_t p, const bn_t k) {
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		eb_mul_ltnaf_imp(r, p, k);
-		return;
-	}
-#endif
-
-#if defined(EB_PLAIN)
-	eb_mul_lnaf_imp(r, p, k);
-#endif
-}
-
-#endif
-
-#if EB_MUL == RWNAF || !defined(STRIP)
-
-void eb_mul_rwnaf(eb_t r, const eb_t p, const bn_t k) {
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		eb_mul_rtnaf_imp(r, p, k);
-		return;
-	}
-#endif
-
-#if defined(EB_PLAIN)
-#if defined(EB_MIXED) && defined(STRIP)
-	/* It is impossible to run a right-to-left algorithm using ordinary curves
-	 * and only mixed additions. */
-	RLC_THROW(ERR_NO_CONFIG);
-#else
-	eb_mul_rnaf_imp(r, p, k);
-#endif
-#endif
-}
-
-#endif
-
-#if EB_MUL == HALVE || !defined(STRIP)
-
-void eb_mul_halve(eb_t r, const eb_t p, const bn_t k) {
-	int i, j, l, trc, cof;
-	int8_t naf[RLC_FB_BITS + 1], *_k;
-	eb_t q, s, t[1 << (EB_WIDTH - 2)];
-	bn_t n, m;
-	fb_t u, v, w, z;
-
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	bn_null(m);
-	bn_null(n);
-	eb_null(q);
-	eb_null(s);
-	for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-		eb_null(t[i]);
-	}
-	fb_null(u);
-	fb_null(v);
-	fb_null(w);
-	fb_null(z);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(m);
-		eb_new(q);
-		eb_new(s);
-		fb_new(u);
-		fb_new(v);
-		fb_new(w);
-		fb_new(z);
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_new(t[i]);
-			eb_set_infty(t[i]);
-		}
-
-		/* Convert k to alternate representation k' = (2^{t-1}k mod n). */
-		eb_curve_get_ord(n);
-		bn_lsh(m, k, bn_bits(n) - 1);
-		bn_mod(m, m, n);
-
-		/* Compute the w-NAF representation of k'. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, m, EB_WIDTH);
-
-		if (naf[bn_bits(n)] == 1) {
-			eb_dbl(t[0], p);
-		}
-		l = bn_bits(n);
-		_k = naf + l - 1;
-
-		eb_copy(q, p);
-		eb_curve_get_cof(n);
-
-		/* Test if curve has a cofactor bigger than 2. */
-		if (bn_cmp_dig(n, 2) == RLC_GT) {
-			cof = 1;
-		} else {
-			cof = 0;
-		}
-
-		trc = fb_trc(eb_curve_get_a());
-
-		if (cof) {
-			/* Curves with cofactor > 2, u = sqrt(a), v = Solve(u). */
-			fb_srt(u, eb_curve_get_a());
-			fb_slv(v, u);
-
-			bn_rand(n, RLC_POS, l);
-
-			for (i = l - 1; i >= 0; i--, _k--) {
-				j = *_k;
-				if (j > 0) {
-					eb_norm(s, q);
-					eb_add(t[j / 2], t[j / 2], s);
-				}
-				if (j < 0) {
-					eb_norm(s, q);
-					eb_sub(t[-j / 2], t[-j / 2], s);
-				}
-
-				/* T = 1/2(Q). */
-				eb_hlv(s, q);
-
-				/* If Tr(x_T) != Tr(a). */
-				if (fb_trc(s->x) != 0) {
-					/* z = l_t, w = sqrt(l_Q), l_T = l_T + sqrt(l_Q) + v. */
-					fb_copy(z, s->y);
-					fb_srt(w, q->y);
-					fb_add(s->y, s->y, w);
-					fb_add(s->y, s->y, v);
-					/* z = (z + x_Q + v + sqrt(a)). */
-					fb_add(z, z, q->x);
-					fb_add(z, z, v);
-					fb_add(z, z, u);
-					/* w = sqrt(w + x_Q + l_Q + sqrt(a)). */
-					fb_add(w, w, q->x);
-					fb_add(w, w, q->y);
-					fb_add(w, w, u);
-					/* x_T = sqrt(w * z), . */
-					fb_mul(w, w, z);
-					fb_srt(s->x, w);
-					fb_set_dig(s->z, 1);
-					s->coord = HALVE;
-				}
-				eb_copy(q, s);
-			}
-		} else {
-			for (i = l - 1; i >= 0; i--, _k--) {
-				j = *_k;
-				if (j > 0) {
-					eb_norm(q, q);
-					eb_add(t[j / 2], t[j / 2], q);
-				}
-				if (j < 0) {
-					eb_norm(q, q);
-					eb_sub(t[-j / 2], t[-j / 2], q);
-				}
-				eb_hlv(q, q);
-			}
-		}
-
-#if EB_WIDTH == 2
-		eb_norm(r, t[0]);
-#else
-		/* Compute Q_i = Q_i + Q_{i+2} for i from 2^{w-1}-3 to 1. */
-		for (i = (1 << (EB_WIDTH - 1)) - 3; i >= 1; i -= 2) {
-			eb_add(t[i / 2], t[i / 2], t[(i + 2) / 2]);
-		}
-		/* Compute R = Q_1 + 2 * sum_{i != 1}Q_i. */
-		eb_copy(r, t[1]);
-		for (i = 2; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_add(r, r, t[i]);
-		}
-		eb_dbl(r, r);
-		eb_add(r, r, t[0]);
-		eb_norm(r, r);
-#endif
-
-		/* We may need to fix an error of a 2-torsion point if the curve has a
-		 * 4-cofactor. */
-		if (cof) {
-			eb_hlv(s, r);
-			if (fb_trc(s->x) != trc) {
-				fb_zero(s->x);
-				fb_srt(s->y, eb_curve_get_b());
-				fb_set_dig(s->z, 1);
-				eb_add(r, r, s);
-				eb_norm(r, r);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t[i]);
-		}
-		bn_free(n);
-		bn_free(m);
-		eb_free(q);
-		eb_free(s);
-		fb_free(u);
-		fb_free(v);
-		fb_free(w);
-		fb_free(z);
-	}
-}
-
-#endif
-
-void eb_mul_gen(eb_t r, const bn_t k) {
-#ifdef EB_PRECO
-	eb_mul_fix(r, eb_curve_get_tab(), k);
-#else
-	eb_t g;
-
-	eb_null(g);
-
-	RLC_TRY {
-		eb_new(g);
-		eb_curve_get_gen(g);
-		eb_mul(r, g, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(g);
-	}
-#endif
-}
-
-void eb_mul_dig(eb_t r, const eb_t p, dig_t k) {
-	eb_t t;
-
-	if (k == 0 || eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	eb_null(t);
-
-	RLC_TRY {
-		eb_new(t);
-
-		eb_copy(t, p);
-		for (int i = util_bits_dig(k) - 2; i >= 0; i--) {
-			eb_dbl(t, t);
-			if (k & ((dig_t)1 << i)) {
-				eb_add(t, t, p);
-			}
-		}
-
-		eb_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_mul_fix.c b/src/dashbls/depends/relic/src/eb/relic_eb_mul_fix.c
deleted file mode 100644
index cf647ad94dec..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_mul_fix.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of fixed point multiplication on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_FIX == LWNAF || !defined(STRIP)
-
-#if defined(EB_KBLTZ)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-TNAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void eb_mul_fix_kbltz(eb_t r, const eb_t *t, const bn_t k) {
-	int i, l, n;
-	int8_t u, tnaf[RLC_FB_BITS + 8];
-
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	/* Compute the w-TNAF representation of k. */
-	if (eb_curve_opt_a() == RLC_ZERO) {
-		u = -1;
-	} else {
-		u = 1;
-	}
-
-	/* Compute the w-TNAF representation of k. */
-	l = sizeof(tnaf);
-	bn_rec_tnaf(tnaf, &l, k, u, RLC_FB_BITS, EB_DEPTH);
-
-	n = tnaf[l - 1];
-	if (n > 0) {
-		eb_copy(r, t[n / 2]);
-	} else {
-		eb_neg(r, t[-n / 2]);
-	}
-
-	for (i = l - 2; i >= 0; i--) {
-		eb_frb(r, r);
-
-		n = tnaf[i];
-		if (n > 0) {
-			eb_add(r, r, t[n / 2]);
-		}
-		if (n < 0) {
-			eb_sub(r, r, t[-n / 2]);
-		}
-	}
-	/* Convert r to affine coordinates. */
-	eb_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		eb_neg(r, r);
-	}
-}
-
-#endif /* EB_KBLTZ */
-
-#if defined(EB_PLAIN)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-NAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t				- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void eb_mul_fix_plain(eb_t r, const eb_t *t, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FB_BITS + 1];
-
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	/* Compute the w-TNAF representation of k. */
-	l = RLC_FB_BITS + 1;
-	bn_rec_naf(naf, &l, k, EB_DEPTH);
-
-	n = naf[l - 1];
-	if (n > 0) {
-		eb_copy(r, t[n / 2]);
-	}
-
-	for (i = l - 2; i >= 0; i--) {
-		eb_dbl(r, r);
-
-		n = naf[i];
-		if (n > 0) {
-			eb_add(r, r, t[n / 2]);
-		}
-		if (n < 0) {
-			eb_sub(r, r, t[-n / 2]);
-		}
-	}
-	/* Convert r to affine coordinates. */
-	eb_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		eb_neg(r, r);
-	}
-}
-
-#endif /* EB_PLAIN */
-
-#endif /* EB_FIX == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_FIX == BASIC || !defined(STRIP)
-
-void eb_mul_pre_basic(eb_t *t, const eb_t p) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-
-		eb_copy(t[0], p);
-		for (int i = 1; i < bn_bits(n); i++) {
-			eb_dbl(t[i], t[i - 1]);
-		}
-
-		eb_norm_sim(t + 1, (const eb_t *)t + 1, bn_bits(n) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void eb_mul_fix_basic(eb_t r, const eb_t *t, const bn_t k) {
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	eb_set_infty(r);
-	for (int i = 0; i < bn_bits(k); i++) {
-		if (bn_get_bit(k, i)) {
-			eb_add(r, r, t[i]);
-		}
-	}
-	eb_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		eb_neg(r, r);
-	}
-}
-
-#endif
-
-#if EB_FIX == COMBS || !defined(STRIP)
-
-void eb_mul_pre_combs(eb_t *t, const eb_t p) {
-	int i, j, l;
-	bn_t ord;
-
-	bn_null(ord);
-
-	RLC_TRY {
-		bn_new(ord);
-
-		eb_curve_get_ord(ord);
-		l = RLC_CEIL(bn_bits(ord), EB_DEPTH);
-
-		eb_set_infty(t[0]);
-
-		eb_copy(t[1], p);
-		for (j = 1; j < EB_DEPTH; j++) {
-			eb_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < l; i++) {
-				eb_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EB_MIXED)
-			eb_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				eb_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-
-		eb_norm_sim(t + 2, (const eb_t *)t + 2, RLC_EB_TABLE_COMBS - 2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(ord);
-	}
-}
-
-void eb_mul_fix_combs(eb_t r, const eb_t *t, const bn_t k) {
-	int i, j, l, w, n, p0, p1;
-	bn_t ord;
-
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	bn_null(ord);
-
-	RLC_TRY {
-		bn_new(ord);
-
-		eb_curve_get_ord(ord);
-		l = RLC_CEIL(bn_bits(ord), EB_DEPTH);
-
-		n = bn_bits(k);
-		p0 = (EB_DEPTH) * l - 1;
-
-		w = 0;
-		p1 = p0--;
-		for (j = EB_DEPTH - 1; j >= 0; j--, p1 -= l) {
-			w = w << 1;
-			if (p1 < n && bn_get_bit(k, p1)) {
-				w = w | 1;
-			}
-		}
-		eb_copy(r, t[w]);
-
-		for (i = l - 2; i >= 0; i--) {
-			eb_dbl(r, r);
-
-			w = 0;
-			p1 = p0--;
-			for (j = EB_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w = w << 1;
-				if (p1 < n && bn_get_bit(k, p1)) {
-					w = w | 1;
-				}
-			}
-			if (w > 0) {
-				eb_add(r, r, t[w]);
-			}
-		}
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(ord);
-	}
-}
-
-#endif
-
-#if EB_FIX == COMBD || !defined(STRIP)
-
-void eb_mul_pre_combd(eb_t *t, const eb_t p) {
-	int i, j, d, e;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-		d = RLC_CEIL(bn_bits(n), EB_DEPTH);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		eb_set_infty(t[0]);
-		eb_copy(t[1], p);
-		for (j = 1; j < EB_DEPTH; j++) {
-			eb_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < d; i++) {
-				eb_dbl(t[1 << j], t[1 << j]);
-			}
-			for (i = 1; i < (1 << j); i++) {
-				eb_add(t[(1 << j) + i], t[1 << j], t[i]);
-			}
-		}
-		eb_set_infty(t[1 << EB_DEPTH]);
-		for (j = 1; j < (1 << EB_DEPTH); j++) {
-			eb_dbl(t[(1 << EB_DEPTH) + j], t[j]);
-			for (i = 1; i < e; i++) {
-				eb_dbl(t[(1 << EB_DEPTH) + j], t[(1 << EB_DEPTH) + j]);
-			}
-		}
-
-		eb_norm_sim(t + 2, (const eb_t *)t + 2, (1 << EB_DEPTH) - 2);
-		eb_norm_sim(t + (1 << EB_DEPTH) + 1,
-				(const eb_t *)t + (1 << EB_DEPTH) + 1, (1 << EB_DEPTH) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void eb_mul_fix_combd(eb_t r, const eb_t *t, const bn_t k) {
-	int i, j, d, e, w0, w1, n0, p0, p1;
-	bn_t n;
-
-	if (bn_is_zero(k)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-
-		d = RLC_CEIL(bn_bits(n), EB_DEPTH);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		eb_set_infty(r);
-		n0 = bn_bits(k);
-
-		p1 = (e - 1) + (EB_DEPTH - 1) * d;
-		for (i = e - 1; i >= 0; i--) {
-			eb_dbl(r, r);
-
-			w0 = 0;
-			p0 = p1;
-			for (j = EB_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w0 = w0 << 1;
-				if (p0 < n0 && bn_get_bit(k, p0)) {
-					w0 = w0 | 1;
-				}
-			}
-
-			w1 = 0;
-			p0 = p1-- + e;
-			for (j = EB_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w1 = w1 << 1;
-				if (i + e < d && p0 < n0 && bn_get_bit(k, p0)) {
-					w1 = w1 | 1;
-				}
-			}
-
-			eb_add(r, r, t[w0]);
-			eb_add(r, r, t[(1 << EB_DEPTH) + w1]);
-		}
-		eb_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if EB_FIX == LWNAF || !defined(STRIP)
-
-void eb_mul_pre_lwnaf(eb_t *t, const eb_t p) {
-	eb_tab(t, p, EB_DEPTH);
-}
-
-void eb_mul_fix_lwnaf(eb_t r, const eb_t *t, const bn_t k) {
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		eb_mul_fix_kbltz(r, t, k);
-		return;
-	}
-#endif
-
-#if defined(EB_PLAIN)
-	eb_mul_fix_plain(r, t, k);
-#endif
-}
-#endif
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_mul_sim.c b/src/dashbls/depends/relic/src/eb/relic_eb_mul_sim.c
deleted file mode 100644
index 31d878ea8a30..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_mul_sim.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of simultaneous point multiplication on binary elliptic
- * curves.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_SIM == INTER || !defined(STRIP)
-
-#if defined(EB_KBLTZ)
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to a precomputed table.
- */
-static void eb_mul_sim_kbltz(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m, const eb_t *t) {
-	int i, l, l0, l1, n0, n1, w, g;
-	int8_t u, tnaf0[RLC_FB_BITS + 8], tnaf1[RLC_FB_BITS + 8], *_k, *_m;
-	eb_t t0[1 << (EB_WIDTH - 2)];
-	eb_t t1[1 << (EB_WIDTH - 2)];
-
-	for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-		eb_null(t0[i]);
-		eb_null(t1[i]);
-	}
-
-	RLC_TRY {
-		/* Compute the w-TNAF representation of k. */
-		if (eb_curve_opt_a() == RLC_ZERO) {
-			u = -1;
-		} else {
-			u = 1;
-		}
-
-		g = (t == NULL ? 0 : 1);
-		if (!g) {
-			for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-				eb_new(t0[i]);
-				eb_set_infty(t0[i]);
-				fb_set_bit(t0[i]->z, 0, 1);
-				t0[i]->coord = BASIC;
-			}
-			eb_tab(t0, p, EB_WIDTH);
-			t = (const eb_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_new(t1[i]);
-			eb_set_infty(t1[i]);
-			fb_set_bit(t1[i]->z, 0, 1);
-			t1[i]->coord = BASIC;
-		}
-		/* Compute the precomputation table. */
-		eb_tab(t1, q, EB_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		if (g) {
-			w = EB_DEPTH;
-		} else {
-			w = EB_WIDTH;
-		}
-
-		l0 = l1 = RLC_FB_BITS + 8;
-		bn_rec_tnaf(tnaf0, &l0, k, u, RLC_FB_BITS, w);
-		bn_rec_tnaf(tnaf1, &l1, m, u, RLC_FB_BITS, EB_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		_k = tnaf0 + l - 1;
-		_m = tnaf1 + l - 1;
-		for (i =  l0; i < l; i++) {
-			tnaf0[i] = 0;
-		}
-		for (i =  l1; i < l; i++) {
-			tnaf1[i] = 0;
-		}
-
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				tnaf0[i] = -tnaf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				tnaf1[i] = -tnaf1[i];
-			}
-		}
-
-		_k = tnaf0 + l - 1;
-		_m = tnaf1 + l - 1;
-		eb_set_infty(r);
-		for (i =  l - 1; i >= 0; i--, _k--, _m--) {
-			eb_frb(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-			if (n0 > 0) {
-				eb_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				eb_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				eb_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				eb_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		if (!g) {
-			for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-				eb_free(t0[i]);
-			}
-		}
-		for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_free(t1[i]);
-		}
-	}
-}
-
-#endif /* EB_KBLTZ */
-
-#if defined(EB_PLAIN)
-
-/**
- * Multiplies and adds two binary elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to a precomputed table.
- */
-static void eb_mul_sim_plain(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m, const eb_t *t) {
-	int i, l, l0, l1, n0, n1, w, g;
-	int8_t naf0[RLC_FB_BITS + 1], naf1[RLC_FB_BITS + 1], *_k, *_m;
-	eb_t t0[1 << (EB_WIDTH - 2)];
-	eb_t t1[1 << (EB_WIDTH - 2)];
-
-	for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-		eb_null(t0[i]);
-		eb_null(t1[i]);
-	}
-
-	RLC_TRY {
-		g = (t == NULL ? 0 : 1);
-		if (!g) {
-			for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-				eb_new(t0[i]);
-			}
-			eb_tab(t0, p, EB_WIDTH);
-			t = (const eb_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i =  0; i < (1 << (EB_WIDTH - 2)); i++) {
-			eb_new(t1[i]);
-		}
-		/* Compute the precomputation table. */
-		eb_tab(t1, q, EB_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		if (g) {
-			w = EB_DEPTH;
-		} else {
-			w = EB_WIDTH;
-		}
-
-		l0 = l1 = RLC_FB_BITS + 1;
-		bn_rec_naf(naf0, &l0, k, w);
-		bn_rec_naf(naf1, &l1, m, EB_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-		eb_set_infty(r);
-		for (i =  l - 1; i >= 0; i--, _k--, _m--) {
-			eb_dbl(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-			if (n0 > 0) {
-				eb_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				eb_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				eb_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				eb_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		eb_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation tables. */
-		if (!g) {
-			for (i =  0; i < 1 << (EB_WIDTH - 2); i++) {
-				eb_free(t0[i]);
-			}
-		}
-		for (i =  0; i < 1 << (EB_WIDTH - 2); i++) {
-			eb_free(t1[i]);
-		}
-	}
-}
-
-#endif /* EB_PLAIN */
-
-#endif /* EB_SIM == INTER */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_SIM == BASIC || !defined(STRIP)
-
-void eb_mul_sim_basic(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m) {
-	eb_t t;
-
-	eb_null(t);
-
-	RLC_TRY {
-		eb_new(t);
-		eb_mul(t, q, m);
-		eb_mul(r, p, k);
-		eb_add(t, t, r);
-		eb_norm(r, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
-
-#endif
-
-#if EB_SIM == TRICK || !defined(STRIP)
-
-void eb_mul_sim_trick(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m) {
-	eb_t t0[1 << (EB_WIDTH / 2)], t1[1 << (EB_WIDTH / 2)], t[1 << EB_WIDTH];
-	int l0, l1, w = EB_WIDTH / 2;
-	uint8_t w0[RLC_FB_BITS], w1[RLC_FB_BITS];
-	bn_t n;
-
-	bn_null(n);
-
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || eb_is_infty(q)) {
-		eb_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-
-		for (int i = 0; i < (1 << w); i++) {
-			eb_null(t0[i]);
-			eb_null(t1[i]);
-			eb_new(t0[i]);
-			eb_new(t1[i]);
-		}
-		for (int i = 0; i < (1 << EB_WIDTH); i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-		}
-
-		eb_set_infty(t0[0]);
-		eb_copy(t0[1], p);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(t0[1], t0[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			eb_add(t0[i], t0[i - 1], t0[1]);
-		}
-
-		eb_set_infty(t1[0]);
-		eb_copy(t1[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			eb_neg(t1[1], t1[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			eb_add(t1[i], t1[i - 1], t1[1]);
-		}
-
-		for (int i = 0; i < (1 << w); i++) {
-			for (int j = 0; j < (1 << w); j++) {
-				eb_add(t[(i << w) + j], t0[i], t1[j]);
-			}
-		}
-
-#if EB_WIDTH > 2 && defined(EB_MIXED)
-		eb_norm_sim(t + 1, (const eb_t *)(t + 1), (1 << EB_WIDTH) - 1);
-#endif
-
-		l0 = l1 = RLC_CEIL(RLC_FB_BITS + 1, w);
-		bn_rec_win(w0, &l0, k, w);
-		bn_rec_win(w1, &l1, m, w);
-		for (int i = l0; i < l1; i++) {
-			w0[i] = 0;
-		}
-		for (int i = l1; i < l0; i++) {
-			w1[i] = 0;
-		}
-
-		eb_set_infty(r);
-		for (int i = RLC_MAX(l0, l1) - 1; i >= 0; i--) {
-			for (int j = 0; j < w; j++) {
-				eb_dbl(r, r);
-			}
-			eb_add(r, r, t[(w0[i] << w) + w1[i]]);
-		}
-		eb_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < (1 << w); i++) {
-			eb_free(t0[i]);
-			eb_free(t1[i]);
-		}
-		for (int i = 0; i < (1 << EB_WIDTH); i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-#endif
-
-#if EB_SIM == INTER || !defined(STRIP)
-
-void eb_mul_sim_inter(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m) {
-
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || eb_is_infty(q)) {
-		eb_mul(r, p, k);
-		return;
-	}
-
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		eb_mul_sim_kbltz(r, p, k, q, m, NULL);
-		return;
-	}
-#endif
-
-#if defined(EB_PLAIN)
-	eb_mul_sim_plain(r, p, k, q, m, NULL);
-#endif
-}
-
-#endif
-
-#if EB_SIM == JOINT || !defined(STRIP)
-
-void eb_mul_sim_joint(eb_t r, const eb_t p, const bn_t k, const eb_t q,
-		const bn_t m) {
-	eb_t t[5];
-	int i, u_i, len, offset;
-	int8_t jsf[2 * (RLC_FB_BITS + 1)];
-
-	if (bn_is_zero(k) || eb_is_infty(p)) {
-		eb_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || eb_is_infty(q)) {
-		eb_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		for (i =  0; i < 5; i++) {
-			eb_null(t[i]);
-			eb_new(t[i]);
-		}
-
-		eb_set_infty(t[0]);
-		eb_copy(t[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			eb_neg(t[1], t[1]);
-		}
-		eb_copy(t[2], p);
-		if (bn_sign(k) == RLC_NEG) {
-			eb_neg(t[2], t[2]);
-		}
-		eb_add(t[3], t[2], t[1]);
-		eb_sub(t[4], t[2], t[1]);
-#if defined(EB_MIXED)
-		eb_norm_sim(t + 3, (const eb_t*)(t + 3), 2);
-#endif
-
-		len = 2 * (RLC_FB_BITS + 1);
-		bn_rec_jsf(jsf, &len, k, m);
-
-		eb_set_infty(r);
-		offset = RLC_MAX(bn_bits(k), bn_bits(m)) + 1;
-		for (i = len - 1; i >= 0; i--) {
-			eb_dbl(r, r);
-			if (jsf[i] != 0 && jsf[i] == -jsf[i + offset]) {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					eb_sub(r, r, t[4]);
-				} else {
-					eb_add(r, r, t[4]);
-				}
-			} else {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					eb_sub(r, r, t[-u_i]);
-				} else {
-					eb_add(r, r, t[u_i]);
-				}
-			}
-		}
-		eb_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i =  0; i < 5; i++) {
-			eb_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-void eb_mul_sim_gen(eb_t r, const bn_t k, const eb_t q, const bn_t m) {
-	eb_t g;
-
-	eb_null(g);
-
-	if (bn_is_zero(k)) {
-		eb_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || eb_is_infty(q)) {
-		eb_mul_gen(r, k);
-		return;
-	}
-
-	RLC_TRY {
-		eb_new(g);
-
-		eb_curve_get_gen(g);
-
-#if defined(EB_KBLTZ)
-#if EB_SIM == INTER && EB_FIX == LWNAF && defined(EB_PRECO)
-		if (eb_curve_is_kbltz()) {
-			eb_mul_sim_kbltz(r, g, k, q, m, eb_curve_get_tab());
-		}
-#else
-		if (eb_curve_is_kbltz()) {
-			eb_mul_sim(r, g, k, q, m);
-		}
-#endif
-#endif
-
-#if defined(EB_PLAIN)
-#if EB_SIM == INTER && EB_FIX == LWNAF && defined(EB_PRECO)
-		if (!eb_curve_is_kbltz()) {
-			eb_mul_sim_plain(r, g, k, q, m, eb_curve_get_tab());
-		}
-#else
-		if (!eb_curve_is_kbltz()) {
-			eb_mul_sim(r, g, k, q, m);
-		}
-#endif
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(g);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_neg.c b/src/dashbls/depends/relic/src/eb/relic_eb_neg.c
deleted file mode 100644
index ee823e7a5524..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_neg.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point negation on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EB_ADD == BASIC || !defined(STRIP)
-
-void eb_neg_basic(eb_t r, const eb_t p) {
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	if (r != p) {
-		fb_copy(r->x, p->x);
-		fb_copy(r->z, p->z);
-	}
-
-	fb_add(r->y, p->x, p->y);
-
-	r->coord = BASIC;
-}
-
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-void eb_neg_projc(eb_t r, const eb_t p) {
-	fb_t t;
-
-	fb_null(t);
-
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		if (r != p) {
-			fb_copy(r->x, p->x);
-			fb_copy(r->z, p->z);
-		}
-
-		fb_add(r->y, p->x, p->y);
-		r->coord = BASIC;
-		return;
-	}
-
-	RLC_TRY {
-		fb_new(t);
-
-		fb_mul(t, p->x, p->z);
-		fb_add(r->y, p->y, t);
-		if (r != p) {
-			fb_copy(r->z, p->z);
-			fb_copy(r->x, p->x);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_norm.c b/src/dashbls/depends/relic/src/eb/relic_eb_norm.c
deleted file mode 100644
index 7ddce052a4f6..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_norm.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EB_ADD == PROJC || !defined(STRIP)
-
-/**
- * Normalizes a point represented in projective coordinates.
- *
- * @param[out] r		- the result.
- * @param[in] p			- the point to normalize.
- * @param inv			- the flag to indicate if z is already inverted.
- */
-static void eb_norm_imp(eb_t r, const eb_t p, int inv) {
-	if (p->coord != BASIC) {
-		if (inv) {
-			fb_copy(r->z, p->z);
-		} else {
-			fb_inv(r->z, p->z);
-		}
-		fb_mul(r->x, p->x, r->z);
-		fb_sqr(r->z, r->z);
-		fb_mul(r->y, p->y, r->z);
-		fb_set_dig(r->z, 1);
-	}
-
-	r->coord = BASIC;
-}
-
-#endif /* EB_ADD == PROJC */
-
-/**
- * Normalizes a point represented in lambda-coordinates.
- *
- * @param[out] r		- the result.
- * @param[in] p			- the point to normalize.
- */
-static void eb_norm_hlv(eb_t r, const eb_t p) {
-	fb_add(r->y, p->x, p->y);
-	fb_mul(r->y, r->y, p->x);
-	fb_copy(r->x, p->x);
-	r->coord = BASIC;
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void eb_norm(eb_t r, const eb_t p) {
-	if (eb_is_infty(p)) {
-		eb_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		/* If the point is represented in affine coordinates, just copy it. */
-		eb_copy(r, p);
-		return;
-	}
-
-	if (p->coord == HALVE) {
-		eb_norm_hlv(r, p);
-		return;
-	}
-
-#if EB_ADD == PROJC || !defined(STRIP)
-	eb_norm_imp(r, p, 0);
-#endif /* EB_ADD == PROJC */
-}
-
-void eb_norm_sim(eb_t *r, const eb_t *t, int n) {
-	fb_t *a = RLC_ALLOCA(fb_t, n);
-
-	if (n == 1) {
-		eb_norm(r[0], t[0]);
-		return;
-	}
-
-	RLC_TRY {
-		if (a == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fb_null(a[i]);
-			fb_new(a[i]);
-			if (!eb_is_infty(t[i])) {
-				fb_copy(a[i], t[i]->z);
-			} else {
-				fb_set_dig(a[i], 1);
-			}
-		}
-
-		fb_inv_sim(a, (const fb_t *)a, n);
-
-		for (int i = 0; i < n; i++) {
-			fb_copy(r[i]->x, t[i]->x);
-			fb_copy(r[i]->y, t[i]->y);
-			if (!eb_is_infty(t[i])) {
-				fb_copy(r[i]->z, a[i]);
-			}
-		}
-
-		for (int i = 0; i < n; i++) {
-			eb_norm_imp(r[i], r[i], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fb_free(a[i]);
-		}
-		RLC_FREE(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_param.c b/src/dashbls/depends/relic/src/eb/relic_eb_param.c
deleted file mode 100644
index bd6806613584..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_param.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary elliptic curve parameters.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_eb.h"
-#include "relic_util.h"
-#include "relic_conf.h"
-#include "relic_arch.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if defined(EB_PLAIN) && FB_POLYN == 163
-/**
- * Parameters for the NIST B-163 binary elliptic curve.
- */
-/** @{ */
-#define NIST_B163_A		"1"
-#define NIST_B163_B		"20A601907B8C953CA1481EB10512F78744A3205FD"
-#define NIST_B163_X		"3F0EBA16286A2D57EA0991168D4994637E8343E36"
-#define NIST_B163_Y		"0D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"
-#define NIST_B163_R		"40000000000000000000292FE77E70C12A4234C33"
-#define NIST_B163_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 163
-/**
- * Parameters for the NIST K-163 binary elliptic curve.
- */
-/** @{ */
-#define NIST_K163_A		"1"
-#define NIST_K163_B		"1"
-#define NIST_K163_X		"2FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"
-#define NIST_K163_Y		"289070FB05D38FF58321F2E800536D538CCDAA3D9"
-#define NIST_K163_R		"4000000000000000000020108A2E0CC0D99F8A5EF"
-#define NIST_K163_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 233
-/**
- * Parameters for the NIST B-233 binary elliptic curve.
- */
-/** @{ */
-#define NIST_B233_A		"1"
-#define NIST_B233_B		"066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD"
-#define NIST_B233_X		"0FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"
-#define NIST_B233_Y		"1006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"
-#define NIST_B233_R		"1000000000000000000000000000013E974E72F8A6922031D2603CFE0D7"
-#define NIST_B233_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 233
-/**
- * Parameters for the NIST K-233 binary elliptic curve.
- */
-/** @{ */
-#define NIST_K233_A		"0"
-#define NIST_K233_B		"1"
-#define NIST_K233_X		"17232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"
-#define NIST_K233_Y		"1DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"
-#define NIST_K233_R		"08000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF"
-#define NIST_K233_H		"4"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 239
-/**
- * Parameters for the SECG K-239 binary elliptic curve.
- */
-/** @{ */
-#define SECG_K239_A		"0"
-#define SECG_K239_B		"1"
-#define SECG_K239_X		"29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"
-#define SECG_K239_Y		"76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"
-#define SECG_K239_R		"2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5"
-#define SECG_K239_H		"4"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 251
-/**
- * Parameters for the eBATS B-251 binary elliptic curve.
- */
-/** @{ */
-#define EBACS_B251_A	"0"
-#define EBACS_B251_B	"2387"
-#define EBACS_B251_X	"6AD0278D8686F4BA4250B2DE565F0A373AA54D9A154ABEFACB90DC03501D57C"
-#define EBACS_B251_Y	"50B1D29DAD5616363249F477B05A1592BA16045BE1A9F218180C5150ABE8573"
-#define EBACS_B251_R	"1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3E3AA131A2E1A8200BEF3B9ABB767E1"
-#define EBACS_B251_H	"4"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 257
-/**
- * Parameters for a curve over GF(2^257) which is really nice for halving.
- */
-/** @{ */
-#define HALVE_B257_A	"1"
-#define HALVE_B257_B	"0585C1ACA676891D5E1940D6F619FD0DD9FDA8AC46AE9331B76F172EDEF520CF0"
-#define HALVE_B257_X	"048E8B0E542D879A1E992E7407F8648F0C8248469B97DD3AF9F21F603E9632D4B"
-#define HALVE_B257_Y	"138D19BC9810C03D3FB499801F81C9E6A338B944338514E0D2D9BEDFEB0B8A310"
-#define HALVE_B257_R	"0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF60349585A0B2E1B2133B4E36C1672179"
-#define HALVE_B257_H	"2"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 283
-/**
- * Parameters for the NIST B-283 binary elliptic curve.
- */
-/** @{ */
-#define NIST_B283_A		"1"
-#define NIST_B283_B		"027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5"
-#define NIST_B283_X		"05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"
-#define NIST_B283_Y		"03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4"
-#define NIST_B283_R		"03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307"
-#define NIST_B283_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 283
-/**
- * Parameters for the NIST K-283 binary elliptic curve.
- */
-/** @{ */
-#define NIST_K283_A		"0"
-#define NIST_K283_B		"1"
-#define NIST_K283_X		"0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"
-#define NIST_K283_Y		"01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259"
-#define NIST_K283_R		"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61"
-#define NIST_K283_H		"4"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 409
-/**
- * Parameters for the NIST B-409 binary elliptic curve.
- */
-/** @{ */
-#define NIST_B409_A		"1"
-#define NIST_B409_B		"021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F"
-#define NIST_B409_X		"15D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"
-#define NIST_B409_Y		"061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706"
-#define NIST_B409_R		"10000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173"
-#define NIST_B409_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 409
-/**
- * Parameters for the NIST K-409 binary elliptic curve.
- */
-/** @{ */
-#define NIST_K409_A		"0"
-#define NIST_K409_B		"1"
-#define NIST_K409_X		"060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"
-#define NIST_K409_Y		"1E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B"
-#define NIST_K409_R		"07FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF"
-#define NIST_K409_H		"4"
-/** @} */
-#endif
-
-#if defined(EB_PLAIN) && FB_POLYN == 571
-/**
- * Parameters for the NIST B-571 binary elliptic curve.
- */
-/** @{ */
-#define NIST_B571_A		"1"
-#define NIST_B571_B		"2F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A"
-#define NIST_B571_X		"303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"
-#define NIST_B571_Y		"37BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B"
-#define NIST_B571_R		"3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47"
-#define NIST_B571_H		"2"
-/** @} */
-#endif
-
-#if defined(EB_KBLTZ) && FB_POLYN == 571
-/**
- * Parameters for the NIST K-571 binary elliptic curve.
- */
-/** @{ */
-#define NIST_K571_A		"0"
-#define NIST_K571_B		"1"
-#define NIST_K571_X		"26EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"
-#define NIST_K571_Y		"349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3"
-#define NIST_K571_R		"20000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001"
-#define NIST_K571_H		"4"
-/** @} */
-#endif
-
-/**
- * Assigns a set of ordinary elliptic curve parameters.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- * @param[in] FIELD		- the finite field identifier.
- */
-#define ASSIGN(CURVE, FIELD)												\
-	fb_param_set(FIELD);													\
-	RLC_GET(str, CURVE##_A, sizeof(CURVE##_A));								\
-	fb_read_str(a, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_B, sizeof(CURVE##_B));								\
-	fb_read_str(b, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_X, sizeof(CURVE##_X));								\
-	fb_read_str(g->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_Y, sizeof(CURVE##_Y));								\
-	fb_read_str(g->y, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_R, sizeof(CURVE##_R));								\
-	bn_read_str(r, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
-	bn_read_str(h, str, strlen(str), 16);									\
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int eb_param_get(void) {
-	return core_get()->eb_id;
-}
-
-void eb_param_set(int param) {
-	char str[2 * RLC_FB_BYTES + 1];
-	fb_t a, b;
-	eb_t g;
-	bn_t r;
-	bn_t h;
-
-	fb_null(a);
-	fb_null(b);
-	eb_null(g);
-	bn_null(r);
-	bn_null(h);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		eb_new(g);
-		bn_new(r);
-		bn_new(h);
-
-		core_get()->eb_id = 0;
-
-		switch (param) {
-#if defined(EB_PLAIN) && FB_POLYN == 163
-			case NIST_B163:
-				ASSIGN(NIST_B163, NIST_163);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 163
-			case NIST_K163:
-				ASSIGN(NIST_K163, NIST_163);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 233
-			case NIST_B233:
-				ASSIGN(NIST_B233, NIST_233);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 233
-			case NIST_K233:
-				ASSIGN(NIST_K233, NIST_233);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 239
-			case SECG_K239:
-				ASSIGN(SECG_K239, SECG_239);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 251
-			case EBACS_B251:
-				ASSIGN(EBACS_B251, PENTA_251);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 257
-			case HALVE_B257:
-				ASSIGN(HALVE_B257, TRINO_257);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 283
-			case NIST_B283:
-				ASSIGN(NIST_B283, NIST_283);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 283
-			case NIST_K283:
-				ASSIGN(NIST_K283, NIST_283);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 409
-			case NIST_B409:
-				ASSIGN(NIST_B409, NIST_409);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 409
-			case NIST_K409:
-				ASSIGN(NIST_K409, NIST_409);
-				break;
-#endif
-#if defined(EB_PLAIN) && FB_POLYN == 571
-			case NIST_B571:
-				ASSIGN(NIST_B571, NIST_571);
-				break;
-#endif
-#if defined(EB_KBLTZ) && FB_POLYN == 571
-			case NIST_K571:
-				ASSIGN(NIST_K571, NIST_571);
-				break;
-#endif
-			default:
-				(void)str;
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		fb_zero(g->z);
-		fb_set_bit(g->z, 0, 1);
-		g->coord = BASIC;
-
-		eb_curve_set(a, b, g, r, h);
-		core_get()->eb_id = param;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(a);
-		fb_free(b);
-		eb_free(g);
-		bn_free(r);
-		bn_free(h);
-	}
-}
-
-int eb_param_set_any(void) {
-	int r = eb_param_set_any_plain();
-	if (r == RLC_ERR) {
-		r = eb_param_set_any_kbltz();
-		if (r == RLC_ERR) {
-			return RLC_ERR;
-		}
-	}
-	return RLC_OK;
-}
-
-int eb_param_set_any_plain(void) {
-	int r = RLC_OK;
-#if defined(EB_PLAIN)
-#if FB_POLYN == 163
-	eb_param_set(NIST_B163);
-#elif FB_POLYN == 233
-	eb_param_set(NIST_B233);
-#elif FB_POLYN == 251
-	eb_param_set(EBACS_B251);
-#elif FB_POLYN == 257
-	eb_param_set(HALVE_B257);
-#elif FB_POLYN == 283
-	eb_param_set(NIST_B283);
-#elif FB_POLYN == 409
-	eb_param_set(NIST_B409);
-#elif FB_POLYN == 571
-	eb_param_set(NIST_B571);
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-int eb_param_set_any_kbltz(void) {
-	int r = RLC_OK;
-#if defined(EB_KBLTZ)
-#if FB_POLYN == 163
-	eb_param_set(NIST_K163);
-#elif FB_POLYN == 233
-	eb_param_set(NIST_K233);
-#elif FB_POLYN == 239
-	eb_param_set(SECG_K239);
-#elif FB_POLYN == 283
-	eb_param_set(NIST_K283);
-#elif FB_POLYN == 409
-	eb_param_set(NIST_K409);
-#elif FB_POLYN == 571
-	eb_param_set(NIST_K571);
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-void eb_param_print(void) {
-	switch (core_get()->eb_id) {
-		case NIST_B163:
-			util_banner("Curve NIST-B163:", 0);
-			break;
-		case NIST_K163:
-			util_banner("Curve NIST-K163:", 0);
-			break;
-		case NIST_B233:
-			util_banner("Curve NIST-B233:", 0);
-			break;
-		case NIST_K233:
-			util_banner("Curve NIST-K233:", 0);
-			break;
-		case SECG_K239:
-			util_banner("Curve SECG-K239:", 0);
-			break;
-		case EBACS_B251:
-			util_banner("Curve EBACS-B251:", 0);
-			break;
-		case HALVE_B257:
-			util_banner("Curve HALVE-B257:", 0);
-			break;
-		case NIST_B283:
-			util_banner("Curve NIST-B283:", 0);
-			break;
-		case NIST_K283:
-			util_banner("Curve NIST-K283:", 0);
-			break;
-		case NIST_B409:
-			util_banner("Curve NIST-B409:", 0);
-			break;
-		case NIST_K409:
-			util_banner("Curve NIST-K409:", 0);
-			break;
-		case NIST_B571:
-			util_banner("Curve NIST-B571:", 0);
-			break;
-		case NIST_K571:
-			util_banner("Curve NIST-K571:", 0);
-			break;
-	}
-}
-
-int eb_param_level(void) {
-	switch (core_get()->eb_id) {
-		case NIST_B163:
-		case NIST_K163:
-			return 80;
-		case NIST_B233:
-		case NIST_K233:
-		case SECG_K239:
-			return 112;
-		case EBACS_B251:
-		case HALVE_B257:
-		case NIST_B283:
-		case NIST_K283:
-			return 128;
-		case NIST_B409:
-		case NIST_K409:
-			return 192;
-		case NIST_B571:
-		case NIST_K571:
-			return 256;
-	}
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_pck.c b/src/dashbls/depends/relic/src/eb/relic_eb_pck.c
deleted file mode 100644
index 3766a2a2a4d9..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_pck.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point compression on binary elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "string.h"
-
-#include "relic_core.h"
-#include "relic_eb.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void eb_pck(eb_t r, const eb_t p) {
-	/* z3 = y1/x1. */
-	fb_inv(r->z, p->x);
-	fb_mul(r->z, r->z, p->y);
-	/* x3 = x1. */
-	fb_copy(r->x, p->x);
-	/* y3 = b(y1/x1). */
-	fb_set_dig(r->y, fb_get_bit(r->z, 0));
-	/* z3 = 1. */
-	fb_set_dig(r->z, 1);
-
-	r->coord = BASIC;
-}
-
-int eb_upk(eb_t r, const eb_t p) {
-	fb_t t0, t1;
-	int result = 0;
-
-	fb_null(t0);
-	fb_null(t1);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-
-		eb_rhs(t1, p);
-
-		fb_sqr(t0, p->x);
-		/* t0 = 1/x1^2. */
-		fb_inv(t0, t0);
-		/* t0 = t1/x1^2. */
-		fb_mul(t0, t0, t1);
-		result = (fb_trc(t0) == 0);
-		if (result) {
-			/* Solve t1^2 + t1 = t0. */
-			fb_slv(t1, t0);
-			/* If this is not the correct solution, try the other. */
-			if (fb_get_bit(t1, 0) != fb_get_bit(p->y, 0)) {
-				fb_add_dig(t1, t1, 1);
-			}
-			/* x3 = x1, y3 = t1 * x1, z3 = 1. */
-			fb_mul(r->y, t1, p->x);
-
-			fb_copy(r->x, p->x);
-			fb_set_dig(r->z, 1);
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/eb/relic_eb_util.c b/src/dashbls/depends/relic/src/eb/relic_eb_util.c
deleted file mode 100644
index 0671fbb0e140..000000000000
--- a/src/dashbls/depends/relic/src/eb/relic_eb_util.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary elliptic curve utilities.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-#include "relic_eb.h"
-#include "relic_conf.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int eb_is_infty(const eb_t p) {
-	return (fb_is_zero(p->z) == 1);
-}
-
-void eb_set_infty(eb_t p) {
-	fb_zero(p->x);
-	fb_zero(p->y);
-	fb_zero(p->z);
-	p->coord = BASIC;
-}
-
-void eb_copy(eb_t r, const eb_t p) {
-	fb_copy(r->x, p->x);
-	fb_copy(r->y, p->y);
-	fb_copy(r->z, p->z);
-	r->coord = p->coord;
-}
-
-void eb_rand(eb_t p) {
-	bn_t n, k;
-
-	bn_null(n);
-	bn_null(k);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-
-		bn_rand_mod(k, n);
-
-		eb_mul_gen(p, k);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-	}
-}
-
-void eb_rhs(fb_t rhs, const eb_t p) {
-	fb_t t0, t1;
-
-	fb_null(t0);
-	fb_null(t1);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-
-		/* t0 = x1^2. */
-		fb_sqr(t0, p->x);
-		/* t1 = x1^3. */
-		fb_mul(t1, t0, p->x);
-
-		/* t1 = x1^3 + a * x1^2 + b. */
-		switch (eb_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fb_add(t1, t1, t0);
-				break;
-			case RLC_TINY:
-				fb_mul_dig(t0, t0, eb_curve_get_a()[0]);
-				fb_add(t1, t1, t0);
-				break;
-			default:
-				fb_mul(t0, t0, eb_curve_get_a());
-				fb_add(t1, t1, t0);
-				break;
-		}
-
-		switch (eb_curve_opt_b()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fb_add_dig(t1, t1, 1);
-				break;
-			case RLC_TINY:
-				fb_add_dig(t1, t1, eb_curve_get_b()[0]);
-				break;
-			default:
-				fb_add(t1, t1, eb_curve_get_b());
-				break;
-		}
-
-		fb_copy(rhs, t1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-	}
-}
-
-void eb_blind(eb_t r, const eb_t p) {
-	fb_t rand;
-
-	fb_null(rand);
-
-	RLC_TRY {
-		fb_new(rand);
-
-		fb_rand(rand);
-		fb_mul(r->z, p->z, rand);
-		fb_mul(r->x, p->x, rand);
-		fb_sqr(rand, rand);
-		fb_mul(r->y, p->y, rand);
-		r->coord = PROJC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(rand);
-	}
-}
-
-int eb_on_curve(const eb_t p) {
-	eb_t t;
-	fb_t lhs;
-	int r = 0;
-
-	eb_null(t);
-	fb_null(lhs);
-
-	RLC_TRY {
-		eb_new(t);
-		fb_new(lhs);
-
-		eb_norm(t, p);
-
-		fb_mul(lhs, t->x, t->y);
-		eb_rhs(t->x, t);
-		fb_sqr(t->y, t->y);
-		fb_add(lhs, lhs, t->y);
-		r = (fb_cmp(lhs, t->x) == RLC_EQ) || eb_is_infty(p);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-		fb_free(lhs);
-	}
-	return r;
-}
-
-void eb_tab(eb_t *t, const eb_t p, int w) {
-	int u;
-
-#if defined(EB_PLAIN)
-	if (!eb_curve_is_kbltz()) {
-		if (w > 2) {
-			eb_dbl(t[0], p);
-#if defined(EB_MIXED)
-			eb_norm(t[0], t[0]);
-#endif
-			eb_add(t[1], t[0], p);
-			for (int i = 2; i < (1 << (w - 2)); i++) {
-				eb_add(t[i], t[i - 1], t[0]);
-			}
-#if defined(EB_MIXED)
-			eb_norm_sim(t + 1, (const eb_t *)t + 1, (1 << (w - 2)) - 1);
-#endif
-		}
-		eb_copy(t[0], p);
-	}
-#endif /* EB_PLAIN */
-
-#if defined(EB_KBLTZ)
-	if (eb_curve_is_kbltz()) {
-		u = (eb_curve_opt_a() == RLC_ZERO ? -1 : 1);
-
-		/* Prepare the precomputation table. */
-		for (int i = 0; i < 1 << (w - 2); i++) {
-			eb_set_infty(t[i]);
-			fb_set_dig(t[i]->z, 1);
-			t[i]->coord = BASIC;
-		}
-
-		switch (w) {
-			/* Formulas from https://eprint.iacr.org/2014/664. */
-#if EB_DEPTH == 3 || EB_WIDTH ==  3
-			case 3:
-				eb_frb(t[0], p);
-				if (u == 1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_add(t[1], t[0], p);
-				eb_copy(t[0], p);
-				break;
-#endif
-#if EB_DEPTH == 4 || EB_WIDTH ==  4
-			case 4:
-				eb_frb(t[0], p);
-				eb_frb(t[1], t[0]);
-				if (u == -1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_sub(t[2], t[0], p);
-				eb_add(t[3], t[0], p);
-				eb_sub(t[1], t[1], p);
-				eb_copy(t[0], p);
-				break;
-#endif
-#if EB_DEPTH == 5 || EB_WIDTH ==  5
-			case 5:
-				eb_frb(t[0], p);
-				eb_frb(t[1], t[0]);
-				if (u == -1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_sub(t[2], t[0], p);
-				eb_add(t[3], t[0], p);
-				eb_sub(t[1], t[1], p);
-				eb_add(t[4], t[1], t[0]);
-				eb_add(t[5], t[2], t[0]);
-				eb_add(t[6], t[3], t[0]);
-				eb_neg(t[7], t[5]);
-				eb_sub(t[7], t[7], t[0]);
-				eb_copy(t[0], p);
-				break;
-#endif
-#if EB_DEPTH == 6 || EB_WIDTH ==  6
-			case 6:
-				eb_frb(t[0], p);
-				eb_frb(t[15], t[0]);
-				eb_neg(t[15], t[15]);
-				if (u == 1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_sub(t[12], t[0], p);
-				eb_add(t[13], t[0], p);
-				eb_neg(t[6], t[12]);
-				eb_sub(t[6], t[6], t[0]);
-				eb_neg(t[5], t[13]);
-				eb_sub(t[5], t[5], t[0]);
-				eb_neg(t[7], t[5]);
-				eb_add(t[7], t[7], t[0]);
-				eb_add(t[14], t[15], p);
-				eb_sub(t[1], t[14], t[0]);
-				eb_neg(t[4], t[14]);
-				eb_sub(t[4], t[4], t[0]);
-				eb_neg(t[11], t[1]);
-				eb_add(t[11], t[11], t[0]);
-				eb_neg(t[8], t[4]);
-				eb_add(t[8], t[8], t[0]);
-				eb_neg(t[10], t[8]);
-				eb_sub(t[10], t[10],t[0]);
-				eb_add(t[15], t[1], t[15]);
-				eb_sub(t[2], t[15], t[0]);
-				eb_neg(t[3], t[15]);
-				eb_sub(t[3], t[3], t[0]);
-				eb_neg(t[9], t[3]);
-				eb_add(t[9], t[9], t[0]);
-				eb_copy(t[0], p);
-				break;
-#endif
-#if EB_DEPTH == 7 || EB_WIDTH ==  7
-			case 7:
-				eb_frb(t[0], p);
-				eb_frb(t[15], t[0]);
-				if (u == -1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_sub(t[18], t[0], p);
-				eb_add(t[19], t[0], p);
-				eb_neg(t[26], t[18]);
-				eb_sub(t[26], t[26], t[0]);
-				eb_neg(t[25], t[19]);
-				eb_sub(t[25], t[25], t[0]);
-				eb_sub(t[7], t[26], t[0]);
-				eb_sub(t[6], t[25], t[0]);
-				eb_neg(t[11], t[7]);
-				eb_add(t[11], t[11], t[0]);
-				eb_neg(t[12], t[6]);
-				eb_add(t[12], t[12], t[0]);
-				eb_add(t[30], t[11], t[0]);
-				eb_add(t[31], t[12], t[0]);
-				eb_neg(t[14], t[30]);
-				eb_sub(t[14], t[14], t[0]);
-
-				eb_sub(t[17], t[15], p);
-				eb_neg(t[1], t[17]);
-				eb_sub(t[27], t[1], t[0]);
-				eb_add(t[1], t[1], t[0]);
-				eb_add(t[20], t[1], t[0]);
-				eb_sub(t[8], t[27], t[0]);
-				eb_neg(t[24], t[20]);
-				eb_sub(t[24], t[24], t[0]);
-				eb_neg(t[10], t[8]);
-				eb_add(t[10], t[10], t[0]);
-				eb_sub(t[5], t[24], t[0]);
-				eb_neg(t[13], t[5]);
-				eb_add(t[13], t[13], t[0]);
-				eb_neg(t[16], t[1]);
-				eb_add(t[16], t[16], t[15]);
-				eb_neg(t[2], t[16]);
-				eb_sub(t[28], t[2], t[0]);
-				eb_add(t[2], t[2], t[0]);
-				eb_add(t[21], t[2], t[0]);
-				eb_sub(t[9], t[28], t[0]);
-				eb_neg(t[23], t[21]);
-				eb_sub(t[23], t[23], t[0]);
-				eb_sub(t[4], t[23], t[0]);
-				eb_neg(t[3], t[2]);
-				eb_add(t[15], t[3], t[15]);
-				eb_neg(t[3], t[15]);
-				eb_add(t[3], t[3], t[0]);
-				eb_neg(t[29], t[15]);
-				eb_sub(t[29], t[29], t[0]);
-				eb_add(t[22], t[3], t[0]);
-				eb_copy(t[0], p);
-				break;
-#endif
-#if EB_DEPTH == 8 || EB_WIDTH ==  8
-			case 8:
-				eb_frb(t[0], p);
-				eb_frb(t[57], t[0]);
-				eb_neg(t[57], t[57]);
-				if (u == 1) {
-					eb_neg(t[0], t[0]);
-				}
-				eb_sub(t[44], t[0], p);
-				eb_add(t[45], t[0], p);
-				eb_neg(t[38], t[44]);
-				eb_sub(t[38], t[38], t[0]);
-				eb_neg(t[37], t[45]);
-				eb_sub(t[37], t[37], t[0]);
-				eb_neg(t[6], t[38]);
-				eb_add(t[6], t[6], t[0]);
-
-				eb_neg(t[7], t[37]);
-				eb_add(t[7], t[7], t[0]);
-				eb_add(t[51], t[6], t[0]);
-				eb_add(t[52], t[7], t[0]);
-				eb_neg(t[31], t[51]);
-				eb_sub(t[31], t[31], t[0]);
-				eb_neg(t[30], t[52]);
-				eb_sub(t[30], t[30], t[0]);
-				eb_neg(t[13], t[31]);
-				eb_add(t[13], t[13], t[0]);
-				eb_neg(t[14], t[30]);
-				eb_add(t[14], t[14], t[0]);
-				eb_add(t[58], t[13], t[0]);
-				eb_add(t[59], t[14], t[0]);
-				eb_neg(t[24], t[58]);
-				eb_sub(t[24], t[24], t[0]);
-				eb_neg(t[23], t[59]);
-				eb_sub(t[23], t[23], t[0]);
-				eb_add(t[46], t[57], p);
-				eb_sub(t[1], t[46], t[0]);
-				eb_neg(t[36], t[46]);
-				eb_sub(t[36], t[36], t[0]);
-				eb_neg(t[43], t[1]);
-				eb_add(t[43], t[43], t[0]);
-				eb_neg(t[8], t[36]);
-				eb_add(t[8], t[8], t[0]);
-				eb_neg(t[39], t[43]);
-				eb_sub(t[39], t[39], t[0]);
-				eb_add(t[53], t[8], t[0]);
-				eb_neg(t[5], t[39]);
-				eb_add(t[5], t[5], t[0]);
-				eb_neg(t[29], t[53]);
-				eb_sub(t[29], t[29], t[0]);
-				eb_add(t[50], t[5], t[0]);
-				eb_neg(t[15], t[29]);
-				eb_add(t[15], t[15], t[0]);
-				eb_neg(t[32], t[50]);
-				eb_sub(t[32], t[32], t[0]);
-				eb_add(t[60], t[15], t[0]);
-				eb_neg(t[12], t[32]);
-				eb_add(t[12], t[12], t[0]);
-				eb_neg(t[22], t[60]);
-				eb_sub(t[22], t[22], t[0]);
-				eb_add(t[47], t[1], t[57]);
-				eb_sub(t[2], t[47], t[0]);
-				eb_neg(t[35], t[47]);
-				eb_sub(t[35], t[35], t[0]);
-				eb_neg(t[42], t[2]);
-				eb_add(t[42], t[42], t[0]);
-				eb_neg(t[9], t[35]);
-				eb_add(t[9], t[9], t[0]);
-				eb_neg(t[40], t[42]);
-				eb_sub(t[40], t[40], t[0]);
-				eb_add(t[54], t[9], t[0]);
-				eb_neg(t[4], t[40]);
-				eb_add(t[4], t[4], t[0]);
-				eb_neg(t[28], t[54]);
-				eb_sub(t[28], t[28], t[0]);
-				eb_neg(t[16], t[28]);
-				eb_add(t[16], t[16], t[0]);
-				eb_add(t[61], t[16], t[0]);
-				eb_neg(t[21], t[61]);
-				eb_sub(t[21], t[21], t[0]);
-				eb_add(t[48], t[2], t[57]);
-				eb_sub(t[3], t[48], t[0]);
-				eb_neg(t[34], t[48]);
-				eb_sub(t[34], t[34], t[0]);
-				eb_neg(t[41], t[3]);
-				eb_add(t[41], t[41], t[0]);
-				eb_neg(t[10], t[34]);
-				eb_add(t[10], t[10], t[0]);
-				eb_add(t[55], t[10], t[0]);
-				eb_neg(t[27], t[55]);
-				eb_sub(t[27], t[27], t[0]);
-				eb_neg(t[17], t[27]);
-				eb_add(t[17], t[17], t[0]);
-				eb_add(t[62], t[17], t[0]);
-				eb_neg(t[20], t[62]);
-				eb_sub(t[20], t[20], t[0]);
-				eb_add(t[49], t[3], t[57]);
-				eb_neg(t[33], t[49]);
-				eb_sub(t[33], t[33], t[0]);
-				eb_neg(t[11], t[33]);
-				eb_add(t[11], t[11], t[0]);
-				eb_add(t[56], t[11], t[0]);
-				eb_neg(t[26], t[56]);
-				eb_sub(t[26], t[26], t[0]);
-				eb_neg(t[18], t[26]);
-				eb_add(t[18], t[18], t[0]);
-				eb_add(t[63], t[18], t[0]);
-				eb_add(t[57], t[11], t[57]);
-				eb_neg(t[25], t[57]);
-				eb_sub(t[25], t[25], t[0]);
-				eb_neg(t[19], t[25]);
-				eb_add(t[19], t[19], t[0]);
-				eb_copy(t[0], p);
-				break;
-#endif
-		}
-#if defined(EB_MIXED)
-		if (w > 2) {
-			eb_norm_sim(t + 1, (const eb_t *)t + 1, (1 << (w - 2)) - 1);
-		}
-#endif
-	}
-#endif /* EB_KBLTZ */
-}
-
-void eb_print(const eb_t p) {
-	fb_print(p->x);
-	fb_print(p->y);
-	fb_print(p->z);
-}
-
-int eb_size_bin(const eb_t a, int pack) {
-	int size = 0;
-
-	if (eb_is_infty(a)) {
-		return 1;
-	}
-
-	size = 1 + RLC_FB_BYTES;
-	if (!pack) {
-		size += RLC_FB_BYTES;
-	}
-
-	return size;
-}
-
-void eb_read_bin(eb_t a, const uint8_t *bin, int len) {
-	if (len == 1) {
-		if (bin[0] == 0) {
-			eb_set_infty(a);
-			return;
-		} else {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		}
-	}
-
-	if (len != (RLC_FB_BYTES + 1) && len != (2 * RLC_FB_BYTES + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	a->coord = BASIC;
-	fb_set_dig(a->z, 1);
-	fb_read_bin(a->x, bin + 1, RLC_FB_BYTES);
-	if (len == RLC_FB_BYTES + 1) {
-		switch(bin[0]) {
-			case 2:
-				fb_zero(a->y);
-				break;
-			case 3:
-				fb_zero(a->y);
-				fb_set_bit(a->y, 0, 1);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		eb_upk(a, a);
-	}
-
-	if (len == 2 * RLC_FB_BYTES + 1) {
-		if (bin[0] == 4) {
-			fb_read_bin(a->y, bin + RLC_FB_BYTES + 1, RLC_FB_BYTES);
-		} else {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-	}
-
-	if (!eb_on_curve(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-void eb_write_bin(uint8_t *bin, int len, const eb_t a, int pack) {
-	eb_t t;
-
-	eb_null(t);
-
-	memset(bin, 0, len);
-
-	if (eb_is_infty(a)) {
-		if (len < 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		} else {
-			return;
-		}
-	}
-
-	RLC_TRY {
-		eb_new(t);
-
-		eb_norm(t, a);
-
-		if (pack) {
-			if (len < RLC_FB_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				eb_pck(t, t);
-				bin[0] = 2 | fb_get_bit(t->y, 0);
-				fb_write_bin(bin + 1, RLC_FB_BYTES, t->x);
-			}
-		} else {
-			if (len < 2 * RLC_FB_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				bin[0] = 4;
-				fb_write_bin(bin + 1, RLC_FB_BYTES, t->x);
-				fb_write_bin(bin + RLC_FB_BYTES + 1, RLC_FB_BYTES, t->y);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		eb_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_add.c b/src/dashbls/depends/relic/src/ed/relic_ed_add.c
deleted file mode 100644
index 9e4fd2d176a2..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_add.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point addition on prime elliptic twisted Edwards curves.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include <assert.h>
-
-#include "relic_core.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_ADD == BASIC || !defined(STRIP)
-
-void ed_add_basic(ed_t r, const ed_t p, const ed_t q) {
-	fp_t t0, t1, t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		/* x3 = (x1*y2+y1*x2)/(1+d*x1*x2*y1*y2)
-		 * y3 = (y1*y2-a*x1*x2)/(1-d*x1*x2*y1*y2) */
-
-		fp_mul(t0, p->x, q->y);
-		fp_mul(t1, p->y, q->x);
-		fp_add(t0, t0, t1);
-
-		fp_mul(t1, p->x, q->x);
-		fp_mul(t2, p->y, q->y);
-		fp_mul(t1, t1, t2);
-		fp_mul(t1, t1, core_get()->ed_d);
-		fp_add_dig(t2, t1, 1);
-		fp_inv(t2, t2);
-		fp_sub_dig(t1, t1, 1);
-		fp_neg(t1, t1);
-		fp_inv(t1, t1);
-
-		fp_mul(t0, t0, t2);
-
-		fp_mul(r->y, p->y, q->y);
-		fp_mul(t2, p->x, q->x);
-		fp_mul(t2, t2, core_get()->ed_a);
-		fp_sub(r->y, r->y, t2);
-		fp_mul(r->y, r->y, t1);
-
-		fp_copy(r->x, t0);
-		fp_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-}
-
-void ed_sub_basic(ed_t r, const ed_t p, const ed_t q) {
-	ed_t t;
-
-	ed_null(t);
-
-	if (p == q) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t);
-
-		ed_neg_basic(t, q);
-		ed_add_basic(r, p, t);
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
-
-#endif /* ED_ADD == BASIC */
-
-#if ED_ADD == PROJC || !defined(STRIP)
-
-void ed_add_projc(ed_t r, const ed_t p, const ed_t q) {
-	fp_t t0, t1, t2, t3, t4, t5, t6, t7;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	fp_null(t6);
-	fp_null(t7);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		fp_new(t6);
-		fp_new(t7);
-
-		/* A = z1 * z2, B = A^2 */
-		fp_mul(t0, p->z, q->z);
-		fp_sqr(t1, t0);
-
-		/* C = x1 * x2, D = y1 * y2 */
-		fp_mul(t2, p->x, q->x);
-		fp_mul(t3, p->y, q->y);
-
-		/* E = d * C * D */
-		fp_mul(t4, core_get()->ed_d, t2);
-		fp_mul(t4, t4, t3);
-
-		/* F = B - E */
-		fp_sub(t5, t1, t4);
-
-		/* G = B + E */
-		fp_add(t6, t1, t4);
-
-		/* x3 = A * F * ((x1 + y1) * (x2 + y2) - C - D) */
-		fp_mul(t7, t0, t5);
-		fp_add(r->z, p->x, p->y);
-		fp_add(r->x, q->x, q->y);
-		fp_mul(r->x, r->z, r->x);
-		fp_sub(r->x, r->x, t2);
-		fp_sub(r->x, r->x, t3);
-		fp_mul(r->x, t7, r->x);
-
-		/* y3 = A * G * (D - a * C) */
-		fp_mul(r->z, t0, t6);
-		fp_mul(r->y, core_get()->ed_a, t2);
-		fp_sub(r->y, t3, r->y);
-		fp_mul(r->y, r->z, r->y);
-
-		/* z3 = F * G */
-		fp_mul(r->z, t5, t6);
-
-		r->coord = PROJC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT)
-	} RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		fp_free(t6);
-		fp_free(t7);
-	}
-}
-
-#endif /* ED_ADD == PROJC */
-
-#if ED_ADD == PROJC || !defined(STRIP)
-
-void ed_sub_projc(ed_t r, const ed_t p, const ed_t q) {
-	ed_t t;
-
-	ed_null(t);
-
-	if (p == q) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t);
-
-		ed_neg_projc(t, q);
-		ed_add_projc(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
-
-#endif /* ED_ADD == PROJC || ED_ADD == EXTND */
-
-#if ED_ADD == EXTND || !defined(STRIP)
-
-void ed_add_extnd(ed_t r, const ed_t p, const ed_t q) {
-	fp_t t0;
-	fp_t t1;
-	fp_t t2;
-	fp_t t3;
-	fp_t t4;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-
-		/* A = x1 * x2, B = y1 * y2 */
-		fp_mul(t0, p->x, q->x);
-		fp_mul(t1, p->y, q->y);
-
-		/* C = d * t1 * t2 */
-		fp_mul(t2, core_get()->ed_d, p->t);
-		fp_mul(r->t, t2, q->t);
-
-		/* D = z1 * z2 */
-		fp_mul(r->z, p->z, q->z);
-
-		/* E = (x1 + y1) * (x2 + y2) - A - B */
-		fp_add(t2, p->x, p->y);
-		fp_add(t3, q->x, q->y);
-		fp_mul(t2, t2, t3);
-		fp_sub(t2, t2, t0);
-		fp_sub(t2, t2, t1);
-
-		/* F = D - C */
-		fp_sub(t3, r->z, r->t);
-
-		/* G = D + C */
-		fp_add(t4, r->z, r->t);
-
-		/* H = B - aA */
-		fp_mul(r->x, core_get()->ed_a, t0);
-		fp_sub(r->z, t1, r->x);
-
-		/* x3 = E * F, y3 = G * H, t3 = E * H, z3 = F * G */
-		fp_mul(r->x, t2, t3);
-		fp_mul(r->y, t4, r->z);
-		fp_mul(r->t, t2, r->z);
-		fp_mul(r->z, t3, t4);
-
-		r->coord = PROJC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT)
-	} RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-	}
-}
-
-void ed_sub_extnd(ed_t r, const ed_t p, const ed_t q) {
-	ed_t t;
-
-	ed_null(t);
-
-	if (p == q) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t);
-
-		ed_neg_projc(t, q);
-		ed_add_extnd(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_cmp.c b/src/dashbls/depends/relic/src/ed/relic_ed_cmp.c
deleted file mode 100644
index 0679b5b8fcc6..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_cmp.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Edwards elliptic curve point comparison.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include <assert.h>
-
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_md.h"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ed_cmp(const ed_t p, const ed_t q) {
-    ed_t r, s;
-    int result = RLC_EQ;
-
-    ed_null(r);
-    ed_null(s);
-
-    RLC_TRY {
-        ed_new(r);
-        ed_new(s);
-
-        if ((p->coord != BASIC) && (q->coord != BASIC)) {
-            /* If the two points are not normalized, it is faster to compare
-             * x1 * z2 == x2 * z1 and y1 * z2 == y2 * z1. */
-            fp_mul(r->x, p->x, q->z);
-            fp_mul(s->x, q->x, p->z);
-            fp_mul(r->y, p->y, q->z);
-            fp_mul(s->y, q->y, p->z);
-#if ED_ADD == EXTND
-			fp_mul(r->t, p->t, q->z);
-			fp_mul(s->t, q->t, p->z);
-			if (fp_cmp(r->t, s->t) != RLC_EQ) {
-	            result = RLC_NE;
-	        }
-#endif
-        } else {
-			ed_copy(r, p);
-            ed_copy(s, q);
-            if (p->coord != BASIC) {
-                ed_norm(r, p);
-            }
-            if (q->coord != BASIC) {
-                ed_norm(s, q);
-            }
-        }
-
-        if (fp_cmp(r->x, s->x) != RLC_EQ) {
-            result = RLC_NE;
-        }
-        if (fp_cmp(r->y, s->y) != RLC_EQ) {
-            result = RLC_NE;
-        }
-    } RLC_CATCH_ANY {
-        RLC_THROW(ERR_CAUGHT);
-    } RLC_FINALLY {
-        ep_free(r);
-        ep_free(s);
-    }
-
-    return result;
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_curve.c b/src/dashbls/depends/relic/src/ed/relic_ed_curve.c
deleted file mode 100644
index 0e1550e891f9..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_curve.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point addition on prime elliptic twisted Edwards curves.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include "relic_core.h"
-
-void ed_curve_init(void) {
-	ctx_t *ctx = core_get();
-#ifdef ED_PRECO
-	for (int i = 0; i < RLC_ED_TABLE; i++) {
-		ctx->ed_ptr[i] = &(ctx->ed_pre[i]);
-	}
-#endif
-	ed_set_infty(&ctx->ed_g);
-	bn_make(&ctx->ed_r, RLC_FP_DIGS);
-	bn_make(&ctx->ed_h, RLC_FP_DIGS);
-}
-
-void ed_curve_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		bn_clean(&ctx->ed_r);
-		bn_clean(&ctx->ed_h);		
-	}
-}
-
-void ed_curve_get_gen(ed_t g) {
-	ed_copy(g, &core_get()->ed_g);
-}
-
-void ed_curve_get_ord(bn_t n) {
-	bn_copy(n, &core_get()->ed_r);
-}
-
-void ed_curve_get_cof(bn_t h) {
-	bn_copy(h, &core_get()->ed_h);
-}
-
-const ed_t *ed_curve_get_tab(void) {
-#if defined(ED_PRECO)
-
-	/* Return a meaningful pointer. */
-#if ALLOC == AUTO
-	return (const ed_t *)*core_get()->ed_ptr;
-#else
-	return (const ed_t *)core_get()->ed_ptr;
-#endif
-
-#else
-	/* Return a null pointer. */
-	return NULL;
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_dbl.c b/src/dashbls/depends/relic/src/ed/relic_ed_dbl.c
deleted file mode 100644
index 4a41a6a50a7e..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_dbl.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
-* @file
-*
-* Implementation of the point doubling on prime elliptic twisted Edwards curves.
-*
-* @version $Id$
-* @ingroup ed
-*/
-
-#include "relic_core.h"
-#include "relic_label.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_ADD == BASIC || !defined(STRIP)
-
-void ed_dbl_basic(ed_t r, const ed_t p) {
-	fp_t t0, t1, t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		/* x3 = (x1*y1+y1*x1)/(1+d*x1*x1*y1*y1)
-		 * y3 = (y1*y1-a*x1*x1)/(1-d*x1*x1*y1*y1) */
-
-		fp_mul(t0, p->x, p->y);
-		fp_sqr(t1, t0);
-
-		fp_mul(t1, t1, core_get()->ed_d);
-		fp_add_dig(t2, t1, 1);
-		fp_inv(t2, t2);
-		fp_sub_dig(t1, t1, 1);
-		fp_neg(t1, t1);
-		fp_inv(t1, t1);
-
-		fp_dbl(t0, t0);
-		fp_mul(t0, t0, t2);
-
-		fp_sqr(t2, p->x);
-		fp_mul(t2, t2, core_get()->ed_a);
-		fp_sqr(r->y, p->y);
-		fp_sub(r->y, r->y, t2);
-		fp_mul(r->y, r->y, t1);
-
-		fp_copy(r->x, t0);
-		fp_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-}
-
-#endif /* ED_ADD == BASIC */
-
-#if ED_ADD == PROJC || !defined(STRIP)
-
-void ed_dbl_projc(ed_t r, const ed_t p) {
-	fp_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	fp_null(t6);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		fp_new(t6);
-
-		// 3M + 4S + 1D + 7add
-
-		/* B = (x1 + y1)^2 */
-		fp_add(t0, p->x, p->y);
-		fp_sqr(t0, t0);
-
-		/* C = x1^2 */
-		fp_sqr(t1, p->x);
-
-		/*  D = y1^2 */
-		fp_sqr(t2, p->y);
-
-		/* E = a * C */
-		fp_mul(t3, core_get()->ed_a, t1);
-
-		/* F = E + D, H = Z^2 */
-		fp_add(t4, t3, t2);
-		fp_sqr(t5, p->z);
-
-		// J = F - 2H
-		fp_dbl(t6, t5);
-		fp_sub(t6, t4, t6);
-
-		// x3 = (B - C - D) * J
-		fp_sub(r->x, t0, t1);
-		fp_sub(r->x, r->x, t2);
-		fp_mul(r->x, r->x, t6);
-
-		// x3 = F * (E - D)
-		fp_sub(r->y, t3, t2);
-		fp_mul(r->y, t4, r->y);
-
-		/* x3 = F * J */
-		fp_mul(r->z, t4, t6);
-
-		r->coord = PROJC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		fp_free(t6);
-	}
-}
-
-#endif /* ED_PROJC */
-
-#if ED_ADD == EXTND || !defined(STRIP)
-
-void ed_dbl_extnd(ed_t r, const ed_t p) {
-	fp_t t0, t1, t2, t3, t4;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-
-		// efd: dbl-2008-hwcd, rfc edition
-		// 4M + 4S + 1D + 7add
-
-		/* A = X^2, B = Y^2 */
-		fp_sqr(t0, p->x);
-		fp_sqr(t1, p->y);
-
-		/* C = 2 * Z^2 */
-		fp_sqr(r->z, p->z);
-		fp_dbl(r->z, r->z);
-
-		/* D = a * A */
-		fp_mul(r->t, core_get()->ed_a, t0);
-
-		/* E = (X + Y) ^ 2 - A - B */
-		fp_add(t2, p->x, p->y);
-		fp_sqr(t2, t2);
-		fp_sub(t2, t2, t0);
-		fp_sub(t2, t2, t1);
-
-		/* G = D + B, F = G - C, H = D - B */
-		fp_add(t4, r->t, t1);
-		fp_sub(t3, t4, r->z);
-		fp_sub(r->z, r->t, t1);
-
-		/* X = E * F */
-		fp_mul(r->x, t2, t3);
-		/* Y = G * H */
-		fp_mul(r->y, t4, r->z);
-		if (r->coord != EXTND) {
-			/* T = E * H */
-			fp_mul(r->t, t2, r->z);
-		}
-		/* Z = F * G */
-		fp_mul(r->z, t3, t4);
-
-		r->coord = PROJC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-	}
-}
-
-#endif /* ED_EXTND */
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_map.c b/src/dashbls/depends/relic/src/ed/relic_ed_map.c
deleted file mode 100644
index 260d98dbee81..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_map.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of hashing to a prime elliptic curve.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-void ed_map_ell2_5mod8(ed_t p, fp_t t) {
-	bn_t h;
-	fp_t tv1, tv2, tv3, tv4, tv5;
-	bn_null(h);
-	fp_null(tv1);
-	fp_null(tv2);
-	fp_null(tv3);
-	fp_null(tv4);
-	fp_null(tv5);
-
-	/* aliases to make code easier to read */
-	ctx_t *ctx = core_get();
-	dig_t *c_2exp = ctx->ed_map_c[0];
-	dig_t *sqrt_M1 = ctx->ed_map_c[1];
-	dig_t *sqrt_M486664 = ctx->ed_map_c[2];
-	dig_t *c_486662 = ctx->ed_map_c[3];
-
-	RLC_TRY {
-		bn_new(h);
-		fp_new(tv1);
-		fp_new(tv2);
-		fp_new(tv3);
-		fp_new(tv4);
-		fp_new(tv5);
-
-		/* set h = (p - 5) / 8 */
-		h->used = RLC_FP_DIGS;
-		h->sign = RLC_POS;
-		dv_copy(h->dp, fp_prime_get(), RLC_FP_DIGS); /* p */
-		bn_sub_dig(h, h, 5);                         /* p - 5 */
-		bn_rsh(h, h, 3);                             /* (p - 5) / 8 */
-
-		/* start evaluating map */
-		fp_sqr(tv1, t);
-		fp_dbl(tv1, tv1);
-		fp_add_dig(tv3, tv1, 1);
-		fp_sqr(tv2, tv3);
-		fp_mul(p->z, tv2, tv3);
-
-		/* compute numerator of g(x1) */
-		fp_sqr(tv4, c_486662);
-		fp_mul(tv4, tv4, tv1);
-		fp_sub(tv4, tv4, tv2);
-		fp_mul(tv4, tv4, c_486662);
-
-		/* compute divsrqt */
-		fp_sqr(tv3, p->z);
-		fp_sqr(tv2, tv3);
-		fp_mul(tv3, tv3, p->z);
-		fp_mul(tv3, tv3, tv4);
-		fp_mul(tv2, tv2, tv3);
-		fp_exp(tv2, tv2, h);
-		fp_mul(tv2, tv2, tv3);
-
-		/* figure out which sqrt we should keep */
-		fp_mul(p->y, tv2, sqrt_M1);
-		fp_sqr(p->x, tv2);
-		fp_mul(p->x, p->x, p->z);
-		{
-			const int e1 = fp_cmp(p->x, tv4);
-			dv_copy_cond(p->y, tv2, RLC_FP_DIGS, e1 == RLC_EQ);
-		} /* e1 goes out of scope */
-
-		/* compute numerator of g(x2) */
-		fp_mul(tv3, tv2, t);
-		fp_mul(tv3, tv3, c_2exp);
-		fp_mul(tv5, tv3, sqrt_M1);
-
-		/* figure out which sqrt we should keep */
-		fp_mul(p->x, tv4, tv1);
-		fp_sqr(tv2, tv3);
-		fp_mul(tv2, tv2, p->z);
-		{
-			const int e2 = fp_cmp(p->x, tv2);
-			dv_copy_cond(tv5, tv3, RLC_FP_DIGS, e2 == RLC_EQ);
-		} /* e2 goes out of scope */
-
-		/* figure out whether we wanted y1 or y2 and x1 or x2 */
-		fp_sqr(tv2, p->y);
-		fp_mul(tv2, tv2, p->z);
-		{
-			const int e3 = fp_cmp(tv2, tv4);
-			fp_set_dig(p->x, 1);
-			dv_copy_cond(p->x, tv1, RLC_FP_DIGS, e3 != RLC_EQ);
-			fp_mul(p->x, p->x, c_486662);
-			fp_neg(p->x, p->x);
-			dv_copy_cond(p->y, tv5, RLC_FP_DIGS, e3 != RLC_EQ);
-
-			/* fix sign of y */
-			fp_prime_back(h, p->y);
-			const int e4 = bn_get_bit(h, 0);
-			fp_neg(tv2, p->y);
-			dv_copy_cond(p->y, tv2, RLC_FP_DIGS, (e3 == RLC_EQ) ^ (e4 == 1));
-		} /* e3 and e4 go out of scope */
-		fp_add_dig(p->z, tv1, 1);
-
-		/* convert to an Edwards point */
-		/* tmp1 = xnumerator = sqrt_M486664 * x */
-		fp_mul(tv1, p->x, sqrt_M486664); /* xn = sqrt(-486664) * x */
-		fp_mul(tv2, p->y, p->z);         /* xd = y * z */
-		fp_sub(tv3, p->x, p->z);         /* yn = x - z */
-		fp_add(tv4, p->x, p->z);         /* yd = x + z */
-
-		fp_mul(p->z, tv2, tv4);
-		fp_mul(p->x, tv1, tv4);
-		fp_mul(p->y, tv2, tv3);
-		{
-			/* exceptional case: either denominator == 0 */
-			const int e4 = fp_is_zero(p->z);
-			fp_set_dig(tv5, 1);
-			dv_copy_cond(p->x, p->z, RLC_FP_DIGS, e4); /* set x to 0 */
-			dv_copy_cond(p->y, tv5, RLC_FP_DIGS, e4);
-			dv_copy_cond(p->z, tv5, RLC_FP_DIGS, e4);
-		} /* e4 goes out of scope */
-
-		/* clear denominator / compute extended coordinates if necessary */
-#if ED_ADD == EXTND || ED_ADD == PROJC
-		p->coord = PROJC;
-#if ED_ADD == EXTND
-		/* extended coordinates: T * Z == X * Y */
-		fp_mul(p->t, p->x, p->y);
-		fp_mul(p->x, p->x, p->z);
-		fp_mul(p->y, p->y, p->z);
-		fp_sqr(p->z, p->z);
-#endif /* ED_ADD == EXTND */
-#else  /* ED_ADD == BASIC */
-		fp_inv(tv1, p->z);
-		fp_mul(p->x, p->x, tv1);
-		fp_mul(p->y, p->y, tv1);
-		fp_set_dig(p->z, 1);
-		p->coord = BASIC;
-#endif /* ED_ADD */
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT)
-	}
-	RLC_FINALLY {
-		bn_free(h);
-		fp_free(tv1);
-		fp_free(tv2);
-		fp_free(tv3);
-		fp_free(tv4);
-		fp_free(tv5);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ed_map_dst(ed_t p, const uint8_t *msg, int len, const uint8_t *dst, int dst_len) {
-	bn_t k;
-	fp_t t;
-	ed_t q;
-	/* enough space for two field elements plus extra bytes for uniformity */
-	const int len_per_elm = (FP_PRIME + ed_param_level() + 7) / 8;
-	uint8_t *pseudo_random_bytes = RLC_ALLOCA(uint8_t, 2 * len_per_elm);
-
-	bn_null(k);
-	fp_null(t);
-	ed_null(q);
-
-	RLC_TRY {
-		bn_new(k);
-		fp_new(t);
-		ed_new(q);
-
-		/* pseudorandom string */
-		md_xmd(pseudo_random_bytes, 2 * len_per_elm, msg, len, dst, dst_len);
-
-#define ED_MAP_CONVERT_BYTES(IDX)                                                        \
-	do {                                                                                 \
-		bn_read_bin(k, pseudo_random_bytes + IDX * len_per_elm, len_per_elm);            \
-		fp_prime_conv(t, k);                                                             \
-	} while (0)
-
-		/* first map invocation */
-		ED_MAP_CONVERT_BYTES(0);
-		ed_map_ell2_5mod8(p, t);
-
-		/* second map invocation */
-		ED_MAP_CONVERT_BYTES(1);
-		ed_map_ell2_5mod8(q, t);
-
-#undef ED_MAP_CONVERT_BYTES
-
-		ed_add(p, p, q);
-
-		/* clear cofactor */
-		switch (ed_param_get()) {
-			case CURVE_ED25519:
-				ed_dbl(p, p);
-				ed_dbl(p, p);
-				ed_dbl(p, p);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-
-		ed_norm(p, p);
-#if ED_ADD == EXTND
-		fp_mul(p->t, p->x, p->y);
-#endif
-		p->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		fp_free(t);
-		ed_free(q);
-		RLC_FREE(pseudo_random_bytes);
-	}
-}
-
-void ed_map(ed_t p, const uint8_t *msg, int len) {
-	ed_map_dst(p, msg, len, (const uint8_t *)"RELIC", 5);
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_mul.c b/src/dashbls/depends/relic/src/ed/relic_ed_mul.c
deleted file mode 100644
index 725401590c80..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_mul.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point multiplication on Twisted Edwards elliptic curves.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if ED_MUL == LWNAF || !defined(STRIP)
-
-static void ed_mul_naf_imp(ed_t r, const ed_t p, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FP_BITS + 1];
-	ed_t t[1 << (ED_WIDTH - 2)];
-
-	if (bn_is_zero(k)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-			ed_null(t[i]);
-			ed_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		ed_tab(t, p, ED_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, k, EP_WIDTH);
-
-		ed_set_infty(r);
-		for (i = l - 1; i > 0; i--) {
-			n = naf[i];
-			if (n == 0) {
-				/* This point will be doubled in the next iteration. */
-#if ED_ADD == EXTND
-				r->coord = EXTND;
-#endif
-			}
-			ed_dbl(r, r);
-			if (n > 0) {
-				ed_add(r, r, t[n / 2]);
-			} else if (n < 0) {
-				ed_sub(r, r, t[-n / 2]);
-			}
-		}
-
-		/* Last iteration. */
-		n = naf[0];
-		ed_dbl(r, r);
-		if (n > 0) {
-			ed_add(r, r, t[n / 2]);
-		} else if (n < 0) {
-			ed_sub(r, r, t[-n / 2]);
-		}
-
-		/* Convert r to affine coordinates. */
-		ed_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-			ed_free(t[i]);
-		}
-	}
-}
-
-#endif /* ED_MUL == LWNAF */
-
-#if ED_MUL == LWREG || !defined(STRIP)
-
-static void ed_mul_reg_imp(ed_t r, const ed_t p, const bn_t k) {
-	bn_t _k;
-	int i, j, l, n;
-	int8_t s, reg[RLC_CEIL(RLC_FP_BITS + 1, ED_WIDTH - 1)];
-	ed_t t[1 << (ED_WIDTH - 2)], u, v;
-
-	bn_null(_k);
-	if (bn_is_zero(k)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(_k);
-		ed_new(u);
-		ed_new(v);
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-			ed_null(t[i]);
-			ed_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		ed_tab(t, p, ED_WIDTH);
-
-		/* Make a copy of the scalar for processing. */
-		bn_abs(_k, k);
-		_k->dp[0] |= bn_is_even(_k);
-
-		/* Compute the w-NAF representation of k. */
-		l = RLC_CEIL(RLC_FP_BITS + 1, ED_WIDTH - 1);
-		bn_rec_reg(reg, &l, _k, RLC_FP_BITS, ED_WIDTH);
-
-		ed_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			for (j = 0; j < ED_WIDTH - 1; j++) {
-#if ED_ADD == EXTND
-				r->coord = EXTND;
-#endif
-				ed_dbl(r, r);
-			}
-
-			n = reg[i];
-			s = (n >> 7);
-			n = ((n ^ s) - s) >> 1;
-
-			for (j = 0; j < (1 << (EP_WIDTH - 2)); j++) {
-				dv_copy_cond(u->x, t[j]->x, RLC_FP_DIGS, j == n);
-				dv_copy_cond(u->y, t[j]->y, RLC_FP_DIGS, j == n);
-				dv_copy_cond(u->z, t[j]->z, RLC_FP_DIGS, j == n);
-			}
-			ed_neg(v, u);
-			dv_copy_cond(u->x, v->x, RLC_FP_DIGS, s != 0);
-			ed_add(r, r, u);
-		}
-
-		/* t[0] has an unmodified copy of p. */
-		ed_sub(u, r, t[0]);
-		dv_copy_cond(r->x, u->x, RLC_FP_DIGS, bn_is_even(k));
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, bn_is_even(k));
-		dv_copy_cond(r->z, u->z, RLC_FP_DIGS, bn_is_even(k));
-		/* Convert r to affine coordinates. */
-		ed_norm(r, r);
-		ed_neg(u, r);
-		dv_copy_cond(r->x, u->x, RLC_FP_DIGS, bn_sign(k) == RLC_NEG);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-			ed_free(t[i]);
-		}
-		bn_free(_k);
-	}
-}
-
-#endif /* ED_MUL == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_MUL == BASIC || !defined(STRIP)
-
-void ed_mul_basic(ed_t r, const ed_t p, const bn_t k) {
-	ed_t t;
-
-	ed_null(t);
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t);
-
-		ed_copy(t, p);
-		for (int i = bn_bits(k) - 2; i >= 0; i--) {
-			ed_dbl(t, t);
-			if (bn_get_bit(k, i)) {
-				ed_add(t, t, p);
-			}
-		}
-
-		ed_norm(r, t);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
-
-#endif
-
-#if ED_MUL == SLIDE || !defined(STRIP)
-
-void ed_mul_slide(ed_t r, const ed_t p, const bn_t k) {
-	ed_t t[1 << (EP_WIDTH - 1)], q;
-	int i, j, l;
-	uint8_t win[RLC_FP_BITS + 1];
-
-	ed_null(q);
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i ++) {
-			ed_null(t[i]);
-			ed_new(t[i]);
-		}
-
-		ed_new(q);
-
-		ed_copy(t[0], p);
-		ed_dbl(q, p);
-
-#if defined(EP_MIXED)
-		ed_norm(q, q);
-#endif
-
-		/* Create table. */
-		for (i = 1; i < (1 << (EP_WIDTH - 1)); i++) {
-			ed_add(t[i], t[i - 1], q);
-		}
-
-#if defined(EP_MIXED)
-		ed_norm_sim(t + 1, (const ed_t *)t + 1, (1 << (EP_WIDTH - 1)) - 1);
-#endif
-
-		ed_set_infty(q);
-		l = RLC_FP_BITS + 1;
-		bn_rec_slw(win, &l, k, EP_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				ed_dbl(q, q);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					ed_dbl(q, q);
-				}
-				ed_add(q, q, t[win[i] >> 1]);
-			}
-		}
-
-		ed_norm(r, q);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i++) {
-			ed_free(t[i]);
-		}
-		ed_free(q);
-	}
-}
-
-#endif
-
-#if ED_MUL == MONTY || !defined(STRIP)
-
-void ed_mul_monty(ed_t r, const ed_t p, const bn_t k) {
-	ed_t t[2];
-
-	ed_null(t[0]);
-	ed_null(t[1]);
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t[0]);
-		ed_new(t[1]);
-
-		ed_set_infty(t[0]);
-		ed_copy(t[1], p);
-
-		for (int i = bn_bits(k) - 1; i >= 0; i--) {
-			int j = bn_get_bit(k, i);
-
-			dv_swap_cond(t[0]->x, t[1]->x, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y, t[1]->y, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z, t[1]->z, RLC_FP_DIGS, j ^ 1);
-#if ED_ADD == EXTND
-			dv_swap_cond(t[0]->t, t[1]->t, RLC_FP_DIGS, j ^ 1);
-#endif
-			ed_add(t[0], t[0], t[1]);
-			ed_dbl(t[1], t[1]);
-			dv_swap_cond(t[0]->x, t[1]->x, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y, t[1]->y, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z, t[1]->z, RLC_FP_DIGS, j ^ 1);
-#if ED_ADD == EXTND
-			dv_swap_cond(t[0]->t, t[1]->t, RLC_FP_DIGS, j ^ 1);
-#endif
-		}
-
-		ed_norm(r, t[0]);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t[1]);
-		ed_free(t[0]);
-	}
-}
-
-#endif
-
-#if ED_MUL == LWNAF || !defined(STRIP)
-
-void ed_mul_lwnaf(ed_t r, const ed_t p, const bn_t k) {
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	ed_mul_naf_imp(r, p, k);
-}
-
-#endif
-
-#if ED_MUL == LWREG || !defined(STRIP)
-
-void ed_mul_lwreg(ed_t r, const ed_t p, const bn_t k) {
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	ed_mul_reg_imp(r, p, k);
-}
-
-#endif
-
-void ed_mul_gen(ed_t r, const bn_t k) {
-	if (bn_is_zero(k)) {
-		ed_set_infty(r);
-		return;
-	}
-#ifdef ED_PRECO
-	ed_mul_fix(r, ed_curve_get_tab(), k);
-#else
-	ed_t g;
-
-	ed_null(g);
-
-	RLC_TRY {
-		ed_new(g);
-		ed_curve_get_gen(g);
-		ed_mul(r, g, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(g);
-	}
-#endif
-}
-
-void ed_mul_dig(ed_t r, const ed_t p, dig_t k) {
-	ed_t t;
-	bn_t _k;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	ed_null(t);
-	bn_null(_k);
-
-	if (k == 0 || ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(t);
-		bn_new(_k);
-
-		bn_set_dig(_k, k);
-
-		l = RLC_DIG + 1;
-		bn_rec_naf(naf, &l, _k, 2);
-
-		ed_set_infty(t);
-		for (int i = l - 1; i >= 0; i--) {
-			ed_dbl(t, t);
-
-			u = naf[i];
-			if (u > 0) {
-				ed_add(t, t, p);
-			} else if (u < 0) {
-				ed_sub(t, t, p);
-			}
-		}
-
-		ed_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-		bn_free(_k);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_mul_fix.c b/src/dashbls/depends/relic/src/ed/relic_ed_mul_fix.c
deleted file mode 100644
index 175a759af21a..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_mul_fix.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of fixed point multiplication on prime elliptic Edwards curves.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if ED_FIX == LWNAF || !defined(STRIP)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-NAF mixed coordinate
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void ed_mul_fix_plain(ed_t r, const ed_t * t, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FP_BITS + 1], *_k;
-
-	/* Compute the w-TNAF representation of k. */
-	l = RLC_FP_BITS + 1;
-	bn_rec_naf(naf, &l, k, ED_DEPTH);
-
-	_k = naf + l - 1;
-	ed_set_infty(r);
-	for (i = l - 1; i >= 0; i--, _k--) {
-		n = *_k;
-		if (n == 0) {
-			/* doubling is followed by another doubling */
-			if (i > 0) {
-				r->coord = EXTND;
-				ed_dbl(r, r);
-			} else {
-				/* use full extended coordinate doubling for last step */
-				ed_dbl(r, r);
-			}
-		} else {
-			ed_dbl(r, r);
-			if (n > 0) {
-				ed_add(r, r, t[n / 2]);
-			} else if (n < 0) {
-				ed_sub(r, r, t[-n / 2]);
-			}
-		}
-	}
-	/* Convert r to affine coordinates. */
-	ed_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ed_neg(r, r);
-	}
-}
-
-#endif /* ED_FIX == LWNAF */
-
-#if ED_FIX == COMBS || !defined(STRIP)
-
-/**
- * Multiplies a prime elliptic curve point by an integer using the COMBS
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void ed_mul_combs_plain(ed_t r, const ed_t * t, const bn_t k) {
-	int i, j, l, w, n0, p0, p1;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % ED_DEPTH) == 0 ? (l / ED_DEPTH) : (l / ED_DEPTH) + 1);
-
-		n0 = bn_bits(k);
-
-		p0 = (ED_DEPTH) * l - 1;
-
-		w = 0;
-		p1 = p0--;
-		for (j = ED_DEPTH - 1; j >= 0; j--, p1 -= l) {
-			w = w << 1;
-			if (p1 < n0 && bn_get_bit(k, p1)) {
-				w = w | 1;
-			}
-		}
-		ed_copy(r, t[w]);
-
-		for (i = l - 2; i >= 0; i--) {
-			ed_dbl(r, r);
-
-			w = 0;
-			p1 = p0--;
-			for (j = ED_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w = w << 1;
-				if (p1 < n0 && bn_get_bit(k, p1)) {
-					w = w | 1;
-				}
-			}
-			if (w > 0) {
-				ed_add(r, r, t[w]);
-			}
-		}
-		ed_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif /* ED_FIX == COMBS */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_FIX == BASIC || !defined(STRIP)
-
-void ed_mul_pre_basic(ed_t * t, const ed_t p) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-
-		ed_copy(t[0], p);
-		for (int i = 1; i < bn_bits(n); i++) {
-			ed_dbl(t[i], t[i - 1]);
-		}
-
-		ed_norm_sim(t + 1, (const ed_t *)t + 1, bn_bits(n) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ed_mul_fix_basic(ed_t r, const ed_t *t, const bn_t k) {
-	if (bn_is_zero(k)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	ed_set_infty(r);
-
-	for (int i = 0; i < bn_bits(k); i++) {
-		if (bn_get_bit(k, i)) {
-			ed_add(r, r, t[i]);
-		}
-	}
-	ed_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ed_neg(r, r);
-	}
-}
-
-#endif
-
-#if ED_FIX == COMBS || !defined(STRIP)
-
-void ed_mul_pre_combs(ed_t * t, const ed_t p) {
-	int i, j, l;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % ED_DEPTH) == 0 ? (l / ED_DEPTH) : (l / ED_DEPTH) + 1);
-
-		ed_set_infty(t[0]);
-
-		ed_copy(t[1], p);
-		for (j = 1; j < ED_DEPTH; j++) {
-			ed_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < l; i++) {
-				ed_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(ED_MIXED)
-			ed_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ed_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-
-		ed_norm_sim(t + 2, (const ed_t *)t + 2, RLC_ED_TABLE_COMBS - 2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ed_mul_fix_combs(ed_t r, const ed_t * t, const bn_t k) {
-	ed_mul_combs_plain(r, t, k);
-}
-#endif
-
-#if ED_FIX == COMBD || !defined(STRIP)
-
-void ed_mul_pre_combd(ed_t * t, const ed_t p) {
-	int i, j, d, e;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % ED_DEPTH) == 0 ? (d / ED_DEPTH) : (d / ED_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ed_set_infty(t[0]);
-		ed_copy(t[1], p);
-		for (j = 1; j < ED_DEPTH; j++) {
-			ed_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < d; i++) {
-				ed_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(ED_MIXED)
-			ed_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ed_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-		ed_set_infty(t[1 << ED_DEPTH]);
-		for (j = 1; j < (1 << ED_DEPTH); j++) {
-			ed_dbl(t[(1 << ED_DEPTH) + j], t[j]);
-			for (i = 1; i < e; i++) {
-				ed_dbl(t[(1 << ED_DEPTH) + j], t[(1 << ED_DEPTH) + j]);
-			}
-		}
-
-		ed_norm_sim(t + 2, (const ed_t *)t + 2, (1 << ED_DEPTH) - 2);
-		ed_norm_sim(t + (1 << ED_DEPTH) + 1,
-				(const ed_t *)t + (1 << ED_DEPTH) + 1, (1 << ED_DEPTH) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ed_mul_fix_combd(ed_t r, const ed_t * t, const bn_t k) {
-	int i, j, d, e, w0, w1, n0, p0, p1;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % ED_DEPTH) == 0 ? (d / ED_DEPTH) : (d / ED_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ed_set_infty(r);
-		n0 = bn_bits(k);
-
-		p1 = (e - 1) + (ED_DEPTH - 1) * d;
-		for (i = e - 1; i >= 0; i--) {
-			ed_dbl(r, r);
-
-			w0 = 0;
-			p0 = p1;
-			for (j = ED_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w0 = w0 << 1;
-				if (p0 < n0 && bn_get_bit(k, p0)) {
-					w0 = w0 | 1;
-				}
-			}
-
-			w1 = 0;
-			p0 = p1-- + e;
-			for (j = ED_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w1 = w1 << 1;
-				if (i + e < d && p0 < n0 && bn_get_bit(k, p0)) {
-					w1 = w1 | 1;
-				}
-			}
-
-			ed_add(r, r, t[w0]);
-			ed_add(r, r, t[(1 << ED_DEPTH) + w1]);
-		}
-		ed_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if ED_FIX == LWNAF || !defined(STRIP)
-
-void ed_mul_pre_lwnaf(ed_t * t, const ed_t p) {
-	ed_tab(t, p, ED_DEPTH);
-}
-
-void ed_mul_fix_lwnaf(ed_t r, const ed_t * t, const bn_t k) {
-	ed_mul_fix_plain(r, t, k);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_mul_sim.c b/src/dashbls/depends/relic/src/ed/relic_ed_mul_sim.c
deleted file mode 100644
index b9b70410efd3..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_mul_sim.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of simultaneous point multiplication on binary elliptic
- * curves.
- *
- * @version $Id$
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if ED_SIM == INTER || !defined(STRIP)
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ed_mul_sim_plain(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-		const bn_t m, const ed_t *t) {
-	int i, l, l0, l1, n0, n1, w, gen;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], *_k, *_m;
-	ed_t t0[1 << (ED_WIDTH - 2)];
-	ed_t t1[1 << (ED_WIDTH - 2)];
-
-	RLC_TRY {
-		gen = (t == NULL ? 0 : 1);
-		if (!gen) {
-			for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-				ed_null(t0[i]);
-				ed_new(t0[i]);
-			}
-			ed_tab(t0, p, ED_WIDTH);
-			t = (const ed_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (ED_WIDTH - 2)); i++) {
-			ed_null(t1[i]);
-			ed_new(t1[i]);
-		}
-		/* Compute the precomputation table. */
-		ed_tab(t1, q, ED_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		if (gen) {
-			w = ED_DEPTH;
-		} else {
-			w = ED_WIDTH;
-		}
-		l0 = l1 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k, w);
-		bn_rec_naf(naf1, &l1, m, ED_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-		ed_set_infty(r);
-		for (i = l - 1; i >= 0; i--, _k--, _m--) {
-			ed_dbl(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-			if (n0 > 0) {
-				ed_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				ed_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				ed_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				ed_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ed_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation tables. */
-		if (!gen) {
-			for (i = 0; i < 1 << (ED_WIDTH - 2); i++) {
-				ed_free(t0[i]);
-			}
-		}
-		for (i = 0; i < 1 << (ED_WIDTH - 2); i++) {
-			ed_free(t1[i]);
-		}
-	}
-}
-
-#endif /* ED_SIM == INTER */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_SIM == BASIC || !defined(STRIP)
-
-void ed_mul_sim_basic(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-		const bn_t m) {
-	ed_t t;
-
-	ed_null(t);
-
-	RLC_TRY {
-		ed_new(t);
-		ed_mul(t, q, m);
-		ed_mul(r, p, k);
-		ed_add(t, t, r);
-		ed_norm(r, t);
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
-
-#endif
-
-#if ED_SIM == TRICK || !defined(STRIP)
-
-void ed_mul_sim_trick(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-		const bn_t m) {
-	ed_t t0[1 << (ED_WIDTH / 2)], t1[1 << (ED_WIDTH / 2)], t[1 << ED_WIDTH];
-	bn_t n;
-	int l0, l1, w = ED_WIDTH / 2;
-	uint8_t w0[RLC_FP_BITS + 1], w1[RLC_FP_BITS + 1];
-
-	bn_null(n);
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ed_is_infty(q)) {
-		ed_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-
-		for (int i = 0; i < (1 << w); i++) {
-			ed_null(t0[i]);
-			ed_null(t1[i]);
-			ed_new(t0[i]);
-			ed_new(t1[i]);
-		}
-		for (int i = 0; i < (1 << ED_WIDTH); i++) {
-			ed_null(t[i]);
-			ed_new(t[i]);
-		}
-
-		ed_set_infty(t0[0]);
-		ed_copy(t0[1], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(t0[1], t0[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			ed_add(t0[i], t0[i - 1], t0[1]);
-		}
-
-		ed_set_infty(t1[0]);
-		ed_copy(t1[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ed_neg(t1[1], t1[1]);
-		}
-		for (int i = 1; i < (1 << w); i++) {
-			ed_add(t1[i], t1[i - 1], t1[1]);
-		}
-
-		for (int i = 0; i < (1 << w); i++) {
-			for (int j = 0; j < (1 << w); j++) {
-				ed_add(t[(i << w) + j], t0[i], t1[j]);
-			}
-		}
-
-#if defined(ED_MIXED)
-		ed_norm_sim(t + 1, (const ed_t *)t + 1, (1 << (ED_WIDTH)) - 1);
-#endif
-
-		l0 = l1 = RLC_CEIL(RLC_FP_BITS, w);
-		bn_rec_win(w0, &l0, k, w);
-		bn_rec_win(w1, &l1, m, w);
-
-		for (int i = l0; i < l1; i++) {
-			w0[i] = 0;
-		}
-		for (int i = l1; i < l0; i++) {
-			w1[i] = 0;
-		}
-
-		ed_set_infty(r);
-		for (int i = RLC_MAX(l0, l1) - 1; i >= 0; i--) {
-			for (int j = 0; j < w; j++) {
-				ed_dbl(r, r);
-			}
-			ed_add(r, r, t[(w0[i] << w) + w1[i]]);
-		}
-		ed_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < (1 << w); i++) {
-			ed_free(t0[i]);
-			ed_free(t1[i]);
-		}
-		for (int i = 0; i < (1 << ED_WIDTH); i++) {
-			ed_free(t[i]);
-		}
-	}
-}
-#endif
-
-#if ED_SIM == INTER || !defined(STRIP)
-
-void ed_mul_sim_inter(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-		const bn_t m) {
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ed_is_infty(q)) {
-		ed_mul(r, p, k);
-		return;
-	}
-
-	ed_mul_sim_plain(r, p, k, q, m, NULL);
-}
-
-#endif
-
-#if ED_SIM == JOINT || !defined(STRIP)
-
-void ed_mul_sim_joint(ed_t r, const ed_t p, const bn_t k, const ed_t q,
-		const bn_t m) {
-	ed_t t[5];
-	int i, l, u_i, offset;
-	int8_t jsf[2 * (RLC_FP_BITS + 1)];
-
-	if (bn_is_zero(k) || ed_is_infty(p)) {
-		ed_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ed_is_infty(q)) {
-		ed_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < 5; i++) {
-			ed_null(t[i]);
-			ed_new(t[i]);
-		}
-
-		ed_set_infty(t[0]);
-		ed_copy(t[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ed_neg(t[1], t[1]);
-		}
-		ed_copy(t[2], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ed_neg(t[2], t[2]);
-		}
-		ed_add(t[3], t[2], t[1]);
-		ed_sub(t[4], t[2], t[1]);
-#if defined(ED_MIXED)
-		ed_norm_sim(t + 3, (const ed_t *)t + 3, 2);
-#endif
-
-		l = 2 * (RLC_FP_BITS + 1);
-		bn_rec_jsf(jsf, &l, k, m);
-
-		ed_set_infty(r);
-
-		offset = RLC_MAX(bn_bits(k), bn_bits(m)) + 1;
-		for (i = l - 1; i >= 0; i--) {
-			ed_dbl(r, r);
-			if (jsf[i] != 0 && jsf[i] == -jsf[i + offset]) {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ed_sub(r, r, t[4]);
-				} else {
-					ed_add(r, r, t[4]);
-				}
-			} else {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ed_sub(r, r, t[-u_i]);
-				} else {
-					ed_add(r, r, t[u_i]);
-				}
-			}
-		}
-		ed_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < 5; i++) {
-			ed_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-void ed_mul_sim_gen(ed_t r, const bn_t k, const ed_t q, const bn_t m) {
-	ed_t g;
-
-	ed_null(g);
-
-	if (bn_is_zero(k)) {
-		ed_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ed_is_infty(q)) {
-		ed_mul_gen(r, k);
-		return;
-	}
-
-	RLC_TRY {
-		ed_new(g);
-
-		ed_curve_get_gen(g);
-
-#if ED_SIM == INTER && ED_FIX == LWNAF && defined(ED_PRECO)
-		ed_mul_sim_plain(r, g, k, q, m, ed_curve_get_tab());
-#else
-		ed_mul_sim(r, g, k, q, m);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(g);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_neg.c b/src/dashbls/depends/relic/src/ed/relic_ed_neg.c
deleted file mode 100644
index 2bcb9a6a7d27..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_neg.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point negation on Edwards elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if ED_ADD == BASIC || !defined(STRIP)
-
-void ed_neg_basic(ed_t r, const ed_t p) {
-	if (ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	fp_copy(r->y, p->y);
-	fp_neg(r->x, p->x);
-
-	r->coord = BASIC;
-}
-
-#endif
-
-#if ED_ADD == PROJC || ED_ADD == EXTND || !defined(STRIP)
-
-void ed_neg_projc(ed_t r, const ed_t p) {
-	if (ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	fp_neg(r->x, p->x);
-	fp_copy(r->y, p->y);
-	fp_copy(r->z, p->z);
-#if ED_ADD == EXTND
-	fp_neg(r->t, p->t);
-#endif
-
-	r->coord = p->coord;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_norm.c b/src/dashbls/depends/relic/src/ed/relic_ed_norm.c
deleted file mode 100644
index cc06c42aa007..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_norm.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization on Edwards elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if ED_ADD == PROJC || ED_ADD == EXTND || !defined(STRIP)
-
-#include "assert.h"
-
-/**
- * Normalizes a point represented in projective coordinates.
- *
- * @param r			- the result.
- * @param p			- the point to normalize.
- */
-static void ed_norm_imp(ed_t r, const ed_t p, int inverted) {
-	if (p->coord != BASIC) {
-		if (inverted) {
-			fp_copy(r->z, p->z);
-		} else {
-			fp_inv(r->z, p->z);
-		}
-		fp_mul(r->x, p->x, r->z);
-		fp_mul(r->y, p->y, r->z);
-#if ED_ADD == EXTND
-		fp_mul(r->t, p->t, r->z);
-#endif
-		fp_set_dig(r->z, 1);
-
-		r->coord = BASIC;
-	}
-}
-
-#endif /* ED_ADD == PROJC */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ed_norm(ed_t r, const ed_t p) {
-	if (ed_is_infty(p)) {
-		ed_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		/* If the point is represented in affine coordinates, just copy it. */
-		ed_copy(r, p);
-		return;
-	}
-#if ED_ADD == PROJC || ED_ADD == EXTND || !defined(STRIP)
-	ed_norm_imp(r, p, 0);
-#endif /* ED_ADD != BASIC*/
-}
-
-void ed_norm_sim(ed_t *r, const ed_t *t, int n) {
-	fp_t* a = RLC_ALLOCA(fp_t, n);
-
-	RLC_TRY {
-		if (a == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fp_null(a[i]);
-			fp_new(a[i]);
-			fp_copy(a[i], t[i]->z);
-		}
-
-		fp_inv_sim(a, (const fp_t *)a, n);
-
-		for (int i = 0; i < n; i++) {
-			fp_copy(r[i]->x, t[i]->x);
-			fp_copy(r[i]->y, t[i]->y);
-#if ED_ADD == EXTND
-			fp_copy(r[i]->t, t[i]->t);
-#endif
-			if (!ed_is_infty(t[i])) {
-				fp_copy(r[i]->z, a[i]);
-			}
-		}
-
-		for (int i = 0; i < n; i++) {
-			ed_norm_imp(r[i], r[i], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fp_free(a[i]);
-		}
-		RLC_FREE(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_param.c b/src/dashbls/depends/relic/src/ed/relic_ed_param.c
deleted file mode 100644
index 45f676084edd..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_param.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Edwards elliptic curve parameters.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include "relic_core.h"
-
-#if FP_PRIME == 255
-/**
- * Parameters for the Ed25519 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_ED25519_A	"7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC"
-#define CURVE_ED25519_D "52036CEE2B6FFE738CC740797779E89800700A4D4141D8AB75EB4DCA135978A3"
-#define CURVE_ED25519_X "216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A"
-#define CURVE_ED25519_Y	"6666666666666666666666666666666666666666666666666666666666666658"
-#define CURVE_ED25519_R "1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED"
-#define CURVE_ED25519_H "0000000000000000000000000000000000000000000000000000000000000008"
-/** @} */
-#endif
-
-/**
- * Assigns a set of ordinary elliptic curve parameters.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- * @param[in] FIELD		- the finite field identifier.
- */
-#define ASSIGN_ED(CURVE, FIELD)												\
-	fp_param_set(FIELD);													\
-	RLC_GET(str, CURVE##_A, sizeof(CURVE##_A));								\
-	fp_read_str(core_get()->ed_a, str, strlen(str), 16);					\
-	RLC_GET(str, CURVE##_D, sizeof(CURVE##_D));								\
-	fp_read_str(core_get()->ed_d, str, strlen(str), 16);					\
-	RLC_GET(str, CURVE##_X, sizeof(CURVE##_X));								\
-	fp_read_str(g->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_Y, sizeof(CURVE##_Y));								\
-	fp_read_str(g->y, str, strlen(str), 16);								\
-	fp_set_dig(g->z, 1);													\
-	RLC_GET(str, CURVE##_R, sizeof(CURVE##_R));								\
-	bn_read_str(r, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
-	bn_read_str(h, str, strlen(str), 16);
-
-void ed_param_set(int param) {
-	ctx_t *ctx = core_get();
-	char str[2 * RLC_FP_BYTES + 2];
-
-	ed_t g;
-	bn_t r;
-	bn_t h;
-
-	ed_null(g);
-	bn_null(r);
-	bn_null(h);
-
-	RLC_TRY {
-		ed_new(g);
-		bn_new(r);
-		bn_new(h);
-
-		ctx->ed_id = 0;
-
-		switch (param) {
-#if FP_PRIME == 255
-			case CURVE_ED25519:
-				ASSIGN_ED(CURVE_ED25519, PRIME_25519);
-				break;
-#endif
-			default:
-				(void)str;
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		fp_set_dig(g->z, 1);
-		fp_neg(g->z, g->z);
-		fp_neg(g->z, g->z);
-#if ED_ADD == EXTND
-		fp_mul(g->t, g->x, g->y);
-#endif
-		g->coord = BASIC;
-
-		bn_copy(&ctx->ed_h, h);
-		bn_copy(&ctx->ed_r, r);
-		ed_copy(&ctx->ed_g, g);
-
-#ifdef ED_PRECO
-		for (int i = 0; i < RLC_ED_TABLE; i++) {
-			ctx->ed_ptr[i] = &(ctx->ed_pre[i]);
-		}
-		ed_mul_pre((ed_t *)ed_curve_get_tab(), &ctx->ed_g);
-#endif
-		ctx->ed_id = param;
-
-		/* compute constants for p == 5 mod 8 */
-		if (fp_prime_get_2ad() == 2) {
-			h->used = RLC_FP_DIGS;
-			h->sign = RLC_POS;
-			dv_copy(h->dp, fp_prime_get(), RLC_FP_DIGS); /* p */
-			bn_add_dig(h, h, 3);                         /* p + 3 */
-			bn_rsh(h, h, 3);                             /* (p + 3) / 8 */
-			/* compute 2^((p+3)/8) */
-			fp_set_dig(ctx->ed_map_c[0], 2);
-			fp_exp(ctx->ed_map_c[0], ctx->ed_map_c[0], h);
-
-			/* compute sqrt(-1) */
-			fp_set_dig(ctx->ed_map_c[1], 1);
-			fp_neg(ctx->ed_map_c[1], ctx->ed_map_c[1]);
-			if (!fp_srt(ctx->ed_map_c[1], ctx->ed_map_c[1])) {
-				/* should never happen because 2adicity > 1 */
-				RLC_THROW(ERR_NO_VALID);
-			}
-
-			if (param == CURVE_ED25519) {
-				/* compute sqrt(-486664) for mapping curve25519 -> edwards25519 */
-				fp_read_str(ctx->ed_map_c[3], "486662", 6, 10);
-				fp_add_dig(ctx->ed_map_c[2], ctx->ed_map_c[3], 2);
-				fp_neg(ctx->ed_map_c[2], ctx->ed_map_c[2]);
-				if (!fp_srt(ctx->ed_map_c[2], ctx->ed_map_c[2])) {
-					RLC_THROW(ERR_NO_VALID);
-				}
-				fp_prime_back(h, ctx->ed_map_c[2]);
-				/* make sure sgn0(ctx->ed_map_c[2]) == 0 */
-				if (bn_get_bit(h, 0) != 0) {
-					fp_neg(ctx->ed_map_c[2], ctx->ed_map_c[2]);
-				}
-			} else {
-				/* don't know how to compute remaining constants for other curves */
-				RLC_THROW(ERR_NO_VALID);
-			}
-		} else {
-			/* map impl only supports p = 5 mod 8! */
-			RLC_THROW(ERR_NO_VALID);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(r);
-		bn_free(h);
-		ed_free(g);
-	}
-}
-
-int ed_param_set_any(void) {
-	int r = RLC_OK;
-#if FP_PRIME == 255
-	ed_param_set(CURVE_ED25519);
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-int ed_param_get(void) {
-	return core_get()->ed_id;
-}
-
-int ed_param_level(void) {
-	switch (ed_param_get()) {
-		case CURVE_ED25519:
-			return 128;
-	}
-	return 0;
-}
-
-void ed_param_print(void) {
-	switch (ed_param_get()) {
-		case CURVE_ED25519:
-			util_banner("Curve ED25519:", 0);
-			break;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_pck.c b/src/dashbls/depends/relic/src/ed/relic_ed_pck.c
deleted file mode 100644
index 155ae449e3b1..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_pck.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point compression on Edwards elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ed_pck(ed_t r, const ed_t p) {
-	fp_copy(r->y, p->y);
-	int b = fp_get_bit(p->x, 0);
-	fp_zero(r->x);
-	fp_set_bit(r->x, 0, b);
-	fp_set_dig(r->z, 1);
-	r->coord = BASIC;
-}
-
-int ed_upk(ed_t r, const ed_t p) {
-	int result = 1;
-	fp_t t, u;
-
-	fp_null(t);
-	fp_null(u);
-
-	RLC_TRY {
-		fp_new(t);
-		fp_new(u);
-
-		fp_copy(r->y, p->y);
-
-		/* x = +/- sqrt((y^2 - 1) / (dy^2 - a)). */
-		fp_sqr(t, p->y);
-		fp_sub_dig(u, t, 1);
-		fp_mul(t, t, core_get()->ed_d);
-		fp_sub(t, t, core_get()->ed_a);
-		fp_inv(t, t);
-		fp_mul(u, u, t);
-		fp_srt(u, u);
-
-		if (fp_get_bit(u, 0) != fp_get_bit(p->x, 0)) {
-			fp_neg(u, u);
-		}
-		fp_copy(r->x, u);
-
-#if ED_ADD == EXTND
-		fp_mul(r->t, r->x, r->y);
-#endif
-		fp_set_dig(r->z, 1);
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/ed/relic_ed_util.c b/src/dashbls/depends/relic/src/ed/relic_ed_util.c
deleted file mode 100644
index fd629962c0c1..000000000000
--- a/src/dashbls/depends/relic/src/ed/relic_ed_util.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Edwards elliptic curve utilities.
- *
- * @version $Id$
- * @ingroup ed
- */
-
-#include <assert.h>
-
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_md.h"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ed_is_infty(const ed_t p) {
-	fp_t t;
-	int r = 0;
-
-	fp_null(t);
-
-	if (p->coord == BASIC) {
-		return (fp_is_zero(p->x) && (fp_cmp_dig(p->y, 1) == RLC_EQ));
-	}
-
-	if (fp_is_zero(p->z)) {
-		RLC_THROW(ERR_NO_VALID);
-		return 0;
-	}
-
-	RLC_TRY {
-		fp_new(t);
-		fp_inv(t, p->z);
-		fp_mul(t, p->y, t);
-		if (fp_is_zero(p->x) && (fp_cmp_dig(t, 1) == RLC_EQ)) {
-			r = 1;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t);
-	}
-
-	return r;
-}
-
-void ed_set_infty(ed_t p) {
-	fp_zero(p->x);
-	fp_set_dig(p->y, 1);
-	fp_set_dig(p->z, 1);
-#if ED_ADD == EXTND
-	fp_zero(p->t);
-#endif
-	p->coord = PROJC;
-}
-
-void ed_copy(ed_t r, const ed_t p) {
-	fp_copy(r->x, p->x);
-	fp_copy(r->y, p->y);
-	fp_copy(r->z, p->z);
-#if ED_ADD == EXTND
-	fp_copy(r->t, p->t);
-#endif
-
-	r->coord = p->coord;
-}
-
-void ed_rand(ed_t p) {
-	bn_t n, k;
-
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-		bn_rand_mod(k, n);
-
-		ed_mul_gen(p, k);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-	}
-}
-
-void ed_blind(ed_t r, const ed_t p) {
-	fp_t rand;
-
-	fp_null(rand);
-
-	RLC_TRY {
-		fp_new(rand);
-
-		fp_rand(rand);
-		fp_mul(r->x, p->x, rand);
-		fp_mul(r->y, p->y, rand);
-		fp_mul(r->z, p->z, rand);
-		r->coord = PROJC;
-#if ED_ADD == EXTND
-		fp_mul(r->t, p->t, rand);
-#endif
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(rand);
-	}
-}
-
-void ed_rhs(fp_t rhs, const ed_t p) {
-	fp_t t0, t1;
-
-	fp_null(t0);
-	fp_null(t1);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-
-		// 1 = a * X^2 + Y^2 - d * X^2 * Y^2
-		fp_sqr(t0, p->x);
-		fp_mul(t0, t0, core_get()->ed_a);
-		fp_sqr(t1, p->y);
-		fp_add(t1, t1, t0);
-		fp_mul(t0, p->x, p->y);
-		fp_sqr(t0, t0);
-		fp_mul(t0, t0, core_get()->ed_d);
-		fp_sub(rhs, t1, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-	}
-}
-
-int ed_on_curve(const ed_t p) {
-	ed_t t;
-	int r = 0;
-
-	ed_null(t);
-
-	if (fp_is_zero(p->z)) {
-		r = 0;
-	} else {
-		RLC_TRY {
-			ed_new(t);
-			ed_norm(t, p);
-
-			ed_rhs(t->z, t);
-#if ED_ADD == EXTND
-			fp_mul(t->y, t->x, t->y);
-			r = ((fp_cmp_dig(t->z, 1) == RLC_EQ) &&
-					(fp_cmp(t->y, t->t) == RLC_EQ)) || ed_is_infty(p);
-#else
-			r = (fp_cmp_dig(t->z, 1) == RLC_EQ) || ed_is_infty(p);
-#endif
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			ed_free(t);
-		}
-	}
-	return r;
-}
-
-void ed_tab(ed_t * t, const ed_t p, int w) {
-	if (w > 2) {
-		ed_dbl(t[0], p);
-#if defined(ED_MIXED)
-		ed_norm(t[0], t[0]);
-#endif
-		ed_add(t[1], t[0], p);
-		for (int i = 2; i < (1 << (w - 2)); i++) {
-			ed_add(t[i], t[i - 1], t[0]);
-		}
-#if defined(ED_MIXED)
-		ed_norm_sim(t + 1, (const ed_t *)t + 1, (1 << (w - 2)) - 1);
-#endif
-	}
-	ed_copy(t[0], p);
-}
-
-void ed_print(const ed_t p) {
-	fp_print(p->x);
-	fp_print(p->y);
-#if ED_ADD == EXTND
-	fp_print(p->t);
-#endif
-	fp_print(p->z);
-}
-
-int ed_size_bin(const ed_t a, int pack) {
-	int size = 0;
-
-	if (ed_is_infty(a)) {
-		return 1;
-	}
-
-	size = 1 + RLC_FP_BYTES;
-	if (!pack) {
-		size += RLC_FP_BYTES;
-	}
-
-	return size;
-}
-
-void ed_read_bin(ed_t a, const uint8_t *bin, int len) {
-	if (len == 1) {
-		if (bin[0] == 0) {
-			ed_set_infty(a);
-			return;
-		} else {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		}
-	}
-
-	if (len != (RLC_FP_BYTES + 1) && len != (2 * RLC_FP_BYTES + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	a->coord = BASIC;
-	fp_set_dig(a->z, 1);
-	fp_read_bin(a->y, bin + 1, RLC_FP_BYTES);
-	if (len == RLC_FP_BYTES + 1) {
-		switch (bin[0]) {
-			case 2:
-				fp_zero(a->x);
-				break;
-			case 3:
-				fp_zero(a->x);
-				fp_set_bit(a->x, 0, 1);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		ed_upk(a, a);
-	}
-
-	if (len == 2 * RLC_FP_BYTES + 1) {
-		if (bin[0] == 4) {
-			fp_read_bin(a->x, bin + RLC_FP_BYTES + 1, RLC_FP_BYTES);
-		} else {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-	}
-#if ED_ADD == EXTND
-	fp_mul(a->t, a->x, a->y);
-	fp_mul(a->x, a->x, a->z);
-	fp_mul(a->y, a->y, a->z);
-	fp_sqr(a->z, a->z);
-#endif
-
-	if (!ed_on_curve(a)) {
-		RLC_THROW(ERR_NO_VALID);
-	}
-}
-
-void ed_write_bin(uint8_t *bin, int len, const ed_t a, int pack) {
-	ed_t t;
-
-	ed_null(t);
-
-	memset(bin, 0, len);
-
-	if (ed_is_infty(a)) {
-		if (len < 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		} else {
-			return;
-		}
-	}
-
-	RLC_TRY {
-		ed_new(t);
-
-		ed_norm(t, a);
-
-		if (pack) {
-			if (len != RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				ed_pck(t, t);
-				bin[0] = 2 | fp_get_bit(t->x, 0);
-				fp_write_bin(bin + 1, RLC_FP_BYTES, t->y);
-			}
-		} else {
-			if (len != 2 * RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				bin[0] = 4;
-				fp_write_bin(bin + 1, RLC_FP_BYTES, t->y);
-				fp_write_bin(bin + RLC_FP_BYTES + 1, RLC_FP_BYTES, t->x);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ed_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_add.c b/src/dashbls/depends/relic/src/ep/relic_ep_add.c
deleted file mode 100644
index c16d8ae2bb20..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_add.c
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point addition on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Adds two points represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-static void ep_add_basic_imp(ep_t r, fp_t s, const ep_t p, const ep_t q) {
-	fp_t t0, t1, t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		/* t0 = x2 - x1. */
-		fp_sub(t0, q->x, p->x);
-		/* t1 = y2 - y1. */
-		fp_sub(t1, q->y, p->y);
-
-		/* If t0 is zero. */
-		if (fp_is_zero(t0)) {
-			if (fp_is_zero(t1)) {
-				/* If t1 is zero, q = p, should have doubled. */
-				ep_dbl_basic(r, p);
-			} else {
-				/* If t1 is not zero and t0 is zero, q = -p and r = infinity. */
-				ep_set_infty(r);
-			}
-		} else {
-			/* t2 = 1/(x2 - x1). */
-			fp_inv(t2, t0);
-			/* t2 = lambda = (y2 - y1)/(x2 - x1). */
-			fp_mul(t2, t1, t2);
-
-			/* x3 = lambda^2 - x2 - x1. */
-			fp_sqr(t1, t2);
-			fp_sub(t0, t1, p->x);
-			fp_sub(t0, t0, q->x);
-
-			/* y3 = lambda * (x1 - x3) - y1. */
-			fp_sub(t1, p->x, t0);
-			fp_mul(t1, t2, t1);
-			fp_sub(r->y, t1, p->y);
-
-			fp_copy(r->x, t0);
-			fp_copy(r->z, p->z);
-
-			if (s != NULL) {
-				fp_copy(s, t2);
-			}
-
-			r->coord = BASIC;
-		}
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Adds a point represented in homogeneous coordinates to a point represented in
- * projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the projective point.
- * @param[in] q				- the affine point.
- */
-static void ep_add_projc_mix(ep_t r, const ep_t p, const ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		/* Formulas for mixed addition from
-		 * "Complete addition formulas for prime order elliptic curves"
-		 * by Joost Renes, Craig Costello, and Lejla Batina
-		 * https://eprint.iacr.org/2015/1060.pdf
-		 */
-
-		 fp_mul(t0, p->x, q->x);
-		 fp_mul(t1, p->y, q->y);
-		 fp_add(t3, q->x, q->y);
-		 fp_add(t4, p->x, p->y);
-		 fp_mul(t3, t3, t4);
-		 fp_add(t4, t0, t1);
-		 fp_sub(t3, t3, t4);
-
-		 if (ep_curve_opt_a() == RLC_ZERO) {
- 			/* Cost of 11M + 2m_3b + 13a. */
-			if (p->coord == BASIC) {
-				/* Save 1M + 1m_3b if z1 = 1. */
-				fp_add(t4, q->y, p->y);
-	 			fp_add(r->y, q->x, p->x);
-				fp_add(r->z, t1, ep_curve_get_b3());
-	 			fp_sub(t1, t1, ep_curve_get_b3());
-			} else {
-				fp_mul(t4, q->y, p->z);
-				fp_add(t4, t4, p->y);
-	 			fp_mul(r->y, q->x, p->z);
-	 			fp_add(r->y, r->y, p->x);
-	 			ep_curve_mul_b3(t2, p->z);
-				fp_add(r->z, t1, t2);
-	 			fp_sub(t1, t1, t2);
-			}
-			fp_dbl(r->x, t0);
-			fp_add(t0, t0, r->x);
- 			ep_curve_mul_b3(r->y, r->y);
- 			fp_mul(r->x, t4, r->y);
- 			fp_mul(t2, t3, t1);
- 			fp_sub(r->x, t2, r->x);
- 			fp_mul(r->y, t0, r->y);
- 			fp_mul(t1, t1, r->z);
- 			fp_add(r->y, t1, r->y);
- 			fp_mul(t0, t0, t3);
- 			fp_mul(r->z, r->z, t4);
- 			fp_add(r->z, r->z, t0);
- 		 } else if (ep_curve_opt_a() == RLC_MIN3) {
- 			/* Cost of 11M + 2m_b + 23a. */
-			if (p->coord == BASIC) {
-				/* Save 2M + 3a if z1 = 1. */
-				fp_set_dig(t2, 3);
-	 			fp_add(t4, q->y, p->y);
-	 			fp_add(r->y, q->x, p->x);
-	 			fp_sub(r->x, r->y, ep_curve_get_b());
-			} else {
-				fp_dbl(t2, p->z);
-	 			fp_add(t2, t2, p->z);
-				fp_mul(t4, q->y, p->z);
-	 			fp_add(t4, t4, p->y);
-	 			fp_mul(r->y, q->x, p->z);
-	 			fp_add(r->y, r->y, p->x);
-				ep_curve_mul_b(r->z, p->z);
-	 			fp_sub(r->x, r->y, r->z);
-			}
- 			fp_dbl(r->z, r->x);
- 			fp_add(r->x, r->x, r->z);
- 			fp_sub(r->z, t1, r->x);
- 			fp_add(r->x, t1, r->x);
- 			ep_curve_mul_b(r->y, r->y);
- 			fp_sub(r->y, r->y, t2);
- 			fp_sub(r->y, r->y, t0);
- 			fp_dbl(t1, r->y);
- 			fp_add(r->y, t1, r->y);
- 			fp_dbl(t1, t0);
- 			fp_add(t0, t1, t0);
- 			fp_sub(t0, t0, t2);
- 			fp_mul(t1, t4, r->y);
- 			fp_mul(t2, t0, r->y);
- 			fp_mul(r->y, r->x, r->z);
- 			fp_add(r->y, r->y, t2);
- 			fp_mul(r->x, t3, r->x);
- 			fp_sub(r->x, r->x, t1);
- 			fp_mul(r->z, t4, r->z);
- 			fp_mul(t1, t3, t0);
- 			fp_add(r->z, r->z, t1);
- 		} else {
-			/* Cost of 11M + 3m_a + 2m_3b + 17a. */
-			if (p->coord == BASIC) {
-				/* Save 1M + 1m_a + 1m_3b if z1 = 1. */
-				fp_copy(t2, ep_curve_get_a());
-				fp_add(t4, q->x, p->x);
-				fp_add(t5, q->y, p->y);
-				ep_curve_mul_a(r->z, t4);
-				fp_add(r->z, r->z, ep_curve_get_b3());
-			} else {
-				ep_curve_mul_a(t2, p->z);
-				fp_mul(t4, q->x, p->z);
-				fp_add(t4, t4, p->x);
-				fp_mul(t5, q->y, p->z);
-				fp_add(t5, t5, p->y);
-				ep_curve_mul_b3(r->x, p->z);
-				ep_curve_mul_a(r->z, t4);
-				fp_add(r->z, r->x, r->z);
-			}
-			fp_sub(r->x, t1, r->z);
-			fp_add(r->z, t1, r->z);
-			fp_mul(r->y, r->x, r->z);
-			fp_dbl(t1, t0);
-			fp_add(t1, t1, t0);
-			ep_curve_mul_b3(t4, t4);
-			fp_add(t1, t1, t2);
-			fp_sub(t2, t0, t2);
-			ep_curve_mul_a(t2, t2);
-			fp_add(t4, t4, t2);
-			fp_mul(t0, t1, t4);
-			fp_add(r->y, r->y, t0);
-			fp_mul(t0, t5, t4);
-			fp_mul(r->x, t3, r->x);
-			fp_sub(r->x, r->x, t0);
-			fp_mul(t0, t3, t1);
-			fp_mul(r->z, t5, r->z);
-			fp_add(r->z, r->z, t0);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-}
-
-/**
- * Adds two points represented in homogeneous coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-static void ep_add_projc_imp(ep_t r, const ep_t p, const ep_t q) {
-#if defined(EP_MIXED) && defined(STRIP)
-	/* If code size is a problem, leave only the mixed version. */
-	ep_add_projc_mix(r, p, q);
-#else /* General addition. */
-
-#if defined(EP_MIXED) || !defined(STRIP)
-	/* Test if z2 = 1 only if mixed coordinates are turned on. */
-	if (q->coord == BASIC) {
-		ep_add_projc_mix(r, p, q);
-		return;
-	}
-#endif
-
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		/* Formulas for point addition from
-		 * "Complete addition formulas for prime order elliptic curves"
-		 * by Joost Renes, Craig Costello, and Lejla Batina
-		 * https://eprint.iacr.org/2015/1060.pdf
-		 */
-		fp_mul(t0, p->x, q->x);
-		fp_mul(t1, p->y, q->y);
-		fp_mul(t2, p->z, q->z);
-		fp_add(t3, p->x, p->y);
-		fp_add(t4, q->x, q->y);
-		fp_mul(t3, t3, t4);
-		fp_add(t4, t0, t1);
-		fp_sub(t3, t3, t4);
-		if (ep_curve_opt_a() == RLC_ZERO) {
-			/* Cost of 12M + 2m_3b + 19a. */
-			fp_add(t4, p->y, p->z);
-			fp_add(t5, q->y, q->z);
-			fp_mul(t4, t4, t5);
-			fp_add(t5, t1, t2);
-			fp_sub(t4, t4, t5);
-			fp_add(r->y, q->x, q->z);
-			fp_add(r->x, p->x, p->z);
-			fp_mul(r->x, r->x, r->y);
-			fp_add(r->y, t0, t2);
-			fp_sub(r->y, r->x, r->y);
-			fp_dbl(r->x, t0);
-			fp_add(t0, t0, r->x);
-			ep_curve_mul_b3(t2, t2);
-			fp_add(r->z, t1, t2);
-			fp_sub(t1, t1, t2);
-			ep_curve_mul_b3(r->y, r->y);
-			fp_mul(r->x, t4, r->y);
-			fp_mul(t2, t3, t1);
-			fp_sub(r->x, t2, r->x);
-			fp_mul(r->y, t0, r->y);
-			fp_mul(t1, t1, r->z);
-			fp_add(r->y, t1, r->y);
-			fp_mul(t0, t0, t3);
-			fp_mul(r->z, r->z, t4);
-			fp_add(r->z, r->z, t0);
-		} else if (ep_curve_opt_a() == RLC_MIN3) {
-			/* Cost of 12M + 2m_b + 29a. */
-			fp_add(t4, p->y, p->z);
-			fp_add(t5, q->y, q->z);
-			fp_mul(t4, t4, t5);
-			fp_add(t5, t1, t2);
-			fp_sub(t4, t4, t5);
-			fp_add(r->x, p->x, p->z);
-			fp_add(r->y, q->x, q->z);
-			fp_mul(r->x, r->x, r->y);
-			fp_add(r->y, t0, t2);
-			fp_sub(r->y, r->x, r->y);
-			ep_curve_mul_b(r->z, t2);
-			fp_sub(r->x, r->y, r->z);
-			fp_dbl(r->z, r->x);
-			fp_add(r->x, r->x, r->z);
-			fp_sub(r->z, t1, r->x);
-			fp_add(r->x, t1, r->x);
-			ep_curve_mul_b(r->y, r->y);
-			fp_dbl(t1, t2);
-			fp_add(t2, t1, t2);
-			fp_sub(r->y, r->y, t2);
-			fp_sub(r->y, r->y, t0);
-			fp_dbl(t1, r->y);
-			fp_add(r->y, t1, r->y);
-			fp_dbl(t1, t0);
-			fp_add(t0, t1, t0);
-			fp_sub(t0, t0, t2);
-			fp_mul(t1, t4, r->y);
-			fp_mul(t2, t0, r->y);
-			fp_mul(r->y, r->x, r->z);
-			fp_add(r->y, r->y, t2);
-			fp_mul(r->x, t3, r->x);
-			fp_sub(r->x, r->x, t1);
-			fp_mul(r->z, t4, r->z);
-			fp_mul(t1, t3, t0);
-			fp_add(r->z, r->z, t1);
-		} else {
-			 /* Cost of 12M + 3m_a + 2_m3b + 23a. */
-			fp_add(t4, p->x, p->z);
-			fp_add(t5, q->x, q->z);
-			fp_mul(t4, t4, t5);
-			fp_add(t5, t0, t2);
-			fp_sub(t4, t4, t5);
-			fp_add(t5, p->y, p->z);
-			fp_add(r->x, q->y, q->z);
-			fp_mul(t5, t5, r->x);
-			fp_add(r->x, t1, t2);
-			fp_sub(t5, t5, r->x);
-			ep_curve_mul_a(r->z, t4);
-			ep_curve_mul_b3(r->x, t2);
-			fp_add(r->z, r->x, r->z);
-			fp_sub(r->x, t1, r->z);
-			fp_add(r->z, t1, r->z);
-			fp_mul(r->y, r->x, r->z);
-			fp_dbl(t1, t0);
-			fp_add(t1, t1, t0);
-			ep_curve_mul_a(t2, t2);
-			ep_curve_mul_b3(t4, t4);
-			fp_add(t1, t1, t2);
-			fp_sub(t2, t0, t2);
-			ep_curve_mul_a(t2, t2);
-			fp_add(t4, t4, t2);
-			fp_mul(t0, t1, t4);
-			fp_add(r->y, r->y, t0);
-			fp_mul(t0, t5, t4);
-			fp_mul(r->x, t3, r->x);
-			fp_sub(r->x, r->x, t0);
-			fp_mul(t0, t3, t1);
-			fp_mul(r->z, t5, r->z);
-			fp_add(r->z, r->z, t0);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-#endif
-}
-
-#endif /* EP_ADD == PROJC */
-
-#if EP_ADD == JACOB || !defined(STRIP)
-
-/**
- * Adds a point represented in Jacobian coordinates to a point represented in
- * projective coordinates.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the projective point.
- * @param[in] q				- the affine point.
- */
-static void ep_add_jacob_mix(ep_t r, const ep_t p, const ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	fp_null(t6);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		fp_new(t6);
-
-		/* madd-2007-bl formulas: 7M + 4S + 9add + 1*4 + 3*2. */
-		/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#addition-madd-2007-bl */
-
-		if (p->coord != BASIC) {
-			/* t0 = z1^2. */
-			fp_sqr(t0, p->z);
-
-			/* t3 = U2 = x2 * z1^2. */
-			fp_mul(t3, q->x, t0);
-
-			/* t1 = S2 = y2 * z1^3. */
-			fp_mul(t1, t0, p->z);
-			fp_mul(t1, t1, q->y);
-
-			/* t3 = H = U2 - x1. */
-			fp_sub(t3, t3, p->x);
-
-			/* t1 = R = 2 * (S2 - y1). */
-			fp_sub(t1, t1, p->y);
-			fp_dbl(t1, t1);
-		} else {
-			/* H = x2 - x1. */
-			fp_sub(t3, q->x, p->x);
-
-			/* t1 = R = 2 * (y2 - y1). */
-			fp_sub(t1, q->y, p->y);
-			fp_dbl(t1, t1);
-		}
-
-		/* t2 = HH = H^2. */
-		fp_sqr(t2, t3);
-
-		/* If H is zero. */
-		if (fp_is_zero(t3)) {
-			if (fp_is_zero(t1)) {
-				/* If I is zero, p = q, should have doubled. */
-				ep_dbl_jacob(r, p);
-			} else {
-				/* If I is not zero, q = -p, r = infinity. */
-				ep_set_infty(r);
-			}
-		} else {
-			/* t4 = I = 4*HH. */
-			fp_dbl(t4, t2);
-			fp_dbl(t4, t4);
-
-			/* t5 = J = H * I. */
-			fp_mul(t5, t3, t4);
-
-			/* t4 = V = x1 * I. */
-			fp_mul(t4, p->x, t4);
-
-			/* x3 = R^2 - J - 2 * V. */
-			fp_sqr(r->x, t1);
-			fp_sub(r->x, r->x, t5);
-			fp_dbl(t6, t4);
-			fp_sub(r->x, r->x, t6);
-
-			/* y3 = R * (V - x3) - 2 * Y1 * J. */
-			fp_sub(t4, t4, r->x);
-			fp_mul(t4, t4, t1);
-			fp_mul(t1, p->y, t5);
-			fp_dbl(t1, t1);
-			fp_sub(r->y, t4, t1);
-
-			if (p->coord != BASIC) {
-				/* z3 = (z1 + H)^2 - z1^2 - HH. */
-				fp_add(r->z, p->z, t3);
-				fp_sqr(r->z, r->z);
-				fp_sub(r->z, r->z, t0);
-				fp_sub(r->z, r->z, t2);
-			} else {
-				/* z3 = 2 * H. */
-				fp_dbl(r->z, t3);
-			}
-		}
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		fp_free(t6);
-	}
-}
-
-/**
- * Adds two points represented in Jacobian coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the first point to add.
- * @param[in] q				- the second point to add.
- */
-static void ep_add_jacob_imp(ep_t r, const ep_t p, const ep_t q) {
-#if defined(EP_MIXED) && defined(STRIP)
-	/* If code size is a problem, leave only the mixed version. */
-	ep_add_jacob_mix(r, p, q);
-#else /* General addition. */
-
-#if defined(EP_MIXED) || !defined(STRIP)
-	/* Test if z2 = 1 only if mixed coordinates are turned on. */
-	if (q->coord == BASIC) {
-		ep_add_jacob_mix(r, p, q);
-		return;
-	}
-#endif
-
-	fp_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	fp_null(t6);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		fp_new(t6);
-
-		/* add-2007-bl formulas: 11M + 5S + 9add + 4*2 */
-		/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#addition-add-2007-bl */
-
-		/* t0 = z1^2. */
-		fp_sqr(t0, p->z);
-
-		/* t1 = z2^2. */
-		fp_sqr(t1, q->z);
-
-		/* t2 = U1 = x1 * z2^2. */
-		fp_mul(t2, p->x, t1);
-
-		/* t3 = U2 = x2 * z1^2. */
-		fp_mul(t3, q->x, t0);
-
-		/* t6 = z1^2 + z2^2. */
-		fp_add(t6, t0, t1);
-
-		/* t0 = S2 = y2 * z1^3. */
-		fp_mul(t0, t0, p->z);
-		fp_mul(t0, t0, q->y);
-
-		/* t1 = S1 = y1 * z2^3. */
-		fp_mul(t1, t1, q->z);
-		fp_mul(t1, t1, p->y);
-
-		/* t3 = H = U2 - U1. */
-		fp_sub(t3, t3, t2);
-
-		/* t0 = R = 2 * (S2 - S1). */
-		fp_sub(t0, t0, t1);
-		fp_dbl(t0, t0);
-
-		/* If E is zero. */
-		if (fp_is_zero(t3)) {
-			if (fp_is_zero(t0)) {
-				/* If I is zero, p = q, should have doubled. */
-				ep_dbl_jacob(r, p);
-			} else {
-				/* If I is not zero, q = -p, r = infinity. */
-				ep_set_infty(r);
-			}
-		} else {
-			/* t4 = I = (2*H)^2. */
-			fp_dbl(t4, t3);
-			fp_sqr(t4, t4);
-
-			/* t5 = J = H * I. */
-			fp_mul(t5, t3, t4);
-
-			/* t4 = V = U1 * I. */
-			fp_mul(t4, t2, t4);
-
-			/* x3 = R^2 - J - 2 * V. */
-			fp_sqr(r->x, t0);
-			fp_sub(r->x, r->x, t5);
-			fp_dbl(t2, t4);
-			fp_sub(r->x, r->x, t2);
-
-			/* y3 = R * (V - x3) - 2 * S1 * J. */
-			fp_sub(t4, t4, r->x);
-			fp_mul(t4, t4, t0);
-			fp_mul(t1, t1, t5);
-			fp_dbl(t1, t1);
-			fp_sub(r->y, t4, t1);
-
-			/* z3 = ((z1 + z2)^2 - z1^2 - z2^2) * H. */
-			fp_add(r->z, p->z, q->z);
-			fp_sqr(r->z, r->z);
-			fp_sub(r->z, r->z, t6);
-			fp_mul(r->z, r->z, t3);
-		}
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		fp_free(t6);
-	}
-#endif
-}
-
-#endif /* EP_ADD == JACOB */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep_add_basic(ep_t r, const ep_t p, const ep_t q) {
-	if (ep_is_infty(p)) {
-		ep_copy(r, q);
-		return;
-	}
-
-	if (ep_is_infty(q)) {
-		ep_copy(r, p);
-		return;
-	}
-
-	ep_add_basic_imp(r, NULL, p, q);
-}
-
-void ep_add_slp_basic(ep_t r, fp_t s, const ep_t p, const ep_t q) {
-	if (ep_is_infty(p)) {
-		ep_copy(r, q);
-		return;
-	}
-
-	if (ep_is_infty(q)) {
-		ep_copy(r, p);
-		return;
-	}
-
-	ep_add_basic_imp(r, s, p, q);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep_add_projc(ep_t r, const ep_t p, const ep_t q) {
-	if (ep_is_infty(p)) {
-		ep_copy(r, q);
-		return;
-	}
-
-	if (ep_is_infty(q)) {
-		ep_copy(r, p);
-		return;
-	}
-
-	ep_add_projc_imp(r, p, q);
-}
-
-#endif
-
-#if EP_ADD == JACOB || !defined(STRIP)
-
-void ep_add_jacob(ep_t r, const ep_t p, const ep_t q) {
-	if (ep_is_infty(p)) {
-		ep_copy(r, q);
-		return;
-	}
-
-	if (ep_is_infty(q)) {
-		ep_copy(r, p);
-		return;
-	}
-
-	ep_add_jacob_imp(r, p, q);
-}
-
-#endif
-
-void ep_sub(ep_t r, const ep_t p, const ep_t q) {
-	ep_t t;
-
-	ep_null(t);
-
-	if (p == q) {
-		ep_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep_new(t);
-		ep_neg(t, q);
-		ep_add(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_cmp.c b/src/dashbls/depends/relic/src/ep/relic_ep_cmp.c
deleted file mode 100644
index cf4e02fe1bc9..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_cmp.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime elliptic curve point comparison.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep_cmp(const ep_t p, const ep_t q) {
-	ep_t r, s;
-	int result = RLC_NE;
-
-	if (ep_is_infty(p) && ep_is_infty(q)) {
-		return RLC_EQ;
-	}
-
-	ep_null(r);
-	ep_null(s);
-
-	RLC_TRY {
-		ep_new(r);
-		ep_new(s);
-
-		switch (q->coord) {
-			case PROJC:
-				/* If q is in homogeneous projective coordinates, compute
-				 * x1 * z2 and y1 * z2. */
-				fp_mul(r->x, p->x, q->z);
-				fp_mul(r->y, p->y, q->z);
-				break;
-			case JACOB:
-				/* If q is in Jacobian projective coordinates, compute
-				 * x2 * z1^2 and y2 * z1^3. */
-				fp_sqr(r->z, q->z);
-				fp_mul(r->x, p->x, r->z);
-				fp_mul(r->z, r->z, q->z);
-				fp_mul(r->y, p->y, r->z);
-				break;
-			default:
-				ep_copy(r, p);
-				break;
-		}
-
-		switch (p->coord) {
-			/* Now do the same for the other point. */
-			case PROJC:
-				fp_mul(s->x, q->x, p->z);
-				fp_mul(s->y, q->y, p->z);
-				break;
-			case JACOB:
-				fp_sqr(s->z, p->z);
-				fp_mul(s->x, q->x, s->z);
-				fp_mul(s->z, s->z, p->z);
-				fp_mul(s->y, q->y, s->z);
-				break;
-			default:
-				ep_copy(s, q);
-				break;
-		}
-
-		if ((fp_cmp(r->x, s->x) == RLC_EQ) && (fp_cmp(r->y, s->y) == RLC_EQ)) {
-			result = RLC_EQ;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(r);
-		ep_free(s);
-	}
-
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_curve.c b/src/dashbls/depends/relic/src/ep/relic_ep_curve.c
deleted file mode 100644
index f4aa0f32975d..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_curve.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**f
- * @file
- *
- * Implementation of the prime elliptic curve utilities.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Detects an optimization based on the curve coefficients.
- *
- * @param[out] opt		- the resulting optimization.
- * @param[in] a			- the curve coefficient.
- */
-static void detect_opt(int *opt, fp_t a) {
-	fp_t t;
-
-	fp_null(t);
-
-	RLC_TRY {
-		fp_new(t);
-		fp_prime_conv_dig(t, 3);
-		fp_neg(t, t);
-
-		if (fp_cmp(a, t) == RLC_EQ) {
-			*opt = RLC_MIN3;
-		} else if (fp_is_zero(a)) {
-			*opt = RLC_ZERO;
-		} else if (fp_cmp_dig(a, 1) == RLC_EQ) {
-			*opt = RLC_ONE;
-		} else if (fp_cmp_dig(a, 2) == RLC_EQ) {
-			*opt = RLC_TWO;
-		} else if (fp_bits(a) <= RLC_DIG) {
-			*opt = RLC_TINY;
-		} else {
-			*opt = RLC_HUGE;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-}
-
-/**
- * Computes the constants neded to evaluate the hash-to-curve map.
- *
- * @param[in] u			- the non-square used for hashing to this curve.
- * @param[in] ctmap	- true if this curve will use an isogeny for mapping.
- */
-static void ep_curve_set_map(const fp_t u) {
-	bn_t t;
-	bn_null(t);
-
-	const int abNeq0 = (ep_curve_opt_a() != RLC_ZERO) && (ep_curve_opt_b() != RLC_ZERO);
-
-	ctx_t *ctx = core_get();
-	dig_t *c1 = ctx->ep_map_c[0];
-	dig_t *c2 = ctx->ep_map_c[1];
-	dig_t *c3 = ctx->ep_map_c[2];
-	dig_t *c4 = ctx->ep_map_c[3];
-
-	fp_copy(ctx->ep_map_u, u);
-
-	RLC_TRY {
-		bn_new(t);
-
-		if (ep_curve_is_ctmap() || abNeq0) {
-			/* SSWU map constants */
-			/* constants 3 and 4: a and b for either the curve or the isogeny */
-#ifdef EP_CTMAP
-			if (ep_curve_is_ctmap()) {
-				fp_copy(c3, ctx->ep_iso.a);
-				fp_copy(c4, ctx->ep_iso.b);
-			} else {
-#endif
-				fp_copy(c3, ctx->ep_a);
-				fp_copy(c4, ctx->ep_b);
-#ifdef EP_CTMAP
-			}
-#endif
-			/* constant 1: -b / a */
-			fp_neg(c1, c3);     /* c1 = -a */
-			fp_inv(c1, c1);     /* c1 = -1 / a */
-			fp_mul(c1, c1, c4); /* c1 = -b / a */
-
-			/* constant 2 is unused in this case */
-		} else {
-			/* SvdW map constants */
-			/* constant 1: g(u) = u^3 + a * u + b */
-			fp_sqr(c1, ctx->ep_map_u);
-			fp_add(c1, c1, ctx->ep_a);
-			fp_mul(c1, c1, ctx->ep_map_u);
-			fp_add(c1, c1, ctx->ep_b);
-
-			/* constant 2: -u / 2 */
-			fp_set_dig(c2, 1);
-			fp_neg(c2, c2);                /* -1 */
-			fp_hlv(c2, c2);                /* -1/2 */
-			fp_mul(c2, c2, ctx->ep_map_u); /* c2 = -1/2 * u */
-
-			/* constant 3: sqrt(-g(u) * (3 * u^2 + 4 * a)) */
-			fp_sqr(c3, ctx->ep_map_u);    /* c3 = u^2 */
-			fp_mul_dig(c3, c3, 3);        /* c3 = 3 * u^2 */
-			fp_mul_dig(c4, ctx->ep_a, 4); /* c4 = 4 * a */
-			fp_add(c4, c3, c4);           /* c4 = 3 * u^2 + 4 * a */
-			fp_neg(c4, c4);               /* c4 = -(3 * u^2 + 4 * a) */
-			fp_mul(c3, c4, c1);           /* c3 = -g(u) * (3 * u^2 + 4 * a) */
-			if (!fp_srt(c3, c3)) {        /* c3 = sqrt(-g(u) * (3 * u^2 + 4 * a)) */
-				RLC_THROW(ERR_NO_VALID);
-			}
-			/* make sure sgn0(c3) == 0 */
-			fp_prime_back(t, c3);
-			if (bn_get_bit(t, 0) != 0) {
-				/* set sgn0(c3) == 0 */
-				fp_neg(c3, c3);
-			}
-
-			/* constant 4: -4 * g(u) / (3 * u^2 + 4 * a) */
-			fp_inv(c4, c4);        /* c4 = -1 / (3 * u^2 + 4 * a) */
-			fp_mul(c4, c4, c1);    /* c4 *= g(u) */
-			fp_mul_dig(c4, c4, 4); /* c4 *= 4 */
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-/**
- * Configures a prime elliptic curve by its coefficients and generator.
- *
- * @param[in] a			- the 'a' coefficient of the curve.
- * @param[in] b			- the 'b' coefficient of the curve.
- * @param[in] g			- the generator.
- * @param[in] r			- the order of the group of points.
- * @param[in] h			- the cofactor of the group order.
- * @param[in] u			- the non-square used for hashing to this curve.
- * @param[in] ctmap	- true if this curve will use an isogeny for mapping.
- */
-static void ep_curve_set(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t u, int ctmap) {
-	ctx_t *ctx = core_get();
-
-	fp_copy(ctx->ep_a, a);
-	fp_copy(ctx->ep_b, b);
-	fp_dbl(ctx->ep_b3, b);
-	fp_add(ctx->ep_b3, ctx->ep_b3, b);
-
-	detect_opt(&(ctx->ep_opt_a), ctx->ep_a);
-	detect_opt(&(ctx->ep_opt_b), ctx->ep_b);
-	detect_opt(&(ctx->ep_opt_b3), ctx->ep_b3);
-
-	ctx->ep_is_ctmap = ctmap;
-	ep_curve_set_map(u);
-
-	ep_norm(&(ctx->ep_g), g);
-	bn_copy(&(ctx->ep_r), r);
-	bn_copy(&(ctx->ep_h), h);
-
-#if defined(EP_PRECO)
-	ep_mul_pre((ep_t *)ep_curve_get_tab(), &(ctx->ep_g));
-#endif
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep_curve_init(void) {
-	ctx_t *ctx = core_get();
-#ifdef EP_PRECO
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		ctx->ep_ptr[i] = &(ctx->ep_pre[i]);
-	}
-#endif
-	ep_set_infty(&ctx->ep_g);
-	bn_make(&ctx->ep_r, RLC_FP_DIGS);
-	bn_make(&ctx->ep_h, RLC_FP_DIGS);
-#if defined(EP_ENDOM) && (EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || !defined(STRIP))
-	for (int i = 0; i < 3; i++) {
-		bn_make(&(ctx->ep_v1[i]), RLC_FP_DIGS);
-		bn_make(&(ctx->ep_v2[i]), RLC_FP_DIGS);
-	}
-#endif
-}
-
-void ep_curve_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		bn_clean(&ctx->ep_r);
-		bn_clean(&ctx->ep_h);
-#if defined(EP_ENDOM) && (EP_MUL == LWNAF || EP_FIX == LWNAF || !defined(STRIP))
-		for (int i = 0; i < 3; i++) {
-			bn_clean(&(ctx->ep_v1[i]));
-			bn_clean(&(ctx->ep_v2[i]));
-		}
-#endif
-	}
-}
-
-dig_t *ep_curve_get_a(void) {
-	return core_get()->ep_a;
-}
-
-dig_t *ep_curve_get_b(void) {
-	return core_get()->ep_b;
-}
-
-dig_t *ep_curve_get_b3(void) {
-	return core_get()->ep_b3;
-}
-
-#if defined(EP_ENDOM) && (EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || EP_SIM == INTER || !defined(STRIP))
-
-dig_t *ep_curve_get_beta(void) {
-	return core_get()->beta;
-}
-
-void ep_curve_get_v1(bn_t v[]) {
-	ctx_t *ctx = core_get();
-	for (int i = 0; i < 3; i++) {
-		bn_copy(v[i], &(ctx->ep_v1[i]));
-	}
-}
-
-void ep_curve_get_v2(bn_t v[]) {
-	ctx_t *ctx = core_get();
-	for (int i = 0; i < 3; i++) {
-		bn_copy(v[i], &(ctx->ep_v2[i]));
-	}
-}
-
-#endif
-
-int ep_curve_opt_a(void) {
-	return core_get()->ep_opt_a;
-}
-
-int ep_curve_opt_b(void) {
-	return core_get()->ep_opt_b;
-}
-
-void ep_curve_mul_a(fp_t c, const fp_t a) {
-	ctx_t *ctx = core_get();
-	switch (ctx->ep_opt_a) {
-		case RLC_ZERO:
-			fp_zero(c);
-			break;
-		case RLC_ONE:
-			fp_copy(c, a);
-			break;
-#if FP_RDC != MONTY
-		case RLC_TINY:
-			fp_mul_dig(c, a, ctx->ep_a[0]);
-			break;
-#endif
-		default:
-			fp_mul(c, a, ctx->ep_a);
-			break;
-	}
-}
-
-void ep_curve_mul_b(fp_t c, const fp_t a) {
-	ctx_t *ctx = core_get();
-	switch (ctx->ep_opt_b) {
-		case RLC_ZERO:
-			fp_zero(c);
-			break;
-		case RLC_ONE:
-			fp_copy(c, a);
-			break;
-#if FP_RDC != MONTY
-		case RLC_TINY:
-			fp_mul_dig(c, a, ctx->ep_b[0]);
-			break;
-#endif
-		default:
-			fp_mul(c, a, ctx->ep_b);
-			break;
-	}
-}
-
-void ep_curve_mul_b3(fp_t c, const fp_t a) {
-	ctx_t *ctx = core_get();
-	switch (ctx->ep_opt_b3) {
-		case RLC_ZERO:
-			fp_zero(c);
-			break;
-		case RLC_ONE:
-			fp_copy(c, a);
-			break;
-#if FP_RDC != MONTY
-		case RLC_TINY:
-			fp_mul_dig(c, a, ctx->ep_b3[0]);
-			break;
-#endif
-		default:
-			fp_mul(c, a, ctx->ep_b3);
-			break;
-	}
-}
-
-int ep_curve_is_endom(void) {
-	return core_get()->ep_is_endom;
-}
-
-int ep_curve_is_super(void) {
-	return core_get()->ep_is_super;
-}
-
-int ep_curve_is_pairf(void) {
-	return core_get()->ep_is_pairf;
-}
-
-int ep_curve_is_ctmap(void) {
-	return core_get()->ep_is_ctmap;
-}
-
-void ep_curve_get_gen(ep_t g) {
-	ep_copy(g, &core_get()->ep_g);
-}
-
-void ep_curve_get_ord(bn_t n) {
-	bn_copy(n, &core_get()->ep_r);
-}
-
-void ep_curve_get_cof(bn_t h) {
-	bn_copy(h, &core_get()->ep_h);
-}
-
-const ep_t *ep_curve_get_tab(void) {
-#if defined(EP_PRECO)
-
-	/* Return a meaningful pointer. */
-#if ALLOC == AUTO
-	return (const ep_t *)*core_get()->ep_ptr;
-#else
-	return (const ep_t *)core_get()->ep_ptr;
-#endif
-
-#else
-	/* Return a null pointer. */
-	return NULL;
-#endif
-}
-
-
-iso_t ep_curve_get_iso() {
-#ifdef EP_CTMAP
-	return &core_get()->ep_iso;
-#else
-	return NULL;
-#endif /* EP_CTMAP */
-}
-
-#if defined(EP_PLAIN)
-
-void ep_curve_set_plain(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t u, int ctmap) {
-	ctx_t *ctx = core_get();
-	ctx->ep_is_endom = 0;
-	ctx->ep_is_super = 0;
-
-	ep_curve_set(a, b, g, r, h, u, ctmap);
-}
-
-#endif
-
-#if defined(EP_SUPER)
-
-void ep_curve_set_super(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t u, int ctmap) {
-	ctx_t *ctx = core_get();
-	ctx->ep_is_endom = 0;
-	ctx->ep_is_super = 1;
-
-	ep_curve_set(a, b, g, r, h, u, ctmap);
-}
-
-#endif
-
-#if defined(EP_ENDOM)
-
-void ep_curve_set_endom(const fp_t a, const fp_t b, const ep_t g, const bn_t r,
-		const bn_t h, const fp_t beta, const bn_t l, const fp_t u, int ctmap) {
-	int bits = bn_bits(r);
-	ctx_t *ctx = core_get();
-	ctx->ep_is_endom = 1;
-	ctx->ep_is_super = 0;
-
-	ep_curve_set(a, b, g, r, h, u, ctmap);
-
-	/* Precompute endomorphism constants. */
-#if EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || EP_SIM == INTER || !defined(STRIP)
-	ep_t p, q;
-	bn_t m;
-
-	ep_null(p);
-	ep_null(q);
-	bn_null(m);
-
-	RLC_TRY {
-		ep_new(p);
-		ep_new(q);
-		bn_new(m);
-
-		/* Check if [m]P = \psi(P). */
-		fp_copy(ctx->beta, beta);
-		bn_copy(m, l);
-		ep_psi(p, g);
-		ep_copy(q, g);
-		for (int i = bn_bits(m) - 2; i >= 0; i--) {
-			ep_dbl(q, q);
-			if (bn_get_bit(m, i)) {
-				ep_add(q, q, g);
-			}
-		}
-		ep_norm(q, q);
-		/* Fix beta in case it is the wrong value. */
-		if (ep_cmp(q, p) != RLC_EQ) {
-			fp_neg(ctx->beta, ctx->beta);
-			fp_sub_dig(ctx->beta, ctx->beta, 1);
-		}
-		bn_gcd_ext_mid(&(ctx->ep_v1[1]), &(ctx->ep_v1[2]), &(ctx->ep_v2[1]),
-				&(ctx->ep_v2[2]), m, r);
-		/* m = (v1[1] * v2[2] - v1[2] * v2[1]) / 2. */
-		bn_mul(&(ctx->ep_v1[0]), &(ctx->ep_v1[1]), &(ctx->ep_v2[2]));
-		bn_mul(&(ctx->ep_v2[0]), &(ctx->ep_v1[2]), &(ctx->ep_v2[1]));
-		bn_sub(m, &(ctx->ep_v1[0]), &(ctx->ep_v2[0]));
-		bn_hlv(m, m);
-		/* v1[0] = round(v2[2] * 2^|n| / m). */
-		bn_lsh(&(ctx->ep_v1[0]), &(ctx->ep_v2[2]), bits + 1);
-		if (bn_sign(&(ctx->ep_v1[0])) == RLC_POS) {
-			bn_add(&(ctx->ep_v1[0]), &(ctx->ep_v1[0]), m);
-		} else {
-			bn_sub(&(ctx->ep_v1[0]), &(ctx->ep_v1[0]), m);
-		}
-		bn_dbl(m, m);
-		bn_div(&(ctx->ep_v1[0]), &(ctx->ep_v1[0]), m);
-		if (bn_sign(&ctx->ep_v1[0]) == RLC_NEG) {
-			bn_add_dig(&(ctx->ep_v1[0]), &(ctx->ep_v1[0]), 1);
-		}
-		/* v2[0] = round(v1[2] * 2^|n| / m). */
-		bn_lsh(&(ctx->ep_v2[0]), &(ctx->ep_v1[2]), bits + 1);
-		if (bn_sign(&(ctx->ep_v2[0])) == RLC_POS) {
-			bn_add(&(ctx->ep_v2[0]), &(ctx->ep_v2[0]), m);
-		} else {
-			bn_sub(&(ctx->ep_v2[0]), &(ctx->ep_v2[0]), m);
-		}
-		bn_div(&(ctx->ep_v2[0]), &(ctx->ep_v2[0]), m);
-		if (bn_sign(&ctx->ep_v2[0]) == RLC_NEG) {
-			bn_add_dig(&(ctx->ep_v2[0]), &(ctx->ep_v2[0]), 1);
-		}
-		bn_neg(&(ctx->ep_v2[0]), &(ctx->ep_v2[0]));
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep_free(p);
-		ep_free(q);
-		bn_free(m);
-	}
-
-#endif
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_dbl.c b/src/dashbls/depends/relic/src/ep/relic_ep_dbl.c
deleted file mode 100644
index 1a160d02cd0c..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_dbl.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point doubling on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the slope.
- * @param[in] p				- the point to double.
- */
-static void ep_dbl_basic_imp(ep_t r, fp_t s, const ep_t p) {
-	fp_t t0, t1, t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		/* t0 = 1/2 * y1. */
-		fp_dbl(t0, p->y);
-		fp_inv(t0, t0);
-
-		/* t1 = 3 * x1^2 + a. */
-		fp_sqr(t1, p->x);
-		fp_copy(t2, t1);
-		fp_dbl(t1, t1);
-		fp_add(t1, t1, t2);
-
-		switch (ep_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-			case RLC_ONE:
-				fp_add_dig(t1, t1, (dig_t)1);
-				break;
-#if FP_RDC != MONTY
-			case RLC_TINY:
-				fp_add_dig(t1, t1, ep_curve_get_a()[0]);
-				break;
-#endif
-			default:
-				fp_add(t1, t1, ep_curve_get_a());
-				break;
-		}
-
-		/* t1 = (3 * x1^2 + a)/(2 * y1). */
-		fp_mul(t1, t1, t0);
-
-		if (s != NULL) {
-			fp_copy(s, t1);
-		}
-
-		/* t2 = t1^2. */
-		fp_sqr(t2, t1);
-
-		/* x3 = t1^2 - 2 * x1. */
-		fp_dbl(t0, p->x);
-		fp_sub(t0, t2, t0);
-
-		/* y3 = t1 * (x1 - x3) - y1. */
-		fp_sub(t2, p->x, t0);
-		fp_mul(t1, t1, t2);
-		fp_sub(r->y, t1, p->y);
-
-		fp_copy(r->x, t0);
-		fp_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Doubles a point represented in projective coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param p					- the point to double.
- */
-static void ep_dbl_projc_imp(ep_t r, const ep_t p) {
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		/* Formulas for point doubling from
-		 * "Complete addition formulas for prime order elliptic curves"
-		 * by Joost Renes, Craig Costello, and Lejla Batina
-		 * https://eprint.iacr.org/2015/1060.pdf
-		 */
-		 if (ep_curve_opt_a() == RLC_ZERO) {
-			/* Cost of 6M + 2S + 1m_3b + 9a. */
-			fp_sqr(t0, p->y);
-			fp_mul(t3, p->x, p->y);
-
- 			if (p->coord == BASIC) {
-				/* Save 1M + 1S + 1m_b3 if z1 = 1. */
-				fp_copy(t1, p->y);
-				fp_copy(t2, ep_curve_get_b3());
- 			} else {
-				fp_mul(t1, p->y, p->z);
-				fp_sqr(t2, p->z);
-				ep_curve_mul_b3(t2, t2);
- 			}
-			fp_dbl(r->z, t0);
-			fp_dbl(r->z, r->z);
-			fp_dbl(r->z, r->z);
- 			fp_mul(r->x, t2, r->z);
-			fp_add(r->y, t0, t2);
-			fp_mul(r->z, t1, r->z);
-			fp_dbl(t1, t2);
-			fp_add(t2, t1, t2);
-			fp_sub(t0, t0, t2);
-			fp_mul(r->y, t0, r->y);
-			fp_add(r->y, r->x, r->y);
-			fp_mul(r->x, t0, t3);
-			fp_dbl(r->x, r->x);
-		} else {
-			fp_sqr(t0, p->x);
-			fp_sqr(t1, p->y);
-			fp_mul(t3, p->x, p->y);
-			fp_dbl(t3, t3);
-			fp_mul(t4, p->y, p->z);
-
-			if (ep_curve_opt_a() == RLC_MIN3) {
-				/* Cost of 8M + 3S + 2mb + 21a. */
-				if (p->coord == BASIC) {
-					/* Save 1S + 1m_b + 2a if z1 = 1. */
-					fp_set_dig(t2, 3);
-					fp_copy(r->y, ep_curve_get_b());
-				} else {
-					fp_sqr(t2, p->z);
-					ep_curve_mul_b(r->y, t2);
-					fp_dbl(t5, t2);
-					fp_add(t2, t2, t5);
-				}
-				fp_mul(r->z, p->x, p->z);
-				fp_dbl(r->z, r->z);
-				fp_sub(r->y, r->y, r->z);
-				fp_dbl(r->x, r->y);
-				fp_add(r->y, r->x, r->y);
-				fp_sub(r->x, t1, r->y);
-				fp_add(r->y, t1, r->y);
-				fp_mul(r->y, r->x, r->y);
-				fp_mul(r->x, t3, r->x);
-				ep_curve_mul_b(r->z, r->z);
-				fp_sub(t3, r->z, t2);
-				fp_sub(t3, t3, t0);
-				fp_dbl(r->z, t3);
-				fp_add(t3, t3, r->z);
-				fp_dbl(r->z, t0);
-				fp_add(t0, t0, r->z);
-				fp_sub(t0, t0, t2);
-			} else {
-				/* Common cost of 8M + 3S + 3m_a + 2m_3b + 15a. */
-				if (p->coord == BASIC) {
-					/* Save 1S + 1m_b + 1m_a if z1 = 1. */
-					fp_copy(r->y, ep_curve_get_b3());
-					fp_copy(t2, ep_curve_get_a());
-				} else {
-					fp_sqr(t2, p->z);
-					ep_curve_mul_b3(r->y, t2);
-					ep_curve_mul_a(t2, t2);
-				}
-				fp_mul(r->z, p->x, p->z);
-				fp_dbl(r->z, r->z);
-				ep_curve_mul_a(r->x, r->z);
-				fp_add(r->y, r->x, r->y);
-				fp_sub(r->x, t1, r->y);
-				fp_add(r->y, t1, r->y);
-				fp_mul(r->y, r->x, r->y);
-				fp_mul(r->x, t3, r->x);
-				ep_curve_mul_b3(r->z, r->z);
-				fp_sub(t3, t0, t2);
-				ep_curve_mul_a(t3, t3);
-				fp_add(t3, t3, r->z);
-				fp_dbl(r->z, t0);
-				fp_add(t0, t0, r->z);
-				fp_add(t0, t0, t2);
-			}
-			/* Common part with renamed variables. */
-			fp_mul(t0, t0, t3);
-			fp_add(r->y, r->y, t0);
-			fp_dbl(t2, t4);
-			fp_mul(t0, t2, t3);
-			fp_sub(r->x, r->x, t0);
-			fp_mul(r->z, t2, t1);
-			fp_dbl(r->z, r->z);
-			fp_dbl(r->z, r->z);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-}
-
-#endif /* EP_ADD == PROJC */
-
-#if EP_ADD == JACOB || !defined(STRIP)
-
-/**
- * Doubles a point represented in Jacobian coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param p					- the point to double.
- */
-static void ep_dbl_jacob_imp(ep_t r, const ep_t p) {
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		if (p->coord != BASIC && ep_curve_opt_a() == RLC_MIN3) {
-			/* dbl-2001-b formulas: 3M + 5S + 8add + 1*4 + 2*8 + 1*3 */
-			/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#doubling-dbl-2001-b */
-
-			/* t0 = delta = z1^2. */
-			fp_sqr(t0, p->z);
-
-			/* t1 = gamma = y1^2. */
-			fp_sqr(t1, p->y);
-
-			/* t2 = beta = x1 * y1^2. */
-			fp_mul(t2, p->x, t1);
-
-			/* t3 = alpha = 3 * (x1 - z1^2) * (x1 + z1^2). */
-			fp_sub(t3, p->x, t0);
-			fp_add(t4, p->x, t0);
-			fp_mul(t4, t3, t4);
-			fp_dbl(t3, t4);
-			fp_add(t3, t3, t4);
-
-			/* x3 = alpha^2 - 8 * beta. */
-			fp_dbl(t2, t2);
-			fp_dbl(t2, t2);
-			fp_dbl(t5, t2);
-			fp_sqr(r->x, t3);
-			fp_sub(r->x, r->x, t5);
-
-			/* z3 = (y1 + z1)^2 - gamma - delta. */
-			fp_add(r->z, p->y, p->z);
-			fp_sqr(r->z, r->z);
-			fp_sub(r->z, r->z, t1);
-			fp_sub(r->z, r->z, t0);
-
-			/* y3 = alpha * (4 * beta - x3) - 8 * gamma^2. */
-			fp_dbl(t1, t1);
-			fp_sqr(t1, t1);
-			fp_dbl(t1, t1);
-			fp_sub(r->y, t2, r->x);
-			fp_mul(r->y, r->y, t3);
-			fp_sub(r->y, r->y, t1);
-		} else if (ep_curve_opt_a() == RLC_ZERO) {
-			/* dbl-2009-l formulas: 2M + 5S + 6add + 1*8 + 3*2 + 1*3. */
-			/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l */
-
-			/* A = X1^2 */
-			fp_sqr(t0, p->x);
-
-			/* B = Y1^2 */
-			fp_sqr(t1, p->y);
-
-			/* C = B^2 */
-			fp_sqr(t2, t1);
-
-			/* D = 2*((X1+B)^2-A-C) */
-			fp_add(t1, t1, p->x);
-			fp_sqr(t1, t1);
-			fp_sub(t1, t1, t0);
-			fp_sub(t1, t1, t2);
-			fp_dbl(t1, t1);
-
-			/* E = 3*A */
-			fp_dbl(t3, t0);
-			fp_add(t0, t3, t0);
-
-			/* F = E^2 */
-			fp_sqr(t3, t0);
-
-			/* Z3 = 2*Y1*Z1 */
-			fp_mul(r->z, p->y, p->z);
-			fp_dbl(r->z, r->z);
-
-			/* X3 = F-2*D */
-			fp_sub(r->x, t3, t1);
-			fp_sub(r->x, r->x, t1);
-
-			/* Y3 = E*(D-X3)-8*C */
-			fp_sub(r->y, t1, r->x);
-			fp_mul(r->y, r->y, t0);
-			fp_dbl(t2, t2);
-			fp_dbl(t2, t2);
-			fp_dbl(t2, t2);
-			fp_sub(r->y, r->y, t2);
-		} else {
-			/* dbl-2007-bl formulas: 1M + 8S + 1*a + 10add + 1*8 + 2*2 + 1*3 */
-			/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian.html#doubling-dbl-2007-bl */
-
-			/* t0 = x1^2, t1 = y1^2, t2 = y1^4. */
-			fp_sqr(t0, p->x);
-			fp_sqr(t1, p->y);
-			fp_sqr(t2, t1);
-
-			if (p->coord != BASIC) {
-				/* t3 = z1^2. */
-				fp_sqr(t3, p->z);
-
-				if (ep_curve_opt_a() == RLC_ZERO) {
-					/* z3 = 2 * y1 * z1. */
-					fp_mul(r->z, p->y, p->z);
-					fp_dbl(r->z, r->z);
-				} else {
-					/* z3 = (y1 + z1)^2 - y1^2 - z1^2. */
-					fp_add(r->z, p->y, p->z);
-					fp_sqr(r->z, r->z);
-					fp_sub(r->z, r->z, t1);
-					fp_sub(r->z, r->z, t3);
-				}
-			} else {
-				/* z3 = 2 * y1. */
-				fp_dbl(r->z, p->y);
-			}
-
-			/* t4 = S = 2*((x1 + y1^2)^2 - x1^2 - y1^4). */
-			fp_add(t4, p->x, t1);
-			fp_sqr(t4, t4);
-			fp_sub(t4, t4, t0);
-			fp_sub(t4, t4, t2);
-			fp_dbl(t4, t4);
-
-			/* t5 = M = 3 * x1^2 + a * z1^4. */
-			fp_dbl(t5, t0);
-			fp_add(t5, t5, t0);
-			if (p->coord != BASIC) {
-				fp_sqr(t3, t3);
-				switch (ep_curve_opt_a()) {
-					case RLC_ZERO:
-						break;
-					case RLC_ONE:
-						fp_add(t5, t5, t3);
-						break;
-					case RLC_TINY:
-						fp_mul_dig(t1, t3, ep_curve_get_a()[0]);
-						fp_add(t5, t5, t1);
-						break;
-					default:
-						fp_mul(t1, t3, ep_curve_get_a());
-						fp_add(t5, t5, t1);
-						break;
-				}
-			} else {
-				switch (ep_curve_opt_a()) {
-					case RLC_ZERO:
-						break;
-					case RLC_ONE:
-						fp_add_dig(t5, t5, (dig_t)1);
-						break;
-					case RLC_TINY:
-						fp_add_dig(t5, t5, ep_curve_get_a()[0]);
-						break;
-					default:
-						fp_add(t5, t5, ep_curve_get_a());
-						break;
-				}
-			}
-
-			/* x3 = T = M^2 - 2 * S. */
-			fp_sqr(r->x, t5);
-			fp_dbl(t1, t4);
-			fp_sub(r->x, r->x, t1);
-
-			/* y3 = M * (S - T) - 8 * y1^4. */
-			fp_dbl(t2, t2);
-			fp_dbl(t2, t2);
-			fp_dbl(t2, t2);
-			fp_sub(t4, t4, r->x);
-			fp_mul(t5, t5, t4);
-			fp_sub(r->y, t5, t2);
-		}
-
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-}
-
-#endif /* EP_ADD == JACOB */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep_dbl_basic(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-	ep_dbl_basic_imp(r, NULL, p);
-}
-
-void ep_dbl_slp_basic(ep_t r, fp_t s, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	ep_dbl_basic_imp(r, s, p);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep_dbl_projc(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	ep_dbl_projc_imp(r, p);
-}
-
-#endif
-
-#if EP_ADD == JACOB || !defined(STRIP)
-
-void ep_dbl_jacob(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	ep_dbl_jacob_imp(r, p);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_map.c b/src/dashbls/depends/relic/src/ep/relic_ep_map.c
deleted file mode 100644
index 10c2c57ad09b..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_map.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of hashing to a prime elliptic curve.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_tmpl_map.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#ifdef EP_CTMAP
-
-/**
- * Evaluate a polynomial represented by its coefficients over a using Horner's
- * rule. Might promove to an API if needed elsewhere in the future.
- *
- * @param[out] c		- the result.
- * @param[in] a			- the input value.
- * @param[in] coeffs	- the vector of coefficients in the polynomial.
- * @param[in] deg 		- the degree of the polynomial.
- */
-TMPL_MAP_HORNER(fp, fp_st)
-/**
- * Generic isogeny map evaluation for use with SSWU map.
- */
-		TMPL_MAP_ISOGENY_MAP(ep, fp, iso)
-#endif /* EP_CTMAP */
-/**
- * Simplified SWU mapping from Section 4 of
- * "Fast and simple constant-time hashing to the BLS12-381 Elliptic Curve"
- */
-#define EP_MAP_COPY_COND(O, I, C) dv_copy_cond(O, I, RLC_FP_DIGS, C)
-		TMPL_MAP_SSWU(ep, fp, dig_t, EP_MAP_COPY_COND)
-/**
- * Shallue--van de Woestijne map, based on the definition from
- * draft-irtf-cfrg-hash-to-curve-06, Section 6.6.1
- */
-TMPL_MAP_SVDW(ep, fp, dig_t, EP_MAP_COPY_COND)
-#undef EP_MAP_COPY_COND
-/* caution: this function overwrites k, which it uses as an auxiliary variable */
-static inline int fp_sgn0(const fp_t t, bn_t k) {
-	fp_prime_back(k, t);
-	return bn_get_bit(k, 0);
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep_map_from_field(ep_t p, const uint8_t *uniform_bytes, int len) {
-	bn_t k;
-	fp_t t;
-	ep_t q;
-	int neg;
-	/* enough space for two field elements plus extra bytes for uniformity */
-	const int len_per_elm = (FP_PRIME + ep_param_level() + 7) / 8;
-
-	bn_null(k);
-	fp_null(t);
-	ep_null(q);
-
-	RLC_TRY {
-		if (len != 2 * len_per_elm) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-
-		bn_new(k);
-		fp_new(t);
-		ep_new(q);
-
-		/* figure out which hash function to use */
-		const int abNeq0 = (ep_curve_opt_a() != RLC_ZERO) &&
-				(ep_curve_opt_b() != RLC_ZERO);
-		void (*const map_fn)(ep_t, fp_t) =(ep_curve_is_ctmap() ||
-				abNeq0) ? ep_map_sswu : ep_map_svdw;
-
-#define EP_MAP_CONVERT_BYTES(IDX)                                       \
-    do {                                                                \
-      bn_read_bin(k, uniform_bytes + IDX * len_per_elm, len_per_elm);   \
-      fp_prime_conv(t, k);                                              \
-    } while (0)
-
-#define EP_MAP_APPLY_MAP(PT)                                    \
-    do {                                                        \
-      /* check sign of t */                                     \
-      neg = fp_sgn0(t, k);                                      \
-      /* convert */                                             \
-      map_fn(PT, t);                                            \
-      /* compare sign of y and sign of t; fix if necessary */   \
-      neg = neg != fp_sgn0(PT->y, k);                             \
-      fp_neg(t, PT->y);                                          \
-      dv_copy_cond(PT->y, t, RLC_FP_DIGS, neg);                  \
-    } while (0)
-
-		/* first map invocation */
-		EP_MAP_CONVERT_BYTES(0);
-		EP_MAP_APPLY_MAP(p);
-		TMPL_MAP_CALL_ISOMAP(ep, p);
-
-		/* second map invocation */
-		EP_MAP_CONVERT_BYTES(1);
-		EP_MAP_APPLY_MAP(q);
-		TMPL_MAP_CALL_ISOMAP(ep, q);
-
-		/* XXX(rsw) could add p and q and then apply isomap,
-		 * but need ep_add to support addition on isogeny curves */
-
-#undef EP_MAP_CONVERT_BYTES
-#undef EP_MAP_APPLY_MAP
-
-		/* sum the result */
-		ep_add(p, p, q);
-		ep_norm(p, p);
-
-		/* clear cofactor */
-		switch (ep_curve_is_pairf()) {
-			case EP_BN:
-				/* h = 1 */
-				break;
-			case EP_B12:
-			case EP_B24:
-				/* multiply by 1-x (x the BLS parameter) to get the correct group. */
-				/* XXX(rsw) is this guaranteed to work? It could fail if one
-				 *          of the prime-squared subgroups is cyclic, but
-				 *          maybe there's an argument that this is never the case...
-				 */
-				fp_prime_get_par(k);
-				bn_neg(k, k);
-				bn_add_dig(k, k, 1);
-				if (bn_bits(k) < RLC_DIG) {
-					ep_mul_dig(p, p, k->dp[0]);
-				} else {
-					ep_mul(p, p, k);
-				}
-				break;
-			default:
-				/* multiply by cofactor to get the correct group. */
-				ep_curve_get_cof(k);
-				if (bn_bits(k) < RLC_DIG) {
-					ep_mul_dig(p, p, k->dp[0]);
-				} else {
-					ep_mul_basic(p, p, k);
-				}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		fp_free(t);
-		ep_free(q);
-	}
-}
-
-void ep_map_dst(ep_t p, const uint8_t *msg, int len, const uint8_t *dst,
-		int dst_len) {
-
-	/* enough space for two field elements plus extra bytes for uniformity */
-	const int len_per_elm = (FP_PRIME + ep_param_level() + 7) / 8;
-	uint8_t *pseudo_random_bytes = RLC_ALLOCA(uint8_t, 2 * len_per_elm);
-
-	RLC_TRY {
-		/* for hash_to_field, need to hash to a pseudorandom string */
-		/* XXX(rsw) the below assumes that we want to use MD_MAP for hashing.
-		 *          Consider making the hash function a per-curve option!
-		 */
-		md_xmd(pseudo_random_bytes, 2 * len_per_elm, msg, len, dst, dst_len);
-		ep_map_from_field(p, pseudo_random_bytes, 2 * len_per_elm);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		RLC_FREE(pseudo_random_bytes);
-	}
-}
-
-void ep_map(ep_t p, const uint8_t *msg, int len) {
-	ep_map_dst(p, msg, len, (const uint8_t *)"RELIC", 5);
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_mul.c b/src/dashbls/depends/relic/src/ep/relic_ep_mul.c
deleted file mode 100644
index 88bd06158c29..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_mul.c
+++ /dev/null
@@ -1,786 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point multiplication on prime elliptic curves.
- *
- * @ingroup eb
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-static void ep_mul_glv_imp(ep_t r, const ep_t p, const bn_t k) {
-	int l, l0, l1, i, n0, n1, s0, s1;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], *t0, *t1;
-	bn_t n, _k, k0, k1, v1[3], v2[3];
-	ep_t q, t[1 << (EP_WIDTH - 2)];
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(k0);
-	bn_null(k1);
-	ep_null(q);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(k0);
-		bn_new(k1);
-		ep_new(q);
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-		for (i = 0; i < 3; i++) {
-			bn_null(v1[i]);
-			bn_null(v2[i]);
-			bn_new(v1[i]);
-			bn_new(v2[i]);
-		}
-
-		ep_curve_get_ord(n);
-		ep_curve_get_v1(v1);
-		ep_curve_get_v2(v2);
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		bn_rec_glv(k0, k1, _k, n, (const bn_t *)v1, (const bn_t *)v2);
-		s0 = bn_sign(k0);
-		s1 = bn_sign(k1);
-		bn_abs(k0, k0);
-		bn_abs(k1, k1);
-
-		if (s0 == RLC_POS) {
-			ep_tab(t, p, EP_WIDTH);
-		} else {
-			ep_neg(q, p);
-			ep_tab(t, q, EP_WIDTH);
-		}
-
-		l0 = l1 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k0, EP_WIDTH);
-		bn_rec_naf(naf1, &l1, k1, EP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		t0 = naf0 + l - 1;
-		t1 = naf1 + l - 1;
-
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--, t0--, t1--) {
-			ep_dbl(r, r);
-
-			n0 = *t0;
-			n1 = *t1;
-			if (n0 > 0) {
-				ep_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				ep_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				ep_psi(q, t[n1 / 2]);
-				if (s0 != s1) {
-					ep_neg(q, q);
-				}
-				ep_add(r, r, q);
-			}
-			if (n1 < 0) {
-				ep_psi(q, t[-n1 / 2]);
-				if (s0 != s1) {
-					ep_neg(q, q);
-				}
-				ep_sub(r, r, q);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(k0);
-		bn_free(k1);
-		bn_free(n)
-		ep_free(q);
-		for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-			ep_free(t[i]);
-		}
-		for (i = 0; i < 3; i++) {
-			bn_free(v1[i]);
-			bn_free(v2[i]);
-		}
-
-	}
-}
-
-#endif /* EP_ENDOM */
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-
-static void ep_mul_naf_imp(ep_t r, const ep_t p, const bn_t k) {
-	int i, l;
-	/* Some of the supported prime curves have order > field. */
-	int8_t u, naf[RLC_FP_BITS + 2];
-	ep_t t[1 << (EP_WIDTH - 2)];
-	bn_t _k, n;
-
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		/* Compute the precomputation table. */
-		ep_tab(t, p, EP_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		l = RLC_FP_BITS + 2;
-		bn_rec_naf(naf, &l, _k, EP_WIDTH);
-
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			ep_dbl(r, r);
-
-			u = naf[i];
-			if (u > 0) {
-				ep_add(r, r, t[u / 2]);
-			} else if (u < 0) {
-				ep_sub(r, r, t[-u / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_free(t[i]);
-		}
-	}
-}
-
-#endif /* EP_PLAIN || EP_SUPER */
-#endif /* EP_MUL == LWNAF */
-
-#if EP_MUL == LWREG || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-static void ep_mul_reg_glv(ep_t r, const ep_t p, const bn_t k) {
-	int i, j, l, n0, n1, s0, s1, b0, b1;
-	int8_t _s0, _s1, reg0[RLC_FP_BITS + 1], reg1[RLC_FP_BITS + 1];
-	bn_t n, _k, k0, k1, v1[3], v2[3];
-	ep_t q, t[1 << (EP_WIDTH - 2)], u, v, w;
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(k0);
-	bn_null(k1);
-	ep_null(q);
-	ep_null(u);
-	ep_null(v);
-	ep_null(w);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(k0);
-		bn_new(k1);
-		ep_new(q);
-		ep_new(u);
-		ep_new(v);
-		ep_new(w);
-
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-		for (i = 0; i < 3; i++) {
-			bn_null(v1[i]);
-			bn_null(v2[i]);
-			bn_new(v1[i]);
-			bn_new(v2[i]);
-		}
-
-		ep_curve_get_ord(n);
-		ep_curve_get_v1(v1);
-		ep_curve_get_v2(v2);
-
-		bn_abs(_k, k);
-		if (bn_cmp(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		bn_rec_glv(k0, k1, _k, n, (const bn_t *)v1, (const bn_t *)v2);
-		s0 = bn_sign(k0);
-		s1 = bn_sign(k1);
-		bn_abs(k0, k0);
-		bn_abs(k1, k1);
-		b0 = bn_is_even(k0);
-		b1 = bn_is_even(k1);
-		k0->dp[0] |= b0;
-		k1->dp[0] |= b1;
-
-		ep_copy(q, p);
-		ep_neg(t[0], p);
-		dv_copy_cond(q->y, t[0]->y, RLC_FP_DIGS, s0 != RLC_POS);
-		ep_tab(t, q, EP_WIDTH);
-
-		l = RLC_FP_BITS + 1;
-		bn_rec_reg(reg0, &l, k0, bn_bits(n)/2, EP_WIDTH);
-		l = RLC_FP_BITS + 1;
-		bn_rec_reg(reg1, &l, k1, bn_bits(n)/2, EP_WIDTH);
-
-#if defined(EP_MIXED)
-		fp_set_dig(u->z, 1);
-		fp_set_dig(w->z, 1);
-		u->coord = w->coord = BASIC;
-#else
-		u->coord = w->coord = EP_ADD;
-#endif
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			for (j = 0; j < EP_WIDTH - 1; j++) {
-				ep_dbl(r, r);
-			}
-
-			n0 = reg0[i];
-			_s0 = (n0 >> 7);
-			n0 = ((n0 ^ _s0) - _s0) >> 1;
-			n1 = reg1[i];
-			_s1 = (n1 >> 7);
-			n1 = ((n1 ^ _s1) - _s1) >> 1;
-
-			for (j = 0; j < (1 << (EP_WIDTH - 2)); j++) {
-				dv_copy_cond(u->x, t[j]->x, RLC_FP_DIGS, j == n0);
-				dv_copy_cond(w->x, t[j]->x, RLC_FP_DIGS, j == n1);
-				dv_copy_cond(u->y, t[j]->y, RLC_FP_DIGS, j == n0);
-				dv_copy_cond(w->y, t[j]->y, RLC_FP_DIGS, j == n1);
-#if !defined(EP_MIXED)
-				dv_copy_cond(u->z, t[j]->z, RLC_FP_DIGS, j == n0);
-				dv_copy_cond(w->z, t[j]->z, RLC_FP_DIGS, j == n1);
-#endif
-			}
-			ep_neg(v, u);
-			dv_copy_cond(u->y, v->y, RLC_FP_DIGS, _s0 != 0);
-			ep_add(r, r, u);
-
-			ep_psi(w, w);
-			ep_neg(q, w);
-			dv_copy_cond(w->y, q->y, RLC_FP_DIGS, s0 != s1);
-			ep_neg(q, w);
-			dv_copy_cond(w->y, q->y, RLC_FP_DIGS, _s1 != 0);
-			ep_add(r, r, w);
-		}
-
-		/* t[0] has an unmodified copy of p. */
-		ep_sub(u, r, t[0]);
-		dv_copy_cond(r->x, u->x, RLC_FP_DIGS, b0);
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, b0);
-		dv_copy_cond(r->z, u->z, RLC_FP_DIGS, b0);
-
-		ep_psi(w, t[0]);
-		ep_neg(q, w);
-		dv_copy_cond(w->y, q->y, RLC_FP_DIGS, s0 != s1);
-		ep_sub(u, r, w);
-		dv_copy_cond(r->x, u->x, RLC_FP_DIGS, b1);
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, b1);
-		dv_copy_cond(r->z, u->z, RLC_FP_DIGS, b1);
-
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-		ep_neg(u, r);
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, bn_sign(k) == RLC_NEG);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(k0);
-		bn_free(k1);
-		bn_free(n);
-		ep_free(q);
-		ep_free(u);
-		ep_free(v);
-		ep_free(w);
-		for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-			ep_free(t[i]);
-		}
-		for (i = 0; i < 3; i++) {
-			bn_free(v1[i]);
-			bn_free(v2[i]);
-		}
-	}
-}
-
-#endif /* EP_ENDOM */
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-
-static void ep_mul_reg_imp(ep_t r, const ep_t p, const bn_t k) {
-	bn_t _k;
-	int i, j, l, n;
-	int8_t s, reg[1 + RLC_CEIL(RLC_FP_BITS + 1, EP_WIDTH - 1)];
-	ep_t t[1 << (EP_WIDTH - 2)], u, v;
-
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(_k);
-		ep_new(u);
-		ep_new(v);
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		ep_tab(t, p, EP_WIDTH);
-
-		ep_curve_get_ord(_k);
-		n = bn_bits(_k);
-
-		/* Make a copy of the scalar for processing. */
-		bn_abs(_k, k);
-		_k->dp[0] |= 1;
-
-		/* Compute the regular w-NAF representation of k. */
-		l = RLC_CEIL(n, EP_WIDTH - 1) + 1;
-		bn_rec_reg(reg, &l, _k, n, EP_WIDTH);
-
-#if defined(EP_MIXED)
-		fp_set_dig(u->z, 1);
-		u->coord = BASIC;
-#else
-		u->coord = EP_ADD;
-#endif
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			for (j = 0; j < EP_WIDTH - 1; j++) {
-				ep_dbl(r, r);
-			}
-
-			n = reg[i];
-			s = (n >> 7);
-			n = ((n ^ s) - s) >> 1;
-
-			for (j = 0; j < (1 << (EP_WIDTH - 2)); j++) {
-				dv_copy_cond(u->x, t[j]->x, RLC_FP_DIGS, j == n);
-				dv_copy_cond(u->y, t[j]->y, RLC_FP_DIGS, j == n);
-#if !defined(EP_MIXED)
-				dv_copy_cond(u->z, t[j]->z, RLC_FP_DIGS, j == n);
-#endif
-			}
-			ep_neg(v, u);
-			dv_copy_cond(u->y, v->y, RLC_FP_DIGS, s != 0);
-			ep_add(r, r, u);
-		}
-		/* t[0] has an unmodified copy of p. */
-		ep_sub(u, r, t[0]);
-		dv_copy_cond(r->x, u->x, RLC_FP_DIGS, bn_is_even(k));
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, bn_is_even(k));
-		dv_copy_cond(r->z, u->z, RLC_FP_DIGS, bn_is_even(k));
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-		ep_neg(u, r);
-		dv_copy_cond(r->y, u->y, RLC_FP_DIGS, bn_sign(k) == RLC_NEG);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_free(t[i]);
-		}
-		bn_free(_k);
-		ep_free(u);
-		ep_free(v);
-	}
-}
-
-#endif /* EP_PLAIN || EP_SUPER */
-#endif /* EP_MUL == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_MUL == BASIC || !defined(STRIP)
-
-void ep_mul_basic(ep_t r, const ep_t p, const bn_t k) {
-	ep_t t;
-
-	ep_null(t);
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep_new(t);
-
-		ep_copy(t, p);
-		for (int i = bn_bits(k) - 2; i >= 0; i--) {
-			ep_dbl(t, t);
-			if (bn_get_bit(k, i)) {
-				ep_add(t, t, p);
-			}
-		}
-
-		ep_norm(r, t);
-		if (bn_sign(k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-	}
-}
-
-#endif
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-
-void ep_mul_slide(ep_t r, const ep_t p, const bn_t k) {
-	bn_t _k, n;
-	ep_t t[1 << (EP_WIDTH - 1)], q;
-	int i, j, l;
-	uint8_t win[RLC_FP_BITS + 1];
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	ep_null(q);
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i ++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-		ep_new(q);
-
-		ep_copy(t[0], p);
-		ep_dbl(q, p);
-
-#if defined(EP_MIXED)
-		ep_norm(q, q);
-#endif
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		/* Create table. */
-		for (i = 1; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep_add(t[i], t[i - 1], q);
-		}
-
-#if defined(EP_MIXED)
-		ep_norm_sim(t + 1, (const ep_t *)t + 1, (1 << (EP_WIDTH - 1)) - 1);
-#endif
-
-		ep_set_infty(q);
-		l = RLC_FP_BITS + 1;
-		bn_rec_slw(win, &l, _k, EP_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				ep_dbl(q, q);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					ep_dbl(q, q);
-				}
-				ep_add(q, q, t[win[i] >> 1]);
-			}
-		}
-
-		ep_norm(r, q);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep_free(t[i]);
-		}
-		ep_free(q);
-	}
-}
-
-#endif
-#include "assert.h"
-#if EP_MUL == MONTY || !defined(STRIP)
-
-void ep_mul_monty(ep_t r, const ep_t p, const bn_t k) {
-	int i, j, bits;
-	ep_t t[2];
-	bn_t n, l, _k;
-
-	bn_null(n);
-	bn_null(l);
-	bn_null(_k);
-	ep_null(t[0]);
-	ep_null(t[1]);
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(l);
-		bn_new(_k);
-		ep_new(t[0]);
-		ep_new(t[1]);
-
-		ep_curve_get_ord(n);
-		bits = bn_bits(n);
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		bn_abs(l, _k);
-		bn_add(l, l, n);
-		bn_add(n, l, n);
-		dv_swap_cond(l->dp, n->dp, RLC_MAX(l->used, n->used),
-			bn_get_bit(l, bits) == 0);
-		l->used = RLC_SEL(l->used, n->used, bn_get_bit(l, bits) == 0);
-
-		ep_norm(t[0], p);
-		ep_dbl(t[1], t[0]);
-
-		/* Blind both points independently. */
-		ep_blind(t[0], t[0]);
-		ep_blind(t[1], t[1]);
-
-		for (i = bits - 1; i >= 0; i--) {
-			j = bn_get_bit(l, i);
-			dv_swap_cond(t[0]->x, t[1]->x, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y, t[1]->y, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z, t[1]->z, RLC_FP_DIGS, j ^ 1);
-			ep_add(t[0], t[0], t[1]);
-			ep_dbl(t[1], t[1]);
-			dv_swap_cond(t[0]->x, t[1]->x, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y, t[1]->y, RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z, t[1]->z, RLC_FP_DIGS, j ^ 1);
-		}
-
-		ep_norm(r, t[0]);
-		ep_neg(t[0], r);
-		dv_copy_cond(r->y, t[0]->y, RLC_FP_DIGS, bn_sign(_k) == RLC_NEG);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(l);
-		bn_free(_k);
-		ep_free(t[1]);
-		ep_free(t[0]);
-	}
-}
-
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-void ep_mul_lwnaf(ep_t r, const ep_t p, const bn_t k) {
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		ep_mul_glv_imp(r, p, k);
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-	ep_mul_naf_imp(r, p, k);
-#endif
-}
-
-#endif
-
-#if EP_MUL == LWREG || !defined(STRIP)
-
-void ep_mul_lwreg(ep_t r, const ep_t p, const bn_t k) {
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		ep_mul_reg_glv(r, p, k);
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-	ep_mul_reg_imp(r, p, k);
-#endif
-}
-
-#endif
-
-void ep_mul_gen(ep_t r, const bn_t k) {
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-#ifdef EP_PRECO
-	ep_mul_fix(r, ep_curve_get_tab(), k);
-#else
-	ep_t g;
-
-	ep_null(g);
-
-	RLC_TRY {
-		ep_new(g);
-		ep_curve_get_gen(g);
-		ep_mul(r, g, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(g);
-	}
-#endif
-}
-
-void ep_mul_dig(ep_t r, const ep_t p, dig_t k) {
-	ep_t t;
-	bn_t _k;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	ep_null(t);
-	bn_null(_k);
-
-	if (k == 0 || ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep_new(t);
-		bn_new(_k);
-
-		bn_set_dig(_k, k);
-
-		l = RLC_DIG + 1;
-		bn_rec_naf(naf, &l, _k, 2);
-
-		ep_set_infty(t);
-		for (int i = l - 1; i >= 0; i--) {
-			ep_dbl(t, t);
-
-			u = naf[i];
-			if (u > 0) {
-				ep_add(t, t, p);
-			} else if (u < 0) {
-				ep_sub(t, t, p);
-			}
-		}
-
-		ep_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-		bn_free(_k);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_mul_fix.c b/src/dashbls/depends/relic/src/ep/relic_ep_mul_fix.c
deleted file mode 100644
index a4e6589bf4d5..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_mul_fix.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of fixed point multiplication on binary elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-NAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void ep_mul_fix_plain(ep_t r, const ep_t *t, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FP_BITS + 1];
-
-	/* Compute the w-TNAF representation of k. */
-	l = RLC_FP_BITS + 1;
-	bn_rec_naf(naf, &l, k, EP_DEPTH);
-
-	n = naf[l - 1];
-	if (n > 0) {
-		ep_copy(r, t[n / 2]);
-	} else {
-		ep_neg(r, t[-n / 2]);
-	}
-
-	for (i = l - 2; i >= 0; i--) {
-		ep_dbl(r, r);
-
-		n = naf[i];
-		if (n > 0) {
-			ep_add(r, r, t[n / 2]);
-		}
-		if (n < 0) {
-			ep_sub(r, r, t[-n / 2]);
-		}
-	}
-	/* Convert r to affine coordinates. */
-	ep_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ep_neg(r, r);
-	}
-}
-
-#endif /* EP_FIX == LWNAF */
-
-#if EP_FIX == COMBS || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-/**
- * Multiplies a prime elliptic curve point by an integer using the COMBS
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void ep_mul_combs_endom(ep_t r, const ep_t *t, const bn_t k) {
-	int i, j, l, w0, w1, n0, n1, p0, p1, s0, s1;
-	bn_t n, _k, k0, k1, v1[3], v2[3];
-	ep_t u;
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(k0);
-	bn_null(k1);
-	ep_null(u);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(k0);
-		bn_new(k1);
-		ep_new(u);
-		for (i = 0; i < 3; i++) {
-			bn_null(v1[i]);
-			bn_null(v2[i]);
-			bn_new(v1[i]);
-			bn_new(v2[i]);
-		}
-
-		ep_curve_get_ord(n);
-		ep_curve_get_v1(v1);
-		ep_curve_get_v2(v2);
-		l = RLC_CEIL(bn_bits(n), (2 * EP_DEPTH));
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		bn_rec_glv(k0, k1, _k, n, (const bn_t *)v1, (const bn_t *)v2);
-		s0 = bn_sign(k0);
-		s1 = bn_sign(k1);
-		bn_abs(k0, k0);
-		bn_abs(k1, k1);
-
-		n0 = bn_bits(k0);
-		n1 = bn_bits(k1);
-
-		p0 = (EP_DEPTH) * l - 1;
-
-		ep_set_infty(r);
-		if (n0 > p0 + 1) {
-			ep_copy(r, t[1 << (EP_DEPTH-1)]);
-		}
-		if (n1 > p0 + 1) {
-			ep_psi(u, t[1 << (EP_DEPTH-1)]);
-			ep_add(r, r, u);
-		}
-
-		for (i = l - 1; i >= 0; i--) {
-			ep_dbl(r, r);
-
-			w0 = w1 = 0;
-			p1 = p0--;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w0 = w0 << 1;
-				w1 = w1 << 1;
-				if (p1 < n0 && bn_get_bit(k0, p1)) {
-					w0 = w0 | 1;
-				}
-				if (p1 < n1 && bn_get_bit(k1, p1)) {
-					w1 = w1 | 1;
-				}
-			}
-			if (w0 > 0) {
-				if (s0 == RLC_POS) {
-					ep_add(r, r, t[w0]);
-				} else {
-					ep_sub(r, r, t[w0]);
-				}
-			}
-			if (w1 > 0) {
-				ep_psi(u, t[w1]);
-				if (s1 == RLC_POS) {
-					ep_add(r, r, u);
-				} else {
-					ep_sub(r, r, u);
-				}
-			}
-		}
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(k0);
-		bn_free(k1);
-		ep_free(u);
-		for (i = 0; i < 3; i++) {
-			bn_free(v1[i]);
-			bn_free(v2[i]);
-		}
-	}
-}
-
-#endif /* EP_ENDOM */
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-/**
- * Multiplies a prime elliptic curve point by an integer using the COMBS
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] t					- the precomputed table.
- * @param[in] k					- the integer.
- */
-static void ep_mul_combs_plain(ep_t r, const ep_t *t, const bn_t k) {
-	int i, j, l, w, n0, p0, p1;
-	bn_t n, _k;
-
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-
-		ep_curve_get_ord(n);
-		l = RLC_CEIL(bn_bits(n), EP_DEPTH);
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		n0 = bn_bits(_k);
-		p0 = (EP_DEPTH) * l - 1;
-
-		w = 0;
-		p1 = p0--;
-		for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-			w = w << 1;
-			if (p1 < n0 && bn_get_bit(_k, p1)) {
-				w = w | 1;
-			}
-		}
-
-		ep_copy(r, t[w]);
-		for (i = l - 2; i >= 0; i--) {
-			ep_dbl(r, r);
-
-			w = 0;
-			p1 = p0--;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w = w << 1;
-				if (p1 < n0 && bn_get_bit(_k, p1)) {
-					w = w | 1;
-				}
-			}
-			if (w > 0) {
-				ep_add(r, r, t[w]);
-			}
-		}
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-	}
-}
-
-#endif /* EP_PLAIN || EP_SUPER */
-
-#endif /* EP_FIX == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_FIX == BASIC || !defined(STRIP)
-
-void ep_mul_pre_basic(ep_t *t, const ep_t p) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep_curve_get_ord(n);
-
-		ep_copy(t[0], p);
-		for (int i = 1; i < bn_bits(n); i++) {
-			ep_dbl(t[i], t[i - 1]);
-		}
-
-		ep_norm_sim(t + 1, (const ep_t *)t + 1, bn_bits(n) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep_mul_fix_basic(ep_t r, const ep_t *t, const bn_t k) {
-	bn_t n, _k;
-
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		ep_set_infty(r);
-		for (int i = 0; i < bn_bits(_k); i++) {
-			if (bn_get_bit(_k, i)) {
-				ep_add(r, r, t[i]);
-			}
-		}
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-	}
-}
-
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-
-void ep_mul_pre_combs(ep_t *t, const ep_t p) {
-	int i, j, l;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep_curve_get_ord(n);
-		l = RLC_CEIL(bn_bits(n), EP_DEPTH);
-
-#if defined(EP_ENDOM)
-		if (ep_curve_is_endom()) {
-			l = RLC_CEIL(bn_bits(n), 2 * EP_DEPTH);
-		}
-#endif
-
-		ep_set_infty(t[0]);
-
-		ep_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < l; i++) {
-				ep_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-
-		ep_norm_sim(t + 2, (const ep_t *)t + 2, RLC_EP_TABLE_COMBS - 2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep_mul_fix_combs(ep_t r, const ep_t *t, const bn_t k) {
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		ep_mul_combs_endom(r, t, k);
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-	ep_mul_combs_plain(r, t, k);
-#endif
-}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-
-void ep_mul_pre_combd(ep_t *t, const ep_t p) {
-	int i, j, d, e;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep_curve_get_ord(n);
-		d = RLC_CEIL(bn_bits(n), EP_DEPTH);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ep_set_infty(t[0]);
-		ep_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < d; i++) {
-				ep_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-		ep_set_infty(t[1 << EP_DEPTH]);
-		for (j = 1; j < (1 << EP_DEPTH); j++) {
-			ep_dbl(t[(1 << EP_DEPTH) + j], t[j]);
-			for (i = 1; i < e; i++) {
-				ep_dbl(t[(1 << EP_DEPTH) + j], t[(1 << EP_DEPTH) + j]);
-			}
-		}
-
-		ep_norm_sim(t + 2, (const ep_t *)t + 2, (1 << EP_DEPTH) - 2);
-		ep_norm_sim(t + (1 << EP_DEPTH) + 1,
-				(const ep_t *)t + (1 << EP_DEPTH) + 1, (1 << EP_DEPTH) - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep_mul_fix_combd(ep_t r, const ep_t *t, const bn_t k) {
-	int i, j, d, e, w0, w1, n0, p0, p1;
-	bn_t n, _k;
-
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-
-		ep_curve_get_ord(n);
-		d = RLC_CEIL(bn_bits(n), EP_DEPTH);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		ep_set_infty(r);
-		n0 = bn_bits(_k);
-
-		p1 = (e - 1) + (EP_DEPTH - 1) * d;
-		for (i = e - 1; i >= 0; i--) {
-			ep_dbl(r, r);
-
-			w0 = 0;
-			p0 = p1;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w0 = w0 << 1;
-				if (p0 < n0 && bn_get_bit(_k, p0)) {
-					w0 = w0 | 1;
-				}
-			}
-
-			w1 = 0;
-			p0 = p1-- + e;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w1 = w1 << 1;
-				if (i + e < d && p0 < n0 && bn_get_bit(_k, p0)) {
-					w1 = w1 | 1;
-				}
-			}
-
-			ep_add(r, r, t[w0]);
-			ep_add(r, r, t[(1 << EP_DEPTH) + w1]);
-		}
-		ep_norm(r, r);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-	}
-}
-
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-void ep_mul_pre_lwnaf(ep_t *t, const ep_t p) {
-	ep_tab(t, p, EP_DEPTH);
-}
-
-void ep_mul_fix_lwnaf(ep_t r, const ep_t *t, const bn_t k) {
-	bn_t n, _k;
-
-	if (bn_is_zero(k)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-
-		ep_mul_fix_plain(r, t, _k);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-	}
-}
-#endif
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_mul_sim.c b/src/dashbls/depends/relic/src/ep/relic_ep_mul_sim.c
deleted file mode 100644
index 0aa506383b1d..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_mul_sim.c
+++ /dev/null
@@ -1,972 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of simultaneous point multiplication on binary elliptic
- * curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ep_mul_sim_endom(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m, const ep_t *t) {
-	int i, l, l0, l1, l2, l3, sk0, sk1, sl0, sl1, w, g = 0;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], *t0, *t1, u;
-	int8_t naf2[RLC_FP_BITS + 1], naf3[RLC_FP_BITS + 1], *t2, *t3;
-	bn_t n, k0, k1, m0, m1;
-	bn_t v1[3], v2[3];
-	ep_t v;
-	ep_t tab0[1 << (EP_WIDTH - 2)];
-	ep_t tab1[1 << (EP_WIDTH - 2)];
-
-	bn_null(n);
-	bn_null(k0);
-	bn_null(k1);
-	bn_null(m0);
-	bn_null(m1);
-	ep_null(v);
-
-	for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-		ep_null(tab0[i]);
-		ep_null(tab1[i]);
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k0);
-		bn_new(k1);
-		bn_new(m0);
-		bn_new(m1);
-		ep_new(v);
-
-		for (i = 0; i < 3; i++) {
-			bn_null(v1[i]);
-			bn_null(v2[i]);
-			bn_new(v1[i]);
-			bn_new(v2[i]);
-		}
-
-		ep_curve_get_ord(n);
-		ep_curve_get_v1(v1);
-		ep_curve_get_v2(v2);
-
-		bn_rec_glv(k0, k1, k, n, (const bn_t *)v1, (const bn_t *)v2);
-		sk0 = bn_sign(k0);
-		sk1 = bn_sign(k1);
-		bn_abs(k0, k0);
-		bn_abs(k1, k1);
-
-		bn_rec_glv(m0, m1, m, n, (const bn_t *)v1, (const bn_t *)v2);
-		sl0 = bn_sign(m0);
-		sl1 = bn_sign(m1);
-		bn_abs(m0, m0);
-		bn_abs(m1, m1);
-
-		g = (t == NULL ? 0 : 1);
-		if (!g) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep_new(tab0[i]);
-			}
-			ep_tab(tab0, p, EP_WIDTH);
-			t = (const ep_t *)tab0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_new(tab1[i]);
-		}
-		/* Compute the precomputation table. */
-		ep_tab(tab1, q, EP_WIDTH);
-
-		/* Compute the w-TNAF representation of k and l */
-		if (g) {
-			w = EP_DEPTH;
-		} else {
-			w = EP_WIDTH;
-		}
-		l0 = l1 = l2 = l3 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k0, w);
-		bn_rec_naf(naf1, &l1, k1, w);
-		bn_rec_naf(naf2, &l2, m0, EP_WIDTH);
-		bn_rec_naf(naf3, &l3, m1, EP_WIDTH);
-
-		l = RLC_MAX(RLC_MAX(l0, l1), RLC_MAX(l2, l3));
-		t0 = naf0 + l - 1;
-		t1 = naf1 + l - 1;
-		t2 = naf2 + l - 1;
-		t3 = naf3 + l - 1;
-
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l2; i++) {
-				naf2[i] = -naf2[i];
-			}
-			for (i =  0; i < l3; i++) {
-				naf3[i] = -naf3[i];
-			}
-		}
-
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--, t0--, t1--, t2--, t3--) {
-			ep_dbl(r, r);
-
-			u = *t0;
-			if (u > 0) {
-				if (sk0 == RLC_POS) {
-					ep_add(r, r, t[u / 2]);
-				} else {
-					ep_sub(r, r, t[u / 2]);
-				}
-			}
-			if (u < 0) {
-				if (sk0 == RLC_POS) {
-					ep_sub(r, r, t[-u / 2]);
-				} else {
-					ep_add(r, r, t[-u / 2]);
-				}
-			}
-			u = *t1;
-			if (u > 0) {
-				ep_psi(v, t[u / 2]);
-				if (sk1 == RLC_NEG) {
-					ep_neg(v, v);
-				}
-				ep_add(r, r, v);
-			}
-			if (u < 0) {
-				ep_psi(v, t[-u / 2]);
-				if (sk1 == RLC_NEG) {
-					ep_neg(v, v);
-				}
-				ep_sub(r, r, v);
-			}
-
-			u = *t2;
-			if (u > 0) {
-				if (sl0 == RLC_POS) {
-					ep_add(r, r, tab1[u / 2]);
-				} else {
-					ep_sub(r, r, tab1[u / 2]);
-				}
-			}
-			if (u < 0) {
-				if (sl0 == RLC_POS) {
-					ep_sub(r, r, tab1[-u / 2]);
-				} else {
-					ep_add(r, r, tab1[-u / 2]);
-				}
-			}
-			u = *t3;
-			if (u > 0) {
-				ep_psi(v, tab1[u / 2]);
-				if (sl1 == RLC_NEG) {
-					ep_neg(v, v);
-				}
-				ep_add(r, r, v);
-			}
-			if (u < 0) {
-				ep_psi(v, tab1[-u / 2]);
-				if (sl1 == RLC_NEG) {
-					ep_neg(v, v);
-				}
-				ep_sub(r, r, v);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(k0);
-		bn_free(k1);
-		bn_free(m0);
-		bn_free(m1);
-		ep_free(v);
-
-		if (!g) {
-			for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-				ep_free(tab0[i]);
-			}
-		}
-		/* Free the precomputation tables. */
-		for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-			ep_free(tab1[i]);
-		}
-		for (i = 0; i < 3; i++) {
-			bn_free(v1[i]);
-			bn_free(v2[i]);
-		}
-	}
-}
-
-#endif /* EP_ENDOM */
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ep_mul_sim_plain(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m, const ep_t *t) {
-	int i, l, l0, l1, w, gen;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], n0, n1, *u, *v;
-	ep_t t0[1 << (EP_WIDTH - 2)];
-	ep_t t1[1 << (EP_WIDTH - 2)];
-
-	RLC_TRY {
-		gen = (t == NULL ? 0 : 1);
-		if (!gen) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep_null(t0[i]);
-				ep_new(t0[i]);
-			}
-			ep_tab(t0, p, EP_WIDTH);
-			t = (const ep_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep_null(t1[i]);
-			ep_new(t1[i]);
-		}
-
-		/* Compute the precomputation table. */
-		ep_tab(t1, q, EP_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		if (gen) {
-			w = EP_DEPTH;
-		} else {
-			w = EP_WIDTH;
-		}
-		l0 = l1 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k, w);
-		bn_rec_naf(naf1, &l1, m, EP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		u = naf0 + l - 1;
-		v = naf1 + l - 1;
-		ep_set_infty(r);
-		for (i = l - 1; i >= 0; i--, u--, v--) {
-			ep_dbl(r, r);
-
-			n0 = *u;
-			n1 = *v;
-			if (n0 > 0) {
-				ep_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				ep_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				ep_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				ep_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation tables. */
-		if (!gen) {
-			for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-				ep_free(t0[i]);
-			}
-		}
-		for (i = 0; i < 1 << (EP_WIDTH - 2); i++) {
-			ep_free(t1[i]);
-		}
-	}
-}
-
-#endif /* EP_PLAIN || EP_SUPER */
-
-#endif /* EP_SIM == INTER */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_SIM == BASIC || !defined(STRIP)
-
-void ep_mul_sim_basic(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m) {
-	ep_t t;
-
-	ep_null(t);
-
-	RLC_TRY {
-		ep_new(t);
-		ep_mul(t, q, m);
-		ep_mul(r, p, k);
-		ep_add(t, t, r);
-		ep_norm(r, t);
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-	}
-}
-
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-
-void ep_mul_sim_trick(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m) {
-	ep_t t0[1 << (EP_WIDTH / 2)], t1[1 << (EP_WIDTH / 2)], t[1 << EP_WIDTH];
-	bn_t n, _k, _m;
-	int l0, l1, w = EP_WIDTH / 2;
-	uint8_t w0[RLC_FP_BITS + 1], w1[RLC_FP_BITS + 1];
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep_is_infty(q)) {
-		ep_mul(r, p, k);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(_m);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(_m);
-
-		for (int i = 0; i < (1 << w); i++) {
-			ep_null(t0[i]);
-			ep_null(t1[i]);
-			ep_new(t0[i]);
-			ep_new(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-		bn_copy(_m, m);
-		if (bn_cmp_abs(_m, n) == RLC_GT) {
-			bn_mod(_m, _m, n);
-		}
-
-		ep_set_infty(t0[0]);
-		ep_copy(t0[1], p);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(t0[1], t0[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			ep_add(t0[i], t0[i - 1], t0[1]);
-		}
-
-		ep_set_infty(t1[0]);
-		ep_copy(t1[1], q);
-		if (bn_sign(_m) == RLC_NEG) {
-			ep_neg(t1[1], t1[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			ep_add(t1[i], t1[i - 1], t1[1]);
-		}
-
-		for (int i = 0; i < (1 << w); i++) {
-			for (int j = 0; j < (1 << w); j++) {
-				ep_add(t[(i << w) + j], t0[i], t1[j]);
-			}
-		}
-
-#if EP_WIDTH > 2 && defined(EP_MIXED)
-		ep_norm_sim(t + 1, (const ep_t *)(t + 1), (1 << EP_WIDTH) - 1);
-#endif
-
-		l0 = l1 = RLC_CEIL(RLC_FP_BITS + 1, w);
-		bn_rec_win(w0, &l0, _k, w);
-		bn_rec_win(w1, &l1, _m, w);
-		for (int i = l0; i < l1; i++) {
-			w0[i] = 0;
-		}
-		for (int i = l1; i < l0; i++) {
-			w1[i] = 0;
-		}
-
-		ep_set_infty(r);
-		for (int i = RLC_MAX(l0, l1) - 1; i >= 0; i--) {
-			for (int j = 0; j < w; j++) {
-				ep_dbl(r, r);
-			}
-			ep_add(r, r, t[(w0[i] << w) + w1[i]]);
-		}
-		ep_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(_m);
-		for (int i = 0; i < (1 << w); i++) {
-			ep_free(t0[i]);
-			ep_free(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep_free(t[i]);
-		}
-	}
-}
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-void ep_mul_sim_inter(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m) {
-	int flag = 0;
-	bn_t n, _k, _m;
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep_is_infty(q)) {
-		ep_mul(r, p, k);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(_m);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(_m);
-
-		/* Handle this here to reduce complexity of static functions. */
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-		bn_copy(_m, m);
-		if (bn_cmp_abs(_m, n) == RLC_GT) {
-			bn_mod(_m, _m, n);
-		}
-
-#if defined(EP_ENDOM)
-		if (ep_curve_is_endom()) {
-			ep_mul_sim_endom(r, p, _k, q, _m, NULL);
-			flag = 1;
-		}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-		if (!flag) {
-			ep_mul_sim_plain(r, p, _k, q, _m, NULL);
-		}
-#endif
-		(void)flag;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(_m);
-	}
-}
-
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-
-void ep_mul_sim_joint(ep_t r, const ep_t p, const bn_t k, const ep_t q,
-		const bn_t m) {
-	bn_t n, _k, _m;
-	ep_t t[5];
-	int i, l, u_i, offset;
-	int8_t jsf[2 * (RLC_FP_BITS + 1)];
-
-	if (bn_is_zero(k) || ep_is_infty(p)) {
-		ep_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep_is_infty(q)) {
-		ep_mul(r, p, k);
-		return;
-	}
-
-	bn_null(n);
-	bn_null(_k);
-	bn_null(_m);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_k);
-		bn_new(_m);
-		for (i = 0; i < 5; i++) {
-			ep_null(t[i]);
-			ep_new(t[i]);
-		}
-
-		ep_curve_get_ord(n);
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-		bn_copy(_m, m);
-		if (bn_cmp_abs(_m, n) == RLC_GT) {
-			bn_mod(_m, _m, n);
-		}
-
-		ep_set_infty(t[0]);
-		ep_copy(t[1], q);
-		if (bn_sign(_m) == RLC_NEG) {
-			ep_neg(t[1], t[1]);
-		}
-		ep_copy(t[2], p);
-		if (bn_sign(_k) == RLC_NEG) {
-			ep_neg(t[2], t[2]);
-		}
-		ep_add(t[3], t[2], t[1]);
-		ep_sub(t[4], t[2], t[1]);
-#if defined(EP_MIXED)
-		ep_norm_sim(t + 3, (const ep_t *)t + 3, 2);
-#endif
-
-		l = 2 * (RLC_FP_BITS + 1);
-		bn_rec_jsf(jsf, &l, _k, _m);
-
-		ep_set_infty(r);
-
-		offset = RLC_MAX(bn_bits(_k), bn_bits(_m)) + 1;
-		for (i = l - 1; i >= 0; i--) {
-			ep_dbl(r, r);
-			if (jsf[i] != 0 && jsf[i] == -jsf[i + offset]) {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep_sub(r, r, t[4]);
-				} else {
-					ep_add(r, r, t[4]);
-				}
-			} else {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep_sub(r, r, t[-u_i]);
-				} else {
-					ep_add(r, r, t[u_i]);
-				}
-			}
-		}
-		ep_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(_k);
-		bn_free(_m);
-		for (i = 0; i < 5; i++) {
-			ep_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-void ep_mul_sim_gen(ep_t r, const bn_t k, const ep_t q, const bn_t m) {
-	ep_t g;
-	bn_t n, _k, _m;
-
-	if (bn_is_zero(k)) {
-		ep_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep_is_infty(q)) {
-		ep_mul_gen(r, k);
-		return;
-	}
-
-	ep_null(g);
-	bn_null(n);
-	bn_null(_k);
-	bn_null(_m);
-
-	RLC_TRY {
-		ep_new(g);
-		bn_new(n);
-		bn_new(_k);
-		bn_new(_m);
-
-		ep_curve_get_gen(g);
-		ep_curve_get_ord(n);
-
-		bn_copy(_k, k);
-		if (bn_cmp_abs(_k, n) == RLC_GT) {
-			bn_mod(_k, _k, n);
-		}
-		bn_copy(_m, m);
-		if (bn_cmp_abs(_m, n) == RLC_GT) {
-			bn_mod(_m, _m, n);
-		}
-
-#if defined(EP_ENDOM)
-#if EP_SIM == INTER && EP_FIX == LWNAF && defined(EP_PRECO)
-		if (ep_curve_is_endom()) {
-			ep_mul_sim_endom(r, g, _k, q, _m, ep_curve_get_tab());
-		}
-#else
-		if (ep_curve_is_endom()) {
-			ep_mul_sim(r, g, _k, q, _m);
-		}
-#endif
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-#if EP_SIM == INTER && EP_FIX == LWNAF && defined(EP_PRECO)
-		if (!ep_curve_is_endom()) {
-			ep_mul_sim_plain(r, g, _k, q, _m, ep_curve_get_tab());
-		}
-#else
-		if (!ep_curve_is_endom()) {
-			ep_mul_sim(r, g, _k, q, _m);
-		}
-#endif
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(g);
-		bn_free(n);
-		bn_free(_k);
-		bn_free(_m);
-	}
-}
-
-void ep_mul_sim_dig(ep_t r, const ep_t p[], const dig_t k[], int len) {
-	ep_t t;
-	int max;
-
-	ep_null(t);
-
-	max = util_bits_dig(k[0]);
-	for (int i = 1; i < len; i++) {
-		max = RLC_MAX(max, util_bits_dig(k[i]));
-	}
-
-	RLC_TRY {
-		ep_new(t);
-
-		ep_set_infty(t);
-		for (int i = max - 1; i >= 0; i--) {
-			ep_dbl(t, t);
-			for (int j = 0; j < len; j++) {
-				if (k[j] & ((dig_t)1 << i)) {
-					ep_add(t, t, p[j]);
-				}
-			}
-		}
-
-		ep_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-	}
-}
-
-void ep_mul_sim_lot(ep_t r, ep_t p[], const bn_t k[], int n) {
-	const int len = RLC_FP_BITS + 1;
-	int i, j, m, l, _l[2];
-	bn_t _k[2], q, v1[3], v2[3];
-	int8_t *naf = RLC_ALLOCA(int8_t, 2 * n * len);
-
-	bn_null(q);
-
-	if (n <= 10) {
-		ep_t *_p = RLC_ALLOCA(ep_t, 2 * n);
-
-		RLC_TRY {
-			if (naf == NULL || _p == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			bn_new(q);
-			for (j = 0; j < 2; j++) {
-				bn_null(_k[j]);
-				bn_new(_k[j]);
-			}
-			for (i = 0; i < n; i++) {
-				ep_null(_p[i]);
-				ep_new(_p[i]);
-			}
-
-			for (i = 0; i < 3; i++) {
-				bn_null(v1[i]);
-				bn_null(v2[i]);
-				bn_new(v1[i]);
-				bn_new(v2[i]);
-			}
-
-			l = 0;
-			ep_curve_get_ord(q);
-			ep_curve_get_v1(v1);
-			ep_curve_get_v2(v2);
-			for (i = 0; i < n; i++) {
-				ep_norm(_p[2*i], p[i]);
-				ep_psi(_p[2*i + 1], _p[2*i]);
-				bn_rec_glv(_k[0], _k[1], k[i], q, (const bn_t *)v1, (const bn_t *)v2);
-				if (bn_sign(k[i]) == RLC_NEG) {
-					bn_neg(_k[0], _k[0]);
-					bn_neg(_k[1], _k[1]);
-				}
-				for (j = 0; j < 2; j++) {
-					_l[j] = len;
-					bn_rec_naf(&naf[(2*i + j)*len], &_l[j], _k[j], 2);
-					if (bn_sign(_k[j]) == RLC_NEG) {
-						ep_neg(_p[2*i + j], _p[2*i + j]);
-					}
-					l = RLC_MAX(l, _l[j]);
-				}
-			}
-
-			ep_set_infty(r);
-			for (i = l - 1; i >= 0; i--) {
-				ep_dbl(r, r);
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 2; m++) {
-						if (naf[(2*j + m)*len + i] > 0) {
-							ep_add(r, r, _p[2*j + m]);
-						}
-						if (naf[(2*j + m)*len + i] < 0) {
-							ep_sub(r, r, _p[2*j + m]);
-						}
-					}
-				}
-			}
-
-			ep_norm(r, r);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			bn_free(_k[0]);
-			bn_free(_k[1]);
-			for (i = 0; i < n; i++) {
-				ep_free(_p[i]);
-			}
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-			for (i = 0; i < 3; i++) {
-				bn_free(v1[i]);
-				bn_free(v2[i]);
-			}
-		}
-	} else {
-		const int w = RLC_MAX(2, util_bits_dig(n) - 2), c = (1 << (w - 2));
-		ep_t s, t, u, v, *_p = RLC_ALLOCA(ep_t, 2 * c);
-		int8_t ptr, *sk = RLC_ALLOCA(int8_t, 2 * n);
-
-		ep_null(s);
-		ep_null(t);
-		ep_null(u);
-		ep_null(v);
-
-		RLC_TRY {
-			if (naf == NULL || _p == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			bn_new(q);
-			ep_new(s);
-			ep_new(t);
-			ep_new(u);
-			ep_new(v);
-			for (i = 0; i < 2; i++) {
-				bn_null(_k[i]);
-				bn_new(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep_null(_p[i*c + j]);
-					ep_new(_p[i*c + j]);
-					ep_set_infty(_p[i*c + j]);
-				}
-			}
-			for (i = 0; i < 3; i++) {
-				bn_null(v1[i]);
-				bn_null(v2[i]);
-				bn_new(v1[i]);
-				bn_new(v2[i]);
-			}
-
-			l = 0;
-			ep_curve_get_ord(q);
-			ep_curve_get_v1(v1);
-			ep_curve_get_v2(v2);
-			for (i = 0; i < n; i++) {
-				bn_rec_glv(_k[0], _k[1], k[i], q, (const bn_t *)v1, (const bn_t *)v2);
-				if (bn_sign(k[i]) == RLC_NEG) {
-					bn_neg(_k[0], _k[0]);
-					bn_neg(_k[1], _k[1]);
-				}
-				for (j = 0; j < 2; j++) {
-					_l[j] = len;
-					bn_rec_naf(&naf[(2*i + j)*len], &_l[j], _k[j], w);
-					if (bn_sign(_k[j]) == RLC_NEG) {
-						for (m = 0; m < _l[j]; m++) {
-							naf[(2*i + j)*len + m] = -naf[(2*i + j)*len + m];
-						}
-					}
-					l = RLC_MAX(l, _l[j]);
-				}
-			}
-
-			ep_set_infty(s);
-			for (i = l - 1; i >= 0; i--) {
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 2; m++) {
-						ptr = naf[(2*j + m)*len + i];
-						if (ptr != 0) {
-							ep_copy(t, p[j]);
-							if (ptr < 0) {
-								ptr = -ptr;
-								ep_neg(t, t);
-							}
-							ep_add(_p[m*c + (ptr >> 1)], _p[m*c + (ptr >> 1)], t);
-						}
-					}
-				}
-
-				ep_set_infty(t);
-				for (m = 1; m >= 0; m--) {
-					ep_psi(t, t);
-					ep_set_infty(u);
-					ep_set_infty(v);
-					for (j = c - 1; j >= 0; j--) {
-						ep_add(u, u, _p[m*c + j]);
-						if (j == 0) {
-							ep_dbl(v, v);
-						}
-						ep_add(v, v, u);
-						ep_set_infty(_p[m*c + j]);
-					}
-					ep_add(t, t, v);
-				}
-				ep_dbl(s, s);
-				ep_add(s, s, t);
-			}
-
-			/* Convert r to affine coordinates. */
-			ep_norm(r, s);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			ep_free(s);
-			ep_free(t);
-			ep_free(u);
-			ep_free(v);
-			for (i = 0; i < 2; i++) {
-				bn_free(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep_free(_p[i*c + j]);
-				}
-			}
-			RLC_FREE(sk);
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-			for (i = 0; i < 3; i++) {
-				bn_free(v1[i]);
-				bn_free(v2[i]);
-			}
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_neg.c b/src/dashbls/depends/relic/src/ep/relic_ep_neg.c
deleted file mode 100644
index eaaf23f5ad3c..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_neg.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the point negation on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep_neg(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	if (r != p) {
-		fp_copy(r->x, p->x);
-		fp_copy(r->z, p->z);
-	}
-
-	fp_neg(r->y, p->y);
-
-	r->coord = p->coord;
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_norm.c b/src/dashbls/depends/relic/src/ep/relic_ep_norm.c
deleted file mode 100644
index 4499a3d0286e..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_norm.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-/**
- * Normalizes a point represented in projective coordinates.
- *
- * @param r			- the result.
- * @param p			- the point to normalize.
- * @param inv		- the flag to indicate if z is already inverted.
- */
-static void ep_norm_imp(ep_t r, const ep_t p, int inv) {
-	if (p->coord != BASIC) {
-		fp_t t;
-
-		fp_null(t);
-
-		RLC_TRY {
-			fp_new(t);
-
-			if (inv) {
-				fp_copy(r->z, p->z);
-			} else {
-				fp_inv(r->z, p->z);
-			}
-
-			switch (p->coord) {
-				case PROJC:
-					fp_mul(r->x, p->x, r->z);
-					fp_mul(r->y, p->y, r->z);
-					break;
-				case JACOB:
-					fp_sqr(t, r->z);
-					fp_mul(r->x, p->x, t);
-					fp_mul(t, t, r->z);
-					fp_mul(r->y, p->y, t);
-					break;
-				default:
-					ep_copy(r, p);
-					break;
-			}
-			fp_set_dig(r->z, 1);
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			fp_free(t);
-		}
-	}
-
-	r->coord = BASIC;
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep_norm(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		/* If the point is represented in affine coordinates, just copy it. */
-		ep_copy(r, p);
-		return;
-	}
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-	ep_norm_imp(r, p, 0);
-#endif /* EP_ADD == PROJC */
-}
-
-void ep_norm_sim(ep_t *r, const ep_t *t, int n) {
-	int i;
-	fp_t* a = RLC_ALLOCA(fp_t, n);
-
-	RLC_TRY {
-		if (a == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < n; i++) {
-			fp_null(a[i]);
-			fp_new(a[i]);
-			fp_copy(a[i], t[i]->z);
-		}
-
-		fp_inv_sim(a, (const fp_t *)a, n);
-
-		for (i = 0; i < n; i++) {
-			fp_copy(r[i]->x, t[i]->x);
-			fp_copy(r[i]->y, t[i]->y);
-			if (!ep_is_infty(t[i])) {
-				fp_copy(r[i]->z, a[i]);
-			}
-		}
-
-		for (i = 0; i < n; i++) {
-			ep_norm_imp(r[i], r[i], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp_free(a[i]);
-		}
-		RLC_FREE(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_param.c b/src/dashbls/depends/relic/src/ep/relic_ep_param.c
deleted file mode 100644
index cfc50f8815b6..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_param.c
+++ /dev/null
@@ -1,1581 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime elliptic curve parameters.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-#include "relic_epx.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/*
- * A note on the MAP_U values below.
- *
- * These values were generated using the methods recommended in
- * draft-irtf-cfrg-hash-to-curve-06, Appendix E. In particular,
- * for any curve with j-invariant 0 or 1728 (i.e., a = 0 or b = 0),
- * the MAP_U value is the output of the find_z_svdw function.
- * For all other curves, the MAP_U value was calculated using the
- * find_z_sswu function.
- *
- * Note that for the BLS12-381 curve (B12_P381) when using an
- * isogeny map (defined(EP_CTMAP)), the MAP_U value is from the
- * find_z_sswu function for the isogenous curve. Similarly, when
- * specifying isogeny maps for other curves one should specify
- * the MAP_U value for the isogenous curve.
- */
-
-#if defined(EP_PLAIN) && FP_PRIME == 160
-/**
- * Parameters for the SECG P-160 prime elliptic curve.
- */
-/** @{ */
-#define SECG_P160_A		"-3"
-#define SECG_P160_B		"1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45"
-#define SECG_P160_X		"4A96B5688EF573284664698968C38BB913CBFC82"
-#define SECG_P160_Y		"23A628553168947D59DCC912042351377AC5FB32"
-#define SECG_P160_R		"100000000000000000001F4C8F927AED3CA752257"
-#define SECG_P160_H		"1"
-#define SECG_P160_MAPU	"3"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 160
-/**
- * Parameters for the SECG K-160 prime elliptic curve.
- */
-/** @{ */
-#define SECG_K160_A		"0"
-#define SECG_K160_B		"7"
-#define SECG_K160_X		"3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
-#define SECG_K160_Y		"938CF935318FDCED6BC28286531733C3F03C4FEE"
-#define SECG_K160_R		"100000000000000000001B8FA16DFAB9ACA16B6B3"
-#define SECG_K160_H		"1"
-#define SECG_K160_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 192
-/**
- * Parameters for the NIST P-192 prime elliptic curve.
- */
-/** @{ */
-#define NIST_P192_A		"-3"
-#define NIST_P192_B		"64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1"
-#define NIST_P192_X		"188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
-#define NIST_P192_Y		"07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"
-#define NIST_P192_R		"FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831"
-#define NIST_P192_H		"1"
-#define NIST_P192_MAPU	"-5"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 192
-/**
- * Parameters for the SECG K-192 prime elliptic curve.
- */
-/** @{ */
-#define SECG_K192_A		"0"
-#define SECG_K192_B		"3"
-#define SECG_K192_X		"DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
-#define SECG_K192_Y		"9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"
-#define SECG_K192_R		"FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D"
-#define SECG_K192_H		"1"
-#define SECG_K192_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 221
-/**
- * Parameters for the Curve22103 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_22103_A	"155555555555555555555555555555555555555555555552174084FF"
-#define CURVE_22103_B	"1425ED097B425ED097B425ED097B425ED097B425ED0BBA9428427967"
-#define CURVE_22103_X	"CB476FE081B61F56A60B1D1B34FB7207D072EF25DADF377731049B0"
-#define CURVE_22103_Y	"36429404D97E1E217BAD2E5601F6551F95D8FE9481BD454D1F3E7B6"
-#define CURVE_22103_R	"3FFFFFFFFFFFFFFFFFFFFFFFFFFF5CD04695A145C3067CF4AAE2025"
-#define CURVE_22103_H	"8"
-#define CURVE_22103_MAPU "F"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 224
-/**
- * Parameters for the NIST P-224 prime elliptic curve.
- */
-/** @{ */
-#define NIST_P224_A		"-3"
-#define NIST_P224_B		"B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4"
-#define NIST_P224_X		"B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
-#define NIST_P224_Y		"BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"
-#define NIST_P224_R		"FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D"
-#define NIST_P224_H		"1"
-#define NIST_P224_MAPU	"1F"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 224
-/**
- * Parameters for the SECG K-224 prime elliptic curve.
- */
-/** @{ */
-#define SECG_K224_A		"0"
-#define SECG_K224_B		"5"
-#define SECG_K224_X		"A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"
-#define SECG_K224_Y		"7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"
-#define SECG_K224_R		"10000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7"
-#define SECG_K224_H		"1"
-#define SECG_K224_BETA	"FE0E87005B4E83761908C5131D552A850B3F58B749C37CF5B84D6768"
-#define SECG_K224_LAMB	"60DCD2104C4CBC0BE6EEEFC2BDD610739EC34E317F9B33046C9E4788"
-#define SECG_K224_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 226
-/**
- * Parameters for the Curve4417 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_4417_A	"4648D10B419379D50F4BA01869D9AE363285E01FE66920878EE075B0"
-#define CURVE_4417_B	"4C4DCEDFAC09383A0311B98EE9637415B9134B4115FDB760C1A3D419"
-#define CURVE_4417_X	"FF9D7EDD97D523012FFAACA32B7C90F1A8E026F21972C789A8484A2B"
-#define CURVE_4417_Y	"3E9036ADC1A41FCE2F2CA08E2D1BE4F6D97E30CA7761DB1F3E2F2CE96"
-#define CURVE_4417_R	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFC4A75594D4923FC93D42713CDAF"
-#define CURVE_4417_H	"4"
-#define CURVE_4417_MAPU "-E"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 251
-/**
- * Parameters for the Curve1174 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_1174_A	"486BE25B34C8080922B969257EEB54C404F914A29067A5560BB9AEE0BC67A6D"
-#define CURVE_1174_B	"E347A25BF875DD2F1F12D8A10334D417CC15E77893A99F4BF278CA563072E6"
-#define CURVE_1174_X	"3BE821D63D2CD5AFE0504F452E5CF47A60A10446928CEAECFD5294F89B45051"
-#define CURVE_1174_Y	"66FE4E7B8B6FE152F743393029A61BFB839747C8FB00F7B27A6841C07532A0"
-#define CURVE_1174_R	"1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF77965C4DFD307348944D45FD166C971"
-#define CURVE_1174_H	"4"
-#define CURVE_1174_MAPU "-A"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 255
-/**
- * Parameters for the Curve25519 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_25519_A	"2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA984914A144"
-#define CURVE_25519_B	"7B425ED097B425ED097B425ED097B425ED097B425ED097B4260B5E9C7710C864"
-#define CURVE_25519_X	"7266F864F799E0D8194DFA071F95AA4D1F29D1DF42D553B4950B0FDD9C5D5711"
-#define CURVE_25519_Y	"72FB43CD5568B3B691204CA8E6A2930633716B80FE7DADAF91E072344991E1F1"
-#define CURVE_25519_R	"1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED"
-#define CURVE_25519_H	"8"
-#define CURVE_25519_MAPU "8"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 256
-/**
- * Parameters for the NIST P-256 prime elliptic curve.
- */
-/** @{ */
-#define NIST_P256_A		"-3"
-#define NIST_P256_B		"5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"
-#define NIST_P256_X		"6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
-#define NIST_P256_Y		"4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"
-#define NIST_P256_R		"FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551"
-#define NIST_P256_H		"1"
-#define NIST_P256_MAPU "-A"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 256
-/**
- * Parameters for the Brainpool P256r1 prime elliptic curve.
- */
-/** @{ */
-#define BSI_P256_A		"7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9"
-#define BSI_P256_B		"26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6"
-#define BSI_P256_X		"8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262"
-#define BSI_P256_Y		"547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997"
-#define BSI_P256_R		"A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7"
-#define BSI_P256_H		"1"
-#define BSI_P256_MAPU	"-2"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 256
-/**
- * Parameters for the SECG K-256 prime elliptic curve.
- */
-/** @{ */
-#define SECG_K256_A		"0"
-#define SECG_K256_B		"7"
-#define SECG_K256_X		"79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"
-#define SECG_K256_Y		"483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"
-#define SECG_K256_R		"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141"
-#define SECG_K256_H		"1"
-#define SECG_K256_BETA	"7AE96A2B657C07106E64479EAC3434E99CF0497512F58995C1396C28719501EE"
-#define SECG_K256_LAMB	"5363AD4CC05C30E0A5261C028812645A122E22EA20816678DF02967C1B23BD72"
-#define SECG_K256_MAPU "1"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 382
-/**
- * Parameters for the Curve67254 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_67254_A	"2E32419A32377AF8E7F03148A106D112C8C2E26D31A89F46B743DEED322C7ADC3024AFE4B5AFD8DB7180281586549F4A"
-#define CURVE_67254_B	"22F6EF3BE72A67FDC236D7173727CD2AF6D02A195753C44BDF451369B02EA0F963D9A775CAE6DC3AE9CCABB7F183C1AD"
-#define CURVE_67254_X	"141946416199FDDA96EC1F1AC80058AA3F0CE96B1BCD023E97BAE542FE3404B4738DB9B81A13698339387672ECA360C0"
-#define CURVE_67254_Y	"D51BF79D968F4A076022E750F821058E2B5073697B639EDD355EBF8AD32352B1EFA9478DE7EB5662EF0D26EF6EEA795"
-#define CURVE_67254_R	"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD5FB21F21E95EEE17C5E69281B102D2773E27E13FD3C9719"
-#define CURVE_67254_H	"4"
-#define CURVE_67254_MAPU "-9"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 383
-/**
- * Parameters for the Curve383187 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_383187_A	"2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA68FEBE08D"
-#define CURVE_383187_B	"4BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684F0D6EE62EDBCA"
-#define CURVE_383187_X	"4D089F05073F52D26988EF5B2378E120A85DEDD8A1EFACEA0008B13951B3CDA06D5C0B44C5C1B8AC6DC3E5E1F2BF015D"
-#define CURVE_383187_Y	"55AB95F2C81569A8E2EADF7C823B133547094AF055BDB287DF4B89F07F1E187D6FCF17FAFA89375C092463FD3D750C55"
-#define CURVE_383187_R	"1000000000000000000000000000000000000000000000000E85A85287A1488ACD41AE84B2B7030446F72088B00A0E21"
-#define CURVE_383187_H	"8"
-#define CURVE_383187_MAPU "2"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 384
-/**
- * Parameters for the NIST P-384 prime elliptic curve.
- */
-/** @{ */
-#define NIST_P384_A		"-3"
-#define NIST_P384_B		"B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF"
-#define NIST_P384_X		"AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"
-#define NIST_P384_Y		"3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"
-#define NIST_P384_R		"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973"
-#define NIST_P384_H		"1"
-#define NIST_P384_MAPU	"-C"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 511
-/**
- * Parameters for the Curve511187 prime elliptic curve.
- */
-/** @{ */
-#define CURVE_511187_A	"2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA94D474F50C"
-#define CURVE_511187_B	"425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED0BEFAE0163491C0"
-#define CURVE_511187_X	"739DCA287463592D2CB963D1C98E0229385B245EEE4380AE1AC2E2953C806C7DC2C3D7C05F3DBB2C0D32B06ED49E8F2F2E3D7289AD62A1CDEB3EAE7D762FBF78"
-#define CURVE_511187_Y	"4515C654CEF9B490BDD32C5DC3930C3E287752AF10D0438213A2873B4A71BA95DD90EE5B3A0D0A1ACD6DBEECC0AB188B748EDF0D31BF92E434867B5948DE59C9"
-#define CURVE_511187_R	"100000000000000000000000000000000000000000000000000000000000000017B5FEFF30C7F5677AB2AEEBD13779A2AC125042A6AA10BFA54C15BAB76BAF1B"
-#define CURVE_511187_H	"8"
-#define CURVE_511187_MAPU "-18"
-/** @} */
-#endif
-
-#if defined(EP_PLAIN) && FP_PRIME == 521
-/**
- * Parameters for the NIST P-192 prime elliptic curve.
- */
-/** @{ */
-#define NIST_P521_A		"-3"
-#define NIST_P521_B		"51953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00"
-#define NIST_P521_X		"C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"
-#define NIST_P521_Y		"11839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650"
-#define NIST_P521_R		"1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409"
-#define NIST_P521_H		"1"
-#define NIST_P521_MAPU	"-4"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 158
-/**
- * Parameters for a 158-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define BN_P158_A		"0"
-#define BN_P158_B		"11"
-#define BN_P158_X		"240000006ED000007FE9C000419FEC800CA035C6"
-#define BN_P158_Y		"4"
-#define BN_P158_R		"240000006ED000007FE96000419F59800C9FFD81"
-#define BN_P158_H		"1"
-#define BN_P158_BETA	"240000006E8800007F434000411F93C00C7F3B08"
-#define BN_P158_LAMB	"240000006E4000007E9D800040A064000C5EB323"
-#define BN_P158_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 254
-/**
- * Parameters for a 254-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define BN_P254_A		"0"
-#define BN_P254_B		"2"
-#define BN_P254_X		"2523648240000001BA344D80000000086121000000000013A700000000000012"
-#define BN_P254_Y		"1"
-#define BN_P254_R		"2523648240000001BA344D8000000007FF9F800000000010A10000000000000D"
-#define BN_P254_H		"1"
-#define BN_P254_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 255
-/**
- * Parameters for a 255-bit crve with high 2-adicity.
- */
-/** @{ */
-#define TWEEDLEDUM_A	"0"
-#define TWEEDLEDUM_B	"5"
-#define TWEEDLEDUM_X	"14733B283272574E23931F358A0354B7BCD5C765CC1FCEACC3B3D1A0C495C9E"
-#define TWEEDLEDUM_Y	"D27E5D5B7C3AFAED0754EA62B947B23546EBF597530A7369EDC466E456761D8"
-#define TWEEDLEDUM_R	"40000000000000000000000000000000038AA127696286C9842CAFD400000001"
-#define TWEEDLEDUM_H	"1"
-#define TWEEDLEDUM_BETA	"1508415AB5E97C949BEBC9146EF83D9A7881FB239BA41A268598ABB3A410C9C8"
-#define TWEEDLEDUM_LAMB	"36C66D3A1E049A5887AD8B5FF9731FFE69CF8DE720E52EC14394C2BD148FA4FD"
-#define TWEEDLEDUM_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 256
-/**
- * Parameters for a 256-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define BN_P256_A		"0"
-#define BN_P256_B		"11"
-#define BN_P256_X		"B64000000000FF2F2200000085FD5480B0001F44B6B88BF142BC818F95E3E6AE"
-#define BN_P256_Y		"4"
-#define BN_P256_R		"B64000000000FF2F2200000085FD547FD8001F44B6B7F4B7C2BC818F7B6BEF99"
-#define BN_P256_H		"1"
-#define BN_P256_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 256
-/**
- * Parameters for a 256-bit pairing-friendly prime curve standardized in China.
- */
-/** @{ */
-#define SM9_P256_A		"0"
-#define SM9_P256_B		"5"
-#define SM9_P256_X		"93DE051D62BF718FF5ED0704487D01D6E1E4086909DC3280E8C4E4817C66DDDD"
-#define SM9_P256_Y		"21FE8DDA4F21E607631065125C395BBC1C1C00CBFA6024350C464CD70A3EA616"
-#define SM9_P256_R		"B640000002A3A6F1D603AB4FF58EC74449F2934B18EA8BEEE56EE19CD69ECF25"
-#define SM9_P256_H		"1"
-#define SM9_P256_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 381
-/**
-* Parameters for a 381-bit pairing-friendly prime curve.
-*/
-/** @{ */
-#define B12_P381_A		"0"
-#define B12_P381_B		"4"
-#define B12_P381_X		"17F1D3A73197D7942695638C4FA9AC0FC3688C4F9774B905A14E3A3F171BAC586C55E83FF97A1AEFFB3AF00ADB22C6BB"
-#define B12_P381_Y		"08B3F481E3AAA0F1A09E30ED741D8AE4FCF5E095D5D00AF600DB18CB2C04B3EDD03CC744A2888AE40CAA232946C5E7E1"
-#define B12_P381_R		"73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001"
-#define B12_P381_H		"396C8C005555E1568C00AAAB0000AAAB"
-#if defined(EP_CTMAP)
-#define B12_P381_ISO_A  "144698A3B8E9433D693A02C96D4982B0EA985383EE66A8D8E8981AEFD881AC98936F8DA0E0F97F5CF428082D584C1D"
-#define B12_P381_ISO_B  "12E2908D11688030018B12E8753EEE3B2016C1F0F24F4070A0B9C14FCEF35EF55A23215A316CEAA5D1CC48E98E172BE0"
-#define B12_P381_ISO_XN "11A05F2B1E833340B809101DD99815856B303E88A2D7005FF2627B56CDB4E2C85610C2D5F2E62D6EAEAC1662734649B7;17294ED3E943AB2F0588BAB22147A81C7C17E75B2F6A8417F565E33C70D1E86B4838F2A6F318C356E834EEF1B3CB83BB;D54005DB97678EC1D1048C5D10A9A1BCE032473295983E56878E501EC68E25C958C3E3D2A09729FE0179F9DAC9EDCB0;1778E7166FCC6DB74E0609D307E55412D7F5E4656A8DBF25F1B33289F1B330835336E25CE3107193C5B388641D9B6861;E99726A3199F4436642B4B3E4118E5499DB995A1257FB3F086EEB65982FAC18985A286F301E77C451154CE9AC8895D9;1630C3250D7313FF01D1201BF7A74AB5DB3CB17DD952799B9ED3AB9097E68F90A0870D2DCAE73D19CD13C1C66F652983;D6ED6553FE44D296A3726C38AE652BFB11586264F0F8CE19008E218F9C86B2A8DA25128C1052ECADDD7F225A139ED84;17B81E7701ABDBE2E8743884D1117E53356DE5AB275B4DB1A682C62EF0F2753339B7C8F8C8F475AF9CCB5618E3F0C88E;80D3CF1F9A78FC47B90B33563BE990DC43B756CE79F5574A2C596C928C5D1DE4FA295F296B74E956D71986A8497E317;169B1F8E1BCFA7C42E0C37515D138F22DD2ECB803A0C5C99676314BAF4BB1B7FA3190B2EDC0327797F241067BE390C9E;10321DA079CE07E272D8EC09D2565B0DFA7DCCDDE6787F96D50AF36003B14866F69B771F8C285DECCA67DF3F1605FB7B;6E08C248E260E70BD1E962381EDEE3D31D79D7E22C837BC23C0BF1BC24C6B68C24B1B80B64D391FA9C8BA2E8BA2D229"
-#define B12_P381_ISO_XD "8CA8D548CFF19AE18B2E62F4BD3FA6F01D5EF4BA35B48BA9C9588617FC8AC62B558D681BE343DF8993CF9FA40D21B1C;12561A5DEB559C4348B4711298E536367041E8CA0CF0800C0126C2588C48BF5713DAA8846CB026E9E5C8276EC82B3BFF;B2962FE57A3225E8137E629BFF2991F6F89416F5A718CD1FCA64E00B11ACEACD6A3D0967C94FEDCFCC239BA5CB83E19;3425581A58AE2FEC83AAFEF7C40EB545B08243F16B1655154CCA8ABC28D6FD04976D5243EECF5C4130DE8938DC62CD8;13A8E162022914A80A6F1D5F43E7A07DFFDFC759A12062BB8D6B44E833B306DA9BD29BA81F35781D539D395B3532A21E;E7355F8E4E667B955390F7F0506C6E9395735E9CE9CAD4D0A43BCEF24B8982F7400D24BC4228F11C02DF9A29F6304A5;772CAACF16936190F3E0C63E0596721570F5799AF53A1894E2E073062AEDE9CEA73B3538F0DE06CEC2574496EE84A3A;14A7AC2A9D64A8B230B3F5B074CF01996E7F63C21BCA68A81996E1CDF9822C580FA5B9489D11E2D311F7D99BBDCC5A5E;A10ECF6ADA54F825E920B3DAFC7A3CCE07F8D1D7161366B74100DA67F39883503826692ABBA43704776EC3A79A1D641;95FC13AB9E92AD4476D6E3EB3A56680F682B4EE96F7D03776DF533978F31C1593174E4B4B7865002D6384D168ECDD0A;1"
-#define B12_P381_ISO_YN "90D97C81BA24EE0259D1F094980DCFA11AD138E48A869522B52AF6C956543D3CD0C7AEE9B3BA3C2BE9845719707BB33;134996A104EE5811D51036D776FB46831223E96C254F383D0F906343EB67AD34D6C56711962FA8BFE097E75A2E41C696;CC786BAA966E66F4A384C86A3B49942552E2D658A31CE2C344BE4B91400DA7D26D521628B00523B8DFE240C72DE1F6;1F86376E8981C217898751AD8746757D42AA7B90EEB791C09E4A3EC03251CF9DE405ABA9EC61DECA6355C77B0E5F4CB;8CC03FDEFE0FF135CAF4FE2A21529C4195536FBE3CE50B879833FD221351ADC2EE7F8DC099040A841B6DAECF2E8FEDB;16603FCA40634B6A2211E11DB8F0A6A074A7D0D4AFADB7BD76505C3D3AD5544E203F6326C95A807299B23AB13633A5F0;4AB0B9BCFAC1BBCB2C977D027796B3CE75BB8CA2BE184CB5231413C4D634F3747A87AC2460F415EC961F8855FE9D6F2;987C8D5333AB86FDE9926BD2CA6C674170A05BFE3BDD81FFD038DA6C26C842642F64550FEDFE935A15E4CA31870FB29;9FC4018BD96684BE88C9E221E4DA1BB8F3ABD16679DC26C1E8B6E6A1F20CABE69D65201C78607A360370E577BDBA587;E1BBA7A1186BDB5223ABDE7ADA14A23C42A0CA7915AF6FE06985E7ED1E4D43B9B3F7055DD4EBA6F2BAFAAEBCA731C30;19713E47937CD1BE0DFD0B8F1D43FB93CD2FCBCB6CAF493FD1183E416389E61031BF3A5CCE3FBAFCE813711AD011C132;18B46A908F36F6DEB918C143FED2EDCC523559B8AAF0C2462E6BFE7F911F643249D9CDF41B44D606CE07C8A4D0074D8E;B182CAC101B9399D155096004F53F447AA7B12A3426B08EC02710E807B4633F06C851C1919211F20D4C04F00B971EF8;245A394AD1ECA9B72FC00AE7BE315DC757B3B080D4C158013E6632D3C40659CC6CF90AD1C232A6442D9D3F5DB980133;5C129645E44CF1102A159F748C4A3FC5E673D81D7E86568D9AB0F5D396A7CE46BA1049B6579AFB7866B1E715475224B;15E6BE4E990F03CE4EA50B3B42DF2EB5CB181D8F84965A3957ADD4FA95AF01B2B665027EFEC01C7704B456BE69C8B604"
-#define B12_P381_ISO_YD "16112C4C3A9C98B252181140FAD0EAE9601A6DE578980BE6EEC3232B5BE72E7A07F3688EF60C206D01479253B03663C1;1962D75C2381201E1A0CBD6C43C348B885C84FF731C4D59CA4A10356F453E01F78A4260763529E3532F6102C2E49A03D;58DF3306640DA276FAAAE7D6E8EB15778C4855551AE7F310C35A5DD279CD2ECA6757CD636F96F891E2538B53DBF67F2;16B7D288798E5395F20D23BF89EDB4D1D115C5DBDDBCD30E123DA489E726AF41727364F2C28297ADA8D26D98445F5416;BE0E079545F43E4B00CC912F8228DDCC6D19C9F0F69BBB0542EDA0FC9DEC916A20B15DC0FD2EDEDDA39142311A5001D;8D9E5297186DB2D9FB266EAAC783182B70152C65550D881C5ECD87B6F0F5A6449F38DB9DFA9CCE202C6477FAAF9B7AC;166007C08A99DB2FC3BA8734ACE9824B5EECFDFA8D0CF8EF5DD365BC400A0051D5FA9C01A58B1FB93D1A1399126A775C;16A3EF08BE3EA7EA03BCDDFABBA6FF6EE5A4375EFA1F4FD7FEB34FD206357132B920F5B00801DEE460EE415A15812ED9;1866C8ED336C61231A1BE54FD1D74CC4F9FB0CE4C6AF5920ABC5750C4BF39B4852CFE2F7BB9248836B233D9D55535D4A;167A55CDA70A6E1CEA820597D94A84903216F763E13D87BB5308592E7EA7D4FBC7385EA3D529B35E346EF48BB8913F55;4D2F259EEA405BD48F010A01AD2911D9C6DD039BB61A6290E591B36E636A5C871A5C29F4F83060400F8B49CBA8F6AA8;ACCBB67481D033FF5852C1E48C50C477F94FF8AEFCE42D28C0F9A88CEA7913516F968986F7EBBEA9684B529E2561092;AD6B9514C767FE3C3613144B45F1496543346D98ADF02267D5CEEF9A00D9B8693000763E3B90AC11E99B138573345CC;2660400EB2E4F3B628BDD0D53CD76F2BF565B94E72927C1CB748DF27942480E420517BD8714CC80D1FADC1326ED06F7;E0FA1D816DDC03E6B24255E0D7819C171C40F65E273B853324EFCD6356CAA205CA2F570F13497804415473A1D634B8F;1"
-#define B12_P381_MAPU	"B"
-#else /* !defined(EP_CTMAP) */
-#define B12_P381_MAPU	"-3"
-#endif /* EP_CTMAP */
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 382
-/**
- * Parameters for a 382-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define BN_P382_A		"0"
-#define BN_P382_B		"2"
-#define BN_P382_X		"24009015183F94892D996CC179C6D1666F82CEFBE47879BBA6E58DBE43002A0609480097801382BE004E000000000012"
-#define BN_P382_Y		"1"
-#define BN_P382_R		"24009015183F94892D996CC179C6D1666F82CEFBE47879BB46E4CDA2E2E2281D08DC008E80108252004200000000000D"
-#define BN_P382_H		"1"
-#define BN_P382_MAPU	"2"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 383
-/**
- * Parameters for a 383-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define B12_P383_A		"0"
-#define B12_P383_B		"4"
-#define B12_P383_X		"4ECB5D037AAE9F176171C5D83FC0D6C7AB9195D3D1442B4809F4A6F577722D5DADC9737D5D368545441992AB647A89BE"
-#define B12_P383_Y		"DD3BFDE4A26B777CEDA2A8F1C4C4E6192C586D8227CC05A34705CCC5A32288C0944408D54909F31BF5C664E81778B03"
-#define B12_P383_R		"1002001800C00B809C04401C81698B381DE05F095A120D3973B2099EBFEBC0001"
-#define B12_P383_H		"555AAAC000AABBFFB550556155169EAB"
-#define B12_P383_MAPU	"5"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 446
-/**
- * Parameters for a 446-bit pairing-friendly prime curve at the new 128-bit security level.
- */
-/** @{ */
-#define BN_P446_A		"0"
-#define BN_P446_B		"101"
-#define BN_P446_X		"2400000000000000002400000002D00000000D800000021C0000001800000000870000000B0400000057C00000015C000000132000000066"
-#define BN_P446_Y		"10"
-#define BN_P446_R		"2400000000000000002400000002D00000000D800000021C00000017A0000000870000000AD400000054C000000156000000126000000061"
-#define BN_P446_H		"1"
-#define BN_P446_MAPU	"1"
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 446
-/**
- * Parameters for a 446-bit pairing-friendly prime curve at the new 128-bit security level.
- */
-/** @{ */
-#define B12_P446_A		"0"
-#define B12_P446_B		"1"
-#define B12_P446_X		"297792B2D03DE39D64FACA6D49FCF7A8850144CA24FC5D815C082A3AA87D1A16929E56228C136123BA51421AE89CACD5B4789A38CE39035A"
-#define B12_P446_Y		"DC40DDCBAB2823A7870B5C688AA04FEE40369D913E4F2F0947A152FE1C27A79B7F787E9C35B869C3846FAC4F12A70D0FE22D2E244268CC"
-#define B12_P446_R		"511B70539F27995B34995830FA4D04C98CCC4C050BC7BB9B0E8D8CA34610428001400040001"
-#define B12_P446_H		"C02082602B0055D560AB0AD5AAAAC0002AAAC"
-#define B12_P446_MAPU	"2"
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 455
-/**
- * Parameters for a 455-bit pairing-friendly prime curve at the new 128-bit security level.
- */
-/** @{ */
-#define B12_P455_A		"0"
-#define B12_P455_B		"A"
-#define B12_P455_X		"03018DF4C2336D178E6EA61540353ABA01923E3890B3295848906DFC90E0C43008E4751FFC913DC1FF3DF33D11DB57BADA7A9297195ACFB2FA"
-#define B12_P455_Y		"19A8A9C4C3AC2FFB4C6B380D17B8282E029615052EAA6416C16C8F36F251D87C272657F0702CC58C4E072628D7BAD3C0E9B3A8AEBFC6B2357C"
-#define B12_P455_R		"10000080000380002E0000F10004F00025E000750001D1000A00000400001C00007FFFFC00001"
-#define B12_P455_H		"555556AAAAB15555B54AAB6A9557FFAABFFAAB"
-#define B12_P455_MAPU	"-1"
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 508
-/**
- * Parameters for a 508-bit pairing-friendly prime curve at the 192-bit security level.
- */
-/** @{ */
-#define KSS_P508_A		"0"
-#define KSS_P508_B		"2"
-#define KSS_P508_X		"3ADD59EAC7B6A0ABC781139CE46388AB3426C6619C27187CB1F2B48AC92E04608AFBD25DA121EDB06015CB5D2BCF369C03C163605BBA21FAF7D550960553784"
-#define KSS_P508_Y		"8773227730CBE52483BF6AAAA9E4FE2870B463FA14D92C31D0F99C6B6EE13106A0E8C87AD7631F8ECCE0DD6189B4C2232C644E4B857F325923FC8A80A947FFA"
-#define KSS_P508_R		"BF33E1C9934E7868ECE51D291E5644DA8A2F179CEE74854EE6819B240F20CE4E7D19F4CDABA6EAEA5B0E3000000001"
-#define KSS_P508_H		"10565283D505534A492ADC6AAABB051B1D"
-#define KSS_P508_BETA	"926C960A5EC3B3A6C6B9CEF2CB923D3240E4780BC1AE423EE39586AD923B1C949768022369DD2CE502E7FCA0670B3A996AC44B48B523DAA7390CCB1F6D9012F"
-#define KSS_P508_LAMB	"1001740B431D14BFD17F4BD000300173FFFFFFFEFFFFFFFED"
-#define KSS_P508_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 509
-/**
- * Parameters for a 477-bit pairing-friendly prime curve at the 192-bit security level.
- */
-/** @{ */
-#define B24_P509_A		"0"
-#define B24_P509_B		"1"
-#define B24_P509_X		"3A1ADC72F714991991F491FA07B2429302EE6CB4FD3A8663BA38F36F81984232A749B91C286A4579F7736D120DC572C42719E75C7F58AC1426DB4827CF4A46A"
-#define B24_P509_Y		"101264A0ACB6129DE3CEB5FF829968E5030855FAD666E88506531D46050023ACB15843C4EA8F8AB478F618D263D4B6271D5972803F2046DDD7C7DBC2F6232FFD"
-#define B24_P509_R		"100000FFFF870FF91CE195DB5B6F3EBD1E08C94C9E193B724ED58B907FF7C311A80D7CABC647746AE3ECB627C943998457FE001"
-#define B24_P509_H		"155555AAAA805FFFAAC0154AAC"
-#define B24_P509_MAPU	"2"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 511
-/**
- * Parameters for the 511-bit jacobi quartic curve.
- */
-/** @{ */
-#define OT8_P511_A		"1"
-#define OT8_P511_B		"0"
-#define OT8_P511_X		"17D8A9281052D5C14B26B88FBDA0DE7001F384C09F7425270874BD187725FF7D68887EC3539658E3C60F6FFADCED61F47267CCDAF5B850DF4A441105AE49CE6"
-#define OT8_P511_Y		"9CB933777C7E567A2040EC255073F2C271F632E6E81490D85377DD77659416965584F5F44DFB146E33393CE36D908F79A4ED5B4B411D78572E6CA972F66DEC8"
-#define OT8_P511_R		"100000000002AC000000002AD56000000131304C0000032F6D0B1000000000001"
-#define OT8_P511_H		"40000000000AB000000000AB5580000044C4C130000564BDB42C401C8E400000"
-#define OT8_P511_BETA	"20000000000AB0000000018FC7800000816148500019C9EF620CC291655380BA94133E310D1CC71ED0A7EBD9B2AB859C0F60AC90F7A2E5A1140C3FCBF1DD5400"
-#define OT8_P511_LAMB	"100000000002AC000000002AD55FFFFFF131304BFFFEAD2F6D0B0FF8DC7000001"
-#define OT8_P511_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 544
-/**
- * Parameters for the 544-bit Cocks-Pinch curve.
- */
-/** @{ */
-#define GMT8_P544_A		"2"
-#define GMT8_P544_B		"0"
-#define GMT8_P544_X		"251670DB162D336F28505AE026E94316A074EFF8A26AD412D22C58A9CD154E4643CFC40DE884D3D54B95455267566445CB284DF1E413E11CB190BB760CD5665B12456771"
-#define GMT8_P544_Y		"A18EC01733AE4D3AA2B087933D739A4987D839A136695CEE9D7C5B0E24EC62754B70DCD5EFE918C626728C2C31BD9616BC2F724015BCC2CF4DD139897799DA9D198B26CF"
-#define GMT8_P544_R		"FF0060739E18D7594A978B0AB6AE4CE3DBFD52A9D00197603FFFDF0000000101"
-#define GMT8_P544_H		"BC5A106E29D336CBF340F2BB98248FFC0719523D3233C6B3909C882E2BD2251BD3B22F14"
-#define GMT8_P544_BETA	"AEB8BAFC09BEB98DE5FB37D9FC56F9EAC4F908F09D88B1CD8622513C94499803C18F54E6B4FB9180292A2FD4C8AFD2AF43F54BCF308198872F3A6B591394AED0EBF7961A"
-#define GMT8_P544_LAMB	"FF801041EF80043901FFFEF800000010"
-#define GMT8_P544_MAPU	"5"
-#endif
-/** @} */
-
-#if defined(EP_ENDOM) && FP_PRIME == 569
-/**
- * Parameters for a 569-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define K54_P569_A		"0"
-#define K54_P569_B		"C"
-#define K54_P569_X		"DE57C87B22B60745E50EC37662D936F2EEE89AB4BEA9D57A7A51458C12B7B2FDEEABEFF35F668015A5289952F19283A7FA557E83BE3969F3B11A9D60FB14BA64603C753360D236"
-#define K54_P569_Y		"67F2F55258AE5E8CDEB1CBA4EBE0C6FDB2C1D56AFA41DEE078BFB87431D057A96104CC1EC77DB5DD0618993D1755CAB1D135938EAF099CE5A05A19947EE57E3DD61AC44B5358EA"
-#define K54_P569_R		"A1112E622260091587703B03A3A18BB5D20524C35116FA9C56BF77006AF8B08F4B8EEB19A39E25CA4BFDA72A9C29E31D9AF44A4BA78A70A237BF1F3690D0A601"
-#define K54_P569_H		"1C242734823F3D3"
-#define K54_P569_BETA	"11B4A0273012B3534BEA4F2B96E641113A156E510AED07E600BE9DD709E2015B0F8E69E3F1A44690DA0652831007C27346D9F444F22DA68B20C46EDC4889EA0B49C773C72195876"
-#define K54_P569_LAMB	"15FB59F1AFF4B536CBEBB5F1317A6D0332AAEF63DBEE47A528280DACBB244A601"
-#define K54_P569_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 575
-/**
- * Parameters for a 575-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define B48_P575_A		"0"
-#define B48_P575_B		"4"
-#define B48_P575_X		"259F58760BBAF5EE9988E2DD032EAB1E69E0BF14C425A57DEA4159D76471A8CA1A95C3762F6AA220C6C93A33C1BFC7264F7B4B1EA9A81889B2E173882AD2A0163B73BC78F8A54AA2"
-#define B48_P575_Y		"4E0AB4BE01EEA9C4A3EA81C84E2081B03934596D846AC24862A851F811CBE5078CD4AF03DECAD5571C4BB90F502155F462E23D3180562EED28C72882F3F538893BD643EDE63C4567"
-#define B48_P575_R		"FFBFC68EB6176EFB58025E547BF4EBACB1315C184DC37EAAF67BBCCE069D07F425050E765ABB8B40D5E6D7AE8A2A5698B771DDBD6E109D56D59C3DFF00000001"
-#define B48_P575_H		"5552A7FA0ADD830B"
-#define B48_P575_BETA	"FFBBC37DA1869F31B9AAFAF31296EECB5167E1C9E9CE0B077E9903AE049FC122282856929B2DF0C32C0B39C487860D76077734153C1C276F79B75B1CB20A7935EB5F2611"
-#define B48_P575_LAMB	"FFDFE14381A38FBBE3439A4861838B75D01E7A1E85BAE6AA2A63C200FFFFFFFF"
-#define B48_P575_MAPU	"1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 638
-/**
- * Parameters for a 638-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define BN_P638_A		"0"
-#define BN_P638_B		"5"
-#define BN_P638_X		"17F382B46725AEFA6F38E6F87ACAA1ACA41757FC6F2C40DB6539EDEB8B95D519B1E99255DF031C67DE6C00E39547E6347E80E5F3D36CC5B4B42FC10D061BFA0A0A8C6CB6B561C487A1420E7B383DC742"
-#define BN_P638_Y		"128AC488584B7C05EFD5436E559D741C978A5027926525B3DECB22D40E03FC7BD8D4235FD7E9DD2F3BFF3945D54C25E701624E27AFEF8F27F7DDEADEDAF3FE3AA0234D35290703FCE6254A7D75B6A304"
-#define BN_P638_R		"23FFFFFDC000000D7FFFFFB8000001D3FFFFF942D000165E3FFF94870000D52FFFFDD0E00008DE55600086550021E555FFFFF54FFFF4EAC000000049800154D9FFFFFFFFFFFFEDA00000000000000061"
-#define BN_P638_H		"1"
-#define BN_P638_BETA	"47FFFFFCA000000D7FFFFFB8000001AFFFFFFCA480000D5BFFFFCA47FFFFFDBFFFFEE90000000018C000479CFFFFFFFFFFFFF9D0000000000000002E"
-#define BN_P638_LAMB	"8FFFFFF94000001AFFFFFF700000035FFFFFF947E0001AC0FFFF947DFFFFFC0FFFFDCFC00000002580007D69FFFFFFFFFFFFF6A0000000000000003D"
-#define BN_P638_MAPU	"-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 638
-/**
- * Parameters for a 638-bit pairing-friendly prime curve.
- */
-/** @{ */
-#define B12_P638_A		"0"
-#define B12_P638_B		"4"
-#define B12_P638_X		"160F63A3A3B297F113075ED79466138E85B025F7FE724B78E32D7AFC4D734BDD54F871092B8D1966D491C0F45A48A8BBA5586095DFFCC1410B7E26ED16BAF98C1117959134C24A17A7BE31E1AFBF844F"
-#define B12_P638_Y		"2D340B33877480A9785E86ED2EDCAFC170B82568CB21B708B79FC6DA3748461FCD80697E486695F3CAE76FCB1781E784F6812F57BE05DFC850426650DED8B40A464B00A35718228EC8E02B52B59D876E"
-#define B12_P638_R		"50F94035FF4000FFFFFFFFFFF9406BFDC0040000000000000035FB801DFFBFFFFFFFFFFFFFFF401BFF80000000000000000000FFC01"
-#define B12_P638_H		"BFF8001555555555555555554D957EAAAAAAAAAAAAAAAAAAAABEB"
-#define B12_P638_BETA	"1E5CD621BF4C01DFFDFFFFFFFCE57239EE275BF63000000000207C802254C4BE7FFFFFFFFFFF55FE959D1B8000000000000001BCCEB5801FFFFFFFFFFFFFFFFE2E801E"
-#define B12_P638_LAMB	"50F94035FF4000FFFFFFFFFFF9406BFDC0040000000000000035F94035FF7FFFFFFFFFFFFFFF4033FF00000000000000000000FF801"
-#define B12_P638_MAPU	"3"
-/** @} */
-#endif
-
-#if defined(EP_SUPER) && FP_PRIME == 1536
-/**
- * Parameters for a 1536-bit supersingular elliptic curve.
- */
-/** @{ */
-#define SS_P1536_A		"83093742908D4D529CEF06C72191A05D5E6073FE861E637D7747C5F154989D1DE125ACE7F997AD228B84EB0A0D0D719E34E83DBD68219BCE952167753C07B5DF0611625004D2959D9A5A42AB197DCF3FA8BB79D93C4F23D5437D6EA2C29D00A4D98BF0BD32E7FE4E8154DC52BCA7785F13D71C425551390B52972C085099A435EC00764313622A1C3A96FE4A97EF944DD3F62C726C5ABBBDF0B6C4E5D07763421DA034AE92B0EFFD8A8C98F08F182516C5159C215CDABF599329A51DD30571B0"
-#define SS_P1536_B		"0"
-#define SS_P1536_X		"3E230AF83F4F4D131622DFF03F35BD464BB9257B2BF87A6809AF0606DB21260C50BC5513DA44AB1E8B5333F2D164487E30DE6C39A1494831153E084A58A416BFA07009B16D12B883510E2DBE903E153FD64D75C02B1E33C93E3994BB8B3AD6810901518C3A0E9EA46F4D77DA416502ACD7A5E939EE25D3AE640AFB8AE5A650AF2748986C8C0DD9B755233F8AF25EC124711BE74F08FF3D01CED42493AAAF7E1D692A8339AD2A51F29B6E0D1B82A6648390CEC06811FA9F55FD337455BEC72A43"
-#define SS_P1536_Y		"76F05A21A057DB46D591CED876EDCA9241A4A9618E13E091EE383BE3D8ECDA72C42449CB20CEA8C21B4A58B08F5871C6E101473933ABCD0BBB61C36F51BE5309138BA1040325EFE2D47B2216923BAC07BA64E6668C67D4647DA5916BF2305280A1BFFA1407ED68F0D28C2C2FC200BA7D1B7C5D71492CD39A2FC6BB7EF2D162B69984460A81D324DA69B0949DA2C7D0F79E39333EAF074F360243BAA824C762A039EBB3DEFF1ABDE3157482134BE93D73B4D8CB308C3ED0E72BA644DEFE22AAB9"
-#define SS_P1536_R		"8000000000000000000000000000000000000000000000000000020000000001"
-#define SS_P1536_H		"106126E85211A9AA539DE0D8E432340BABCC0E7FD0C3CC6FAEE8F87CA5F7725B54BBBE7DE38C3EBEE164AD00490346D95FD32BFC679AA8029708CEA26C981A77064FB3C8A6CDD411E36688D584793A96CAD10CE6351A0AC319F434764054488B5741CEF8BE9E019424732EB40A6EE109E4ADBD540FA43899E5484F37822EC07596F62045187571F182E85ACE872AE0376040E3510D06083B388463D1DD30571B4"
-#define SS_P1536_MAPU	"1"
-/** @} */
-#endif
-
-/**
- * Assigns a set of ordinary elliptic curve parameters.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- * @param[in] FIELD		- the finite field identifier.
- */
-#define ASSIGN(CURVE, FIELD)												\
-	fp_param_set(FIELD);													\
-	RLC_GET(str, CURVE##_A, sizeof(CURVE##_A));								\
-	fp_read_str(a, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_B, sizeof(CURVE##_B));								\
-	fp_read_str(b, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_X, sizeof(CURVE##_X));								\
-	fp_read_str(g->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_Y, sizeof(CURVE##_Y));								\
-	fp_read_str(g->y, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_R, sizeof(CURVE##_R));								\
-	bn_read_str(r, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
-	bn_read_str(h, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_MAPU, sizeof(CURVE##_MAPU));						\
-	fp_read_str(u, str, strlen(str), 16);									\
-
-/**
- * Assigns a set of parameters for an elliptic curve with endomorphisms.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- * @param[in] FIELD		- the finite field identifier.
- */
-#define ASSIGNK(CURVE, FIELD)												\
-	ASSIGN(CURVE, FIELD);													\
-	RLC_GET(str, CURVE##_BETA, sizeof(CURVE##_BETA));						\
-	fp_read_str(beta, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_LAMB, sizeof(CURVE##_LAMB));						\
-	bn_read_str(lamb, str, strlen(str), 16);								\
-
-#if defined(EP_CTMAP)
-
-/**
- * Assigns the isogeny map parameters for hashing with SSWU map.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- */
-#define ASSIGNM(CURVE)														\
-    ep_param_set_ctmap(CURVE##_ISO_A, CURVE##_ISO_B, CURVE##_ISO_XN,		\
-			CURVE##_ISO_XD, CURVE##_ISO_YN, CURVE##_ISO_YD)					\
-
-#endif /* EP_CTMAP */
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if defined(EP_CTMAP)
-
-/**
- * Reads a sequence of polynomial coefficients from semicolon separated string.
- *
- * @param[out] coeffs 		- the resulting coefficients.
- * @param[in] str			- the string to parse.
- */
-static int ep_param_get_coeffs(fp_st *coeffs, const char *str) {
-	if (str[0] == '\0') {
-		/* need nonzero strlen */
-		RLC_THROW(ERR_NO_VALID);
-	}
-	int degree = 0;
-	unsigned offset = 0;
-	for (; degree < RLC_EP_CTMAP_MAX; ++degree) {
-		const char *end = strchr(str + offset, ';');
-		if (end == NULL) {
-			/* last one */
-			fp_read_str(coeffs[degree], str + offset, strlen(str + offset), 16);
-			break;
-		}
-		unsigned len = end - str - offset;
-		fp_read_str(coeffs[degree], str + offset, len, 16);
-		offset += len + 1; /* move to after ';' */
-	}
-	if (degree == RLC_EP_CTMAP_MAX) {
-		/* ran out of space before converting all coeffs */
-		RLC_THROW(ERR_NO_VALID);
-	}
-	return degree;
-}
-
-/**
- * Configures a constant-time hash-to-curve function based on an isogeny map.
- *
- * @param[in] a_str				- the string representing the 'a' coefficient.
- * @param[in] b_str				- the string representing the 'b' coefficient.
- * @param[in] xn_str			- the string representing the x numerator coefficients.
- * @param[in] xd_str			- the string representing the x denominator coefficients.
- * @param[in] yn_str			- the string representing the y numerator coefficients.
- * @param[in] yd_str			- the string representing the y denominator coefficients.
- */
-/* declaring this function inline suppresses unused function warnings */
-static inline void ep_param_set_ctmap(const char *a_str, const char *b_str,
-									  const char *xn_str, const char *xd_str,
-									  const char *yn_str, const char *yd_str) {
-	/* coefficients of isogenous curve */
-	fp_read_str(ep_curve_get_iso()->a, a_str, strlen(a_str), 16);
-	fp_read_str(ep_curve_get_iso()->b, b_str, strlen(b_str), 16);
-
-	/* isogeny map coeffs */
-	iso_t coeffs = ep_curve_get_iso();
-	coeffs->deg_xn = ep_param_get_coeffs(coeffs->xn, xn_str);
-	coeffs->deg_xd = ep_param_get_coeffs(coeffs->xd, xd_str);
-	coeffs->deg_yn = ep_param_get_coeffs(coeffs->yn, yn_str);
-	coeffs->deg_yd = ep_param_get_coeffs(coeffs->yd, yd_str);
-}
-
-#endif /* EP_CTMAP */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep_param_get(void) {
-	return core_get()->ep_id;
-}
-
-void ep_param_set(int param) {
-	int plain = 0, endom = 0, super = 0, pairf = 0, ctmap = 0;
-	char str[2 * RLC_FP_BYTES + 2];
-	fp_t a, b, beta, u;
-	ep_t g;
-	bn_t r, h, lamb;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(beta);
-	fp_null(u);
-	bn_null(lamb);
-	ep_null(g);
-	bn_null(r);
-	bn_null(h);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(beta);
-		fp_new(u);
-		bn_new(lamb);
-		ep_new(g);
-		bn_new(r);
-		bn_new(h);
-
-		core_get()->ep_id = 0;
-
-		switch (param) {
-#if defined(EP_ENDOM) && FP_PRIME == 158
-			case BN_P158:
-				ASSIGN(BN_P158, BN_158);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 160
-			case SECG_P160:
-				ASSIGN(SECG_P160, SECG_160);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 160
-			case SECG_K160:
-				ASSIGN(SECG_K160, SECG_160D);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 192
-			case NIST_P192:
-				ASSIGN(NIST_P192, NIST_192);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 192
-			case SECG_K192:
-				ASSIGN(SECG_K192, SECG_192);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 221
-			case CURVE_22103:
-				ASSIGN(CURVE_22103, PRIME_22103);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 224
-			case NIST_P224:
-				ASSIGN(NIST_P224, NIST_224);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 224
-			case SECG_K224:
-				ASSIGN(SECG_K224, SECG_224);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 226
-			case CURVE_4417:
-				ASSIGN(CURVE_4417, PRIME_22605);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 254
-			case BN_P254:
-				ASSIGN(BN_P254, BN_254);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 251
-			case CURVE_1174:
-				ASSIGN(CURVE_1174, PRIME_25109);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 255
-			case CURVE_25519:
-				ASSIGN(CURVE_25519, PRIME_25519);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 255
-			case TWEEDLEDUM:
-				ASSIGNK(TWEEDLEDUM, PRIME_H2ADC);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 256
-			case NIST_P256:
-				ASSIGN(NIST_P256, NIST_256);
-				plain = 1;
-				break;
-			case BSI_P256:
-				ASSIGN(BSI_P256, BSI_256);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 256
-			case SECG_K256:
-				ASSIGN(SECG_K256, SECG_256);
-				endom = 1;
-				break;
-			case SM9_P256:
-				ASSIGN(SM9_P256, SM9_256);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-			case BN_P256:
-				ASSIGN(BN_P256, BN_256);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-#endif
-#if defined(EP_PLAIN) & FP_PRIME == 382
-			case CURVE_67254:
-				ASSIGN(CURVE_67254, PRIME_382105);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) & FP_PRIME == 381
-			case B12_P381:
-				ASSIGN(B12_P381, B12_381);
-				endom = 1;
-#if defined(EP_CTMAP)
-				ASSIGNM(B12_P381);
-				ctmap = 1;
-#endif /* EP_CTMAP */
-				pairf = EP_B12;
-				break;
-#endif
-#if defined(EP_ENDOM) & FP_PRIME == 382
-			case BN_P382:
-				ASSIGN(BN_P382, BN_382);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 383
-			case CURVE_383187:
-				ASSIGN(CURVE_383187, PRIME_383187);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 383
-			case B12_P383:
-				ASSIGN(B12_P383, B12_383);
-				endom = 1;
-				pairf = EP_B12;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 384
-			case NIST_P384:
-				ASSIGN(NIST_P384, NIST_384);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 446
-			case BN_P446:
-				ASSIGN(BN_P446, BN_446);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-			case B12_P446:
-				ASSIGN(B12_P446, B12_446);
-				endom = 1;
-				pairf = EP_B12;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 455
-			case B12_P455:
-				ASSIGN(B12_P455, B12_455);
-				endom = 1;
-				pairf = EP_B12;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 508
-			case KSS_P508:
-				ASSIGNK(KSS_P508, KSS_508);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 509
-			case B24_P509:
-				ASSIGN(B24_P509, B24_509);
-				endom = 1;
-				pairf = EP_B24;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 511
-			case OT8_P511:
-				ASSIGNK(OT8_P511, OT_511);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 511
-			case CURVE_511187:
-				ASSIGN(CURVE_511187, PRIME_511187);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_PLAIN) && FP_PRIME == 521
-			case NIST_P521:
-				ASSIGN(NIST_P521, NIST_521);
-				plain = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 544
-			case GMT8_P544:
-				ASSIGN(GMT8_P544, GMT8_544);
-				endom = 1;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 569
-			case K54_P569:
-				ASSIGN(K54_P569, K54_569);
-				endom = 1;
-				pairf = EP_K54;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 575
-			case B48_P575:
-				ASSIGNK(B48_P575, B48_575);
-				endom = 1;
-				pairf = EP_B48;
-				break;
-#endif
-#if defined(EP_ENDOM) && FP_PRIME == 638
-			case BN_P638:
-				ASSIGN(BN_P638, BN_638);
-				endom = 1;
-				pairf = EP_BN;
-				break;
-			case B12_P638:
-				ASSIGN(B12_P638, B12_638);
-				endom = 1;
-				pairf = EP_B12;
-				break;
-#endif
-#if defined(EP_SUPER) && FP_PRIME == 1536
-			case SS_P1536:
-				ASSIGN(SS_P1536, SS_1536);
-				super = 1;
-				break;
-#endif
-			default:
-				(void)str;
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-
-#if defined(EP_ENDOM)
-		if (endom) {
-			switch(pairf) {
-				/* beta = (-1+sqrt(-3))/2, lambda = 36*u^3 + 18*u^2 + 6*u + 1 */
-				case EP_BN:
-					fp_set_dig(beta, 3);
-					fp_neg(beta, beta);
-					fp_srt(beta, beta);
-					fp_sub_dig(beta, beta, 1);
-					fp_hlv(beta, beta);
-					fp_prime_get_par(lamb);
-					bn_sqr(lamb, lamb);
-					bn_sqr(lamb, lamb);
-					bn_mul_dig(lamb, lamb, 36);
-					bn_sub(lamb, r, lamb);
-					if (bn_sign(lamb) == RLC_NEG) {
-						bn_neg(lamb, lamb);
-						bn_sub_dig(lamb, lamb, 1);
-					}
-					break;
-				/* beta = (-1 + sqrt(-3))/2, lambda = z^2 - 1 */
-				case EP_B12:
-					fp_set_dig(beta, 3);
-					fp_neg(beta, beta);
-					fp_srt(beta, beta);
-					fp_sub_dig(beta, beta, 1);
-					fp_hlv(beta, beta);
-					fp_prime_get_par(lamb);
-					bn_sqr(lamb, lamb);
-					bn_sub_dig(lamb, lamb, 1);
-					break;
-				case EP_B24:
-				/* beta = (-1 + sqrt(-3))/2, lambda = z^4 - 1. */
-					fp_set_dig(beta, 3);
-					fp_neg(beta, beta);
-					fp_srt(beta, beta);
-					fp_sub_dig(beta, beta, 1);
-					fp_hlv(beta, beta);
-					fp_prime_get_par(lamb);
-				 	bn_sqr(lamb, lamb);
-					bn_sqr(lamb, lamb);
-					bn_sub_dig(lamb, lamb, 1);
-					break;
-				default:
-					if (bn_cmp_dig(h, 1) == RLC_EQ) {
-						/* SECG curves with endomorphisms. */
-						fp_set_dig(beta, 2);
-						h->used = RLC_FP_DIGS;
-						dv_copy(h->dp, fp_prime_get(), RLC_FP_DIGS);
-						/* Borrow h but restore at the end. */
-						bn_sub_dig(h, h, 1);
-						bn_div_dig(h, h, 3);
-						fp_exp(beta, beta, h);
-						bn_set_dig(lamb, 3);
-						bn_sub_dig(h, r, 1);
-						bn_div_dig(h, h, 3);
-						bn_mxp(lamb, lamb, h, r);
-						/* Try another primitive root. */
-						if (bn_cmp_dig(lamb, 1) == RLC_EQ) {
-							bn_set_dig(lamb, 2);
-							bn_mxp(lamb, lamb, h, r);
-						}
-						bn_set_dig(h, 1);
-					}
-					break;
-			}
-		}
-#endif /* EP_ENDOM */
-
-		/* Do not generate warnings when these are disabled. */
-		(void)endom;
-		(void)plain;
-		(void)super;
-		(void)pairf;
-		(void)beta;
-		(void)ctmap;
-
-		fp_set_dig(g->z, 1);
-		g->coord = BASIC;
-
-#if defined(EP_PLAIN)
-		if (plain) {
-			ep_curve_set_plain(a, b, g, r, h, u, ctmap);
-			core_get()->ep_id = param;
-		}
-#endif
-
-#if defined(EP_ENDOM)
-		if (endom) {
-			ep_curve_set_endom(a, b, g, r, h, beta, lamb, u, ctmap);
-			core_get()->ep_id = param;
-			core_get()->ep_is_pairf = pairf;
-		}
-#endif
-
-#if defined(EP_SUPER)
-		if (super) {
-			ep_curve_set_super(a, b, g, r, h, u, ctmap);
-			core_get()->ep_id = param;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(a);
-		fp_free(b);
-		fp_free(beta);
-		fp_free(u);
-		bn_free(lamb);
-		ep_free(g);
-		bn_free(r);
-		bn_free(h);
-	}
-}
-
-int ep_param_set_any(void) {
-	int r = ep_param_set_any_plain();
-	if (r == RLC_ERR) {
-		r = ep_param_set_any_endom();
-		if (r == RLC_ERR) {
-			r = ep_param_set_any_pairf();
-			if (r == RLC_ERR) {
-				return RLC_ERR;
-			}
-		}
-	}
-	return RLC_OK;
-}
-
-int ep_param_set_any_plain(void) {
-	int r = RLC_OK;
-#if defined(EP_PLAIN)
-#if FP_PRIME == 160
-	ep_param_set(SECG_P160);
-#elif FP_PRIME == 192
-	ep_param_set(NIST_P192);
-#elif FP_PRIME == 221
-	ep_param_set(CURVE_22103);
-#elif FP_PRIME == 224
-	ep_param_set(NIST_P224);
-#elif FP_PRIME == 226
-	ep_param_set(CURVE_4417);
-#elif FP_PRIME == 251
-	ep_param_set(CURVE_1174);
-#elif FP_PRIME == 255
-	ep_param_set(CURVE_25519);
-#elif FP_PRIME == 256
-	ep_param_set(NIST_P256);
-#elif FP_PRIME == 382
-	ep_param_set(CURVE_67254);
-#elif FP_PRIME == 383
-	ep_param_set(CURVE_383187);
-#elif FP_PRIME == 384
-	ep_param_set(NIST_P384);
-#elif FP_PRIME == 521
-	ep_param_set(NIST_P521);
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-int ep_param_set_any_endom(void) {
-	int r = RLC_OK;
-#if defined(EP_ENDOM)
-#if FP_PRIME == 158
-	ep_param_set(BN_P158);
-#elif FP_PRIME == 160
-	ep_param_set(SECG_K160);
-#elif FP_PRIME == 192
-	ep_param_set(SECG_K192);
-#elif FP_PRIME == 224
-	ep_param_set(SECG_K224);
-#elif FP_PRIME == 254
-	ep_param_set(BN_P254);
-#elif FP_PRIME == 255
-	ep_param_set(TWEEDLEDUM);
-#elif FP_PRIME == 256
-	ep_param_set(SECG_K256);
-#elif FP_PRIME == 381
-	ep_param_set(B12_P381);
-#elif FP_PRIME == 382
-	ep_param_set(BN_P382);
-#elif FP_PRIME == 383
-	ep_param_set(B12_P383);
-#elif FP_PRIME == 446
-#ifdef FP_QNRES
-	ep_param_set(B12_P446);
-#else
-	ep_param_set(BN_P446);
-#endif
-#elif FP_PRIME == 455
-	ep_param_set(B12_P455);
-#elif FP_PRIME == 508
-	ep_param_set(KSS_P508);
-#elif FP_PRIME == 509
-	ep_param_set(B24_P509);
-#elif FP_PRIME == 511
-	ep_param_set(OT8_P511);
-#elif FP_PRIME == 544
-	ep_param_set(GMT8_P544);
-#elif FP_PRIME == 638
-#ifdef FP_QNRES
-	ep_param_set(B12_P638);
-#else
-	ep_param_set(BN_P638);
-#endif
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-int ep_param_set_any_super(void) {
-	int r = RLC_OK;
-#if defined(EP_SUPER)
-#if FP_PRIME == 1536
-	ep_param_set(SS_P1536);
-#elif FP_PRIME == 3072
-	ep_param_set(SS_P3072);
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-	return r;
-}
-
-int ep_param_set_any_pairf(void) {
-	int type = 0, degree = 0, r = RLC_OK;
-#if defined(EP_ENDOM)
-#if FP_PRIME == 158
-	ep_param_set(BN_P158);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 254
-	ep_param_set(BN_P254);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 256
-	ep_param_set(BN_P256);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 381
-	ep_param_set(B12_P381);
-	type = RLC_EP_MTYPE;
-	degree = 2;
-#elif FP_PRIME == 382
-	ep_param_set(BN_P382);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 383
-	ep_param_set(B12_P383);
-	type = RLC_EP_MTYPE;
-	degree = 2;
-#elif FP_PRIME == 446
-#ifdef FP_QNRES
-	ep_param_set(B12_P446);
-	type = RLC_EP_MTYPE;
-	degree = 2;
-#else
-	ep_param_set(BN_P446);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#endif
-#elif FP_PRIME == 455
-	ep_param_set(B12_P455);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 508
-	ep_param_set(KSS_P508);
-	type = RLC_EP_DTYPE;
-	degree = 3;
-#elif FP_PRIME == 509
-	ep_param_set(B24_P509);
-	type = RLC_EP_DTYPE;
-	degree = 4;
-#elif FP_PRIME == 511
-	ep_param_set(OT8_P511);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#elif FP_PRIME == 544
-	ep_param_set(GMT8_P544);
-	type = RLC_EP_MTYPE;
-	degree = 2;
-#elif FP_PRIME == 569
-	ep_param_set(K54_P569);
-	type = RLC_EP_MTYPE;
-	degree = 9;
-#elif FP_PRIME == 575
-	ep_param_set(B48_P575);
-	type = RLC_EP_MTYPE;
-	degree = 8;
-#elif FP_PRIME == 638
-#ifdef FP_QNRES
-	ep_param_set(B12_P638);
-	type = RLC_EP_MTYPE;
-	degree = 2;
-#else
-	ep_param_set(BN_P638);
-	type = RLC_EP_DTYPE;
-	degree = 2;
-#endif
-#elif FP_PRIME == 1536
-	ep_param_set(SS_P1536);
-	degree = 0;
-#elif FP_PRIME == 3072
-	ep_param_set(SS_P3072);
-	degree = 0;
-#else
-	r = RLC_ERR;
-#endif
-#else
-	r = RLC_ERR;
-#endif
-#ifdef WITH_PP
-	if (r == RLC_OK) {
-		switch (degree) {
-			case 0:
-				ep2_curve_set_twist(0);
-				/* Compute pairing generator. */
-				pc_core_calc();
-				break;
-			case 2:
-				ep2_curve_set_twist(type);
-				break;
-			case 4:
-				ep4_curve_set_twist(type);
-				break;
-		}
-	}
-#else
-	(void)type;
-	(void)degree;
-#endif
-	return r;
-}
-
-void ep_param_print(void) {
-	switch (ep_param_get()) {
-		case SECG_P160:
-			util_banner("Curve SECG-P160:", 0);
-			break;
-		case SECG_K160:
-			util_banner("Curve SECG-K160:", 0);
-			break;
-		case NIST_P192:
-			util_banner("Curve NIST-P192:", 0);
-			break;
-		case SECG_K192:
-			util_banner("Curve SECG-K192:", 0);
-			break;
-		case NIST_P224:
-			util_banner("Curve NIST-P224:", 0);
-			break;
-		case SECG_K224:
-			util_banner("Curve SECG-K224:", 0);
-			break;
-		case NIST_P256:
-			util_banner("Curve NIST-P256:", 0);
-			break;
-		case BSI_P256:
-			util_banner("Curve BSI-P256:", 0);
-			break;
-		case SECG_K256:
-			util_banner("Curve SECG-K256:", 0);
-			break;
-		case NIST_P384:
-			util_banner("Curve NIST-P384:", 0);
-			break;
-		case NIST_P521:
-			util_banner("Curve NIST-P521:", 0);
-			break;
-		case BN_P158:
-			util_banner("Curve BN-P158:", 0);
-			break;
-		case BN_P254:
-			util_banner("Curve BN-P254:", 0);
-			break;
-		case TWEEDLEDUM:
-			util_banner("Curve Tweedledum:", 0);
-			break;
-		case BN_P256:
-			util_banner("Curve BN-P256:", 0);
-			break;
-		case SM9_P256:
-			util_banner("Curve SM9-P256:", 0);
-			break;
-		case B12_P381:
-			util_banner("Curve B12-P381:", 0);
-			break;
-		case BN_P382:
-			util_banner("Curve BN-P382:", 0);
-			break;
-		case B12_P383:
-			util_banner("Curve B12-P383:", 0);
-			break;
-		case GMT8_P544:
-			util_banner("Curve GMT8-P544:", 0);
-			break;
-		case BN_P446:
-			util_banner("Curve BN-P446:", 0);
-			break;
-		case B12_P446:
-			util_banner("Curve B12-P446:", 0);
-			break;
-		case B12_P455:
-			util_banner("Curve B12-P455:", 0);
-			break;
-		case KSS_P508:
-			util_banner("Curve KSS-P508:", 0);
-			break;
-		case B24_P509:
-			util_banner("Curve B24-P509:", 0);
-			break;
-		case OT8_P511:
-			util_banner("Curve OT8-P511:", 0);
-			break;
-		case K54_P569:
-			util_banner("Curve K54-P569:", 0);
-			break;
-		case B48_P575:
-			util_banner("Curve B48-P575:", 0);
-			break;
-		case BN_P638:
-			util_banner("Curve BN-P638:", 0);
-			break;
-		case B12_P638:
-			util_banner("Curve B12-P638:", 0);
-			break;
-		case SS_P1536:
-			util_banner("Curve SS-P1536:", 0);
-			break;
-		case SS_P3072:
-			util_banner("Curve SS-3072:", 0);
-			break;
-		case CURVE_1174:
-			util_banner("Curve Curve1174:", 0);
-			break;
-		case CURVE_25519:
-			util_banner("Curve Curve25519:", 0);
-			break;
-		case CURVE_383187:
-			util_banner("Curve Curve383187:", 0);
-			break;
-		case CURVE_511187:
-			util_banner("Curve Curve511187:", 0);
-			break;
-	}
-}
-
-int ep_param_level(void) {
-	switch (ep_param_get()) {
-		case BN_P158:
-			return 78;
-		case SECG_P160:
-		case SECG_K160:
-			return 80;
-		case NIST_P192:
-		case SECG_K192:
-			return 96;
-		case NIST_P224:
-		case SECG_K224:
-			return 112;
-		case BN_P254:
-		case BN_P256:
-		case SM9_P256:
-			return 112;
-		case NIST_P256:
-		case SECG_K256:
-		case CURVE_25519:
-		case TWEEDLEDUM:
-			return 128;
-		case B12_P381:
-		case BN_P382:
-		case B12_P383:
-		case BN_P446:
-		case B12_P446:
-		case GMT8_544:
-		case SS_P1536:
-			return 128;
-		case B12_P455:
-			return 140;
-		case NIST_P384:
-		case B24_P509:
-			return 192;
-		case NIST_P521:
-			return 256;
-		case BN_P638:
-		case B12_P638:
-			return 160;
-	}
-	return 0;
-}
-
-int ep_param_embed(void) {
-	switch (ep_param_get()) {
-		case SS_P1536:
-			return 2;
-		case OT8_P511:
-		case GMT8_P544:
-			return 8;
-		case BN_P158:
-		case BN_P254:
-		case BN_P256:
-		case SM9_P256:
-		case BN_P382:
-		case BN_P446:
-		case B12_P446:
-		case BN_P638:
-		case B12_P381:
-		case B12_P383:
-		case B12_P455:
-		case B12_P638:
-			return 12;
-		case B24_P509:
-			return 24;
-		case B48_P575:
-			return 48;
-		case K54_P569:
-			return 54;
-	}
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_pck.c b/src/dashbls/depends/relic/src/ep/relic_ep_pck.c
deleted file mode 100644
index 2aac19239bb8..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_pck.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point compression on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep_pck(ep_t r, const ep_t p) {
-	int b;
-	bn_t halfQ, yValue;
-
-	bn_null(halfQ);
-	bn_null(yValue);
-
-	RLC_TRY {
-		bn_new(halfQ);
-		bn_new(yValue);
-
-		fp_copy(r->x, p->x);
-
-		if (ep_curve_is_pairf()) {
-			halfQ->used = RLC_FP_DIGS;
-			dv_copy(halfQ->dp, fp_prime_get(), RLC_FP_DIGS);
-			bn_hlv(halfQ, halfQ);
-
-			fp_prime_back(yValue, p->y);
-
-			b = bn_cmp(yValue, halfQ) == RLC_GT;
-		} else {
-			b = fp_get_bit(p->y, 0);
-		}
-
-		fp_zero(r->y);
-		fp_set_bit(r->y, 0, b);
-		fp_set_dig(r->z, 1);
-
-		r->coord = BASIC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(yValue);
-		bn_free(halfQ);
-	}
-}
-
-int ep_upk(ep_t r, const ep_t p) {
-	fp_t t;
-	bn_t halfQ;
-	bn_t yValue;
-	int result = 0;
-
-	fp_null(t);
-	bn_null(halfQ);
-	bn_null(yValue);
-
-	RLC_TRY {
-		fp_new(t);
-		bn_new(halfQ);
-		bn_new(yValue);
-
-		ep_rhs(t, p);
-
-		/* t0 = sqrt(x1^3 + a * x1 + b). */
-		result = fp_srt(t, t);
-
-		if (result) {
-			if (ep_curve_is_pairf()) {
-				/* Verify whether the y coordinate is the larger one, matches the
-				 * compressed y-coordinate, from IETF pairing friendly spec:
-					sign_F_p(y) :=  { 1 if y > (p - 1) / 2, else
-									{ 0 otherwise.
-				*/
-				halfQ->used = RLC_FP_DIGS;
-				dv_copy(halfQ->dp, fp_prime_get(), RLC_FP_DIGS);
-				bn_hlv(halfQ, halfQ);  // This is equivalent to p - 1 / 2, floor division
-
-				fp_prime_back(yValue, t);
-				int sign_fpy = bn_cmp(yValue, halfQ) == RLC_GT;
-
-				if (sign_fpy != fp_get_bit(p->y, 0)) {
-					fp_neg(t, t);
-				}
-			} else {
-				/* Verify if least significant bit of the result matches the
-				 * compressed y-coordinate. */
-				if (fp_get_bit(t, 0) != fp_get_bit(p->y, 0)) {
-					fp_neg(t, t);
-				}
-			}
-			fp_copy(r->x, p->x);
-			fp_copy(r->y, t);
-			fp_set_dig(r->z, 1);
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-		bn_free(yValue);
-		bn_free(halfQ);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_psi.c b/src/dashbls/depends/relic/src/ep/relic_ep_psi.c
deleted file mode 100644
index c700be38c6a1..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_psi.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the endomorphism map on prime elliptic curves.
- *
- * @ingroup ep
- */
-
-#include "relic_core.h"
-#include "relic_ep.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if defined(EP_ENDOM)
-
-void ep_psi(ep_t r, const ep_t p) {
-	if (ep_is_infty(p)) {
-		ep_set_infty(r);
-		return;
-	}
-
-	if (r != p) {
-		ep_copy(r, p);
-	}
-	if (ep_curve_opt_a() == RLC_ZERO) {
-		fp_mul(r->x, r->x, ep_curve_get_beta());
- 	} else {
-		fp_neg(r->x, r->x);
-	 	fp_mul(r->y, r->y, ep_curve_get_beta());
- 	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/ep/relic_ep_util.c b/src/dashbls/depends/relic/src/ep/relic_ep_util.c
deleted file mode 100644
index ae143e9f3826..000000000000
--- a/src/dashbls/depends/relic/src/ep/relic_ep_util.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime elliptic curve utilities.
- *
- * @version $Id$
- * @ingroup ep
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep_is_infty(const ep_t p) {
-	return (fp_is_zero(p->z) == 1);
-}
-
-void ep_set_infty(ep_t p) {
-	fp_zero(p->x);
-	fp_zero(p->y);
-	fp_zero(p->z);
-	p->coord = BASIC;
-}
-
-void ep_copy(ep_t r, const ep_t p) {
-	fp_copy(r->x, p->x);
-	fp_copy(r->y, p->y);
-	fp_copy(r->z, p->z);
-	r->coord = p->coord;
-}
-
-void ep_rand(ep_t p) {
-	bn_t n, k;
-
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-
-		ep_curve_get_ord(n);
-		bn_rand_mod(k, n);
-
-		ep_mul_gen(p, k);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-	}
-}
-
-void ep_blind(ep_t r, const ep_t p) {
-	fp_t rand;
-
-	fp_null(rand);
-
-	RLC_TRY {
-		fp_new(rand);
-		fp_rand(rand);
-#if EP_ADD == BASIC
-		(void)rand;
-		ep_copy(r, p);
-#elif EP_ADD == PROJC
-		fp_mul(r->x, p->x, rand);
-		fp_mul(r->y, p->y, rand);
-		fp_mul(r->z, p->z, rand);
-		r->coord = PROJC;
-#elif EP_ADD == JACOB
-		fp_mul(r->z, p->z, rand);
-		fp_mul(r->y, p->y, rand);
-		fp_sqr(rand, rand);
-		fp_mul(r->x, r->x, rand);
-		fp_mul(r->y, r->y, rand);
-		r->coord = JACOB;
-#endif
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(rand);
-	}
-}
-
-void ep_rhs(fp_t rhs, const ep_t p) {
-	fp_t t0;
-
-	fp_null(t0);
-
-	RLC_TRY {
-		fp_new(t0);
-
-		/* t0 = x1^2. */
-		fp_sqr(t0, p->x);
-
-		/* t0 = x1^2 + a */
-		switch (ep_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				fp_add_dig(t0, t0, ep_curve_get_a()[0]);
-				break;
-#endif
-			default:
-				fp_add(t0, t0, ep_curve_get_a());
-				break;
-		}
-
-		/* t0 = x1^3 + a * x */
-		fp_mul(t0, t0, p->x);
-
-		/* t0 = x1^3 + a * x + b */
-		switch (ep_curve_opt_b()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				fp_add_dig(t0, t0, ep_curve_get_b()[0]);
-				break;
-#endif
-			default:
-				fp_add(t0, t0, ep_curve_get_b());
-				break;
-		}
-
-		fp_copy(rhs, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t0);
-	}
-}
-
-int ep_on_curve(const ep_t p) {
-	ep_t t;
-	int r = 0;
-
-	ep_null(t);
-
-	RLC_TRY {
-		ep_new(t);
-
-		ep_norm(t, p);
-		ep_rhs(t->x, t);
-		fp_sqr(t->y, t->y);
-		r = (fp_cmp(t->x, t->y) == RLC_EQ) || ep_is_infty(p);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep_free(t);
-	}
-	return r;
-}
-
-void ep_tab(ep_t *t, const ep_t p, int w) {
-	if (w > 2) {
-		ep_dbl(t[0], p);
-#if defined(EP_MIXED)
-		ep_norm(t[0], t[0]);
-#endif
-		ep_add(t[1], t[0], p);
-		for (int i = 2; i < (1 << (w - 2)); i++) {
-			ep_add(t[i], t[i - 1], t[0]);
-		}
-#if defined(EP_MIXED)
-		ep_norm_sim(t + 1, (const ep_t *)t + 1, (1 << (w - 2)) - 1);
-#endif
-	}
-	ep_copy(t[0], p);
-}
-
-void ep_print(const ep_t p) {
-	fp_print(p->x);
-	fp_print(p->y);
-	fp_print(p->z);
-}
-
-int ep_size_bin(const ep_t a, int pack) {
-	int size = 0;
-
-	if (ep_is_infty(a)) {
-		return 1;
-	}
-
-	size = 1 + RLC_FP_BYTES;
-	if (!pack) {
-		size += RLC_FP_BYTES;
-	}
-
-	return size;
-}
-
-void ep_read_bin(ep_t a, const uint8_t *bin, int len) {
-	if (len == 1) {
-		if (bin[0] == 0) {
-			ep_set_infty(a);
-			return;
-		} else {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		}
-	}
-
-	if (len != (RLC_FP_BYTES + 1) && len != (2 * RLC_FP_BYTES + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	a->coord = BASIC;
-	fp_set_dig(a->z, 1);
-	fp_read_bin(a->x, bin + 1, RLC_FP_BYTES);
-	if (len == RLC_FP_BYTES + 1) {
-		switch(bin[0]) {
-			case 2:
-				fp_zero(a->y);
-				break;
-			case 3:
-				fp_zero(a->y);
-				fp_set_bit(a->y, 0, 1);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		ep_upk(a, a);
-	}
-
-	if (len == 2 * RLC_FP_BYTES + 1) {
-		if (bin[0] == 4) {
-			fp_read_bin(a->y, bin + RLC_FP_BYTES + 1, RLC_FP_BYTES);
-		} else {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-	}
-
-	if (!ep_on_curve(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-void ep_write_bin(uint8_t *bin, int len, const ep_t a, int pack) {
-	ep_t t;
-
-	ep_null(t);
-
-	memset(bin, 0, len);
-
-	if (ep_is_infty(a)) {
-		if (len < 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		} else {
-			bin[0] = 0;
-			return;
-		}
-	}
-
-	RLC_TRY {
-		ep_new(t);
-
-		ep_norm(t, a);
-
-		if (pack) {
-			if (len < RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				ep_pck(t, t);
-				bin[0] = 2 | fp_get_bit(t->y, 0);
-				fp_write_bin(bin + 1, RLC_FP_BYTES, t->x);
-			}
-		} else {
-			if (len < 2 * RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				bin[0] = 4;
-				fp_write_bin(bin + 1, RLC_FP_BYTES, t->x);
-				fp_write_bin(bin + RLC_FP_BYTES + 1, RLC_FP_BYTES, t->y);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_add.c b/src/dashbls/depends/relic/src/epx/relic_ep2_add.c
deleted file mode 100644
index 2a9766e7c10b..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_add.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of addition on prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Adds two points represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param s					- the resulting slope.
- * @param p					- the first point to add.
- * @param q					- the second point to add.
- */
-static void ep2_add_basic_imp(ep2_t r, fp2_t s, ep2_t p, ep2_t q) {
-	fp2_t t0, t1, t2;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* t0 = x2 - x1. */
-		fp2_sub(t0, q->x, p->x);
-		/* t1 = y2 - y1. */
-		fp2_sub(t1, q->y, p->y);
-
-		/* If t0 is zero. */
-		if (fp2_is_zero(t0)) {
-			if (fp2_is_zero(t1)) {
-				/* If t1 is zero, q = p, should have doubled. */
-				ep2_dbl_slp_basic(r, s, p);
-			} else {
-				/* If t1 is not zero and t0 is zero, q = -p and r = infty. */
-				ep2_set_infty(r);
-			}
-		} else {
-			/* t2 = 1/(x2 - x1). */
-			fp2_inv(t2, t0);
-			/* t2 = lambda = (y2 - y1)/(x2 - x1). */
-			fp2_mul(t2, t1, t2);
-
-			/* x3 = lambda^2 - x2 - x1. */
-			fp2_sqr(t1, t2);
-			fp2_sub(t0, t1, p->x);
-			fp2_sub(t0, t0, q->x);
-
-			/* y3 = lambda * (x1 - x3) - y1. */
-			fp2_sub(t1, p->x, t0);
-			fp2_mul(t1, t2, t1);
-			fp2_sub(r->y, t1, p->y);
-
-			fp2_copy(r->x, t0);
-			fp2_copy(r->z, p->z);
-
-			if (s != NULL) {
-				fp2_copy(s, t2);
-			}
-
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-#if defined(EP_MIXED) || !defined(STRIP)
-
-/**
- * Adds a point represented in affine coordinates to a point represented in
- * projective coordinates.
- *
- * @param r					- the result.
- * @param s					- the slope.
- * @param p					- the affine point.
- * @param q					- the projective point.
- */
-static void ep2_add_projc_mix(ep2_t r, ep2_t p, ep2_t q) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		if (p->coord != BASIC) {
-			/* t0 = z1^2. */
-			fp2_sqr(t0, p->z);
-
-			/* t3 = U2 = x2 * z1^2. */
-			fp2_mul(t3, q->x, t0);
-
-			/* t1 = S2 = y2 * z1^3. */
-			fp2_mul(t1, t0, p->z);
-			fp2_mul(t1, t1, q->y);
-
-			/* t3 = H = U2 - x1. */
-			fp2_sub(t3, t3, p->x);
-
-			/* t1 = R = 2 * (S2 - y1). */
-			fp2_sub(t1, t1, p->y);
-		} else {
-			/* H = x2 - x1. */
-			fp2_sub(t3, q->x, p->x);
-
-			/* t1 = R = 2 * (y2 - y1). */
-			fp2_sub(t1, q->y, p->y);
-		}
-
-		/* t2 = HH = H^2. */
-		fp2_sqr(t2, t3);
-
-		/* If E is zero. */
-		if (fp2_is_zero(t3)) {
-			if (fp2_is_zero(t1)) {
-				/* If I is zero, p = q, should have doubled. */
-				ep2_dbl_projc(r, p);
-			} else {
-				/* If I is not zero, q = -p, r = infinity. */
-				ep2_set_infty(r);
-			}
-		} else {
-			/* t5 = J = H * HH. */
-			fp2_mul(t5, t3, t2);
-
-			/* t4 = V = x1 * HH. */
-			fp2_mul(t4, p->x, t2);
-
-			/* x3 = R^2 - J - 2 * V. */
-			fp2_sqr(r->x, t1);
-			fp2_sub(r->x, r->x, t5);
-			fp2_dbl(t6, t4);
-			fp2_sub(r->x, r->x, t6);
-
-			/* y3 = R * (V - x3) - Y1 * J. */
-			fp2_sub(t4, t4, r->x);
-			fp2_mul(t4, t4, t1);
-			fp2_mul(t1, p->y, t5);
-			fp2_sub(r->y, t4, t1);
-
-			if (p->coord != BASIC) {
-				/* z3 = z1 * H. */
-				fp2_mul(r->z, p->z, t3);
-			} else {
-				/* z3 = H. */
-				fp2_copy(r->z, t3);
-			}
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-}
-
-#endif
-
-/**
- * Adds two points represented in projective coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param p					- the first point to add.
- * @param q					- the second point to add.
- */
-static void ep2_add_projc_imp(ep2_t r, ep2_t p, ep2_t q) {
-#if defined(EP_MIXED) && defined(STRIP)
-	ep2_add_projc_mix(r, p, q);
-#else /* General addition. */
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		if (q->coord == BASIC) {
-			ep2_add_projc_mix(r, p, q);
-		} else {
-			/* t0 = z1^2. */
-			fp2_sqr(t0, p->z);
-
-			/* t1 = z2^2. */
-			fp2_sqr(t1, q->z);
-
-			/* t2 = U1 = x1 * z2^2. */
-			fp2_mul(t2, p->x, t1);
-
-			/* t3 = U2 = x2 * z1^2. */
-			fp2_mul(t3, q->x, t0);
-
-			/* t6 = z1^2 + z2^2. */
-			fp2_add(t6, t0, t1);
-
-			/* t0 = S2 = y2 * z1^3. */
-			fp2_mul(t0, t0, p->z);
-			fp2_mul(t0, t0, q->y);
-
-			/* t1 = S1 = y1 * z2^3. */
-			fp2_mul(t1, t1, q->z);
-			fp2_mul(t1, t1, p->y);
-
-			/* t3 = H = U2 - U1. */
-			fp2_sub(t3, t3, t2);
-
-			/* t0 = R = 2 * (S2 - S1). */
-			fp2_sub(t0, t0, t1);
-
-			fp2_dbl(t0, t0);
-
-			/* If E is zero. */
-			if (fp2_is_zero(t3)) {
-				if (fp2_is_zero(t0)) {
-					/* If I is zero, p = q, should have doubled. */
-					ep2_dbl_projc(r, p);
-				} else {
-					/* If I is not zero, q = -p, r = infinity. */
-					ep2_set_infty(r);
-				}
-			} else {
-				/* t4 = I = (2*H)^2. */
-				fp2_dbl(t4, t3);
-				fp2_sqr(t4, t4);
-
-				/* t5 = J = H * I. */
-				fp2_mul(t5, t3, t4);
-
-				/* t4 = V = U1 * I. */
-				fp2_mul(t4, t2, t4);
-
-				/* x3 = R^2 - J - 2 * V. */
-				fp2_sqr(r->x, t0);
-				fp2_sub(r->x, r->x, t5);
-				fp2_dbl(t2, t4);
-				fp2_sub(r->x, r->x, t2);
-
-				/* y3 = R * (V - x3) - 2 * S1 * J. */
-				fp2_sub(t4, t4, r->x);
-				fp2_mul(t4, t4, t0);
-				fp2_mul(t1, t1, t5);
-				fp2_dbl(t1, t1);
-				fp2_sub(r->y, t4, t1);
-
-				/* z3 = ((z1 + z2)^2 - z1^2 - z2^2) * H. */
-				fp2_add(r->z, p->z, q->z);
-				fp2_sqr(r->z, r->z);
-				fp2_sub(r->z, r->z, t6);
-				fp2_mul(r->z, r->z, t3);
-			}
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-#endif
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep2_add_basic(ep2_t r, ep2_t p, ep2_t q) {
-	if (ep2_is_infty(p)) {
-		ep2_copy(r, q);
-		return;
-	}
-
-	if (ep2_is_infty(q)) {
-		ep2_copy(r, p);
-		return;
-	}
-
-	ep2_add_basic_imp(r, NULL, p, q);
-}
-
-void ep2_add_slp_basic(ep2_t r, fp2_t s, ep2_t p, ep2_t q) {
-	if (ep2_is_infty(p)) {
-		ep2_copy(r, q);
-		return;
-	}
-
-	if (ep2_is_infty(q)) {
-		ep2_copy(r, p);
-		return;
-	}
-
-	ep2_add_basic_imp(r, s, p, q);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep2_add_projc(ep2_t r, ep2_t p, ep2_t q) {
-	if (ep2_is_infty(p)) {
-		ep2_copy(r, q);
-		return;
-	}
-
-	if (ep2_is_infty(q)) {
-		ep2_copy(r, p);
-		return;
-	}
-
-	if (p == q) {
-		/* TODO: This is a quick hack. Should we fix this? */
-		ep2_dbl(r, p);
-		return;
-	}
-
-	ep2_add_projc_imp(r, p, q);
-}
-
-#endif
-
-void ep2_sub(ep2_t r, ep2_t p, ep2_t q) {
-	ep2_t t;
-
-	ep2_null(t);
-
-	if (p == q) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-
-		ep2_neg(t, q);
-		ep2_add(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_cmp.c b/src/dashbls/depends/relic/src/epx/relic_ep2_cmp.c
deleted file mode 100644
index c5943789cb39..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_cmp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of utilities for prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep2_cmp(ep2_t p, ep2_t q) {
-    ep2_t r, s;
-    int result = RLC_NE;
-
-	if (ep2_is_infty(p) && ep2_is_infty(q)) {
-		return RLC_EQ;
-	}
-
-    ep2_null(r);
-    ep2_null(s);
-
-    RLC_TRY {
-        ep2_new(r);
-        ep2_new(s);
-
-        if ((p->coord != BASIC) && (q->coord != BASIC)) {
-            /* If the two points are not normalized, it is faster to compare
-             * x1 * z2^2 == x2 * z1^2 and y1 * z2^3 == y2 * z1^3. */
-            fp2_sqr(r->z, p->z);
-            fp2_sqr(s->z, q->z);
-            fp2_mul(r->x, p->x, s->z);
-            fp2_mul(s->x, q->x, r->z);
-            fp2_mul(r->z, r->z, p->z);
-            fp2_mul(s->z, s->z, q->z);
-            fp2_mul(r->y, p->y, s->z);
-            fp2_mul(s->y, q->y, r->z);
-        } else {
-			ep2_norm(r, p);
-            ep2_norm(s, q);
-        }
-
-        if ((fp2_cmp(r->x, s->x) == RLC_EQ) &&
-				(fp2_cmp(r->y, s->y) == RLC_EQ)) {
-            result = RLC_EQ;
-        }
-    } RLC_CATCH_ANY {
-        RLC_THROW(ERR_CAUGHT);
-    } RLC_FINALLY {
-        ep2_free(r);
-        ep2_free(s);
-    }
-
-    return result;
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_curve.c b/src/dashbls/depends/relic/src/epx/relic_ep2_curve.c
deleted file mode 100644
index cdf301946b89..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_curve.c
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of configuration of prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/* See ep/relic_ep_param.c for discussion of MAP_U parameters. */
-
-/**
- * Parameters for a pairing-friendly prime curve over a quadratic extension.
- */
-#if defined(EP_ENDOM) && FP_PRIME == 158
-/** @{ */
-#define BN_P158_A0		"0"
-#define BN_P158_A1		"0"
-#define BN_P158_B0		"4"
-#define BN_P158_B1		"240000006ED000007FE9C000419FEC800CA035C6"
-#define BN_P158_X0		"172C0A466DAFB4ACF48C9BDD0C12A435CB36CE6C"
-#define BN_P158_X1		"0CE0287269D7E317EB91AF3DCD27CC373114299E"
-#define BN_P158_Y0		"19A185D6B6241576480E965463B4A6A66875C184"
-#define BN_P158_Y1		"074866EA7BD0AB4C67C77F70E0467F1FF32D800D"
-#define BN_P158_R		"240000006ED000007FE96000419F59800C9FFD81"
-#define BN_P158_H		"240000006ED000007FEA200041A07F800CA06E0D"
-#define BN_P158_MAPU0 "0"
-#define BN_P158_MAPU1 "-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 254
-/** @{ */
-#define BN_P254_A0		"0"
-#define BN_P254_A1		"0"
-#define BN_P254_B0		"1"
-#define BN_P254_B1		"2523648240000001BA344D80000000086121000000000013A700000000000012"
-#define BN_P254_X0		"061A10BB519EB62FEB8D8C7E8C61EDB6A4648BBB4898BF0D91EE4224C803FB2B"
-#define BN_P254_X1		"0516AAF9BA737833310AA78C5982AA5B1F4D746BAE3784B70D8C34C1E7D54CF3"
-#define BN_P254_Y0		"021897A06BAF93439A90E096698C822329BD0AE6BDBE09BD19F0E07891CD2B9A"
-#define BN_P254_Y1		"0EBB2B0E7C8B15268F6D4456F5F38D37B09006FFD739C9578A2D1AEC6B3ACE9B"
-#define BN_P254_R		"2523648240000001BA344D8000000007FF9F800000000010A10000000000000D"
-#define BN_P254_H		"2523648240000001BA344D8000000008C2A2800000000016AD00000000000019"
-#define BN_P254_MAPU0 "0"
-#define BN_P254_MAPU1 "-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 256
-/** @{ */
-#define BN_P256_A0		"0"
-#define BN_P256_A1		"0"
-#define BN_P256_B0		"4"
-#define BN_P256_B1		"B64000000000FF2F2200000085FD5480B0001F44B6B88BF142BC818F95E3E6AE"
-#define BN_P256_X0		"0C77AE4A1D6E145166739CF23DAFACA9DD396E9046424FC5479BD57692904538"
-#define BN_P256_X1		"8D1705B45D9EAAD78A9198FD8D76E2013D1BC119B4D95721A8D32F819A544F51"
-#define BN_P256_Y0		"A906E963E4988478E458A4959EF7D61B570358814E28A04EF9B8C794064D73A7"
-#define BN_P256_Y1		"A033144CA161E3E3271624B3F0CC1CE607ACD2CBCE9E9253C732CF3E1016DEE7"
-#define BN_P256_R		"B64000000000FF2F2200000085FD547FD8001F44B6B7F4B7C2BC818F7B6BEF99"
-#define BN_P256_H		"B64000000000FF2F2200000085FD548188001F44B6B9232AC2BC818FB05BDDC5"
-#define BN_P256_MAPU0 "0"
-#define BN_P256_MAPU1 "-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 256
-/** @{ */
-#define SM9_P256_A0		"0"
-#define SM9_P256_A1		"0"
-#define SM9_P256_B0		"0"
-#define SM9_P256_B1		"5"
-#define SM9_P256_X0		"3722755292130B08D2AAB97FD34EC120EE265948D19C17ABF9B7213BAF82D65B"
-#define SM9_P256_X1		"85AEF3D078640C98597B6027B441A01FF1DD2C190F5E93C454806C11D8806141"
-#define SM9_P256_Y0		"A7CF28D519BE3DA65F3170153D278FF247EFBA98A71A08116215BBA5C999A7C7"
-#define SM9_P256_Y1		"17509B092E845C1266BA0D262CBEE6ED0736A96FA347C8BD856DC76B84EBEB96"
-#define SM9_P256_R		"B640000002A3A6F1D603AB4FF58EC74449F2934B18EA8BEEE56EE19CD69ECF25"
-#define SM9_P256_H		"B640000002A3A6F1D603AB4FF58EC745F9F2934B1C0B51C8E57054B2F003BBD5"
-#define SM9_P256_MAPU0 "-1"
-#define SM9_P256_MAPU1 "0"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 381
-/** @{ */
-#define B12_P381_A0		"0"
-#define B12_P381_A1		"0"
-#define B12_P381_B0		"4"
-#define B12_P381_B1		"4"
-#define B12_P381_X0		"024AA2B2F08F0A91260805272DC51051C6E47AD4FA403B02B4510B647AE3D1770BAC0326A805BBEFD48056C8C121BDB8"
-#define B12_P381_X1		"13E02B6052719F607DACD3A088274F65596BD0D09920B61AB5DA61BBDC7F5049334CF11213945D57E5AC7D055D042B7E"
-#define B12_P381_Y0		"0CE5D527727D6E118CC9CDC6DA2E351AADFD9BAA8CBDD3A76D429A695160D12C923AC9CC3BACA289E193548608B82801"
-#define B12_P381_Y1		"0606C4A02EA734CC32ACD2B02BC28B99CB3E287E85A763AF267492AB572E99AB3F370D275CEC1DA1AAA9075FF05F79BE"
-#define B12_P381_R		"73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001"
-#define B12_P381_H		"5D543A95414E7F1091D50792876A202CD91DE4547085ABAA68A205B2E5A7DDFA628F1CB4D9E82EF21537E293A6691AE1616EC6E786F0C70CF1C38E31C7238E5"
-#if defined(EP_CTMAP)
-#define B12_P381_ISO_A0 "0"
-#define B12_P381_ISO_A1 "F0"
-#define B12_P381_ISO_B0 "3F4"
-#define B12_P381_ISO_B1 "3F4"
-#define B12_P381_ISO_XN "5c759507e8e333ebb5b7a9a47d7ed8532c52d39fd3a042a88b58423c50ae15d5c2638e343d9c71c6238aaaaaaaa97d6,5c759507e8e333ebb5b7a9a47d7ed8532c52d39fd3a042a88b58423c50ae15d5c2638e343d9c71c6238aaaaaaaa97d6;0,11560bf17baa99bc32126fced787c88f984f87adf7ae0c7f9a208c6b4f20a4181472aaa9cb8d555526a9ffffffffc71a;11560bf17baa99bc32126fced787c88f984f87adf7ae0c7f9a208c6b4f20a4181472aaa9cb8d555526a9ffffffffc71e,8ab05f8bdd54cde190937e76bc3e447cc27c3d6fbd7063fcd104635a790520c0a395554e5c6aaaa9354ffffffffe38d;171d6541fa38ccfaed6dea691f5fb614cb14b4e7f4e810aa22d6108f142b85757098e38d0f671c7188e2aaaaaaaa5ed1,0"
-#define B12_P381_ISO_XD "0,1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa63;c,1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa9f;1,0"
-#define B12_P381_ISO_YN "1530477c7ab4113b59a4c18b076d11930f7da5d4a07f649bf54439d87d27e500fc8c25ebf8c92f6812cfc71c71c6d706,1530477c7ab4113b59a4c18b076d11930f7da5d4a07f649bf54439d87d27e500fc8c25ebf8c92f6812cfc71c71c6d706;0,5c759507e8e333ebb5b7a9a47d7ed8532c52d39fd3a042a88b58423c50ae15d5c2638e343d9c71c6238aaaaaaaa97be;11560bf17baa99bc32126fced787c88f984f87adf7ae0c7f9a208c6b4f20a4181472aaa9cb8d555526a9ffffffffc71c,8ab05f8bdd54cde190937e76bc3e447cc27c3d6fbd7063fcd104635a790520c0a395554e5c6aaaa9354ffffffffe38f;124c9ad43b6cf79bfbf7043de3811ad0761b0f37a1e26286b0e977c69aa274524e79097a56dc4bd9e1b371c71c718b10,0"
-#define B12_P381_ISO_YD "1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffa8fb,1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffa8fb;0,1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffa9d3;12,1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa99;1,0"
-#define B12_P381_MAPU0 "-2"
-#define B12_P381_MAPU1 "-1"
-#else /* !defined(EP_CTMAP) */
-#define B12_P381_MAPU0 "0"
-#define B12_P381_MAPU1 "1"
-#endif
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 382
-/** @{ */
-#define BN_P382_A0		"0"
-#define BN_P382_A1		"0"
-#define BN_P382_B0		"1"
-#define BN_P382_B1		"24009015183F94892D996CC179C6D1666F82CEFBE47879BBA6E58DBE43002A0609480097801382BE004E000000000012"
-#define BN_P382_X0		"124D78021D2F75CC7C4CA67A4A0E97BB67A89C66B61C2C06600760B0D7531624F2DD78AEF890A5FC0EB7F8C6FD6FC24C"
-#define BN_P382_X1		"0DD2BB64502028D5DED81EAC950BF96D0140DBA681B99152F14A0AC190AC93E4A7EA979A355367B30D23B6E8CAD6F394"
-#define BN_P382_Y0		"16C2749A07848E85C9E128D710796AE465DBD5DDC7B285FA02777E378E9FFF0A42E2128C3167B231602B72553DF79669"
-#define BN_P382_Y1		"09CAC2932F3C894CCE129ECBB49AFD4BFF94C10B5DF37AB469E3455F16EFDD304721F689BFF864A92ACB3F4DF52678ED"
-#define BN_P382_R		"24009015183F94892D996CC179C6D1666F82CEFBE47879BB46E4CDA2E2E2281D08DC008E80108252004200000000000D"
-#define BN_P382_H		"24009015183F94892D996CC179C6D1666F82CEFBE47879BC06E64DD9A31E2BEF09B400A08016832A005A000000000019"
-#define BN_P382_MAPU0 "0"
-#define BN_P382_MAPU1 "-1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 383
-/** @{ */
-#define B12_P383_A0		"0"
-#define B12_P383_A1		"0"
-#define B12_P383_B0		"4"
-#define B12_P383_B1		"4"
-#define B12_P383_X0		"2E4DCF4E55CBA1075B3325DD25C2B80BD907686E55E175F0B5D097E46E78B6B5F8E600B80D2EBD4E410BCCCBAE018976"
-#define B12_P383_X1		"0BE0128C473D6A90202AC72A60E988CF7901242A2A4623A89253256CC11C1519D3C633897E071D8F466EA0BFFA5F9313"
-#define B12_P383_Y0		"44900D049962DF1BBCB29872FDA90D0DFC2253033569F7D684080F6A5B4F669120A29F908FED5B64AAA9A56502405B39"
-#define B12_P383_Y1		"1459B073246773B35CBCBFC9318AC47DDC1C284887D1DA4BE13593ACC0E45B748AF4115011A3EA730A7DB21A83562411"
-#define B12_P383_R		"1002001800C00B809C04401C81698B381DE05F095A120D3973B2099EBFEBC0001"
-#define B12_P383_H		"1C78E45562AB68EE641721902ED56C9B45EB1276A5C15CB19C7BF81F7A7B6F22053BAC3422240A3F4A7E3C25D470E7BABDB8A2E1E1793BF9CEBDD1BF2EFE30E5"
-#define B12_P383_MAPU0 "0"
-#define B12_P383_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 446
-/** @{ */
-#define BN_P446_A0		"0"
-#define BN_P446_A1		"0"
-#define BN_P446_B0		"10"
-#define BN_P446_B1		"2400000000000000002400000002D00000000D800000021C0000001800000000870000000B0400000057C00000015C000000132000000066"
-#define BN_P446_X0		"1DFCEBAE017EC74D18BFCF2CABB36B7B53B64AD3DE65B2E1F7991A38ADB90BE52FF2AC01B15EDDAAEB92DE6338A40F24A5052A3BBA1F755D"
-#define BN_P446_X1		"4CC6E0E84FC2FE13FFCB9B6F716AE188D1532B57754CA4FBD9058E3B7C6419933E76D470BA8365E21DAB35662CD74C0A381020DF944CDD2"
-#define BN_P446_Y0		"13043EE14F4BE8FBF314D15D49ACD7928DD6D12CF903D5485F8EDA2B343A2F8E43A61D9FF1FC74788DBA03B064498B143171A0885AD9EC37"
-#define BN_P446_Y1		"91F93BEB46071DEDF410DC5A7662DD8B4BBC8BE5D3A8662009A4C2C0577F82A2337D208379F21C65F90FE1D90482CC48DEC83BFB8AD8E45"
-#define BN_P446_R		"2400000000000000002400000002D00000000D800000021C00000017A0000000870000000AD400000054C000000156000000126000000061"
-#define BN_P446_H		"2400000000000000002400000002D00000000D800000021C0000001860000000870000000B340000005AC00000016200000013E00000006D"
-#define BN_P446_MAPU0 "0"
-#define BN_P446_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 446
-/** @{ */
-#define B12_P446_A0		"0"
-#define B12_P446_A1		"0"
-#define B12_P446_B0		"1"
-#define B12_P446_B1		"1"
-#define B12_P446_X0		"2B416CB07EA30312C0465130F59E1598732EE5DEC92F52F521F9D90CEEDA7E5F97208A5EAEE7DA3F56CFCF3DF403C5E2D96E929C8C064CA6"
-#define B12_P446_X1		"1378EBE7D0BE6234B9702E4361DD1432B2965B29F82169693815DB423EE5030F1C78A0137885E737D2C242C8C9CA2704347EB3F1F6D84C57"
-#define B12_P446_Y0		"26392FFC4FB772DE4C4D2A8A61AE00E74FEF64D573EA3D06DF741E666688E83495610E4CE1B9C7EAB270A57C8F82D9B459F2392065EEEAF3"
-#define B12_P446_Y1		"10ACDEBE52C1499796809283C38E100C4BA9FA0699696BF9F8647CB18EE632A4DDDAA771A78C031F868FAFA07E8642CCA633FE6F99B744C4"
-#define B12_P446_R		"511B70539F27995B34995830FA4D04C98CCC4C050BC7BB9B0E8D8CA34610428001400040001"
-#define B12_P446_H		"2DAEE3988A06F1BB3444D5780484639BF731D657742BF556901567CEFE5C3DD2555CB74C3560CED298D5147F8E24B79369C54C81E026DD55B51D6A75088593E6A92EFCE555594000638E5"
-#define B12_P446_MAPU0 "0"
-#define B12_P446_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 455
-/** @{ */
-#define B12_P455_A0		"0"
-#define B12_P455_A1		"0"
-#define B12_P455_B0		"5"
-#define B12_P455_B1		"55555955557955572AA00E0F95B49203003F665E3A5B1D56234BD93954FCB314B8B3DB9994ACE86D1BA6C589556B2AA956AAA00001800002A6"
-#define B12_P455_X0		"2EEC192F28D9F29B538E089E5A05014765EAC5E066D4A3083D247C009EE309392AA2D813C9FC798CB292D0655CD9F559C961B6F678109C5676"
-#define B12_P455_X1		"26DD95EE22842C030FEB5D46259492EA7E051D604608D35F8F5AFB65B0FC18DADBC079D037D5F9E24634346181876FC2F9D501E9A060ED726D"
-#define B12_P455_Y0		"29C445A3809D96184EB3E76193ABBE3688B68B4123ABCC9F31A81F42D2420B1B4D653673CEAC2A0543347EE3B1A56591F3496626F8763EEADB"
-#define B12_P455_Y1		"24AC244C6F31FDAC1214CA62AB4DB7BA9B5F0D54D56A3D5C680044225C3AAF9815C272A15AA1D28FB6AC9EB7B0BE6916450794A617AFFB4EF9"
-#define B12_P455_R		"10000080000380002E0000F10004F00025E000750001D1000A00000400001C00007FFFFC00001"
-#define B12_P455_H		"1C71C8E38E4C71C8238726432AFAC33B9D05A24A43A2531F1F9DE9B4C688A0B7A2716C48868F7C7D716F8AB8D45A1B9B21F9EB90E83876E4E18AD09613EC7DCAF8B8E238558711C838C718E5"
-#define B12_P455_MAPU0 "0"
-#define B12_P455_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 511
-/** @{ */
-#define OT8_P511_A0		"0"
-#define OT8_P511_A1		"1"
-#define OT8_P511_B0		"0"
-#define OT8_P511_B1		"0"
-#define OT8_P511_X0		"09541B7BB446EBE58277E0183B448E09D567ACFAAA07F2D3C01967088544C6FA844B803CFC8C8A91D0DFFAB5F55B95372C5AB5DD38E13EE92DAA6882535A1244"
-#define OT8_P511_X1		"332FBBD88DA3493CAF2F082C9C43E463523C8611AC52AB498F1D28D7844E42C67AF62A9BF0F4D9DDD38F79F51C9DBDB10735AC3CD69FF7867E27EBD65DD8D3EF"
-#define OT8_P511_Y0		"2E298CA6C71CE0C6CABA9208E6350B73B0E8BF3EE7CC1777C64BD3680AC857D1823993C8877CBD0203CD3A9835A053F5549BDF7DC206EE1B40BA43A2BD59B793"
-#define OT8_P511_Y1		"109CF99B6C312D74CEFF87959789AF53D231988B0E77FF424C8738C20EA91E7F634399A3899E101EBF5C6A0DBE2E40ACA8D0DBCE0F2C6A0300987BBABD9097DC"
-#define OT8_P511_R		"100000000002AC000000002AD56000000131304C0000032F6D0B1000000000001"
-#define OT8_P511_H		"1000000000080400000001D72B20000061916054001384B3D863F2EBD23CF44774A8836D060A488CB13701DF690F23AF2A5394A1F9EE0B564F725AD505A8F75463E3DBDF97FBE852B96A19E4477DB82D7C260034DEDA6C75853BB18EE3956002"
-#define OT8_P511_MAPU0 "0"
-#define OT8_P511_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 544
-/** @{ */
-#define GMT8_P544_A0		"0"
-#define GMT8_P544_A1		"2"
-#define GMT8_P544_B0		"0"
-#define GMT8_P544_B1		"0"
-#define GMT8_P544_X0		"1EE84A939A46EAE4287805E2FFABBCED3605B74F5FD7E545F390D2E3D34AD0C60851EA65A18CF92396B9318FCAB3205D79C8D03E928590F719E4086A1C42AF2D40EB6C3A"
-#define GMT8_P544_X1		"065F721D63381C07D1BF556D65A3A82B0E969BA031FB3812F49709926D5159324DFB685048D4EAFC914F893A0D5382868D1D252619AA964149258DCC1A86B68775F36A82"
-#define GMT8_P544_Y0		"9B80046683050F459F48D7CE4C83992D5B044718326AEE2DD86F3E5557BD240441A763BC40030F21FC3A64483B450330930BAFA62E7B573B565404A9DB2A5BFF7D6994D4"
-#define GMT8_P544_Y1		"AB457A64E140799D3D9B77ECEA828957F3AEADB3278FEE32E9AD77F068DD2F95B469607E8CE3CE5705276F869CFB18270C0A8FC8D8AD0D17545F4DCCC9E599853A7BAB76"
-#define GMT8_P544_R		"FF0060739E18D7594A978B0AB6AE4CE3DBFD52A9D00197603FFFDF0000000101"
-#define GMT8_P544_H		"8A0A079FC7C3D421A4986FAAA10A6593F60BC94E32AEE8067E35551B86D59F0F61BD6A750917746236DD39CB4710BD44B7BE86F0A8E5324DFE802973060F04BF37C018705B78072182D139A8D2BD338A630511676FDAFD47C60DB5393F9DFC96089B1FFB60B78FB2"
-#define GMT8_P544_MAPU0 "0"
-#define GMT8_P544_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 638
-/** @{ */
-#define BN_P638_A0		"0"
-#define BN_P638_A1		"0"
-#define BN_P638_B0		"2"
-#define BN_P638_B1		"23FFFFFDC000000D7FFFFFB8000001D3FFFFF942D000165E3FFF94870000D52FFFFDD0E00008DE55C00086520021E55BFFFFF51FFFF4EB800000004C80015ACDFFFFFFFFFFFFECE00000000000000066"
-#define BN_P638_X0		"C6BA9612456EFF0E3CD291C9C1A9116FB5EEF4992E052BC5C5126F0F55F67A7D190ED74C3D6229BC3D2F645328C94554AA032352A4D7D667542F793C8FEA25AD39606CA97025AA6EF16BAC2438B1DD3"
-#define BN_P638_X1		"17BE713D379D46F3D77CFF94B7226EFFB4AD01CC67A8BA712DECB3FE8FFE58A027A45523200BF6FDA534F3F59763A1F6A6461F5D2DCAC172774C0CD24BA091A37B42C6E89A1E92F3B12E3B5AFFC222BB"
-#define BN_P638_Y0		"E4197B30E3A9DD98A75E6C4D2C6561B6B96083E943230D578E944E2354482212ADAAA94CA54FC4A29D6CA873EFFB27C4B61B9B822C3C217D388C6C5D04C821F1A3A8A13A37C9807323AE9CAEDD021EC"
-#define BN_P638_Y1		"1A650343ACEF6895FE4EC59B49F40E043DEB05DEF170DFD71B44CAB9496E2EADD034EC0E9238544556902D2D51AB93D224DC757AD720F4DE8ED3BFA4E22DB0ECE92369F681543F23A908A9B319D5FAEF"
-#define BN_P638_R		"23FFFFFDC000000D7FFFFFB8000001D3FFFFF942D000165E3FFF94870000D52FFFFDD0E00008DE55600086550021E555FFFFF54FFFF4EAC000000049800154D9FFFFFFFFFFFFEDA00000000000000061"
-#define BN_P638_H		"23FFFFFDC000000D7FFFFFB8000001D3FFFFF942D000165E3FFF94870000D52FFFFDD0E00008DE562000864F0021E561FFFFF4EFFFF4EC400000004F800160C1FFFFFFFFFFFFEC20000000000000006D"
-#define BN_P638_MAPU0 "0"
-#define BN_P638_MAPU1 "1"
-/** @} */
-#endif
-
-#if defined(EP_ENDOM) && FP_PRIME == 638
-/** @{ */
-#define B12_P638_A0		"0"
-#define B12_P638_A1		"0"
-#define B12_P638_B0		"4"
-#define B12_P638_B1		"4"
-#define B12_P638_X0		"3C57F8F05130D336804E30CAA7BB45E06244DFC0BA836056B036038703719449A42CCC7C34452B4EE2DCA3CBCE0B7637E14E9CA88BDEF105440FB3F84AA95C75DE0BA05686394492B8648BB71D5E7F39"
-#define B12_P638_X1		"07B30040203566584002D6DBB49A3DA1D99ECA3CBCD113C07E0CF1FFB3FA4F87F034A034C86F56DB380F2810AC329ED8BD6FE0F4D5C1FA26949739AF82D3AAD4702D2186862B0293E16C5EDDDDA3C922"
-#define B12_P638_Y0		"29ED1A1C4F3F5AFC64AB2BA97CFA4D17998061179331A1C34E024B7D82134C60A3569F644E4155753C48698C8A01C80C0C3CEC9E3BDE2E5E22D81BBB514FD24DE186FEBA69B82E88809BFCCE51A1840F"
-#define B12_P638_Y1		"3795191221DB4917EEE4B7B85BC7D7CA0C60E82116064463FED0892BA82ACECF905E6DB8083C5F589F04DB80E3203C1B2BEB52ACDED6DF96FC515F36761E7152AEED13369A504FE38C4FF93860B89550"
-#define B12_P638_R		"50F94035FF4000FFFFFFFFFFF9406BFDC0040000000000000035FB801DFFBFFFFFFFFFFFFFFF401BFF80000000000000000000FFC01"
-#define B12_P638_H		"2D88688DBA18275F5801BFFD4DDE93725697788C46C7B4BC8050639BA17EA2158B6784CCACDDECE490643943E5376D29C71C96B894056CCCC13C3DC6AAAAAA0F89601DC2979B3721C71C71C8B38CB8AEFEEB9E1C71C71C71C4B9FED17AE51B8E38E38E38E38FC954E8C65"
-#define B12_P638_MAPU0 "0"
-#define B12_P638_MAPU1 "1"
-/** @} */
-#endif
-
-/**
- * Assigns a set of ordinary elliptic curve parameters.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- */
-#define ASSIGN(CURVE)														\
-	RLC_GET(str, CURVE##_A0, sizeof(CURVE##_A0));							\
-	fp_read_str(a[0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A1, sizeof(CURVE##_A1));							\
-	fp_read_str(a[1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B0, sizeof(CURVE##_B0));							\
-	fp_read_str(b[0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B1, sizeof(CURVE##_B1));							\
-	fp_read_str(b[1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_X0, sizeof(CURVE##_X0));							\
-	fp_read_str(g->x[0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_X1, sizeof(CURVE##_X1));							\
-	fp_read_str(g->x[1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_Y0, sizeof(CURVE##_Y0));							\
-	fp_read_str(g->y[0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_Y1, sizeof(CURVE##_Y1));							\
-	fp_read_str(g->y[1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_R, sizeof(CURVE##_R));								\
-	bn_read_str(r, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
-	bn_read_str(h, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_MAPU0, sizeof(CURVE##_MAPU0));						\
-	fp_read_str(u[0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_MAPU1, sizeof(CURVE##_MAPU1));						\
-	fp_read_str(u[1], str, strlen(str), 16);
-
-#if defined(EP_CTMAP)
-
-/**
- * Assigns the isogeny map parameters for hashing with SSWU map.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- */
-#define ASSIGNM(CURVE)														\
-    ep2_curve_set_ctmap(CURVE##_ISO_A0, CURVE##_ISO_A1, CURVE##_ISO_B0,		\
-                        CURVE##_ISO_B1, CURVE##_ISO_XN, CURVE##_ISO_XD,		\
-						CURVE##_ISO_YN, CURVE##_ISO_YD)
-
-#endif /* EP_CTMAP */
-
-#if defined(EP_CTMAP)
-/**
- * Reads a sequence of polynomial coefficients from semicolon separated string.
- *
- * @param[out] coeffs		- the resulting coefficients.
- * @param[in] str			- the input string.
- */
-static int ep2_curve_get_coeffs(fp2_t *coeffs, const char *str) {
-	int degree = 0;
-	unsigned offset = 0;
-
-	if (str[0] == '\0') {
-		/* need nonzero strlen */
-		RLC_THROW(ERR_NO_VALID);
-		return 0;
-	}
-	for (; degree < RLC_EPX_CTMAP_MAX; ++degree) {
-		/* first coeff */
-		const char *end = strchr(str + offset, ',');
-		if (end == NULL) {
-			/* should not happen --- means there's no second coeff */
-			RLC_THROW(ERR_NO_VALID);
-		}
-		unsigned len = end - str - offset;
-		fp_read_str(coeffs[degree][0], str + offset, len, 16);
-		offset += len + 1; /* move to after ',' */
-
-		/* second coeff */
-		end = strchr(str + offset, ';');
-		if (end == NULL) {
-			/* last one */
-			fp_read_str(coeffs[degree][1], str + offset, strlen(str + offset), 16);
-			break;
-		}
-		len = end - str - offset;
-		fp_read_str(coeffs[degree][1], str + offset, len, 16);
-		offset += len + 1; /* move to after ';' */
-	}
-	if (degree == RLC_EPX_CTMAP_MAX) {
-		/* ran out of space before converting all coeffs */
-		RLC_THROW(ERR_NO_VALID);
-	}
-	return degree;
-}
-
-/**
- * Configures a constant-time hash-to-curve function based on an isogeny map.
- *
- * @param[in] a0_str			- the string representing the 1st element of the 'a' coefficient.
- * @param[in] a1_str			- the string representing the 2nd element of the 'a' coefficient.
- * @param[in] b0_str			- the string representing the 1st element of the 'b' coefficient.
- * @param[in] b1_str			- the string representing the 2nd element of the 'b' coefficient.
- * @param[in] xn_str			- the string representing the x numerator coefficients.
- * @param[in] xd_str			- the string representing the x denominator coefficients.
- * @param[in] yn_str			- the string representing the y numerator coefficients.
- * @param[in] yd_str			- the string representing the y denominator coefficients.
- */
-/* declaring this function inline suppresses unused function warnings */
-static inline void ep2_curve_set_ctmap(const char *a0_str, const char *a1_str,
-									   const char *b0_str, const char *b1_str,
-									   const char *xn_str, const char *xd_str,
-									   const char *yn_str, const char *yd_str) {
-	iso2_t iso = ep2_curve_get_iso();
-
-	/* coefficients of isogenous curve */
-	fp_read_str(iso->a[0], a0_str, strlen(a0_str), 16);
-	fp_read_str(iso->a[1], a1_str, strlen(a1_str), 16);
-	fp_read_str(iso->b[0], b0_str, strlen(b0_str), 16);
-	fp_read_str(iso->b[1], b1_str, strlen(b1_str), 16);
-
-	/* isogeny map coeffs */
-	iso->deg_xn = ep2_curve_get_coeffs(iso->xn, xn_str);
-	iso->deg_xd = ep2_curve_get_coeffs(iso->xd, xd_str);
-	iso->deg_yn = ep2_curve_get_coeffs(iso->yn, yn_str);
-	iso->deg_yd = ep2_curve_get_coeffs(iso->yd, yd_str);
-}
-#endif /* EP_CTMAP */
-
-/**
- * Precomputes constants used by the ep2_map function.
- */
-static void ep2_curve_set_map(void) {
-	bn_t t;
-	bn_null(t);
-
-	const int abNeq0 = (ep2_curve_opt_a() != RLC_ZERO) && (ep2_curve_opt_b() != RLC_ZERO);
-
-	ctx_t *ctx = core_get();
-	fp_t *c1 = ctx->ep2_map_c[0];
-	fp_t *c2 = ctx->ep2_map_c[1];
-	fp_t *c3 = ctx->ep2_map_c[2];
-	fp_t *c4 = ctx->ep2_map_c[3];
-
-	RLC_TRY {
-		bn_new(t);
-
-		if (ep2_curve_is_ctmap() || abNeq0) {
-			/* SSWU map constants */
-			/* constants 3 and 4 are a and b for the curve or isogeny */
-#ifdef EP_CTMAP
-			if (ep2_curve_is_ctmap()) {
-				fp2_copy(c3, ctx->ep2_iso.a);
-				fp2_copy(c4, ctx->ep2_iso.b);
-			} else {
-#endif
-				fp2_copy(c3, ctx->ep2_a);
-				fp2_copy(c4, ctx->ep2_b);
-#ifdef EP_CTMAP
-			}
-#endif
-			/* constant 1: -b / a */
-			fp2_neg(c1, c3);     /* c1 = -a */
-			fp2_inv(c1, c1);     /* c1 = -1 / a */
-			fp2_mul(c1, c1, c4); /* c1 = -b / a */
-
-			/* constant 2 is unused in this case */
-		} else {
-			/* SvdW map constants */
-			/* constant 1: g(u) = u^3 + a * u + b */
-			fp2_sqr(c1, ctx->ep2_map_u);
-			fp2_add(c1, c1, ctx->ep2_a);
-			fp2_mul(c1, c1, ctx->ep2_map_u);
-			fp2_add(c1, c1, ctx->ep2_b);
-
-			/* constant 2: -u / 2 */
-			fp2_set_dig(c2, 2);
-			fp2_neg(c2, c2);                 /* -2 */
-			fp2_inv(c2, c2);                 /* -1 / 2 */
-			fp2_mul(c2, c2, ctx->ep2_map_u); /* -u / 2 */
-
-			/* constant 3: sqrt(-g(u) * (3 * u^2 + 4 * a)) */
-			fp2_sqr(c3, ctx->ep2_map_u);    /* u^2 */
-			fp2_mul_dig(c3, c3, 3);         /* 3 * u^2 */
-			fp2_mul_dig(c4, ctx->ep2_a, 4); /* 4 * a */
-			fp2_add(c4, c3, c4);            /* 3 * u^2 + 4 * a */
-			fp2_neg(c4, c4);                /* -(3 * u^2 + 4 * a) */
-			fp2_mul(c3, c4, c1);            /* -g(u) * (3 * u^2 + 4 * a) */
-			if (!fp2_srt(c3, c3)) {
-				RLC_THROW(ERR_NO_VALID);
-			}
-			/* make sure sgn0(c3) == 0 */
-			const int c30_z = fp_is_zero(c3[0]);
-			fp_prime_back(t, c3[0]);
-			const int c30_n = bn_get_bit(t, 0);
-			fp_prime_back(t, c3[1]);
-			const int c31_n = bn_get_bit(t, 0);
-			if (c30_n | (c30_z & c31_n)) {
-				/* set sgn0(c3) == 0 */
-				fp2_neg(c3, c3);
-			}
-
-			/* constant 4: -4 * g(u) / (3 * u^2 + 4 * a) */
-			fp2_inv(c4, c4);        /* -1 / (3 * u^2 + 4 * a */
-			fp2_mul(c4, c4, c1);    /* -g(u) / (3 * u^2 + 4 * a) */
-			fp2_mul_dig(c4, c4, 4); /* -4 * g(u) / (3 * u^2 + 4 * a) */
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-/**
- * Detects an optimization based on the curve coefficients.
- */
-static void detect_opt(int *opt, fp2_t a) {
-	fp2_t t;
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-		fp2_set_dig(t, 3);
-		fp2_neg(t, t);
-
-		if (fp2_cmp(a, t) == RLC_EQ) {
-			*opt = RLC_MIN3;
-		} else if (fp2_is_zero(a)) {
-			*opt = RLC_ZERO;
-		} else if (fp2_cmp_dig(a, 1) == RLC_EQ) {
-			*opt = RLC_ONE;
-		} else if (fp2_cmp_dig(a, 2) == RLC_EQ) {
-			*opt = RLC_TWO;
-		} else if ((fp_bits(a[0]) <= RLC_DIG) && fp_is_zero(a[1])) {
-			*opt = RLC_TINY;
-		} else {
-			*opt = RLC_HUGE;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_curve_init(void) {
-	ctx_t *ctx = core_get();
-
-#ifdef EP_PRECO
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		ctx->ep2_ptr[i] = &(ctx->ep2_pre[i]);
-	}
-#endif
-
-#if ALLOC == DYNAMIC
-	ep2_new(ctx->ep2_g);
-	fp2_new(ctx->ep2_a);
-	fp2_new(ctx->ep2_b);
-	fp2_new(ctx->ep2_map_u);
-	for (unsigned i = 0; i < 4; ++i) {
-		fp2_new(ctx->ep2_map_c[i]);
-	}
-	fp2_new(ctx->ep2_frb[0]);
-	fp2_new(ctx->ep2_frb[1]);
-#endif
-
-#ifdef EP_PRECO
-#if ALLOC == DYNAMIC
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		fp2_new(ctx->ep2_pre[i].x);
-		fp2_new(ctx->ep2_pre[i].y);
-		fp2_new(ctx->ep2_pre[i].z);
-	}
-#endif
-#endif
-	ep2_set_infty(ctx->ep2_g);
-	bn_make(&(ctx->ep2_r), RLC_FP_DIGS);
-	bn_make(&(ctx->ep2_h), RLC_FP_DIGS);
-
-#ifdef EP_CTMAP
-	iso2_t iso = ep2_curve_get_iso();
-#if ALLOC == DYNAMIC
-	fp2_new(iso->a);
-	fp2_new(iso->b);
-	for (unsigned i = 0; i < RLC_EPX_CTMAP_MAX; ++i) {
-		/* XXX(rsw) this doesn't result in contiguous layout for
-		 * coeffs of a given polynomial. Is this worth fixing? */
-		fp2_new(iso->xn[i]);
-		fp2_new(iso->xd[i]);
-		fp2_new(iso->yn[i]);
-		fp2_new(iso->yd[i]);
-	}
-#else
-	(void)iso; /* suppress unused warning when ALLOC == AUTO */
-#endif /* ALLOC */
-#endif /* EP_CTMAP */
-#undef EP_CURVE_INIT_FP2
-}
-
-void ep2_curve_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-#ifdef EP_PRECO
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			fp2_free(ctx->ep2_pre[i].x);
-			fp2_free(ctx->ep2_pre[i].y);
-			fp2_free(ctx->ep2_pre[i].z);
-		}
-#endif
-		bn_clean(&(ctx->ep2_r));
-		bn_clean(&(ctx->ep2_h));
-
-#ifdef EP_CTMAP
-		iso2_t iso = ep2_curve_get_iso();
-		(void)iso; /* suppress unused warning when ALLOC == AUTO */
-		fp2_free(iso->a);
-		fp2_free(iso->b);
-		for (unsigned i = 0; i < RLC_EPX_CTMAP_MAX; ++i) {
-			fp2_free(iso->xn[i]);
-			fp2_free(iso->xd[i]);
-			fp2_free(iso->yn[i]);
-			fp2_free(iso->yd[i]);
-		}
-#endif
-		ep2_free(ctx->ep2_g);
-		fp2_free(ctx->ep2_a);
-		fp2_free(ctx->ep2_b);
-		fp2_free(ctx->ep2_map_u);
-		for (unsigned i = 0; i < 4; ++i) {
-			fp2_free(ctx->ep2_map_c[i]);
-		}
-		fp2_free(ctx->ep2_frb[0]);
-		fp2_free(ctx->ep2_frb[1]);
-	}
-}
-
-int ep2_curve_opt_a(void) {
-	return core_get()->ep2_opt_a;
-}
-
-int ep2_curve_opt_b(void) {
-	return core_get()->ep2_opt_b;
-}
-
-int ep2_curve_is_twist(void) {
-	return core_get()->ep2_is_twist;
-}
-
-int ep2_curve_is_ctmap(void) {
-	return core_get()->ep2_is_ctmap;
-}
-
-void ep2_curve_get_gen(ep2_t g) {
-	ep2_copy(g, core_get()->ep2_g);
-}
-
-fp_t *ep2_curve_get_a(void) {
-	return core_get()->ep2_a;
-}
-
-fp_t *ep2_curve_get_b(void) {
-	return core_get()->ep2_b;
-}
-
-void ep2_curve_get_vs(bn_t *v) {
-	bn_t x, t;
-
-	bn_null(x);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(x);
-		bn_new(t);
-
-		fp_prime_get_par(x);
-		bn_copy(v[1], x);
-		bn_copy(v[2], x);
-		bn_copy(v[3], x);
-
-		/* t = 2x^2. */
-		bn_sqr(t, x);
-		bn_dbl(t, t);
-
-		/* v0 = 2x^2 + 3x + 1. */
-		bn_mul_dig(v[0], x, 3);
-		bn_add_dig(v[0], v[0], 1);
-		bn_add(v[0], v[0], t);
-
-		/* v3 = -(2x^2 + x). */
-		bn_add(v[3], v[3], t);
-		bn_neg(v[3], v[3]);
-
-		/* v1 = 12x^3 + 8x^2 + x, v2 = 6x^3 + 4x^2 + x. */
-		bn_dbl(t, t);
-		bn_add(v[2], v[2], t);
-		bn_dbl(t, t);
-		bn_add(v[1], v[1], t);
-		bn_rsh(t, t, 2);
-		bn_mul(t, t, x);
-		bn_mul_dig(t, t, 3);
-		bn_add(v[2], v[2], t);
-		bn_dbl(t, t);
-		bn_add(v[1], v[1], t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(x);
-		bn_free(t);
-	}
-}
-
-void ep2_curve_get_ord(bn_t n) {
-	ctx_t *ctx = core_get();
-	if (ctx->ep2_is_twist) {
-		ep_curve_get_ord(n);
-	} else {
-		bn_copy(n, &(ctx->ep2_r));
-	}
-}
-
-void ep2_curve_get_cof(bn_t h) {
-	bn_copy(h, &(core_get()->ep2_h));
-}
-
-iso2_t ep2_curve_get_iso() {
-#ifdef EP_CTMAP
-	return &core_get()->ep2_iso;
-#else
-	return NULL;
-#endif /* EP_CTMAP */
-}
-
-#if defined(EP_PRECO)
-
-ep2_t *ep2_curve_get_tab(void) {
-#if ALLOC == AUTO
-	return (ep2_t *)*(core_get()->ep2_ptr);
-#else
-	return core_get()->ep2_ptr;
-#endif
-}
-
-#endif
-
-void ep2_curve_set_twist(int type) {
-	int ctmap = 0;
-	char str[4 * RLC_FP_BYTES + 1];
-	ctx_t *ctx = core_get();
-	ep2_t g;
-	fp2_t a, b, u;
-	bn_t r, h;
-
-	ep2_null(g);
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(u);
-	bn_null(r);
-	bn_null(h);
-
-	ctx->ep2_is_twist = 0;
-	if (type == RLC_EP_MTYPE || type == RLC_EP_DTYPE) {
-		ctx->ep2_is_twist = type;
-	} else {
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(g);
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(u);
-		bn_new(r);
-		bn_new(h);
-
-		switch (ep_param_get()) {
-#if FP_PRIME == 158
-			case BN_P158:
-				ASSIGN(BN_P158);
-				break;
-#elif FP_PRIME == 254
-			case BN_P254:
-				ASSIGN(BN_P254);
-				break;
-#elif FP_PRIME == 256
-			case BN_P256:
-				ASSIGN(BN_P256);
-				break;
-			case SM9_P256:
-				ASSIGN(SM9_P256);
-				break;
-#elif FP_PRIME == 381
-			case B12_P381:
-				ASSIGN(B12_P381);
-#if defined(EP_CTMAP)
-				ctmap = 1;
-				ASSIGNM(B12_P381);
-#endif /* EP_CTMAP */
-				break;
-#elif FP_PRIME == 382
-			case BN_P382:
-				ASSIGN(BN_P382);
-				break;
-#elif FP_PRIME == 383
-			case B12_P383:
-				ASSIGN(B12_P383);
-				break;
-#elif FP_PRIME == 446
-			case BN_P446:
-				ASSIGN(BN_P446);
-				break;
-			case B12_P446:
-				ASSIGN(B12_P446);
-				break;
-#elif FP_PRIME == 455
-			case B12_P455:
-				ASSIGN(B12_P455);
-				break;
-#elif FP_PRIME == 511
-			case OT8_P511:
-				ASSIGN(OT8_P511);
-				break;
-#elif FP_PRIME == 544
-			case GMT8_P544:
-				ASSIGN(GMT8_P544);
-				break;
-#elif FP_PRIME == 638
-			case BN_P638:
-				ASSIGN(BN_P638);
-				break;
-			case B12_P638:
-				ASSIGN(B12_P638);
-				break;
-#endif
-			default:
-				(void)str;
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-
-		fp2_zero(g->z);
-		fp2_set_dig(g->z, 1);
-		g->coord = BASIC;
-
-		ep2_copy(ctx->ep2_g, g);
-		fp2_copy(ctx->ep2_a, a);
-		fp2_copy(ctx->ep2_b, b);
-
-		detect_opt(&(ctx->ep2_opt_a), ctx->ep2_a);
-		detect_opt(&(ctx->ep2_opt_b), ctx->ep2_b);
-
-		fp2_copy(ctx->ep2_map_u, u);
-		bn_copy(&(ctx->ep2_r), r);
-		bn_copy(&(ctx->ep2_h), h);
-		ctx->ep2_is_ctmap = ctmap;
-		/* I don't have a better place for this. */
-		fp_prime_calc();
-
-		fp_copy(ctx->ep2_frb[0][0], ctx->fp2_p1[1][0]);
-		fp_copy(ctx->ep2_frb[0][1], ctx->fp2_p1[1][1]);
-		fp_copy(ctx->ep2_frb[1][0], ctx->fp2_p1[2][0]);
-		fp_copy(ctx->ep2_frb[1][1], ctx->fp2_p1[2][1]);
-		if (type == RLC_EP_MTYPE) {
-			fp2_inv(ctx->ep2_frb[0], ctx->ep2_frb[0]);
-			fp2_inv(ctx->ep2_frb[1], ctx->ep2_frb[1]);
-		}
-
-		/* compute constants for hash-to-curve */
-		ep2_curve_set_map();
-
-#if defined(WITH_PC)
-		/* Compute pairing generator. */
-		pc_core_calc();
-#endif
-
-#if defined(EP_PRECO)
-		ep2_mul_pre((ep2_t *)ep2_curve_get_tab(), ctx->ep2_g);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(g);
-		fp2_free(a);
-		fp2_free(b);
-		fp2_free(u);
-		bn_free(r);
-		bn_free(h);
-	}
-}
-
-void ep2_curve_set(fp2_t a, fp2_t b, ep2_t g, bn_t r, bn_t h) {
-	ctx_t *ctx = core_get();
-	ctx->ep2_is_twist = 0;
-
-	fp2_copy(ctx->ep2_a, a);
-	fp2_copy(ctx->ep2_b, b);
-
-	ep2_norm(ctx->ep2_g, g);
-	bn_copy(&(ctx->ep2_r), r);
-	bn_copy(&(ctx->ep2_h), h);
-
-#if defined(EP_PRECO)
-	ep2_mul_pre((ep2_t *)ep2_curve_get_tab(), ctx->ep2_g);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_dbl.c b/src/dashbls/depends/relic/src/epx/relic_ep2_dbl.c
deleted file mode 100644
index c329c5a0081f..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_dbl.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of doubling on elliptic prime curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the resulting slope.
- * @param[in] p				- the point to double.
- */
-static void ep2_dbl_basic_imp(ep2_t r, fp2_t s, ep2_t p) {
-	fp2_t t0, t1, t2;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* t0 = 1/(2 * y1). */
-		fp2_dbl(t0, p->y);
-		fp2_inv(t0, t0);
-
-		/* t1 = 3 * x1^2 + a. */
-		fp2_sqr(t1, p->x);
-		fp2_copy(t2, t1);
-		fp2_dbl(t1, t1);
-		fp2_add(t1, t1, t2);
-
-		fp2_add(t1, t1, ep2_curve_get_a());
-
-		/* t1 = (3 * x1^2 + a)/(2 * y1). */
-		fp2_mul(t1, t1, t0);
-
-		if (s != NULL) {
-			fp2_copy(s, t1);
-		}
-
-		/* t2 = t1^2. */
-		fp2_sqr(t2, t1);
-
-		/* x3 = t1^2 - 2 * x1. */
-		fp2_dbl(t0, p->x);
-		fp2_sub(t0, t2, t0);
-
-		/* y3 = t1 * (x1 - x3) - y1. */
-		fp2_sub(t2, p->x, t0);
-		fp2_mul(t1, t1, t2);
-
-		fp2_sub(r->y, t1, p->y);
-
-		fp2_copy(r->x, t0);
-		fp2_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the point to double.
- */
-static void ep2_dbl_projc_imp(ep2_t r, ep2_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-
-	RLC_TRY {
-		if (ep_curve_opt_a() == RLC_ZERO) {
-			fp2_new(t0);
-			fp2_new(t1);
-			fp2_new(t2);
-			fp2_new(t3);
-			fp2_new(t4);
-			fp2_new(t5);
-
-			fp2_sqr(t0, p->x);
-			fp2_add(t2, t0, t0);
-			fp2_add(t0, t2, t0);
-
-			fp2_sqr(t3, p->y);
-			fp2_mul(t1, t3, p->x);
-			fp2_add(t1, t1, t1);
-			fp2_add(t1, t1, t1);
-			fp2_sqr(r->x, t0);
-			fp2_add(t2, t1, t1);
-			fp2_sub(r->x, r->x, t2);
-			fp2_mul(r->z, p->z, p->y);
-			fp2_add(r->z, r->z, r->z);
-			fp2_add(t3, t3, t3);
-
-			fp2_sqr(t3, t3);
-			fp2_add(t3, t3, t3);
-			fp2_sub(t1, t1, r->x);
-			fp2_mul(r->y, t0, t1);
-			fp2_sub(r->y, r->y, t3);
-		} else {
-			/* dbl-2007-bl formulas: 1M + 8S + 1*a + 10add + 1*8 + 2*2 + 1*3 */
-			/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian.html#doubling-dbl-2007-bl */
-
-			/* t0 = x1^2, t1 = y1^2, t2 = y1^4. */
-			fp2_sqr(t0, p->x);
-			fp2_sqr(t1, p->y);
-			fp2_sqr(t2, t1);
-
-			if (p->coord != BASIC) {
-				/* t3 = z1^2. */
-				fp2_sqr(t3, p->z);
-
-				if (ep_curve_get_a() == RLC_ZERO) {
-					/* z3 = 2 * y1 * z1. */
-					fp2_mul(r->z, p->y, p->z);
-					fp2_dbl(r->z, r->z);
-				} else {
-					/* z3 = (y1 + z1)^2 - y1^2 - z1^2. */
-					fp2_add(r->z, p->y, p->z);
-					fp2_sqr(r->z, r->z);
-					fp2_sub(r->z, r->z, t1);
-					fp2_sub(r->z, r->z, t3);
-				}
-			} else {
-				/* z3 = 2 * y1. */
-				fp2_dbl(r->z, p->y);
-			}
-
-			/* t4 = S = 2*((x1 + y1^2)^2 - x1^2 - y1^4). */
-			fp2_add(t4, p->x, t1);
-			fp2_sqr(t4, t4);
-			fp2_sub(t4, t4, t0);
-			fp2_sub(t4, t4, t2);
-			fp2_dbl(t4, t4);
-
-			/* t5 = M = 3 * x1^2 + a * z1^4. */
-			fp2_dbl(t5, t0);
-			fp2_add(t5, t5, t0);
-			if (p->coord != BASIC) {
-				fp2_sqr(t3, t3);
-				fp2_mul(t1, t3, ep2_curve_get_a());
-				fp2_add(t5, t5, t1);
-			} else {
-				fp2_add(t5, t5, ep2_curve_get_a());
-			}
-
-			/* x3 = T = M^2 - 2 * S. */
-			fp2_sqr(r->x, t5);
-			fp2_dbl(t1, t4);
-			fp2_sub(r->x, r->x, t1);
-
-			/* y3 = M * (S - T) - 8 * y1^4. */
-			fp2_dbl(t2, t2);
-			fp2_dbl(t2, t2);
-			fp2_dbl(t2, t2);
-			fp2_sub(t4, t4, r->x);
-			fp2_mul(t5, t5, t4);
-			fp2_sub(r->y, t5, t2);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-	}
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep2_dbl_basic(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	ep2_dbl_basic_imp(r, NULL, p);
-}
-
-void ep2_dbl_slp_basic(ep2_t r, fp2_t s, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	ep2_dbl_basic_imp(r, s, p);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep2_dbl_projc(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	ep2_dbl_projc_imp(r, p);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_frb.c b/src/dashbls/depends/relic/src/epx/relic_ep2_frb.c
deleted file mode 100644
index e16be1702a9c..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_frb.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of frobenius action on prime elliptic curves over
- * quadratic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_frb(ep2_t r, ep2_t p, int i) {
-	ctx_t *ctx = core_get();
-
-	ep2_copy(r, p);
-	for (; i > 0; i--) {
-		fp2_frb(r->x, r->x, 1);
-		fp2_frb(r->y, r->y, 1);
-		fp2_frb(r->z, r->z, 1);
-		fp2_mul(r->x, r->x, ctx->ep2_frb[0]);
-		fp2_mul(r->y, r->y, ctx->ep2_frb[1]);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_map.c b/src/dashbls/depends/relic/src/epx/relic_ep2_map.c
deleted file mode 100644
index 7764679abcae..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_map.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of hashing to a prime elliptic curve over a quadratic
- * extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_tmpl_map.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#ifdef EP_CTMAP
-/**
- * Evaluate a polynomial represented by its coefficients using Horner's rule.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the input value.
- * @param[in] coeffs		- the vector of coefficients in the polynomial.
- * @param[in] len			- the degree of the polynomial.
- */
-TMPL_MAP_HORNER(fp2, fp2_t)
-
-/**
- * Generic isogeny map evaluation for use with SSWU map.
- */
-TMPL_MAP_ISOGENY_MAP(ep2, fp2, iso2)
-#endif /* EP_CTMAP */
-
-/**
- * Simplified SWU mapping.
- */
-#define EP2_MAP_COPY_COND(O, I, C)                                                       \
-	do {                                                                                 \
-		dv_copy_cond(O[0], I[0], RLC_FP_DIGS, C);                                        \
-		dv_copy_cond(O[1], I[1], RLC_FP_DIGS, C);                                        \
-	} while (0)
-TMPL_MAP_SSWU(ep2, fp2, fp_t, EP2_MAP_COPY_COND)
-
-/**
- * Shallue--van de Woestijne map.
- */
-TMPL_MAP_SVDW(ep2, fp2, fp_t, EP2_MAP_COPY_COND)
-#undef EP2_MAP_COPY_COND
-
-/* caution: this function overwrites k, which it uses as an auxiliary variable */
-static inline int fp2_sgn0(const fp2_t t, bn_t k) {
-	const int t_0_zero = fp_is_zero(t[0]);
-
-	fp_prime_back(k, t[0]);
-	const int t_0_neg = bn_get_bit(k, 0);
-
-	fp_prime_back(k, t[1]);
-	const int t_1_neg = bn_get_bit(k, 0);
-
-	/* t[0] == 0 ? sgn0(t[1]) : sgn0(t[0]) */
-	return t_0_neg | (t_0_zero & t_1_neg);
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_map_from_field(ep2_t p, const uint8_t *uniform_bytes, int len) {
-        bn_t k;
-        fp2_t t;
-        ep2_t q;
-        int neg;
-        /* enough space for two extension field elements plus extra bytes for uniformity */
-        const int len_per_elm = (FP_PRIME + ep_param_level() + 7) / 8;
-
-        bn_null(k);
-        fp2_null(t);
-        ep2_null(q);
-
-        RLC_TRY {
-                if (len != 2* len_per_elm) {
-                  RLC_THROW(ERR_NO_VALID);
-                }
-
-                bn_new(k);
-                fp2_new(t);
-                ep2_new(q);
-
-                /* which hash function should we use? */
-                const int abNeq0 = (ep2_curve_opt_a() != RLC_ZERO) && (ep2_curve_opt_b() != RLC_ZERO);
-                void (*const map_fn)(ep2_t, fp2_t) = (ep2_curve_is_ctmap() || abNeq0) ? ep2_map_sswu : ep2_map_svdw;
-
-#define EP2_MAP_CONVERT_BYTES(IDX)                                                       \
-        do {                                                                                 \
-                bn_read_bin(k, uniform_bytes + 2 * IDX * len_per_elm, len_per_elm);        \
-                fp_prime_conv(t[0], k);                                                          \
-                bn_read_bin(k, uniform_bytes + (2 * IDX + 1) * len_per_elm, len_per_elm);  \
-                fp_prime_conv(t[1], k);                                                          \
-        } while (0)
-
-#define EP2_MAP_APPLY_MAP(PT)                                                            \
-        do {                                                                                 \
-                /* sign of t */                                                                  \
-                neg = fp2_sgn0(t, k);                                                            \
-                /* convert */                                                                    \
-                map_fn(PT, t);                                                                   \
-                /* compare sign of y to sign of t; fix if necessary */                           \
-                neg = neg != fp2_sgn0(PT->y, k);                                                 \
-                fp2_neg(t, PT->y);                                                               \
-                dv_copy_cond(PT->y[0], t[0], RLC_FP_DIGS, neg);                                  \
-                dv_copy_cond(PT->y[1], t[1], RLC_FP_DIGS, neg);                                  \
-        } while (0)
-
-                /* first map invocation */
-                EP2_MAP_CONVERT_BYTES(0);
-                EP2_MAP_APPLY_MAP(p);
-                TMPL_MAP_CALL_ISOMAP(ep2, p);
-
-                /* second map invocation */
-                EP2_MAP_CONVERT_BYTES(1);
-                EP2_MAP_APPLY_MAP(q);
-                TMPL_MAP_CALL_ISOMAP(ep2, q);
-
-                /* XXX(rsw) could add p and q and then apply isomap,
-                 * but need ep_add to support addition on isogeny curves */
-
-#undef EP2_MAP_CONVERT_BYTES
-#undef EP2_MAP_APPLY_MAP
-
-                /* sum the result */
-                ep2_add(p, p, q);
-                ep2_norm(p, p);
-                ep2_mul_cof(p, p);
-        }
-        RLC_CATCH_ANY {
-                RLC_THROW(ERR_CAUGHT);
-        }
-        RLC_FINALLY {
-                bn_free(k);
-                fp2_free(t);
-                ep2_free(q);
-        }
-}
-
-
-void ep2_map_dst(ep2_t p, const uint8_t *msg, int len, const uint8_t *dst, int dst_len) {
-
-        /* enough space for two field elements plus extra bytes for uniformity */
-        const int len_per_elm = (FP_PRIME + ep_param_level() + 7) / 8;
-        uint8_t *pseudo_random_bytes = RLC_ALLOCA(uint8_t, 4 * len_per_elm);
-
-        RLC_TRY {
-
-                /* XXX(rsw) See note in ep/relic_ep_map.c about using MD_MAP. */
-                /* hash to a pseudorandom string using md_xmd */
-                md_xmd(pseudo_random_bytes, 4 * len_per_elm, msg, len, dst, dst_len);
-                ep2_map_from_field(p, pseudo_random_bytes, 2 * len_per_elm);
-        }
-        RLC_CATCH_ANY {
-                RLC_THROW(ERR_CAUGHT);
-        }
-        RLC_FINALLY {
-                RLC_FREE(pseudo_random_bytes);
-        }
-}
-
-void ep2_map(ep2_t p, const uint8_t *msg, int len) {
-	ep2_map_dst(p, msg, len, (const uint8_t *)"RELIC", 5);
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_mul.c b/src/dashbls/depends/relic/src/epx/relic_ep2_mul.c
deleted file mode 100644
index 6d303ad95255..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_mul.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point multiplication on prime elliptic curves over
- * quadratic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-static void ep2_mul_glv_imp(ep2_t r, ep2_t p, const bn_t k) {
-	int i, j, l, _l[4];
-	bn_t n, _k[4], u;
-	int8_t naf[4][RLC_FP_BITS + 1];
-	ep2_t q[4];
-
-	bn_null(n);
-	bn_null(u);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(u);
-		for (i = 0; i < 4; i++) {
-			bn_null(_k[i]);
-			ep2_null(q[i]);
-			bn_new(_k[i]);
-			ep2_new(q[i]);
-		}
-
-		ep2_curve_get_ord(n);
-		fp_prime_get_par(u);
-		bn_rec_frb(_k, 4, k, u, n, ep_curve_is_pairf() == EP_B12);
-
-		ep2_norm(q[0], p);
-		ep2_frb(q[1], q[0], 1);
-		ep2_frb(q[2], q[1], 1);
-		ep2_frb(q[3], q[2], 1);
-
-		l = 0;
-		for (i = 0; i < 4; i++) {
-			if (bn_sign(_k[i]) == RLC_NEG) {
-				ep2_neg(q[i], q[i]);
-			}
-			_l[i] = RLC_FP_BITS + 1;
-			bn_rec_naf(naf[i], &_l[i], _k[i], 2);
-			l = RLC_MAX(l, _l[i]);
-		}
-
-		ep2_set_infty(r);
-		for (j = l - 1; j >= 0; j--) {
-			ep2_dbl(r, r);
-
-			for (i = 0; i < 4; i++) {
-				if (naf[i][j] > 0) {
-					ep2_add(r, r, q[i]);
-				}
-				if (naf[i][j] < 0) {
-					ep2_sub(r, r, q[i]);
-				}
-			}
-		}
-
-		/* Convert r to affine coordinates. */
-		ep2_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		bn_free(u);
-		for (i = 0; i < 4; i++) {
-			bn_free(_k[i]);
-			ep2_free(q[i]);
-		}
-
-	}
-}
-
-#endif /* EP_ENDOM */
-
-static void ep2_mul_naf_imp(ep2_t r, ep2_t p, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FP_BITS + 1];
-	ep2_t t[1 << (EP_WIDTH - 2)];
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep2_null(t[i]);
-			ep2_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		ep2_tab(t, p, EP_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, k, EP_WIDTH);
-
-		ep2_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			ep2_dbl(r, r);
-
-			n = naf[i];
-			if (n > 0) {
-				ep2_add(r, r, t[n / 2]);
-			}
-			if (n < 0) {
-				ep2_sub(r, r, t[-n / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep2_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep2_free(t[i]);
-		}
-	}
-}
-
-#endif /* EP_MUL == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_mul_basic(ep2_t r, ep2_t p, const bn_t k) {
-	int i, l;
-	ep2_t t;
-
-	ep2_null(t);
-
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-		l = bn_bits(k);
-
-		if (bn_get_bit(k, l - 1)) {
-			ep2_copy(t, p);
-		} else {
-			ep2_set_infty(t);
-		}
-
-		for (i = l - 2; i >= 0; i--) {
-			ep2_dbl(t, t);
-			if (bn_get_bit(k, i)) {
-				ep2_add(t, t, p);
-			}
-		}
-
-		ep2_copy(r, t);
-		ep2_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t);
-	}
-}
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-
-void ep2_mul_slide(ep2_t r, ep2_t p, const bn_t k) {
-	ep2_t t[1 << (EP_WIDTH - 1)], q;
-	int i, j, l;
-	uint8_t win[RLC_FP_BITS + 1];
-
-	ep2_null(q);
-
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i ++) {
-			ep2_null(t[i]);
-			ep2_new(t[i]);
-		}
-
-		ep2_new(q);
-
-		ep2_copy(t[0], p);
-		ep2_dbl(q, p);
-
-#if defined(EP_MIXED)
-		ep2_norm(q, q);
-#endif
-
-		/* Create table. */
-		for (i = 1; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep2_add(t[i], t[i - 1], q);
-		}
-
-#if defined(EP_MIXED)
-		ep2_norm_sim(t + 1, t + 1, (1 << (EP_WIDTH - 1)) - 1);
-#endif
-
-		ep2_set_infty(q);
-		l = RLC_FP_BITS + 1;
-		bn_rec_slw(win, &l, k, EP_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				ep2_dbl(q, q);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					ep2_dbl(q, q);
-				}
-				ep2_add(q, q, t[win[i] >> 1]);
-			}
-		}
-
-		ep2_norm(r, q);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep2_free(t[i]);
-		}
-		ep2_free(q);
-	}
-}
-
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-
-void ep2_mul_monty(ep2_t r, ep2_t p, const bn_t k) {
-	ep2_t t[2];
-
-	ep2_null(t[0]);
-	ep2_null(t[1]);
-
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(t[0]);
-		ep2_new(t[1]);
-
-		ep2_set_infty(t[0]);
-		ep2_copy(t[1], p);
-
-		for (int i = bn_bits(k) - 1; i >= 0; i--) {
-			int j = bn_get_bit(k, i);
-			dv_swap_cond(t[0]->x[0], t[1]->x[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1], t[1]->x[1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0], t[1]->y[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1], t[1]->y[1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0], t[1]->z[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1], t[1]->z[1], RLC_FP_DIGS, j ^ 1);
-			ep2_add(t[0], t[0], t[1]);
-			ep2_dbl(t[1], t[1]);
-			dv_swap_cond(t[0]->x[0], t[1]->x[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1], t[1]->x[1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0], t[1]->y[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1], t[1]->y[1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0], t[1]->z[0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1], t[1]->z[1], RLC_FP_DIGS, j ^ 1);
-		}
-
-		ep2_norm(r, t[0]);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t[1]);
-		ep2_free(t[0]);
-	}
-}
-
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-void ep2_mul_lwnaf(ep2_t r, ep2_t p, const bn_t k) {
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		if (ep2_curve_opt_a() == RLC_ZERO) {
-			ep2_mul_glv_imp(r, p, k);
-		} else {
-			ep2_mul_naf_imp(r, p, k);
-		}
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-	ep2_mul_naf_imp(r, p, k);
-#endif
-}
-
-#endif
-
-void ep2_mul_gen(ep2_t r, bn_t k) {
-	if (bn_is_zero(k)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-#ifdef EP_PRECO
-	ep2_mul_fix(r, ep2_curve_get_tab(), k);
-#else
-	ep2_t g;
-
-	ep2_null(g);
-
-	RLC_TRY {
-		ep2_new(g);
-		ep2_curve_get_gen(g);
-		ep2_mul(r, g, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(g);
-	}
-#endif
-}
-
-void ep2_mul_dig(ep2_t r, ep2_t p, dig_t k) {
-	ep2_t t;
-	bn_t _k;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	ep2_null(t);
-	bn_null(_k);
-
-	if (k == 0 || ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-		bn_new(_k);
-
-		bn_set_dig(_k, k);
-
-		l = RLC_DIG + 1;
-		bn_rec_naf(naf, &l, _k, 2);
-
-		ep2_set_infty(t);
-		for (int i = l - 1; i >= 0; i--) {
-			ep2_dbl(t, t);
-
-			u = naf[i];
-			if (u > 0) {
-				ep2_add(t, t, p);
-			} else if (u < 0) {
-				ep2_sub(t, t, p);
-			}
-		}
-
-		ep2_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t);
-		bn_free(_k);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_cof.c b/src/dashbls/depends/relic/src/epx/relic_ep2_mul_cof.c
deleted file mode 100644
index 575c40a1760c..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_cof.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point multiplication of a prime elliptic curve over a
- * quadratic extension by the curve cofactor.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_tmpl_map.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Multiplies a point by the cofactor in a Barreto-Naehrig curve.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- */
-static void ep2_mul_cof_bn(ep2_t r, ep2_t p) {
-	bn_t x;
-	ep2_t t0, t1, t2;
-
-	ep2_null(t0);
-	ep2_null(t1);
-	ep2_null(t2);
-	bn_null(x);
-
-	RLC_TRY {
-		ep2_new(t0);
-		ep2_new(t1);
-		ep2_new(t2);
-		bn_new(x);
-
-		fp_prime_get_par(x);
-
-		/* Compute t0 = xP. */
-		ep2_mul_basic(t0, p, x);
-
-		/* Compute t1 = \psi(3xP). */
-		ep2_dbl(t1, t0);
-		ep2_add(t1, t1, t0);
-		ep2_norm(t1, t1);
-		ep2_frb(t1, t1, 1);
-
-		/* Compute t2 = \psi^3(P) + t0 + t1 + \psi^2(xP). */
-		ep2_frb(t2, p, 2);
-		ep2_frb(t2, t2, 1);
-		ep2_add(t2, t2, t0);
-		ep2_add(t2, t2, t1);
-		ep2_frb(t1, t0, 2);
-		ep2_add(t2, t2, t1);
-
-		ep2_norm(r, t2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t0);
-		ep2_free(t1);
-		ep2_free(t2);
-		bn_free(x);
-	}
-}
-
-/**
- * Multiplies a point by the cofactor in a Barreto-Lynn-Scott curve.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- */
-static void ep2_mul_cof_b12(ep2_t r, ep2_t p) {
-	bn_t x;
-	ep2_t t0, t1, t2, t3;
-
-	ep2_null(t0);
-	ep2_null(t1);
-	ep2_null(t2);
-	ep2_null(t3);
-	bn_null(x);
-
-	RLC_TRY {
-		ep2_new(t0);
-		ep2_new(t1);
-		ep2_new(t2);
-		ep2_new(t3);
-		bn_new(x);
-
-		fp_prime_get_par(x);
-
-		/* Compute t0 = xP. */
-		ep2_mul_basic(t0, p, x);
-		/* Compute t1 = [x^2]P. */
-		ep2_mul_basic(t1, t0, x);
-
-		/* t2 = (x^2 - x - 1)P = x^2P - x*P - P. */
-		ep2_sub(t2, t1, t0);
-		ep2_sub(t2, t2, p);
-		/* t3 = \psi(x - 1)P. */
-		ep2_sub(t3, t0, p);
-		ep2_frb(t3, t3, 1);
-		ep2_add(t2, t2, t3);
-		/* t3 = \psi^2(2P). */
-		ep2_dbl(t3, p);
-		ep2_frb(t3, t3, 2);
-		ep2_add(t2, t2, t3);
-		ep2_norm(r, t2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t0);
-		ep2_free(t1);
-		ep2_free(t2);
-		ep2_free(t3);
-		bn_free(x);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_mul_cof(ep2_t r, ep2_t p) {
-	bn_t k;
-
-	bn_null(k);
-
-	RLC_TRY {
-		switch (ep_curve_is_pairf()) {
-			case EP_BN:
-				ep2_mul_cof_bn(p, p);
-				break;
-			case EP_B12:
-				ep2_mul_cof_b12(p, p);
-				break;
-			default:
-				/* Now, multiply by cofactor to get the correct group. */
-				ep2_curve_get_cof(k);
-				if (bn_bits(k) < RLC_DIG) {
-					ep2_mul_dig(p, p, k->dp[0]);
-				} else {
-					ep2_mul_big(p, p, k);
-				}
-				break;
-		}		
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(k);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_fix.c b/src/dashbls/depends/relic/src/epx/relic_ep2_mul_fix.c
deleted file mode 100755
index d16b14dab00a..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_fix.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of fixed point multiplication on a prime elliptic curve over
- * a quadratic extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-/**
- * Precomputes a table for a point multiplication on an ordinary curve.
- *
- * @param[out] t				- the destination table.
- * @param[in] p					- the point to multiply.
- */
-static void ep2_mul_pre_ordin(ep2_t *t, ep2_t p) {
-	int i;
-
-	ep2_dbl(t[0], p);
-#if defined(EP_MIXED)
-	ep2_norm(t[0], t[0]);
-#endif
-
-#if EP_DEPTH > 2
-	ep2_add(t[1], t[0], p);
-	for (i = 2; i < (1 << (EP_DEPTH - 2)); i++) {
-		ep2_add(t[i], t[i - 1], t[0]);
-	}
-
-#if defined(EP_MIXED)
-	for (i = 1; i < (1 << (EP_DEPTH - 2)); i++) {
-		ep2_norm(t[i], t[i]);
-	}
-#endif
-
-#endif
-	ep2_copy(t[0], p);
-}
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-NAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void ep2_mul_fix_ordin(ep2_t r, ep2_t *table, bn_t k) {
-	int len, i, n;
-	int8_t naf[2 * RLC_FP_BITS + 1], *t;
-
-	if (bn_is_zero(k)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	/* Compute the w-TNAF representation of k. */
-	len = 2 * RLC_FP_BITS + 1;
-	bn_rec_naf(naf, &len, k, EP_DEPTH);
-
-	t = naf + len - 1;
-	ep2_set_infty(r);
-	for (i = len - 1; i >= 0; i--, t--) {
-		ep2_dbl(r, r);
-
-		n = *t;
-		if (n > 0) {
-			ep2_add(r, r, table[n / 2]);
-		}
-		if (n < 0) {
-			ep2_sub(r, r, table[-n / 2]);
-		}
-	}
-	/* Convert r to affine coordinates. */
-	ep2_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ep2_neg(r, r);
-	}
-}
-
-#endif /* EP_FIX == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_FIX == BASIC || !defined(STRIP)
-
-void ep2_mul_pre_basic(ep2_t *t, ep2_t p) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-
-		ep2_copy(t[0], p);
-		for (int i = 1; i < bn_bits(n); i++) {
-			ep2_dbl(t[i], t[i - 1]);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep2_mul_fix_basic(ep2_t r, ep2_t *t, bn_t k) {
-	if (bn_is_zero(k)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	ep2_set_infty(r);
-
-	for (int i = 0; i < bn_bits(k); i++) {
-		if (bn_get_bit(k, i)) {
-			ep2_add(r, r, t[i]);
-		}
-	}
-	ep2_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ep2_neg(r, r);
-	}
-}
-
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-
-void ep2_mul_pre_combs(ep2_t *t, ep2_t p) {
-	int i, j, l;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % EP_DEPTH) == 0 ? (l / EP_DEPTH) : (l / EP_DEPTH) + 1);
-
-		ep2_set_infty(t[0]);
-
-		ep2_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep2_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < l; i++) {
-				ep2_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep2_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep2_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-#if defined(EP_MIXED)
-		for (i = 1; i < RLC_EP_TABLE_COMBS; i++) {
-			ep2_norm(t[i], t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep2_mul_fix_combs(ep2_t r, ep2_t *t, bn_t k) {
-	int i, j, l, w, n0, p0, p1;
-	bn_t n;
-
-	if (bn_is_zero(k)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % EP_DEPTH) == 0 ? (l / EP_DEPTH) : (l / EP_DEPTH) + 1);
-
-		n0 = bn_bits(k);
-
-		p0 = (EP_DEPTH) * l - 1;
-
-		w = 0;
-		p1 = p0--;
-		for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-			w = w << 1;
-			if (p1 < n0 && bn_get_bit(k, p1)) {
-				w = w | 1;
-			}
-		}
-		ep2_copy(r, t[w]);
-
-		for (i = l - 2; i >= 0; i--) {
-			ep2_dbl(r, r);
-
-			w = 0;
-			p1 = p0--;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w = w << 1;
-				if (p1 < n0 && bn_get_bit(k, p1)) {
-					w = w | 1;
-				}
-			}
-			if (w > 0) {
-				ep2_add(r, r, t[w]);
-			}
-		}
-		ep2_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-
-void ep2_mul_pre_combd(ep2_t *t, ep2_t p) {
-	int i, j, d, e;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % EP_DEPTH) == 0 ? (d / EP_DEPTH) : (d / EP_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ep2_set_infty(t[0]);
-		ep2_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep2_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < d; i++) {
-				ep2_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep2_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep2_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-		ep2_set_infty(t[1 << EP_DEPTH]);
-		for (j = 1; j < (1 << EP_DEPTH); j++) {
-			ep2_dbl(t[(1 << EP_DEPTH) + j], t[j]);
-			for (i = 1; i < e; i++) {
-				ep2_dbl(t[(1 << EP_DEPTH) + j], t[(1 << EP_DEPTH) + j]);
-			}
-		}
-#if defined(EP_MIXED)
-		for (i = 1; i < RLC_EP_TABLE_COMBD; i++) {
-			ep2_norm(t[i], t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep2_mul_fix_combd(ep2_t r, ep2_t *t, bn_t k) {
-	int i, j, d, e, w0, w1, n0, p0, p1;
-	bn_t n;
-
-	if (bn_is_zero(k)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % EP_DEPTH) == 0 ? (d / EP_DEPTH) : (d / EP_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ep2_set_infty(r);
-		n0 = bn_bits(k);
-
-		p1 = (e - 1) + (EP_DEPTH - 1) * d;
-		for (i = e - 1; i >= 0; i--) {
-			ep2_dbl(r, r);
-
-			w0 = 0;
-			p0 = p1;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w0 = w0 << 1;
-				if (p0 < n0 && bn_get_bit(k, p0)) {
-					w0 = w0 | 1;
-				}
-			}
-
-			w1 = 0;
-			p0 = p1-- + e;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w1 = w1 << 1;
-				if (i + e < d && p0 < n0 && bn_get_bit(k, p0)) {
-					w1 = w1 | 1;
-				}
-			}
-
-			ep2_add(r, r, t[w0]);
-			ep2_add(r, r, t[(1 << EP_DEPTH) + w1]);
-		}
-		ep2_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-void ep2_mul_pre_lwnaf(ep2_t *t, ep2_t p) {
-	ep2_mul_pre_ordin(t, p);
-}
-
-void ep2_mul_fix_lwnaf(ep2_t r, ep2_t *t, bn_t k) {
-	ep2_mul_fix_ordin(r, t, k);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_sim.c b/src/dashbls/depends/relic/src/epx/relic_ep2_mul_sim.c
deleted file mode 100644
index 1223616f15d9..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_mul_sim.c
+++ /dev/null
@@ -1,723 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of simultaneous point multiplication on a prime elliptic
- * curve over a quadratic extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ep2_mul_sim_endom(ep2_t r, ep2_t p, const bn_t k, ep2_t q, const bn_t m) {
-	int i, j, l;
-	bn_t n, u, _k[4], _m[4];
-	ep2_t _p[4], _q[4];
-
-	bn_null(n);
-	bn_null(u);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(u);
-		for (i = 0; i < 4; i++) {
-			bn_null(_k[i]);
-			bn_null(_m[i]);
-			ep2_null(_p[i]);
-			ep2_null(_q[i]);
-			bn_new(_k[i]);
-			bn_new(_m[i]);
-			ep2_new(_p[i]);
-			ep2_new(_q[i]);
-		}
-
-		ep2_curve_get_ord(n);
-		fp_prime_get_par(u);
-		bn_rec_frb(_k, 4, k, u, n, ep_curve_is_pairf() == EP_B12);
-		bn_rec_frb(_m, 4, m, u, n, ep_curve_is_pairf() == EP_B12);
-
-		ep2_norm(_p[0], p);
-		ep2_frb(_p[1], _p[0], 1);
-		ep2_frb(_p[2], _p[1], 1);
-		ep2_frb(_p[3], _p[2], 1);
-		ep2_norm(_q[0], q);
-		ep2_frb(_q[1], _q[0], 1);
-		ep2_frb(_q[2], _q[1], 1);
-		ep2_frb(_q[3], _q[2], 1);
-
-		for (i = 0; i < 4; i++) {
-			if (bn_sign(_k[i]) == RLC_NEG) {
-				ep2_neg(_p[i], _p[i]);
-			}
-			if (bn_sign(_m[i]) == RLC_NEG) {
-				ep2_neg(_q[i], _q[i]);
-			}
-		}
-
-		l = RLC_MAX(bn_bits(_k[0]), bn_bits(_k[1]));
-		l = RLC_MAX(l, RLC_MAX(bn_bits(_k[2]), bn_bits(_k[3])));
-		l = RLC_MAX(l, RLC_MAX(bn_bits(_m[0]), bn_bits(_m[1])));
-		l = RLC_MAX(l, RLC_MAX(bn_bits(_m[2]), bn_bits(_m[3])));
-
-		ep2_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			ep2_dbl(r, r);
-			for (j = 0; j < 4; j++) {
-				if (bn_get_bit(_k[j], i)) {
-					ep2_add(r, r, _p[j]);
-				}
-				if (bn_get_bit(_m[j], i)) {
-					ep2_add(r, r, _q[j]);
-				}
-			}
-		}
-
-		/* Convert r to affine coordinates. */
-		ep2_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(u);
-		for (i = 0; i < 4; i++) {
-			bn_free(_k[i]);
-			bn_free(_m[i]);
-			ep2_free(_p[i]);
-			ep2_free(_q[i]);
-		}
-	}
-}
-
-#endif /* EP_ENDOM */
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ep2_mul_sim_plain(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m,
-		ep2_t *t) {
-	int i, l, l0, l1, n0, n1, w, gen;
-	int8_t naf0[2 * RLC_FP_BITS + 1], naf1[2 * RLC_FP_BITS + 1], *_k, *_m;
-	ep2_t t0[1 << (EP_WIDTH - 2)];
-	ep2_t t1[1 << (EP_WIDTH - 2)];
-
-	RLC_TRY {
-		gen = (t == NULL ? 0 : 1);
-		if (!gen) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep2_null(t0[i]);
-				ep2_new(t0[i]);
-			}
-			ep2_tab(t0, p, EP_WIDTH);
-			t = (ep2_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep2_null(t1[i]);
-			ep2_new(t1[i]);
-		}
-		/* Compute the precomputation table. */
-		ep2_tab(t1, q, EP_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		if (gen) {
-			w = EP_DEPTH;
-		} else {
-			w = EP_WIDTH;
-		}
-		l0 = l1 = 2 * RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k, w);
-		bn_rec_naf(naf1, &l1, m, EP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-		for (i = l0; i < l; i++) {
-			naf0[i] = 0;
-		}
-		for (i = l1; i < l; i++) {
-			naf1[i] = 0;
-		}
-
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		ep2_set_infty(r);
-		for (i = l - 1; i >= 0; i--, _k--, _m--) {
-			ep2_dbl(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-			if (n0 > 0) {
-				ep2_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				ep2_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				ep2_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				ep2_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep2_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation tables. */
-		if (!gen) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep2_free(t0[i]);
-			}
-		}
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep2_free(t1[i]);
-		}
-	}
-}
-
-#endif /* EP_SIM == INTER */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_SIM == BASIC || !defined(STRIP)
-
-void ep2_mul_sim_basic(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t l) {
-	ep2_t t;
-
-	ep2_null(t);
-
-	RLC_TRY {
-		ep2_new(t);
-		ep2_mul(t, q, l);
-		ep2_mul(r, p, k);
-		ep2_add(t, t, r);
-		ep2_norm(r, t);
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t);
-	}
-}
-
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-
-void ep2_mul_sim_trick(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m) {
-	ep2_t t0[1 << (EP_WIDTH / 2)];
-	ep2_t t1[1 << (EP_WIDTH / 2)];
-	ep2_t t[1 << EP_WIDTH];
-	bn_t n;
-	int l0, l1, w = EP_WIDTH / 2;
-	uint8_t w0[2 * RLC_FP_BITS], w1[2 * RLC_FP_BITS];
-
-	bn_null(n);
-
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep2_is_infty(q)) {
-		ep2_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-
-		for (int i = 0; i < (1 << w); i++) {
-			ep2_null(t0[i]);
-			ep2_null(t1[i]);
-			ep2_new(t0[i]);
-			ep2_new(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep2_null(t[i]);
-			ep2_new(t[i]);
-		}
-
-		ep2_set_infty(t0[0]);
-		ep2_copy(t0[1], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(t0[1], t0[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			ep2_add(t0[i], t0[i - 1], t0[1]);
-		}
-
-		ep2_set_infty(t1[0]);
-		ep2_copy(t1[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ep2_neg(t1[1], t1[1]);
-		}
-		for (int i = 1; i < (1 << w); i++) {
-			ep2_add(t1[i], t1[i - 1], t1[1]);
-		}
-
-		for (int i = 0; i < (1 << w); i++) {
-			for (int j = 0; j < (1 << w); j++) {
-				ep2_add(t[(i << w) + j], t0[i], t1[j]);
-			}
-		}
-
-#if defined(EP_MIXED)
-		ep2_norm_sim(t + 1, t + 1, (1 << (EP_WIDTH)) - 1);
-#endif
-
-		l0 = l1 = RLC_CEIL(2 * RLC_FP_BITS, w);
-		bn_rec_win(w0, &l0, k, w);
-		bn_rec_win(w1, &l1, m, w);
-
-		for (int i = l0; i < l1; i++) {
-			w0[i] = 0;
-		}
-		for (int i = l1; i < l0; i++) {
-			w1[i] = 0;
-		}
-
-		ep2_set_infty(r);
-		for (int i = RLC_MAX(l0, l1) - 1; i >= 0; i--) {
-			for (int j = 0; j < w; j++) {
-				ep2_dbl(r, r);
-			}
-			ep2_add(r, r, t[(w0[i] << w) + w1[i]]);
-		}
-		ep2_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < (1 << w); i++) {
-			ep2_free(t0[i]);
-			ep2_free(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep2_free(t[i]);
-		}
-	}
-}
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-void ep2_mul_sim_inter(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m) {
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep2_is_infty(q)) {
-		ep2_mul(r, p, k);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		if (ep_curve_opt_a() == RLC_ZERO) {
-			ep2_mul_sim_endom(r, p, k, q, m);
-		} else {
-			ep2_mul_sim_plain(r, p, k, q, m, NULL);
-		}
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN)
-	ep2_mul_sim_plain(r, p, k, q, m, NULL);
-#endif
-}
-
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-
-void ep2_mul_sim_joint(ep2_t r, ep2_t p, bn_t k, ep2_t q, bn_t m) {
-	ep2_t t[5];
-	int i, l, u_i, offset;
-	int8_t jsf[4 * (RLC_FP_BITS + 1)];
-
-	if (bn_is_zero(k) || ep2_is_infty(p)) {
-		ep2_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep2_is_infty(q)) {
-		ep2_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < 5; i++) {
-			ep2_null(t[i]);
-			ep2_new(t[i]);
-		}
-
-		ep2_set_infty(t[0]);
-		ep2_copy(t[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ep2_neg(t[1], t[1]);
-		}
-		ep2_copy(t[2], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ep2_neg(t[2], t[2]);
-		}
-		ep2_add(t[3], t[2], t[1]);
-		ep2_sub(t[4], t[2], t[1]);
-#if defined(EP_MIXED)
-		ep2_norm_sim(t + 3, t + 3, 2);
-#endif
-
-		l = 4 * (RLC_FP_BITS + 1);
-		bn_rec_jsf(jsf, &l, k, m);
-
-		ep2_set_infty(r);
-
-		offset = RLC_MAX(bn_bits(k), bn_bits(m)) + 1;
-		for (i = l - 1; i >= 0; i--) {
-			ep2_dbl(r, r);
-			if (jsf[i] != 0 && jsf[i] == -jsf[i + offset]) {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep2_sub(r, r, t[4]);
-				} else {
-					ep2_add(r, r, t[4]);
-				}
-			} else {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep2_sub(r, r, t[-u_i]);
-				} else {
-					ep2_add(r, r, t[u_i]);
-				}
-			}
-		}
-		ep2_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < 5; i++) {
-			ep2_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-void ep2_mul_sim_gen(ep2_t r, bn_t k, ep2_t q, bn_t m) {
-	ep2_t gen;
-
-	ep2_null(gen);
-
-	if (bn_is_zero(k)) {
-		ep2_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep2_is_infty(q)) {
-		ep2_mul_gen(r, k);
-		return;
-	}
-
-	RLC_TRY {
-		ep2_new(gen);
-
-		ep2_curve_get_gen(gen);
-#if EP_FIX == LWNAF && defined(EP_PRECO)
-		ep2_mul_sim_plain(r, gen, k, q, m, ep2_curve_get_tab());
-#else
-		ep2_mul_sim(r, gen, k, q, m);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(gen);
-	}
-}
-
-void ep2_mul_sim_dig(ep2_t r, ep2_t p[], dig_t k[], int len) {
-	ep2_t t;
-	int max;
-
-	ep2_null(t);
-
-	max = util_bits_dig(k[0]);
-	for (int i = 1; i < len; i++) {
-		max = RLC_MAX(max, util_bits_dig(k[i]));
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-
-		ep2_set_infty(t);
-		for (int i = max - 1; i >= 0; i--) {
-			ep2_dbl(t, t);
-			for (int j = 0; j < len; j++) {
-				if (k[j] & ((dig_t)1 << i)) {
-					ep2_add(t, t, p[j]);
-				}
-			}
-		}
-
-		ep2_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep2_free(t);
-	}
-}
-
-void ep2_mul_sim_lot(ep2_t r, ep2_t p[], const bn_t k[], int n) {
-	const int len = RLC_FP_BITS + 1;
-	int i, j, m, l, _l[4];
-	bn_t _k[4], q, x;
-	int8_t *naf = RLC_ALLOCA(int8_t, 4 * n * len);
-
-	bn_null(q);
-	bn_null(x);
-
-	if (n <= 10) {
-		ep2_t *_p = RLC_ALLOCA(ep2_t, 4 * n);
-
-		RLC_TRY {
-			if (naf == NULL || _p == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			bn_new(q);
-			bn_new(x);
-			for (j = 0; j < 4; j++) {
-				bn_null(_k[j]);
-				bn_new(_k[j]);
-				for (i = 0; i < n; i++) {
-					ep2_null(_p[4*i + j]);
-					ep2_new(_p[4*i + j]);
-				}
-			}
-
-			l = 0;
-			ep2_curve_get_ord(q);
-			fp_prime_get_par(x);
-			for (i = 0; i < n; i++) {
-				ep2_norm(_p[4*i], p[i]);
-				ep2_frb(_p[4*i + 1], _p[4*i], 1);
-				ep2_frb(_p[4*i + 2], _p[4*i + 1], 1);
-				ep2_frb(_p[4*i + 3], _p[4*i + 2], 1);
-
-				bn_rec_frb(_k, 4, k[i], x, q, ep_curve_is_pairf() == EP_B12);
-				for (j = 0; j < 4; j++) {
-					_l[j] = len;
-					bn_rec_naf(&naf[(4*i + j)*len], &_l[j], _k[j], 2);
-					if (bn_sign(_k[j]) == RLC_NEG) {
-						ep2_neg(_p[4*i + j], _p[4*i + j]);
-					}
-					l = RLC_MAX(l, _l[j]);
-				}
-			}
-
-			ep2_set_infty(r);
-			for (i = l - 1; i >= 0; i--) {
-				ep2_dbl(r, r);
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 4; m++) {
-						if (naf[(4*j + m)*len + i] > 0) {
-							ep2_add(r, r, _p[4*j + m]);
-						}
-						if (naf[(4*j + m)*len + i] < 0) {
-							ep2_sub(r, r, _p[4*j + m]);
-						}
-					}
-				}
-			}
-
-			/* Convert r to affine coordinates. */
-			ep2_norm(r, r);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			bn_free(x);
-			for (j = 0; j < 4; j++) {
-				bn_free(_k[j]);
-				for (i = 0; i < n; i++) {
-					ep2_free(_p[4*i + j]);
-				}
-			}
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-		}
-	} else {
-		const int w = RLC_MAX(2, util_bits_dig(n) - 2), c = (1 << (w - 2));
-		ep2_t s, t, u, v, *_p = RLC_ALLOCA(ep2_t, 4 * c);
-		int8_t ptr;
-
-		ep2_null(s);
-		ep2_null(t);
-		ep2_null(u);
-		ep2_null(v);
-
-		RLC_TRY {
-			if (naf == NULL || _p == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			bn_new(q);
-			bn_new(x);
-			ep2_new(s);
-			ep2_new(t);
-			ep2_new(u);
-			ep2_new(v);
-			for (i = 0; i < 4; i++) {
-				bn_null(_k[i]);
-				bn_new(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep2_null(_p[i*c + j]);
-					ep2_new(_p[i*c + j]);
-					ep2_set_infty(_p[i*c + j]);
-				}
-			}
-
-			l = 0;
-			ep2_curve_get_ord(q);
-			fp_prime_get_par(x);
-			for (i = 0; i < n; i++) {
-				bn_rec_frb(_k, 4, k[i], x, q, ep_curve_is_pairf() == EP_B12);
-				for (j = 0; j < 4; j++) {
-					_l[j] = len;
-					bn_rec_naf(&naf[(4*i + j)*len], &_l[j], _k[j], w);
-					l = RLC_MAX(l, _l[j]);
-				}
-			}
-
-			ep2_set_infty(s);
-			for (i = l - 1; i >= 0; i--) {
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 4; m++) {
-						ptr = naf[(4*j + m)*len + i];
-						if (ptr != 0) {
-							ep2_copy(t, p[j]);
-							if (ptr < 0) {
-								ptr = -ptr;
-								ep2_neg(t, t);
-							}
-							if (bn_sign(k[i]) == RLC_NEG) {
-								ep2_neg(t, t);
-							}
-							ep2_add(_p[m*c + (ptr >> 1)], _p[m*c + (ptr >> 1)], t);
-						}
-					}
-				}
-
-				ep2_set_infty(t);
-				for (m = 3; m >= 0; m--) {
-					ep2_frb(t, t, 1);
-					ep2_set_infty(u);
-					ep2_set_infty(v);
-					for (j = c - 1; j >= 0; j--) {
-						ep2_add(u, u, _p[m*c + j]);
-						if (j == 0) {
-							ep2_dbl(v, v);
-						}
-						ep2_add(v, v, u);
-						ep2_set_infty(_p[m*c + j]);
-					}
-					ep2_add(t, t, v);
-				}
-				ep2_dbl(s, s);
-				ep2_add(s, s, t);
-			}
-
-			/* Convert r to affine coordinates. */
-			ep2_norm(r, s);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			bn_free(x);
-			ep2_free(s);
-			ep2_free(t);
-			ep2_free(u);
-			ep2_free(v);
-			for (i = 0; i < 4; i++) {
-				bn_free(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep2_free(_p[i*c + j]);
-				}
-			}
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_neg.c b/src/dashbls/depends/relic/src/epx/relic_ep2_neg.c
deleted file mode 100644
index 072e5665e3da..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_neg.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point negation on elliptic prime curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_neg(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	if (r != p) {
-		fp2_copy(r->x, p->x);
-		fp2_copy(r->z, p->z);
-	}
-
-	fp2_neg(r->y, p->y);
-
-	r->coord = p->coord;
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_norm.c b/src/dashbls/depends/relic/src/epx/relic_ep2_norm.c
deleted file mode 100644
index 7ba24c841866..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_norm.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization on prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Normalizes a point represented in projective coordinates.
- *
- * @param r			- the result.
- * @param p			- the point to normalize.
- */
-static void ep2_norm_imp(ep2_t r, ep2_t p, int inverted) {
-	if (p->coord != BASIC) {
-		fp2_t t0, t1;
-
-		fp2_null(t0);
-		fp2_null(t1);
-
-		RLC_TRY {
-
-			fp2_new(t0);
-			fp2_new(t1);
-
-			if (inverted) {
-				fp2_copy(t1, p->z);
-			} else {
-				fp2_inv(t1, p->z);
-			}
-			fp2_sqr(t0, t1);
-			fp2_mul(r->x, p->x, t0);
-			fp2_mul(t0, t0, t1);
-			fp2_mul(r->y, p->y, t0);
-			fp2_set_dig(r->z, 1);
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			fp2_free(t0);
-			fp2_free(t1);
-		}
-	}
-
-	r->coord = BASIC;
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_norm(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		/* If the point is represented in affine coordinates, we just copy it. */
-		ep2_copy(r, p);
-	}
-#if EP_ADD == PROJC || !defined(STRIP)
-	ep2_norm_imp(r, p, 0);
-#endif
-}
-
-void ep2_norm_sim(ep2_t *r, ep2_t *t, int n) {
-	int i;
-	fp2_t *a = RLC_ALLOCA(fp2_t, n);
-
-	RLC_TRY {
-		if (a == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < n; i++) {
-			fp2_null(a[i]);
-			fp2_new(a[i]);
-			fp2_copy(a[i], t[i]->z);
-		}
-
-		fp2_inv_sim(a, a, n);
-
-		for (i = 0; i < n; i++) {
-			fp2_copy(r[i]->x, t[i]->x);
-			fp2_copy(r[i]->y, t[i]->y);
-			fp2_copy(r[i]->z, a[i]);
-		}
-
-		for (i = 0; i < n; i++) {
-			ep2_norm_imp(r[i], r[i], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp2_free(a[i]);
-		}
-		RLC_FREE(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_pck.c b/src/dashbls/depends/relic/src/epx/relic_ep2_pck.c
deleted file mode 100644
index 09282756bd5b..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_pck.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point compression on prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep2_pck(ep2_t r, ep2_t p) {
-	bn_t halfQ, yValue;
-
-        bn_null(halfQ);
-        bn_null(yValue);
-
-	RLC_TRY {
-		bn_new(halfQ);
-		bn_new(yValue);
-
-	        halfQ->used = RLC_FP_DIGS;
-	        dv_copy(halfQ->dp, fp_prime_get(), RLC_FP_DIGS);
-	        bn_hlv(halfQ, halfQ);
-
-	        fp_prime_back(yValue, p->y[1]);
-
-	        int b = bn_cmp(yValue, halfQ) == RLC_GT;
-
-	        fp2_copy(r->x, p->x);
-	        fp2_zero(r->y);
-	        fp_set_bit(r->y[0], 0, b);
-	        fp_zero(r->y[1]);
-	        fp_set_dig(r->z[0], 1);
-	        fp_zero(r->z[1]);
-	        r->coord = BASIC;
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(yValue);
-		bn_free(halfQ);
-	}
-}
-
-int ep2_upk(ep2_t r, ep2_t p) {
-	fp2_t t;
-	bn_t halfQ;
-	bn_t yValue;
-	int result = 0;
-
-	fp2_null(t);
-	bn_null(halfQ);
-	bn_null(yValue);
-
-	RLC_TRY {
-		fp2_new(t);
-		bn_new(halfQ);
-		bn_new(yValue);
-
-		ep2_rhs(t, p);
-
-		/* t0 = sqrt(x1^3 + a * x1 + b). */
-		result = fp2_srt(t, t);
-
-		if (result) {
-			/* Verify whether the y coordinate is the larger one, matches the
-			 * compressed y-coordinate (IETF pairing friendly spec)
-			 * sign_F_p^2(y') := { sign_F_p(y'_0) if y'_1 equals 0, else
-			 *          	     { 1 if y'_1 > (p - 1) / 2, else
-			 *                   { 0 otherwise.
-			 *
-			 */
-			halfQ->used = RLC_FP_DIGS;
-			dv_copy(halfQ->dp, fp_prime_get(), RLC_FP_DIGS);
-			bn_hlv(halfQ, halfQ);
-
-			fp_prime_back(yValue, t[1]);
-
-			if (bn_is_zero(yValue)) {
-				fp_prime_back(yValue, t[0]);
-			}
-
-			int sign_fp2y = bn_cmp(yValue, halfQ) == RLC_GT;
-
-			if (sign_fp2y != fp_get_bit(p->y[0], 0)) {
-				fp2_neg(t, t);
-			}
-			fp2_copy(r->x, p->x);
-			fp2_copy(r->y, t);
-			fp_set_dig(r->z[0], 1);
-			fp_zero(r->z[1]);
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-		bn_free(yValue);
-		bn_free(halfQ);
-	}
-	return result;
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep2_util.c b/src/dashbls/depends/relic/src/epx/relic_ep2_util.c
deleted file mode 100644
index 8f1490b37b72..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep2_util.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of comparison for points on prime elliptic curves over
- * quadratic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep2_is_infty(ep2_t p) {
-	return (fp2_is_zero(p->z) == 1);
-}
-
-void ep2_set_infty(ep2_t p) {
-	fp2_zero(p->x);
-	fp2_zero(p->y);
-	fp2_zero(p->z);
-	p->coord = BASIC;
-}
-
-void ep2_copy(ep2_t r, ep2_t p) {
-	fp2_copy(r->x, p->x);
-	fp2_copy(r->y, p->y);
-	fp2_copy(r->z, p->z);
-	r->coord = p->coord;
-}
-
-void ep2_rand(ep2_t p) {
-	bn_t n, k;
-
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-		bn_rand_mod(k, n);
-
-		ep2_mul_gen(p, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-	}
-}
-
-void ep2_blind(ep2_t r, ep2_t p) {
-	fp2_t rand;
-
-	fp2_null(rand);
-
-	RLC_TRY {
-		fp2_new(rand);
-		fp2_rand(rand);
-#if EP_ADD == BASIC
-		(void)rand;
-		ep2_copy(r, p);
-#else
-		fp2_mul(r->z, p->z, rand);
-		fp2_mul(r->y, p->y, rand);
-		fp2_sqr(rand, rand);
-		fp2_mul(r->x, r->x, rand);
-		fp2_mul(r->y, r->y, rand);
-		r->coord = EP_ADD;
-#endif
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(rand);
-	}
-}
-
-void ep2_rhs(fp2_t rhs, ep2_t p) {
-	fp2_t t0;
-
-	fp2_null(t0);
-
-	RLC_TRY {
-		fp2_new(t0);
-
-		fp2_sqr(t0, p->x);                  /* x1^2 */
-
-		switch (ep2_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp2_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp2_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp2_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				fp2_mul_dig(t0, t0, ep2_curve_get_a()[0][0]);
-				break;
-#endif
-			default:
-				fp2_add(t0, t0, ep2_curve_get_a());
-				break;
-		}
-
-		fp2_mul(t0, t0, p->x);				/* x1^3 + a * x */
-
-		switch (ep2_curve_opt_b()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp2_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp2_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp2_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				fp2_mul_dig(t0, t0, ep2_curve_get_b()[0][0]);
-				break;
-#endif
-			default:
-				fp2_add(t0, t0, ep2_curve_get_b());
-				break;
-		}
-
-		fp2_copy(rhs, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-	}
-}
-
-
-int ep2_on_curve(ep2_t p) {
-	ep2_t t;
-	int r = 0;
-
-	ep2_null(t);
-
-	RLC_TRY {
-		ep2_new(t);
-
-		ep2_norm(t, p);
-
-		ep2_rhs(t->x, t);
-		fp2_sqr(t->y, t->y);
-
-		r = (fp2_cmp(t->x, t->y) == RLC_EQ) || ep2_is_infty(p);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep2_free(t);
-	}
-	return r;
-}
-
-void ep2_tab(ep2_t *t, ep2_t p, int w) {
-	if (w > 2) {
-		ep2_dbl(t[0], p);
-#if defined(EP_MIXED)
-		ep2_norm(t[0], t[0]);
-#endif
-		ep2_add(t[1], t[0], p);
-		for (int i = 2; i < (1 << (w - 2)); i++) {
-			ep2_add(t[i], t[i - 1], t[0]);
-		}
-#if defined(EP_MIXED)
-		ep2_norm_sim(t + 1, t + 1, (1 << (w - 2)) - 1);
-#endif
-	}
-	ep2_copy(t[0], p);
-}
-
-void ep2_print(ep2_t p) {
-	fp2_print(p->x);
-	fp2_print(p->y);
-	fp2_print(p->z);
-}
-
-int ep2_size_bin(ep2_t a, int pack) {
-	ep2_t t;
-	int size = 0;
-
-	ep2_null(t);
-
-	if (ep2_is_infty(a)) {
-		return 1;
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-
-		ep2_norm(t, a);
-
-		size = 1 + 2 * RLC_FP_BYTES;
-		if (!pack) {
-			size += 2 * RLC_FP_BYTES;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep2_free(t);
-	}
-
-	return size;
-}
-
-void ep2_read_bin(ep2_t a, const uint8_t *bin, int len) {
-	if (len == 1) {
-		if (bin[0] == 0) {
-			ep2_set_infty(a);
-			return;
-		} else {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		}
-	}
-
-	if (len != (2 * RLC_FP_BYTES + 1) && len != (4 * RLC_FP_BYTES + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	a->coord = BASIC;
-	fp2_set_dig(a->z, 1);
-	fp2_read_bin(a->x, bin + 1, 2 * RLC_FP_BYTES);
-	if (len == 2 * RLC_FP_BYTES + 1) {
-		switch(bin[0]) {
-			case 2:
-				fp2_zero(a->y);
-				break;
-			case 3:
-				fp2_zero(a->y);
-				fp_set_bit(a->y[0], 0, 1);
-				fp_zero(a->y[1]);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-		ep2_upk(a, a);
-	}
-
-	if (len == 4 * RLC_FP_BYTES + 1) {
-		if (bin[0] == 4) {
-			fp2_read_bin(a->y, bin + 2 * RLC_FP_BYTES + 1, 2 * RLC_FP_BYTES);
-		} else {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-	}
-
-	if (!ep2_on_curve(a)) {
-		RLC_THROW(ERR_NO_VALID);
-	}
-}
-
-void ep2_write_bin(uint8_t *bin, int len, ep2_t a, int pack) {
-	ep2_t t;
-
-	ep2_null(t);
-
-	memset(bin, 0, len);
-
-	if (ep2_is_infty(a)) {
-		if (len < 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		} else {
-			return;
-		}
-	}
-
-	RLC_TRY {
-		ep2_new(t);
-
-		ep2_norm(t, a);
-
-		if (pack) {
-			if (len < 2 * RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				ep2_pck(t, t);
-				bin[0] = 2 | fp_get_bit(t->y[0], 0);
-				fp2_write_bin(bin + 1, 2 * RLC_FP_BYTES, t->x, 0);
-			}
-		} else {
-			if (len < 4 * RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-			} else {
-				bin[0] = 4;
-				fp2_write_bin(bin + 1, 2 * RLC_FP_BYTES, t->x, 0);
-				fp2_write_bin(bin + 2 * RLC_FP_BYTES + 1, 2 * RLC_FP_BYTES, t->y, 0);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep2_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_add.c b/src/dashbls/depends/relic/src/epx/relic_ep4_add.c
deleted file mode 100644
index af731a5ea689..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_add.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of addition on prime elliptic curves over quartic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Adds two points represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param s					- the resulting slope.
- * @param p					- the first point to add.
- * @param q					- the second point to add.
- */
-static void ep4_add_basic_imp(ep4_t r, fp4_t s, ep4_t p, ep4_t q) {
-	fp4_t t0, t1, t2;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-
-		/* t0 = x2 - x1. */
-		fp4_sub(t0, q->x, p->x);
-		/* t1 = y2 - y1. */
-		fp4_sub(t1, q->y, p->y);
-
-		/* If t0 is zero. */
-		if (fp4_is_zero(t0)) {
-			if (fp4_is_zero(t1)) {
-				/* If t1 is zero, q = p, should have doubled. */
-				ep4_dbl_slp_basic(r, s, p);
-			} else {
-				/* If t1 is not zero and t0 is zero, q = -p and r = infty. */
-				ep4_set_infty(r);
-			}
-		} else {
-			/* t2 = 1/(x2 - x1). */
-			fp4_inv(t2, t0);
-			/* t2 = lambda = (y2 - y1)/(x2 - x1). */
-			fp4_mul(t2, t1, t2);
-
-			/* x3 = lambda^2 - x2 - x1. */
-			fp4_sqr(t1, t2);
-			fp4_sub(t0, t1, p->x);
-			fp4_sub(t0, t0, q->x);
-
-			/* y3 = lambda * (x1 - x3) - y1. */
-			fp4_sub(t1, p->x, t0);
-			fp4_mul(t1, t2, t1);
-			fp4_sub(r->y, t1, p->y);
-
-			fp4_copy(r->x, t0);
-			fp4_copy(r->z, p->z);
-
-			if (s != NULL) {
-				fp4_copy(s, t2);
-			}
-
-			r->coord = BASIC;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-#if defined(EP_MIXED) || !defined(STRIP)
-
-/**
- * Adds a point represented in affine coordinates to a point represented in
- * projective coordinates.
- *
- * @param r					- the result.
- * @param s					- the slope.
- * @param p					- the affine point.
- * @param q					- the projective point.
- */
-static void ep4_add_projc_mix(ep4_t r, ep4_t p, ep4_t q) {
-	fp4_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-	fp4_null(t6);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-		fp4_new(t5);
-		fp4_new(t6);
-
-		if (p->coord != BASIC) {
-			/* t0 = z1^2. */
-			fp4_sqr(t0, p->z);
-
-			/* t3 = U2 = x2 * z1^2. */
-			fp4_mul(t3, q->x, t0);
-
-			/* t1 = S2 = y2 * z1^3. */
-			fp4_mul(t1, t0, p->z);
-			fp4_mul(t1, t1, q->y);
-
-			/* t3 = H = U2 - x1. */
-			fp4_sub(t3, t3, p->x);
-
-			/* t1 = R = 2 * (S2 - y1). */
-			fp4_sub(t1, t1, p->y);
-		} else {
-			/* H = x2 - x1. */
-			fp4_sub(t3, q->x, p->x);
-
-			/* t1 = R = 2 * (y2 - y1). */
-			fp4_sub(t1, q->y, p->y);
-		}
-
-		/* t2 = HH = H^2. */
-		fp4_sqr(t2, t3);
-
-		/* If E is zero. */
-		if (fp4_is_zero(t3)) {
-			if (fp4_is_zero(t1)) {
-				/* If I is zero, p = q, should have doubled. */
-				ep4_dbl_projc(r, p);
-			} else {
-				/* If I is not zero, q = -p, r = infinity. */
-				ep4_set_infty(r);
-			}
-		} else {
-			/* t5 = J = H * HH. */
-			fp4_mul(t5, t3, t2);
-
-			/* t4 = V = x1 * HH. */
-			fp4_mul(t4, p->x, t2);
-
-			/* x3 = R^2 - J - 2 * V. */
-			fp4_sqr(r->x, t1);
-			fp4_sub(r->x, r->x, t5);
-			fp4_dbl(t6, t4);
-			fp4_sub(r->x, r->x, t6);
-
-			/* y3 = R * (V - x3) - Y1 * J. */
-			fp4_sub(t4, t4, r->x);
-			fp4_mul(t4, t4, t1);
-			fp4_mul(t1, p->y, t5);
-			fp4_sub(r->y, t4, t1);
-
-			if (p->coord != BASIC) {
-				/* z3 = z1 * H. */
-				fp4_mul(r->z, p->z, t3);
-			} else {
-				/* z3 = H. */
-				fp4_copy(r->z, t3);
-			}
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-		fp4_free(t6);
-	}
-}
-
-#endif
-
-/**
- * Adds two points represented in projective coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param r					- the result.
- * @param p					- the first point to add.
- * @param q					- the second point to add.
- */
-static void ep4_add_projc_imp(ep4_t r, ep4_t p, ep4_t q) {
-#if defined(EP_MIXED) && defined(STRIP)
-	ep4_add_projc_mix(r, p, q);
-#else /* General addition. */
-	fp4_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-	fp4_null(t6);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-		fp4_new(t5);
-		fp4_new(t6);
-
-		if (q->coord == BASIC) {
-			ep4_add_projc_mix(r, p, q);
-		} else {
-			/* t0 = z1^2. */
-			fp4_sqr(t0, p->z);
-
-			/* t1 = z2^2. */
-			fp4_sqr(t1, q->z);
-
-			/* t2 = U1 = x1 * z2^2. */
-			fp4_mul(t2, p->x, t1);
-
-			/* t3 = U2 = x2 * z1^2. */
-			fp4_mul(t3, q->x, t0);
-
-			/* t6 = z1^2 + z2^2. */
-			fp4_add(t6, t0, t1);
-
-			/* t0 = S2 = y2 * z1^3. */
-			fp4_mul(t0, t0, p->z);
-			fp4_mul(t0, t0, q->y);
-
-			/* t1 = S1 = y1 * z2^3. */
-			fp4_mul(t1, t1, q->z);
-			fp4_mul(t1, t1, p->y);
-
-			/* t3 = H = U2 - U1. */
-			fp4_sub(t3, t3, t2);
-
-			/* t0 = R = 2 * (S2 - S1). */
-			fp4_sub(t0, t0, t1);
-
-			fp4_dbl(t0, t0);
-
-			/* If E is zero. */
-			if (fp4_is_zero(t3)) {
-				if (fp4_is_zero(t0)) {
-					/* If I is zero, p = q, should have doubled. */
-					ep4_dbl_projc(r, p);
-				} else {
-					/* If I is not zero, q = -p, r = infinity. */
-					ep4_set_infty(r);
-				}
-			} else {
-				/* t4 = I = (2*H)^2. */
-				fp4_dbl(t4, t3);
-				fp4_sqr(t4, t4);
-
-				/* t5 = J = H * I. */
-				fp4_mul(t5, t3, t4);
-
-				/* t4 = V = U1 * I. */
-				fp4_mul(t4, t2, t4);
-
-				/* x3 = R^2 - J - 2 * V. */
-				fp4_sqr(r->x, t0);
-				fp4_sub(r->x, r->x, t5);
-				fp4_dbl(t2, t4);
-				fp4_sub(r->x, r->x, t2);
-
-				/* y3 = R * (V - x3) - 2 * S1 * J. */
-				fp4_sub(t4, t4, r->x);
-				fp4_mul(t4, t4, t0);
-				fp4_mul(t1, t1, t5);
-				fp4_dbl(t1, t1);
-				fp4_sub(r->y, t4, t1);
-
-				/* z3 = ((z1 + z2)^2 - z1^2 - z2^2) * H. */
-				fp4_add(r->z, p->z, q->z);
-				fp4_sqr(r->z, r->z);
-				fp4_sub(r->z, r->z, t6);
-				fp4_mul(r->z, r->z, t3);
-			}
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-		fp4_free(t6);
-	}
-#endif
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep4_add_basic(ep4_t r, ep4_t p, ep4_t q) {
-	if (ep4_is_infty(p)) {
-		ep4_copy(r, q);
-		return;
-	}
-
-	if (ep4_is_infty(q)) {
-		ep4_copy(r, p);
-		return;
-	}
-
-	ep4_add_basic_imp(r, NULL, p, q);
-}
-
-void ep4_add_slp_basic(ep4_t r, fp4_t s, ep4_t p, ep4_t q) {
-	if (ep4_is_infty(p)) {
-		ep4_copy(r, q);
-		return;
-	}
-
-	if (ep4_is_infty(q)) {
-		ep4_copy(r, p);
-		return;
-	}
-
-	ep4_add_basic_imp(r, s, p, q);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep4_add_projc(ep4_t r, ep4_t p, ep4_t q) {
-	if (ep4_is_infty(p)) {
-		ep4_copy(r, q);
-		return;
-	}
-
-	if (ep4_is_infty(q)) {
-		ep4_copy(r, p);
-		return;
-	}
-
-	if (p == q) {
-		/* TODO: This is a quick hack. Should we fix this? */
-		ep4_dbl(r, p);
-		return;
-	}
-
-	ep4_add_projc_imp(r, p, q);
-}
-
-#endif
-
-void ep4_sub(ep4_t r, ep4_t p, ep4_t q) {
-	ep4_t t;
-
-	ep4_null(t);
-
-	if (p == q) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-
-		ep4_neg(t, q);
-		ep4_add(r, p, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_cmp.c b/src/dashbls/depends/relic/src/epx/relic_ep4_cmp.c
deleted file mode 100644
index 3d12fc327832..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_cmp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of utilities for prime elliptic curves over quadratic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep4_cmp(ep4_t p, ep4_t q) {
-    ep4_t r, s;
-    int result = RLC_NE;
-
-	if (ep4_is_infty(p) && ep4_is_infty(q)) {
-		return RLC_EQ;
-	}
-
-    ep4_null(r);
-    ep4_null(s);
-
-    RLC_TRY {
-        ep4_new(r);
-        ep4_new(s);
-
-        if ((p->coord != BASIC) && (q->coord != BASIC)) {
-            /* If the two points are not normalized, it is faster to compare
-             * x1 * z2^2 == x2 * z1^2 and y1 * z2^3 == y2 * z1^3. */
-            fp4_sqr(r->z, p->z);
-            fp4_sqr(s->z, q->z);
-            fp4_mul(r->x, p->x, s->z);
-            fp4_mul(s->x, q->x, r->z);
-            fp4_mul(r->z, r->z, p->z);
-            fp4_mul(s->z, s->z, q->z);
-            fp4_mul(r->y, p->y, s->z);
-            fp4_mul(s->y, q->y, r->z);
-        } else {
-			ep4_norm(r, p);
-            ep4_norm(s, q);
-        }
-
-        if ((fp4_cmp(r->x, s->x) == RLC_EQ) &&
-				(fp4_cmp(r->y, s->y) == RLC_EQ)) {
-            result = RLC_EQ;
-        }
-    } RLC_CATCH_ANY {
-        RLC_THROW(ERR_CAUGHT);
-    } RLC_FINALLY {
-        ep4_free(r);
-        ep4_free(s);
-    }
-
-    return result;
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_curve.c b/src/dashbls/depends/relic/src/epx/relic_ep4_curve.c
deleted file mode 100644
index d70cc792a679..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_curve.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of configuration of prime elliptic curves over quartic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/* See ep/relic_ep_param.c for discussion of MAP_U parameters. */
-
-#if defined(EP_ENDOM) && FP_PRIME == 509
-/** @{ */
-#define B24_P509_A0		"0"
-#define B24_P509_A1		"0"
-#define B24_P509_A2		"0"
-#define B24_P509_A3		"0"
-#define B24_P509_B0		"0"
-#define B24_P509_B1		"0"
-#define B24_P509_B2		"AAAAB7FFF9CE54DFE76F95A7CE0767B65C56424AE8C3F4619750081F008485DB13742DFBE0C507867E5AE3038DD69E97731DE83B746C980509E88C6DC5FE956"
-#define B24_P509_B3		"AAAAB7FFF9CE54DFE76F95A7CE0767B65C56424AE8C3F4619750081F008485DB13742DFBE0C507867E5AE3038DD69E97731DE83B746C980509E88C6DC5FE955"
-#define B24_P509_X0		"4D5AF70D2E605D1691DE7667FF1096AF4537749FD200277E1BC502847F63F4BC2F000FC81571F6E282FD46B96045CD611159ED554AFA95B2B1800A74F6A97C0"
-#define B24_P509_X1		"EA0D1E6A2105587ED20E9CA255A777AC78D0A24AEB118B1CE4D1F213BE42F7FFD3F3F5F60F06F902FEE405DF84143D533006D7383C25A7F7C26656440A80A0B"
-#define B24_P509_X2		"10E955FAFCA0C3C16D9DA9754859EAF918518C1A3FD0D14F427302CDE750224AD9E337CA12D3824B9E5E1668F94F56A4C2D935C6841C65FF4CA89E62C6A88D34"
-#define B24_P509_X3		"A9A981033A3844468D815A18B921C9F7C2B152372F240EAC4848A942FEAA4019B086104AE4F86C929F5B9064B4FE917A327279CEDCE02962FD3E971F9D00CCA"
-#define B24_P509_Y0		"C45C4179589584F8D1146550C117E3B452B7789170B7E7C0BEB1E417B5E32845CC1810760585AE0FE07762D94774A311932C100276C7A2EA4304EF7FBAA89F"
-#define B24_P509_Y1		"20315B1CE6AEE44F7ADCAE2F0B178DF7574F91380DB5E4A27281D02CC47A24618F995ACC29E611D7BBCE63E8A2CBD783256A1799FFA2A5D061D6872962CBAD"
-#define B24_P509_Y2		"20DEE7CA8DF5A616A014D78C0BCC69491116C715DDF5416C52B8A1833F8E4974255FBCCC5C6288DCA9B7CB2F4BB58525AB13D2225590A4A69955A859D36BF67"
-#define B24_P509_Y3		"5CD7D6B0C7890DC487A34BE4976767DE0C20BEB43A0EE741A5ED21021EBE5BDC42281008E19C44497E13A38165A36019235BDF7A48E76B6BA79D527024D227C"
-#define B24_P509_R		"100000FFFF870FF91CE195DB5B6F3EBD1E08C94C9E193B724ED58B907FF7C311A80D7CABC647746AE3ECB627C943998457FE001"
-#define B24_P509_H		"32916E9E0188E2252DA44F42F6DC0E90A66E8C7AFA49D50688A07F362BA18A01F6D9317009D55DAF8CFA9159E35E2736DA6417B31C8550DFC6CD766340D92AB85D629676E78E12D5E76AB9FAC536661EEA6615242264E5F6B46EBA0F95191CD226B0CB144CEC686A846DE323CBE0244A3B6E5FFE49BD01599F13AD869FF3DA2E5551FD9C2D885EF8FB95EB7FFD5460EC84FA36A569BCB5BBBC5A21B025CECEEAD08540C0ACCB87D9136ECB9C2CEDC2D465831D76AC3551EE87BCA06B751C18699A1424FF71E791EB953FA79"
-/** @} */
-#endif
-
-/**
- * Assigns a set of ordinary elliptic curve parameters.
- *
- * @param[in] CURVE		- the curve parameters to assign.
- */
-#define ASSIGN(CURVE)														\
-	RLC_GET(str, CURVE##_A0, sizeof(CURVE##_A0));							\
-	fp_read_str(a[0][0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A1, sizeof(CURVE##_A1));							\
-	fp_read_str(a[0][1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A2, sizeof(CURVE##_A2));							\
-	fp_read_str(a[1][0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A3, sizeof(CURVE##_A3));							\
-	fp_read_str(a[1][1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B0, sizeof(CURVE##_B0));							\
-	fp_read_str(b[0][0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B1, sizeof(CURVE##_B1));							\
-	fp_read_str(b[0][1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B2, sizeof(CURVE##_B2));							\
-	fp_read_str(b[1][0], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B3, sizeof(CURVE##_B3));							\
-	fp_read_str(b[1][1], str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_X0, sizeof(CURVE##_X0));							\
-	fp_read_str(g->x[0][0], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_X1, sizeof(CURVE##_X1));							\
-	fp_read_str(g->x[0][1], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_X2, sizeof(CURVE##_X2));							\
-	fp_read_str(g->x[1][0], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_X3, sizeof(CURVE##_X3));							\
-	fp_read_str(g->x[1][1], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_Y0, sizeof(CURVE##_Y0));							\
-	fp_read_str(g->y[0][0], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_Y1, sizeof(CURVE##_Y1));							\
-	fp_read_str(g->y[0][1], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_Y2, sizeof(CURVE##_Y2));							\
-	fp_read_str(g->y[1][0], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_Y3, sizeof(CURVE##_Y3));							\
-	fp_read_str(g->y[1][1], str, strlen(str), 16);							\
-	RLC_GET(str, CURVE##_R, sizeof(CURVE##_R));								\
-	bn_read_str(r, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
-	bn_read_str(h, str, strlen(str), 16);									\
-
-/**
- * Detects an optimization based on the curve coefficients.
- */
-static void detect_opt(int *opt, fp4_t a) {
-	fp4_t t;
-	fp4_null(t);
-
-	RLC_TRY {
-		fp4_new(t);
-		fp4_set_dig(t, 3);
-		fp4_neg(t, t);
-
-		if (fp4_cmp(a, t) == RLC_EQ) {
-			*opt = RLC_MIN3;
-		} else if (fp4_is_zero(a)) {
-			*opt = RLC_ZERO;
-		} else if (fp4_cmp_dig(a, 1) == RLC_EQ) {
-			*opt = RLC_ONE;
-		} else if (fp4_cmp_dig(a, 2) == RLC_EQ) {
-			*opt = RLC_TWO;
-		} else if ((fp_bits(a[0][0]) <= RLC_DIG) && fp_is_zero(a[0][1]) &&
-				fp2_is_zero(a[1])) {
-			*opt = RLC_TINY;
-		} else {
-			*opt = RLC_HUGE;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_curve_init(void) {
-	ctx_t *ctx = core_get();
-
-#ifdef EP_PRECO
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		ctx->ep4_ptr[i] = &(ctx->ep4_pre[i]);
-	}
-#endif
-
-#if ALLOC == DYNAMIC
-	ep4_new(ctx->ep4_g);
-	fp4_new(ctx->ep4_a);
-	fp4_new(ctx->ep4_b);
-#endif
-
-#ifdef EP_PRECO
-#if ALLOC == DYNAMIC
-	for (int i = 0; i < RLC_EP_TABLE; i++) {
-		fp4_new(ctx->ep4_pre[i].x);
-		fp4_new(ctx->ep4_pre[i].y);
-		fp4_new(ctx->ep4_pre[i].z);
-	}
-#endif
-#endif
-	ep4_set_infty(ctx->ep4_g);
-	bn_make(&(ctx->ep4_r), RLC_FP_DIGS);
-	bn_make(&(ctx->ep4_h), RLC_FP_DIGS);
-}
-
-void ep4_curve_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-#ifdef EP_PRECO
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			fp4_free(ctx->ep4_pre[i].x);
-			fp4_free(ctx->ep4_pre[i].y);
-			fp4_free(ctx->ep4_pre[i].z);
-		}
-#endif
-		bn_clean(&(ctx->ep4_r));
-		bn_clean(&(ctx->ep4_h));
-		ep4_free(ctx->ep4_g);
-		fp4_free(ctx->ep4_a);
-		fp4_free(ctx->ep4_b);
-	}
-}
-
-int ep4_curve_opt_a(void) {
-	return core_get()->ep4_opt_a;
-}
-
-int ep4_curve_opt_b(void) {
-	return core_get()->ep4_opt_b;
-}
-
-int ep4_curve_is_twist(void) {
-	return core_get()->ep4_is_twist;
-}
-
-void ep4_curve_get_gen(ep4_t g) {
-	ep4_copy(g, core_get()->ep4_g);
-}
-
-void ep4_curve_get_a(fp4_t a) {
-	fp4_copy(a, core_get()->ep4_a);
-}
-
-void ep4_curve_get_b(fp4_t b) {
-	fp4_copy(b, core_get()->ep4_b);
-}
-
-void ep4_curve_get_vs(bn_t *v) {
-	bn_t x, t;
-
-	bn_null(x);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(x);
-		bn_new(t);
-
-		fp_prime_get_par(x);
-		bn_copy(v[1], x);
-		bn_copy(v[2], x);
-		bn_copy(v[3], x);
-
-		/* t = 2x^2. */
-		bn_sqr(t, x);
-		bn_dbl(t, t);
-
-		/* v0 = 2x^2 + 3x + 1. */
-		bn_mul_dig(v[0], x, 3);
-		bn_add_dig(v[0], v[0], 1);
-		bn_add(v[0], v[0], t);
-
-		/* v3 = -(2x^2 + x). */
-		bn_add(v[3], v[3], t);
-		bn_neg(v[3], v[3]);
-
-		/* v1 = 12x^3 + 8x^2 + x, v2 = 6x^3 + 4x^2 + x. */
-		bn_dbl(t, t);
-		bn_add(v[2], v[2], t);
-		bn_dbl(t, t);
-		bn_add(v[1], v[1], t);
-		bn_rsh(t, t, 2);
-		bn_mul(t, t, x);
-		bn_mul_dig(t, t, 3);
-		bn_add(v[2], v[2], t);
-		bn_dbl(t, t);
-		bn_add(v[1], v[1], t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(x);
-		bn_free(t);
-	}
-}
-
-void ep4_curve_get_ord(bn_t n) {
-	ctx_t *ctx = core_get();
-	if (ctx->ep4_is_twist) {
-		ep_curve_get_ord(n);
-	} else {
-		bn_copy(n, &(ctx->ep4_r));
-	}
-}
-
-void ep4_curve_get_cof(bn_t h) {
-	bn_copy(h, &(core_get()->ep4_h));
-}
-
-#if defined(EP_PRECO)
-
-ep4_t *ep4_curve_get_tab(void) {
-#if ALLOC == AUTO
-	return (ep4_t *)*(core_get()->ep4_ptr);
-#else
-	return core_get()->ep4_ptr;
-#endif
-}
-
-#endif
-
-void ep4_curve_set_twist(int type) {
-	char str[8 * RLC_FP_BYTES + 1];
-	ctx_t *ctx = core_get();
-	ep4_t g;
-	fp4_t a, b;
-	bn_t r, h;
-
-	ep4_null(g);
-	fp4_null(a);
-	fp4_null(b);
-	bn_null(r);
-	bn_null(h);
-
-	ctx->ep4_is_twist = 0;
-	if (type == RLC_EP_MTYPE || type == RLC_EP_DTYPE) {
-		ctx->ep4_is_twist = type;
-	} else {
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(g);
-		fp4_new(a);
-		fp4_new(b);
-		bn_new(r);
-		bn_new(h);
-
-		switch (ep_param_get()) {
-#if FP_PRIME == 509
-			case B24_P509:
-				ASSIGN(B24_P509);
-				break;
-#endif
-			default:
-				(void)str;
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-
-		fp4_zero(g->z);
-		fp4_set_dig(g->z, 1);
-		g->coord = BASIC;
-
-		ep4_copy(ctx->ep4_g, g);
-		fp4_copy(ctx->ep4_a, a);
-		fp4_copy(ctx->ep4_b, b);
-
-		detect_opt(&(ctx->ep4_opt_a), ctx->ep4_a);
-		detect_opt(&(ctx->ep4_opt_b), ctx->ep4_b);
-
-		bn_copy(&(ctx->ep4_r), r);
-		bn_copy(&(ctx->ep4_h), h);
-
-#if defined(WITH_PC)
-		/* Compute pairing generator. */
-		pc_core_calc();
-#endif
-
-#if defined(EP_PRECO)
-		ep4_mul_pre((ep4_t *)ep4_curve_get_tab(), ctx->ep4_g);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(g);
-		fp4_free(a);
-		fp4_free(b);
-		bn_free(r);
-		bn_free(h);
-	}
-}
-
-void ep4_curve_set(fp4_t a, fp4_t b, ep4_t g, bn_t r, bn_t h) {
-	ctx_t *ctx = core_get();
-	ctx->ep4_is_twist = 0;
-
-	fp4_copy(ctx->ep4_a, a);
-	fp4_copy(ctx->ep4_b, b);
-
-	ep4_norm(ctx->ep4_g, g);
-	bn_copy(&(ctx->ep4_r), r);
-	bn_copy(&(ctx->ep4_h), h);
-
-#if defined(EP_PRECO)
-	ep4_mul_pre((ep4_t *)ep4_curve_get_tab(), ctx->ep4_g);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_dbl.c b/src/dashbls/depends/relic/src/epx/relic_ep4_dbl.c
deleted file mode 100644
index 11d0bb04725e..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_dbl.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of doubling on elliptic prime curves over quartic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r			- the result.
- * @param[out] s			- the resulting slope.
- * @param[in] p				- the point to double.
- */
-static void ep4_dbl_basic_imp(ep4_t r, fp4_t s, ep4_t p) {
-	fp4_t t0, t1, t2;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-
-		/* t0 = 1/(2 * y1). */
-		fp4_dbl(t0, p->y);
-		fp4_inv(t0, t0);
-
-		/* t1 = 3 * x1^2 + a. */
-		fp4_sqr(t1, p->x);
-		fp4_copy(t2, t1);
-		fp4_dbl(t1, t1);
-		fp4_add(t1, t1, t2);
-
-		ep4_curve_get_a(t2);
-		fp4_add(t1, t1, t2);
-
-		/* t1 = (3 * x1^2 + a)/(2 * y1). */
-		fp4_mul(t1, t1, t0);
-
-		if (s != NULL) {
-			fp4_copy(s, t1);
-		}
-
-		/* t2 = t1^2. */
-		fp4_sqr(t2, t1);
-
-		/* x3 = t1^2 - 2 * x1. */
-		fp4_dbl(t0, p->x);
-		fp4_sub(t0, t2, t0);
-
-		/* y3 = t1 * (x1 - x3) - y1. */
-		fp4_sub(t2, p->x, t0);
-		fp4_mul(t1, t1, t2);
-
-		fp4_sub(r->y, t1, p->y);
-
-		fp4_copy(r->x, t0);
-		fp4_copy(r->z, p->z);
-
-		r->coord = BASIC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-	}
-}
-
-#endif /* EP_ADD == BASIC */
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Doubles a point represented in affine coordinates on an ordinary prime
- * elliptic curve.
- *
- * @param[out] r				- the result.
- * @param[in] p					- the point to double.
- */
-static void ep4_dbl_projc_imp(ep4_t r, ep4_t p) {
-	fp4_t t0, t1, t2, t3, t4, t5;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-
-	RLC_TRY {
-		if (ep_curve_opt_a() == RLC_ZERO) {
-			fp4_new(t0);
-			fp4_new(t1);
-			fp4_new(t2);
-			fp4_new(t3);
-			fp4_new(t4);
-			fp4_new(t5);
-
-			fp4_sqr(t0, p->x);
-			fp4_add(t2, t0, t0);
-			fp4_add(t0, t2, t0);
-
-			fp4_sqr(t3, p->y);
-			fp4_mul(t1, t3, p->x);
-			fp4_add(t1, t1, t1);
-			fp4_add(t1, t1, t1);
-			fp4_sqr(r->x, t0);
-			fp4_add(t2, t1, t1);
-			fp4_sub(r->x, r->x, t2);
-			fp4_mul(r->z, p->z, p->y);
-			fp4_add(r->z, r->z, r->z);
-			fp4_add(t3, t3, t3);
-
-			fp4_sqr(t3, t3);
-			fp4_add(t3, t3, t3);
-			fp4_sub(t1, t1, r->x);
-			fp4_mul(r->y, t0, t1);
-			fp4_sub(r->y, r->y, t3);
-		} else {
-			/* dbl-2007-bl formulas: 1M + 8S + 1*a + 10add + 1*8 + 2*2 + 1*3 */
-			/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian.html#doubling-dbl-2007-bl */
-
-			/* t0 = x1^2, t1 = y1^2, t2 = y1^4. */
-			fp4_sqr(t0, p->x);
-			fp4_sqr(t1, p->y);
-			fp4_sqr(t2, t1);
-
-			if (p->coord != BASIC) {
-				/* t3 = z1^2. */
-				fp4_sqr(t3, p->z);
-
-				if (ep_curve_get_a() == RLC_ZERO) {
-					/* z3 = 2 * y1 * z1. */
-					fp4_mul(r->z, p->y, p->z);
-					fp4_dbl(r->z, r->z);
-				} else {
-					/* z3 = (y1 + z1)^2 - y1^2 - z1^2. */
-					fp4_add(r->z, p->y, p->z);
-					fp4_sqr(r->z, r->z);
-					fp4_sub(r->z, r->z, t1);
-					fp4_sub(r->z, r->z, t3);
-				}
-			} else {
-				/* z3 = 2 * y1. */
-				fp4_dbl(r->z, p->y);
-			}
-
-			/* t4 = S = 2*((x1 + y1^2)^2 - x1^2 - y1^4). */
-			fp4_add(t4, p->x, t1);
-			fp4_sqr(t4, t4);
-			fp4_sub(t4, t4, t0);
-			fp4_sub(t4, t4, t2);
-			fp4_dbl(t4, t4);
-
-			/* t5 = M = 3 * x1^2 + a * z1^4. */
-			fp4_dbl(t5, t0);
-			fp4_add(t5, t5, t0);
-			if (p->coord != BASIC) {
-				fp4_sqr(t3, t3);
-				ep4_curve_get_a(t1);
-				fp4_mul(t1, t3, t1);
-				fp4_add(t5, t5, t1);
-			} else {
-				ep4_curve_get_a(t1);
-				fp4_add(t5, t5, t1);
-			}
-
-			/* x3 = T = M^2 - 2 * S. */
-			fp4_sqr(r->x, t5);
-			fp4_dbl(t1, t4);
-			fp4_sub(r->x, r->x, t1);
-
-			/* y3 = M * (S - T) - 8 * y1^4. */
-			fp4_dbl(t2, t2);
-			fp4_dbl(t2, t2);
-			fp4_dbl(t2, t2);
-			fp4_sub(t4, t4, r->x);
-			fp4_mul(t5, t5, t4);
-			fp4_sub(r->y, t5, t2);
-		}
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-	}
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-	/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void ep4_dbl_basic(ep4_t r, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	ep4_dbl_basic_imp(r, NULL, p);
-}
-
-void ep4_dbl_slp_basic(ep4_t r, fp4_t s, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	ep4_dbl_basic_imp(r, s, p);
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void ep4_dbl_projc(ep4_t r, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	ep4_dbl_projc_imp(r, p);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_frb.c b/src/dashbls/depends/relic/src/epx/relic_ep4_frb.c
deleted file mode 100644
index fa216d53e371..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_frb.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of frobenius action on prime elliptic curves over
- * quartic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_frb(ep4_t r, ep4_t p, int i) {
-	ep4_copy(r, p);
-	for (; i > 0; i--) {
-		fp4_frb(r->x, r->x, 1);
-		fp4_frb(r->y, r->y, 1);
-		fp4_frb(r->z, r->z, 1);
-		fp4_mul_frb(r->x, r->x, 1, 2);
-		fp4_mul_frb(r->y, r->y, 1, 3);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_map.c b/src/dashbls/depends/relic/src/epx/relic_ep4_map.c
deleted file mode 100644
index be73b8d1e373..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_map.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of hashing to a prime elliptic curve over a quadratic
- * extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_map(ep4_t p, const uint8_t *msg, int len) {
-	bn_t x;
-	fp4_t t0;
-	uint8_t digest[RLC_MD_LEN];
-
-	bn_null(x);
-	fp4_null(t0);
-
-	RLC_TRY {
-		bn_new(x);
-		fp4_new(t0);
-
-		md_map(digest, msg, len);
-		bn_read_bin(x, digest, RLC_MIN(RLC_FP_BYTES, RLC_MD_LEN));
-
-		fp4_zero(p->x);
-		fp_prime_conv(p->x[0][0], x);
-		fp4_set_dig(p->z, 1);
-
-		while (1) {
-			ep4_rhs(t0, p);
-
-			if (fp4_srt(p->y, t0)) {
-				p->coord = BASIC;
-				break;
-			}
-
-			fp_add_dig(p->x[0][0], p->x[0][0], 1);
-		}
-
-		ep4_mul_cof(p, p);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		fp4_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_mul.c b/src/dashbls/depends/relic/src/epx/relic_ep4_mul.c
deleted file mode 100644
index c02f41b90541..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_mul.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point multiplication on prime elliptic curves over
- * quadratic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-#if defined(EP_ENDOM)
-
-static void ep4_mul_glv_imp(ep4_t r, ep4_t p, const bn_t k) {
-	int sign, i, j, l, _l[8];
-	bn_t n, _k[8], u, v;
-	int8_t naf[8][RLC_FP_BITS + 1];
-	ep4_t q[8];
-
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(u);
-		bn_new(v);
-		for (i = 0; i < 8; i++) {
-			bn_null(_k[i]);
-			ep4_null(q[i]);
-			bn_new(_k[i]);
-			ep4_new(q[i]);
-		}
-
-        bn_abs(v, k);
-		ep4_curve_get_ord(n);
-        if (bn_cmp_abs(v, n) == RLC_GT) {
-            bn_mod(v, v, n);
-        }
-
-		fp_prime_get_par(u);
-		sign = bn_sign(u);
-        bn_abs(u, u);
-
-		ep4_norm(q[0], p);
-		for (i = 0; i < 8; i++) {
-			bn_mod(_k[i], v, u);
-			bn_div(v, v, u);
-			if ((sign == RLC_NEG) && (i % 2 != 0)) {
-				bn_neg(_k[i], _k[i]);
-			}
-            if (bn_sign(k) == RLC_NEG) {
-                bn_neg(_k[i], _k[i]);
-            }
-            if (i > 0) {
-                ep4_frb(q[i], q[i - 1], 1);
-            }
-		}
-
-        l = 0;
-		for (i = 0; i < 8; i++) {
-			if (bn_sign(_k[i]) == RLC_NEG) {
-				ep4_neg(q[i], q[i]);
-			}
-			_l[i] = RLC_FP_BITS + 1;
-			bn_rec_naf(naf[i], &_l[i], _k[i], 2);
-            l = RLC_MAX(l, _l[i]);
-		}
-
-		ep4_set_infty(r);
-		for (j = l - 1; j >= 0; j--) {
-			ep4_dbl(r, r);
-
-			for (i = 0; i < 8; i++) {
-				if (naf[i][j] > 0) {
-					ep4_add(r, r, q[i]);
-				}
-				if (naf[i][j] < 0) {
-					ep4_sub(r, r, q[i]);
-				}
-			}
-		}
-
-		/* Convert r to affine coordinates. */
-		ep4_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-        bn_free(u);
-        bn_free(v);
-		for (i = 0; i < 8; i++) {
-			bn_free(_k[i]);
-			ep4_free(q[i]);
-		}
-
-	}
-}
-
-#endif /* EP_ENDOM */
-
-static void ep4_mul_naf_imp(ep4_t r, ep4_t p, const bn_t k) {
-	int l, i, n;
-	int8_t naf[RLC_FP_BITS + 1];
-	ep4_t t[1 << (EP_WIDTH - 2)];
-
-	RLC_TRY {
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep4_null(t[i]);
-			ep4_new(t[i]);
-		}
-		/* Compute the precomputation table. */
-		ep4_tab(t, p, EP_WIDTH);
-
-		/* Compute the w-NAF representation of k. */
-		l = sizeof(naf);
-		bn_rec_naf(naf, &l, k, EP_WIDTH);
-
-		ep4_set_infty(r);
-		for (i = l - 1; i >= 0; i--) {
-			ep4_dbl(r, r);
-
-			n = naf[i];
-			if (n > 0) {
-				ep4_add(r, r, t[n / 2]);
-			}
-			if (n < 0) {
-				ep4_sub(r, r, t[-n / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep4_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep4_free(t[i]);
-		}
-	}
-}
-
-#endif /* EP_MUL == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_mul_basic(ep4_t r, ep4_t p, const bn_t k) {
-	int i, l;
-	ep4_t t;
-
-	ep4_null(t);
-
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-		l = bn_bits(k);
-
-		if (bn_get_bit(k, l - 1)) {
-			ep4_copy(t, p);
-		} else {
-			ep4_set_infty(t);
-		}
-
-		for (i = l - 2; i >= 0; i--) {
-			ep4_dbl(t, t);
-			if (bn_get_bit(k, i)) {
-				ep4_add(t, t, p);
-			}
-		}
-
-		ep4_copy(r, t);
-		ep4_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t);
-	}
-}
-
-#if EP_MUL == SLIDE || !defined(STRIP)
-
-void ep4_mul_slide(ep4_t r, ep4_t p, const bn_t k) {
-	ep4_t t[1 << (EP_WIDTH - 1)], q;
-	int i, j, l;
-	uint8_t win[RLC_FP_BITS + 1];
-
-	ep4_null(q);
-
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i ++) {
-			ep4_null(t[i]);
-			ep4_new(t[i]);
-		}
-
-		ep4_new(q);
-
-		ep4_copy(t[0], p);
-		ep4_dbl(q, p);
-
-#if defined(EP_MIXED)
-		ep4_norm(q, q);
-#endif
-
-		/* Create table. */
-		for (i = 1; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep4_add(t[i], t[i - 1], q);
-		}
-
-#if defined(EP_MIXED)
-		ep4_norm_sim(t + 1, t + 1, (1 << (EP_WIDTH - 1)) - 1);
-#endif
-
-		ep4_set_infty(q);
-		l = RLC_FP_BITS + 1;
-		bn_rec_slw(win, &l, k, EP_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				ep4_dbl(q, q);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					ep4_dbl(q, q);
-				}
-				ep4_add(q, q, t[win[i] >> 1]);
-			}
-		}
-
-		ep4_norm(r, q);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (EP_WIDTH - 1)); i++) {
-			ep4_free(t[i]);
-		}
-		ep4_free(q);
-	}
-}
-
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-
-void ep4_mul_monty(ep4_t r, ep4_t p, const bn_t k) {
-	ep4_t t[2];
-
-	ep4_null(t[0]);
-	ep4_null(t[1]);
-
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(t[0]);
-		ep4_new(t[1]);
-
-		ep4_set_infty(t[0]);
-		ep4_copy(t[1], p);
-
-		for (int i = bn_bits(k) - 1; i >= 0; i--) {
-			int j = bn_get_bit(k, i);
-			dv_swap_cond(t[0]->x[0][0], t[1]->x[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[0][1], t[1]->x[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1][0], t[1]->x[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1][1], t[1]->x[1][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0][0], t[1]->y[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0][1], t[1]->y[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1][0], t[1]->y[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1][1], t[1]->y[1][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0][0], t[1]->z[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0][1], t[1]->z[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1][0], t[1]->z[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1][1], t[1]->z[1][1], RLC_FP_DIGS, j ^ 1);
-			ep4_add(t[0], t[0], t[1]);
-			ep4_dbl(t[1], t[1]);
-			dv_swap_cond(t[0]->x[0][0], t[1]->x[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[0][1], t[1]->x[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1][0], t[1]->x[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->x[1][1], t[1]->x[1][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0][0], t[1]->y[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[0][1], t[1]->y[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1][0], t[1]->y[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->y[1][1], t[1]->y[1][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0][0], t[1]->z[0][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[0][1], t[1]->z[0][1], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1][0], t[1]->z[1][0], RLC_FP_DIGS, j ^ 1);
-			dv_swap_cond(t[0]->z[1][1], t[1]->z[1][1], RLC_FP_DIGS, j ^ 1);
-		}
-
-		ep4_norm(r, t[0]);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t[1]);
-		ep4_free(t[0]);
-	}
-}
-
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-
-void ep4_mul_lwnaf(ep4_t r, ep4_t p, const bn_t k) {
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-#if defined(EP_ENDOM)
-	if (ep_curve_is_endom()) {
-		if (ep_curve_opt_a() == RLC_ZERO) {
-			ep4_mul_glv_imp(r, p, k);
-		} else {
-			ep4_mul_naf_imp(r, p, k);
-		}
-		return;
-	}
-#endif
-
-#if defined(EP_PLAIN) || defined(EP_SUPER)
-	ep4_mul_naf_imp(r, p, k);
-#endif
-}
-
-#endif
-
-void ep4_mul_gen(ep4_t r, bn_t k) {
-	if (bn_is_zero(k)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-#ifdef EP_PRECO
-	ep4_mul_fix(r, ep4_curve_get_tab(), k);
-#else
-	ep4_t g;
-
-	ep4_null(g);
-
-	RLC_TRY {
-		ep4_new(g);
-		ep4_curve_get_gen(g);
-		ep4_mul(r, g, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(g);
-	}
-#endif
-}
-
-void ep4_mul_dig(ep4_t r, ep4_t p, dig_t k) {
-	int i, l;
-	ep4_t t;
-
-	ep4_null(t);
-
-	if (k == 0 || ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-
-		l = util_bits_dig(k);
-
-		ep4_copy(t, p);
-
-		for (i = l - 2; i >= 0; i--) {
-			ep4_dbl(t, t);
-			if (k & ((dig_t)1 << i)) {
-				ep4_add(t, t, p);
-			}
-		}
-
-		ep4_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_cof.c b/src/dashbls/depends/relic/src/epx/relic_ep4_mul_cof.c
deleted file mode 100644
index 14f9973f2e28..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_cof.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point multiplication of a prime elliptic curve over a
- * quadratic extension by the curve cofactor.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_tmpl_map.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_mul_cof(ep4_t r, ep4_t p) {
-	bn_t z;
-	ep4_t t0, t1, t2, t3;
-
-	ep4_null(t0);
-	ep4_null(t1);
-	ep4_null(t2);
-	ep4_null(t3);
-	bn_null(z);
-
-	RLC_TRY {
-		ep4_new(t0);
-		ep4_new(t1);
-		ep4_new(t2);
-		ep4_new(t3);
-
-		fp_prime_get_par(z);
-
-		ep4_mul_basic(t0, p, z);
-		ep4_mul_basic(t1, t0, z);
-		ep4_mul_basic(t2, t1, z);
-		ep4_mul_basic(t3, t2, z);
-
-		ep4_sub(t3, t3, t2);
-		ep4_sub(t3, t3, p);
-		ep4_sub(t2, t2, t1);
-		ep4_frb(t2, t2, 1);
-
-		ep4_sub(t1, t1, t0);
-		ep4_frb(t1, t1, 2);
-
-		ep4_sub(t0, t0, p);
-		ep4_frb(t0, t0, 3);
-
-		ep4_dbl(r, p);
-		ep4_frb(r, r, 4);
-		ep4_add(r, r, t0);
-		ep4_add(r, r, t1);
-		ep4_add(r, r, t2);
-		ep4_add(r, r, t3);
-
-		ep4_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep4_free(t0);
-		ep4_free(t1);
-		ep4_free(t2);
-		ep4_free(t3);
-		bn_free(z);
-
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_fix.c b/src/dashbls/depends/relic/src/epx/relic_ep4_mul_fix.c
deleted file mode 100644
index 8709e702b397..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_fix.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of fixed point multiplication on a prime elliptic curve over
- * a quartic extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-/**
- * Precomputes a table for a point multiplication on an ordinary curve.
- *
- * @param[out] t				- the destination table.
- * @param[in] p					- the point to multiply.
- */
-static void ep4_mul_pre_ordin(ep4_t *t, ep4_t p) {
-	int i;
-
-	ep4_dbl(t[0], p);
-#if defined(EP_MIXED)
-	ep4_norm(t[0], t[0]);
-#endif
-
-#if EP_DEPTH > 2
-	ep4_add(t[1], t[0], p);
-	for (i = 2; i < (1 << (EP_DEPTH - 2)); i++) {
-		ep4_add(t[i], t[i - 1], t[0]);
-	}
-
-#if defined(EP_MIXED)
-	for (i = 1; i < (1 << (EP_DEPTH - 2)); i++) {
-		ep4_norm(t[i], t[i]);
-	}
-#endif
-
-#endif
-	ep4_copy(t[0], p);
-}
-
-/**
- * Multiplies a binary elliptic curve point by an integer using the w-NAF
- * method.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the point to multiply.
- * @param[in] k					- the integer.
- */
-static void ep4_mul_fix_ordin(ep4_t r, ep4_t *table, bn_t k) {
-	int len, i, n;
-	int8_t naf[2 * RLC_FP_BITS + 1], *t;
-
-	if (bn_is_zero(k)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	/* Compute the w-TNAF representation of k. */
-	len = 2 * RLC_FP_BITS + 1;
-	bn_rec_naf(naf, &len, k, EP_DEPTH);
-
-	t = naf + len - 1;
-	ep4_set_infty(r);
-	for (i = len - 1; i >= 0; i--, t--) {
-		ep4_dbl(r, r);
-
-		n = *t;
-		if (n > 0) {
-			ep4_add(r, r, table[n / 2]);
-		}
-		if (n < 0) {
-			ep4_sub(r, r, table[-n / 2]);
-		}
-	}
-	/* Convert r to affine coordinates. */
-	ep4_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ep4_neg(r, r);
-	}
-}
-
-#endif /* EP_FIX == LWNAF */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_FIX == BASIC || !defined(STRIP)
-
-void ep4_mul_pre_basic(ep4_t *t, ep4_t p) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-
-		ep4_copy(t[0], p);
-		for (int i = 1; i < bn_bits(n); i++) {
-			ep4_dbl(t[i], t[i - 1]);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep4_mul_fix_basic(ep4_t r, ep4_t *t, bn_t k) {
-	if (bn_is_zero(k)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	ep4_set_infty(r);
-
-	for (int i = 0; i < bn_bits(k); i++) {
-		if (bn_get_bit(k, i)) {
-			ep4_add(r, r, t[i]);
-		}
-	}
-	ep4_norm(r, r);
-	if (bn_sign(k) == RLC_NEG) {
-		ep4_neg(r, r);
-	}
-}
-
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-
-void ep4_mul_pre_combs(ep4_t *t, ep4_t p) {
-	int i, j, l;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % EP_DEPTH) == 0 ? (l / EP_DEPTH) : (l / EP_DEPTH) + 1);
-
-		ep4_set_infty(t[0]);
-
-		ep4_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep4_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < l; i++) {
-				ep4_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep4_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep4_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-#if defined(EP_MIXED)
-		for (i = 1; i < RLC_EP_TABLE_COMBS; i++) {
-			ep4_norm(t[i], t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep4_mul_fix_combs(ep4_t r, ep4_t *t, bn_t k) {
-	int i, j, l, w, n0, p0, p1;
-	bn_t n;
-
-	if (bn_is_zero(k)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-		l = bn_bits(n);
-		l = ((l % EP_DEPTH) == 0 ? (l / EP_DEPTH) : (l / EP_DEPTH) + 1);
-
-		n0 = bn_bits(k);
-
-		p0 = (EP_DEPTH) * l - 1;
-
-		w = 0;
-		p1 = p0--;
-		for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-			w = w << 1;
-			if (p1 < n0 && bn_get_bit(k, p1)) {
-				w = w | 1;
-			}
-		}
-		ep4_copy(r, t[w]);
-
-		for (i = l - 2; i >= 0; i--) {
-			ep4_dbl(r, r);
-
-			w = 0;
-			p1 = p0--;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p1 -= l) {
-				w = w << 1;
-				if (p1 < n0 && bn_get_bit(k, p1)) {
-					w = w | 1;
-				}
-			}
-			if (w > 0) {
-				ep4_add(r, r, t[w]);
-			}
-		}
-		ep4_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-
-void ep4_mul_pre_combd(ep4_t *t, ep4_t p) {
-	int i, j, d, e;
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % EP_DEPTH) == 0 ? (d / EP_DEPTH) : (d / EP_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ep4_set_infty(t[0]);
-		ep4_copy(t[1], p);
-		for (j = 1; j < EP_DEPTH; j++) {
-			ep4_dbl(t[1 << j], t[1 << (j - 1)]);
-			for (i = 1; i < d; i++) {
-				ep4_dbl(t[1 << j], t[1 << j]);
-			}
-#if defined(EP_MIXED)
-			ep4_norm(t[1 << j], t[1 << j]);
-#endif
-			for (i = 1; i < (1 << j); i++) {
-				ep4_add(t[(1 << j) + i], t[i], t[1 << j]);
-			}
-		}
-		ep4_set_infty(t[1 << EP_DEPTH]);
-		for (j = 1; j < (1 << EP_DEPTH); j++) {
-			ep4_dbl(t[(1 << EP_DEPTH) + j], t[j]);
-			for (i = 1; i < e; i++) {
-				ep4_dbl(t[(1 << EP_DEPTH) + j], t[(1 << EP_DEPTH) + j]);
-			}
-		}
-#if defined(EP_MIXED)
-		for (i = 1; i < RLC_EP_TABLE_COMBD; i++) {
-			ep4_norm(t[i], t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void ep4_mul_fix_combd(ep4_t r, ep4_t *t, bn_t k) {
-	int i, j, d, e, w0, w1, n0, p0, p1;
-	bn_t n;
-
-	if (bn_is_zero(k)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-		d = bn_bits(n);
-		d = ((d % EP_DEPTH) == 0 ? (d / EP_DEPTH) : (d / EP_DEPTH) + 1);
-		e = (d % 2 == 0 ? (d / 2) : (d / 2) + 1);
-
-		ep4_set_infty(r);
-		n0 = bn_bits(k);
-
-		p1 = (e - 1) + (EP_DEPTH - 1) * d;
-		for (i = e - 1; i >= 0; i--) {
-			ep4_dbl(r, r);
-
-			w0 = 0;
-			p0 = p1;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w0 = w0 << 1;
-				if (p0 < n0 && bn_get_bit(k, p0)) {
-					w0 = w0 | 1;
-				}
-			}
-
-			w1 = 0;
-			p0 = p1-- + e;
-			for (j = EP_DEPTH - 1; j >= 0; j--, p0 -= d) {
-				w1 = w1 << 1;
-				if (i + e < d && p0 < n0 && bn_get_bit(k, p0)) {
-					w1 = w1 | 1;
-				}
-			}
-
-			ep4_add(r, r, t[w0]);
-			ep4_add(r, r, t[(1 << EP_DEPTH) + w1]);
-		}
-		ep4_norm(r, r);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-
-void ep4_mul_pre_lwnaf(ep4_t *t, ep4_t p) {
-	ep4_mul_pre_ordin(t, p);
-}
-
-void ep4_mul_fix_lwnaf(ep4_t r, ep4_t *t, bn_t k) {
-	ep4_mul_fix_ordin(r, t, k);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_sim.c b/src/dashbls/depends/relic/src/epx/relic_ep4_mul_sim.c
deleted file mode 100644
index faff8f0c330c..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_mul_sim.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of simultaneous point multiplication on a prime elliptic
- * curve over a quartic extension.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-/**
- * Multiplies and adds two prime elliptic curve points simultaneously,
- * optionally choosing the first point as the generator depending on an optional
- * table of precomputed points.
- *
- * @param[out] r 				- the result.
- * @param[in] p					- the first point to multiply.
- * @param[in] k					- the first integer.
- * @param[in] q					- the second point to multiply.
- * @param[in] m					- the second integer.
- * @param[in] t					- the pointer to the precomputed table.
- */
-static void ep4_mul_sim_plain(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m,
-		ep4_t *t) {
-	int i, l, l0, l1, n0, n1, w, gen;
-	int8_t naf0[2 * RLC_FP_BITS + 1], naf1[2 * RLC_FP_BITS + 1], *_k, *_m;
-	ep4_t t0[1 << (EP_WIDTH - 2)];
-	ep4_t t1[1 << (EP_WIDTH - 2)];
-
-	RLC_TRY {
-		gen = (t == NULL ? 0 : 1);
-		if (!gen) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep4_null(t0[i]);
-				ep4_new(t0[i]);
-			}
-			ep4_tab(t0, p, EP_WIDTH);
-			t = (ep4_t *)t0;
-		}
-
-		/* Prepare the precomputation table. */
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep4_null(t1[i]);
-			ep4_new(t1[i]);
-		}
-		/* Compute the precomputation table. */
-		ep4_tab(t1, q, EP_WIDTH);
-
-		/* Compute the w-TNAF representation of k. */
-		if (gen) {
-			w = EP_DEPTH;
-		} else {
-			w = EP_WIDTH;
-		}
-		l0 = l1 = 2 * RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, k, w);
-		bn_rec_naf(naf1, &l1, m, EP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-		if (bn_sign(k) == RLC_NEG) {
-			for (i =  0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(m) == RLC_NEG) {
-			for (i =  0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		ep4_set_infty(r);
-		for (i = l - 1; i >= 0; i--, _k--, _m--) {
-			ep4_dbl(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-			if (n0 > 0) {
-				ep4_add(r, r, t[n0 / 2]);
-			}
-			if (n0 < 0) {
-				ep4_sub(r, r, t[-n0 / 2]);
-			}
-			if (n1 > 0) {
-				ep4_add(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				ep4_sub(r, r, t1[-n1 / 2]);
-			}
-		}
-		/* Convert r to affine coordinates. */
-		ep4_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		/* Free the precomputation tables. */
-		if (!gen) {
-			for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-				ep4_free(t0[i]);
-			}
-		}
-		for (i = 0; i < (1 << (EP_WIDTH - 2)); i++) {
-			ep4_free(t1[i]);
-		}
-	}
-}
-
-#endif /* EP_SIM == INTER */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_SIM == BASIC || !defined(STRIP)
-
-void ep4_mul_sim_basic(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t l) {
-	ep4_t t;
-
-	ep4_null(t);
-
-	RLC_TRY {
-		ep4_new(t);
-		ep4_mul(t, q, l);
-		ep4_mul(r, p, k);
-		ep4_add(t, t, r);
-		ep4_norm(r, t);
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t);
-	}
-}
-
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-
-void ep4_mul_sim_trick(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m) {
-	ep4_t t0[1 << (EP_WIDTH / 2)];
-	ep4_t t1[1 << (EP_WIDTH / 2)];
-	ep4_t t[1 << EP_WIDTH];
-	bn_t n;
-	int l0, l1, w = EP_WIDTH / 2;
-	uint8_t w0[2 * RLC_FP_BITS], w1[2 * RLC_FP_BITS];
-
-	bn_null(n);
-
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep4_is_infty(q)) {
-		ep4_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-
-		for (int i = 0; i < (1 << w); i++) {
-			ep4_null(t0[i]);
-			ep4_null(t1[i]);
-			ep4_new(t0[i]);
-			ep4_new(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep4_null(t[i]);
-			ep4_new(t[i]);
-		}
-
-		ep4_set_infty(t0[0]);
-		ep4_copy(t0[1], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(t0[1], t0[1]);
-		}
-		for (int i = 2; i < (1 << w); i++) {
-			ep4_add(t0[i], t0[i - 1], t0[1]);
-		}
-
-		ep4_set_infty(t1[0]);
-		ep4_copy(t1[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ep4_neg(t1[1], t1[1]);
-		}
-		for (int i = 1; i < (1 << w); i++) {
-			ep4_add(t1[i], t1[i - 1], t1[1]);
-		}
-
-		for (int i = 0; i < (1 << w); i++) {
-			for (int j = 0; j < (1 << w); j++) {
-				ep4_add(t[(i << w) + j], t0[i], t1[j]);
-			}
-		}
-
-#if defined(EP_MIXED)
-		ep4_norm_sim(t + 1, t + 1, (1 << (EP_WIDTH)) - 1);
-#endif
-
-		l0 = l1 = RLC_CEIL(2 * RLC_FP_BITS, w);
-		bn_rec_win(w0, &l0, k, w);
-		bn_rec_win(w1, &l1, m, w);
-
-		for (int i = l0; i < l1; i++) {
-			w0[i] = 0;
-		}
-		for (int i = l1; i < l0; i++) {
-			w1[i] = 0;
-		}
-
-		ep4_set_infty(r);
-		for (int i = RLC_MAX(l0, l1) - 1; i >= 0; i--) {
-			for (int j = 0; j < w; j++) {
-				ep4_dbl(r, r);
-			}
-			ep4_add(r, r, t[(w0[i] << w) + w1[i]]);
-		}
-		ep4_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (int i = 0; i < (1 << w); i++) {
-			ep4_free(t0[i]);
-			ep4_free(t1[i]);
-		}
-		for (int i = 0; i < (1 << EP_WIDTH); i++) {
-			ep4_free(t[i]);
-		}
-	}
-}
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-
-void ep4_mul_sim_inter(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m) {
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep4_is_infty(q)) {
-		ep4_mul(r, p, k);
-		return;
-	}
-
-	ep4_mul_sim_plain(r, p, k, q, m, NULL);
-}
-
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-
-void ep4_mul_sim_joint(ep4_t r, ep4_t p, bn_t k, ep4_t q, bn_t m) {
-	ep4_t t[5];
-	int i, l, u_i, offset;
-	int8_t jsf[4 * (RLC_FP_BITS + 1)];
-
-	if (bn_is_zero(k) || ep4_is_infty(p)) {
-		ep4_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep4_is_infty(q)) {
-		ep4_mul(r, p, k);
-		return;
-	}
-
-	RLC_TRY {
-		for (i = 0; i < 5; i++) {
-			ep4_null(t[i]);
-			ep4_new(t[i]);
-		}
-
-		ep4_set_infty(t[0]);
-		ep4_copy(t[1], q);
-		if (bn_sign(m) == RLC_NEG) {
-			ep4_neg(t[1], t[1]);
-		}
-		ep4_copy(t[2], p);
-		if (bn_sign(k) == RLC_NEG) {
-			ep4_neg(t[2], t[2]);
-		}
-		ep4_add(t[3], t[2], t[1]);
-		ep4_sub(t[4], t[2], t[1]);
-#if defined(EP_MIXED)
-		ep4_norm_sim(t + 3, t + 3, 2);
-#endif
-
-		l = 4 * (RLC_FP_BITS + 1);
-		bn_rec_jsf(jsf, &l, k, m);
-
-		ep4_set_infty(r);
-
-		offset = RLC_MAX(bn_bits(k), bn_bits(m)) + 1;
-		for (i = l - 1; i >= 0; i--) {
-			ep4_dbl(r, r);
-			if (jsf[i] != 0 && jsf[i] == -jsf[i + offset]) {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep4_sub(r, r, t[4]);
-				} else {
-					ep4_add(r, r, t[4]);
-				}
-			} else {
-				u_i = jsf[i] * 2 + jsf[i + offset];
-				if (u_i < 0) {
-					ep4_sub(r, r, t[-u_i]);
-				} else {
-					ep4_add(r, r, t[u_i]);
-				}
-			}
-		}
-		ep4_norm(r, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < 5; i++) {
-			ep4_free(t[i]);
-		}
-	}
-}
-
-#endif
-
-void ep4_mul_sim_gen(ep4_t r, bn_t k, ep4_t q, bn_t m) {
-	ep4_t gen;
-
-	ep4_null(gen);
-
-	if (bn_is_zero(k)) {
-		ep4_mul(r, q, m);
-		return;
-	}
-	if (bn_is_zero(m) || ep4_is_infty(q)) {
-		ep4_mul_gen(r, k);
-		return;
-	}
-
-	RLC_TRY {
-		ep4_new(gen);
-
-		ep4_curve_get_gen(gen);
-#if EP_FIX == LWNAF && defined(EP_PRECO)
-		ep4_mul_sim_plain(r, gen, k, q, m, ep4_curve_get_tab());
-#else
-		ep4_mul_sim(r, gen, k, q, m);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(gen);
-	}
-}
-
-void ep4_mul_sim_dig(ep4_t r, ep4_t p[], dig_t k[], int len) {
-	ep4_t t;
-	int max;
-
-	ep4_null(t);
-
-	max = util_bits_dig(k[0]);
-	for (int i = 1; i < len; i++) {
-		max = RLC_MAX(max, util_bits_dig(k[i]));
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-
-		ep4_set_infty(t);
-		for (int i = max - 1; i >= 0; i--) {
-			ep4_dbl(t, t);
-			for (int j = 0; j < len; j++) {
-				if (k[j] & ((dig_t)1 << i)) {
-					ep4_add(t, t, p[j]);
-				}
-			}
-		}
-
-		ep4_norm(r, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep4_free(t);
-	}
-}
-
-void ep4_mul_sim_lot(ep4_t r, ep4_t p[], const bn_t k[], int n) {
-	const int len = RLC_FP_BITS + 1;
-	int i, j, m, l, *_l = RLC_ALLOCA(int, 8 * n);
-	bn_t _k[8], q, x;
-	int8_t *naf = RLC_ALLOCA(int8_t, 8 * n * len);
-
-	bn_null(q);
-	bn_null(x);
-
-	if (n <= 10) {
-		ep4_t *_p = RLC_ALLOCA(ep4_t, 8 * n);
-
-		RLC_TRY {
-			bn_new(q);
-			bn_new(x);
-			for (j = 0; j < 8; j++) {
-				bn_null(_k[j]);
-				bn_new(_k[j]);
-				for (i = 0; i < n; i++) {
-					ep4_null(_p[8*i + j]);
-					ep4_new(_p[8*i + j]);
-				}
-			}
-
-			for (int i = 0; i < n; i++) {
-				ep4_norm(_p[8*i], p[i]);
-				ep4_frb(_p[8*i + 1], _p[8*i], 1);
-				ep4_frb(_p[8*i + 2], _p[8*i + 1], 1);
-				ep4_frb(_p[8*i + 3], _p[8*i + 2], 1);
-				ep4_frb(_p[8*i + 4], _p[8*i + 3], 1);
-				ep4_frb(_p[8*i + 5], _p[8*i + 4], 1);
-				ep4_frb(_p[8*i + 6], _p[8*i + 5], 1);
-				ep4_frb(_p[8*i + 7], _p[8*i + 6], 1);
-			}
-
-			ep_curve_get_ord(q);
-			fp_prime_get_par(x);
-
-			l = 0;
-			for (i = 0; i < n; i++) {
-				bn_rec_frb(_k, 8, k[i], q, x, ep_curve_is_pairf());
-				for (j = 0; j < 8; j++) {
-					_l[8*i + j] = len;
-					bn_rec_naf(&naf[(8*i + j)*len], &_l[8*i + j], _k[j], 2);
-					if (bn_sign(_k[j]) == RLC_NEG) {
-						ep4_neg(_p[8*i + j], _p[8*i + j]);
-					}
-					l = RLC_MAX(l, _l[8*i + j]);
-				}
-			}
-
-			for (i = 0; i < n; i++) {
-				for (j = 0; j < 8; j++) {
-					for (m = _l[8*i + j]; m < l; m++) {
-						naf[(8*i + j)*len + m] = 0;
-					}
-				}
-			}
-
-			ep4_set_infty(r);
-			for (i = l - 1; i >= 0; i--) {
-				ep4_dbl(r, r);
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 8; m++) {
-						if (naf[(8*j + m)*len + i] > 0) {
-							ep4_add(r, r, _p[8*j + m]);
-						}
-						if (naf[(8*j + m)*len + i] < 0) {
-							ep4_sub(r, r, _p[8*j + m]);
-						}
-					}
-				}
-			}
-
-			/* Convert r to affine coordinates. */
-			ep4_norm(r, r);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			bn_free(x);
-			for (j = 0; j < 8; j++) {
-				bn_free(_k[j]);
-				for (i = 0; i < n; i++) {
-					ep4_free(_p[8*i + j]);
-				}
-			}
-			RLC_FREE(_l);
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-		}
-	} else {
-		const int w = RLC_MAX(2, util_bits_dig(n) - 2), c = (1 << (w - 2));
-		ep4_t s, t, u, v, *_p = RLC_ALLOCA(ep4_t, 8 * c);
-		int8_t ptr;
-
-		ep4_null(s);
-		ep4_null(t);
-		ep4_null(u);
-		ep4_null(v);
-
-		RLC_TRY {
-			bn_new(q);
-			bn_new(x);
-			ep4_new(s);
-			ep4_new(t);
-			ep4_new(u);
-			ep4_new(v);
-			for (i = 0; i < 8; i++) {
-				bn_null(_k[i]);
-				bn_new(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep4_null(_p[i*c + j]);
-					ep4_new(_p[i*c + j]);
-					ep4_set_infty(_p[i*c + j]);
-				}
-			}
-
-			ep_curve_get_ord(q);
-			fp_prime_get_par(x);
-
-			l = 0;
-			for (i = 0; i < n; i++) {
-				bn_rec_frb(_k, 8, k[i], q, x, ep_curve_is_pairf());
-				for (j = 0; j < 8; j++) {
-					_l[8*i + j] = len;
-					bn_rec_naf(&naf[(8*i + j)*len], &_l[8*i + j], _k[j], w);
-					l = RLC_MAX(l, _l[8*i + j]);
-				}
-			}
-
-			for (i = 0; i < n; i++) {
-				for (j = 0; j < 8; j++) {
-					for (m = _l[8*i + j]; m < l; m++) {
-						naf[(8*i + j)*len + m] = 0;
-					}
-				}
-			}
-
-			ep4_set_infty(s);
-			for (i = l - 1; i >= 0; i--) {
-				for (j = 0; j < n; j++) {
-					for (m = 0; m < 8; m++) {
-						ptr = naf[(8*j + m)*len + i];
-						if (ptr != 0) {
-							ep4_copy(t, p[j]);
-							if (ptr < 0) {
-								ptr = -ptr;
-								ep4_neg(t, t);
-							}
-							if (bn_sign(_k[m]) == RLC_NEG) {
-								ep4_neg(t, t);
-							}
-							ep4_add(_p[m*c + (ptr >> 1)], _p[m*c + (ptr >> 1)], t);
-						}
-					}
-				}
-
-				ep4_set_infty(t);
-				for (m = 3; m >= 0; m--) {
-					ep4_frb(t, t, 1);
-					ep4_set_infty(u);
-					ep4_set_infty(v);
-					for (j = c - 1; j >= 0; j--) {
-						ep4_add(u, u, _p[m*c + j]);
-						if (j == 0) {
-							ep4_dbl(v, v);
-						}
-						ep4_add(v, v, u);
-						ep4_set_infty(_p[m*c + j]);
-					}
-					ep4_add(t, t, v);
-				}
-				ep4_dbl(s, s);
-				ep4_add(s, s, t);
-			}
-
-			/* Convert r to affine coordinates. */
-			ep4_norm(r, s);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			bn_free(q);
-			bn_free(x);
-			ep4_free(s);
-			ep4_free(t);
-			ep4_free(u);
-			ep4_free(v);
-			for (i = 0; i < 8; i++) {
-				bn_free(_k[i]);
-				for (j = 0; j < c; j++) {
-					ep4_free(_p[i*c + j]);
-				}
-			}
-			RLC_FREE(_l);
-			RLC_FREE(_p);
-			RLC_FREE(naf);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_neg.c b/src/dashbls/depends/relic/src/epx/relic_ep4_neg.c
deleted file mode 100644
index 4351c809c0ab..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_neg.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point negation on elliptic prime curves over quartic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_neg(ep4_t r, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	if (r != p) {
-		fp4_copy(r->x, p->x);
-		fp4_copy(r->z, p->z);
-	}
-
-	fp4_neg(r->y, p->y);
-
-	r->coord = p->coord;
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_norm.c b/src/dashbls/depends/relic/src/epx/relic_ep4_norm.c
deleted file mode 100644
index 8ad02259c2f5..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_norm.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization on prime elliptic curves over quartic
- * extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-/**
- * Normalizes a point represented in projective coordinates.
- *
- * @param r			- the result.
- * @param p			- the point to normalize.
- */
-static void ep4_norm_imp(ep4_t r, ep4_t p, int inverted) {
-	if (p->coord != BASIC) {
-		fp4_t t0, t1;
-
-		fp4_null(t0);
-		fp4_null(t1);
-
-		RLC_TRY {
-
-			fp4_new(t0);
-			fp4_new(t1);
-
-			if (inverted) {
-				fp4_copy(t1, p->z);
-			} else {
-				fp4_inv(t1, p->z);
-			}
-			fp4_sqr(t0, t1);
-			fp4_mul(r->x, p->x, t0);
-			fp4_mul(t0, t0, t1);
-			fp4_mul(r->y, p->y, t0);
-			fp4_set_dig(r->z, 1);
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			fp4_free(t0);
-			fp4_free(t1);
-		}
-	}
-
-	r->coord = BASIC;
-}
-
-#endif /* EP_ADD == PROJC */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void ep4_norm(ep4_t r, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	if (p->coord == BASIC) {
-		/* If the point is represented in affine coordinates, we just copy it. */
-		ep4_copy(r, p);
-	}
-#if EP_ADD == PROJC || !defined(STRIP)
-	ep4_norm_imp(r, p, 0);
-#endif
-}
-
-void ep4_norm_sim(ep4_t *r, ep4_t *t, int n) {
-	int i;
-	fp4_t *a = RLC_ALLOCA(fp4_t, n);
-
-	RLC_TRY {
-		if (a == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < n; i++) {
-			fp4_null(a[i]);
-			fp4_new(a[i]);
-			fp4_copy(a[i], t[i]->z);
-		}
-
-		fp4_inv_sim(a, a, n);
-
-		for (i = 0; i < n; i++) {
-			fp4_copy(r[i]->x, t[i]->x);
-			fp4_copy(r[i]->y, t[i]->y);
-			fp4_copy(r[i]->z, a[i]);
-		}
-
-		for (i = 0; i < n; i++) {
-			ep4_norm_imp(r[i], r[i], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp4_free(a[i]);
-		}
-		RLC_FREE(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/epx/relic_ep4_util.c b/src/dashbls/depends/relic/src/epx/relic_ep4_util.c
deleted file mode 100644
index 1bba16f2b664..000000000000
--- a/src/dashbls/depends/relic/src/epx/relic_ep4_util.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of comparison for points on prime elliptic curves over
- * quartic extensions.
- *
- * @ingroup epx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int ep4_is_infty(ep4_t p) {
-	return (fp4_is_zero(p->z) == 1);
-}
-
-void ep4_set_infty(ep4_t p) {
-	fp4_zero(p->x);
-	fp4_zero(p->y);
-	fp4_zero(p->z);
-	p->coord = BASIC;
-}
-
-void ep4_copy(ep4_t r, ep4_t p) {
-	fp4_copy(r->x, p->x);
-	fp4_copy(r->y, p->y);
-	fp4_copy(r->z, p->z);
-	r->coord = p->coord;
-}
-
-void ep4_rand(ep4_t p) {
-	bn_t n, k;
-
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(k);
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-		bn_rand_mod(k, n);
-
-		ep4_mul_gen(p, k);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(k);
-		bn_free(n);
-	}
-}
-
-void ep4_blind(ep4_t r, ep4_t p) {
-	fp4_t rand;
-
-	fp4_null(rand);
-
-	RLC_TRY {
-		fp4_new(rand);
-		fp4_rand(rand);
-#if EP_ADD == BASIC
-		(void)rand;
-		ep4_copy(r, p);
-#else
-		fp4_mul(r->z, p->z, rand);
-		fp4_mul(r->y, p->y, rand);
-		fp4_sqr(rand, rand);
-		fp4_mul(r->x, r->x, rand);
-		fp4_mul(r->y, r->y, rand);
-		r->coord = EP_ADD;
-#endif
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(rand);
-	}
-}
-
-void ep4_rhs(fp4_t rhs, ep4_t p) {
-	fp4_t t0, t1;
-
-	fp4_null(t0);
-	fp4_null(t1);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-
-		fp4_sqr(t0, p->x);                  /* x1^2 */
-
-		switch (ep4_curve_opt_a()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp4_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp4_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp4_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				ep4_curve_get_a(t1);
-				fp4_mul_dig(t0, t0, t1[0][0]);
-				break;
-#endif
-			default:
-				ep4_curve_get_a(t1);
-				fp4_add(t0, t0, t1);
-				break;
-		}
-
-		fp4_mul(t0, t0, p->x);				/* x1^3 + a * x */
-
-		switch (ep4_curve_opt_b()) {
-			case RLC_ZERO:
-				break;
-#if FP_RDC != MONTY
-			case RLC_MIN3:
-				fp4_sub_dig(t0, t0, 3);
-				break;
-			case RLC_ONE:
-				fp4_add_dig(t0, t0, 1);
-				break;
-			case RLC_TWO:
-				fp4_add_dig(t0, t0, 2);
-				break;
-			case RLC_TINY:
-				ep4_curve_get_b(t1);
-				fp4_mul_dig(t0, t0, t1[0][0]);
-				break;
-#endif
-			default:
-				ep4_curve_get_b(t1);
-				fp4_add(t0, t0, t1);
-				break;
-		}
-
-		fp4_copy(rhs, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-	}
-}
-
-
-int ep4_on_curve(ep4_t p) {
-	ep4_t t;
-	int r = 0;
-
-	ep4_null(t);
-
-	RLC_TRY {
-		ep4_new(t);
-
-		ep4_norm(t, p);
-
-		ep4_rhs(t->x, t);
-		fp4_sqr(t->y, t->y);
-
-		r = (fp4_cmp(t->x, t->y) == RLC_EQ) || ep4_is_infty(p);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep4_free(t);
-	}
-	return r;
-}
-
-void ep4_tab(ep4_t *t, ep4_t p, int w) {
-	if (w > 2) {
-		ep4_dbl(t[0], p);
-#if defined(EP_MIXED)
-		ep4_norm(t[0], t[0]);
-#endif
-		ep4_add(t[1], t[0], p);
-		for (int i = 2; i < (1 << (w - 2)); i++) {
-			ep4_add(t[i], t[i - 1], t[0]);
-		}
-#if defined(EP_MIXED)
-		ep4_norm_sim(t + 1, t + 1, (1 << (w - 2)) - 1);
-#endif
-	}
-	ep4_copy(t[0], p);
-}
-
-void ep4_print(ep4_t p) {
-	fp4_print(p->x);
-	fp4_print(p->y);
-	fp4_print(p->z);
-}
-
-int ep4_size_bin(ep4_t a, int pack) {
-	ep4_t t;
-	int size = 0;
-
-	ep4_null(t);
-
-	if (ep4_is_infty(a)) {
-		return 1;
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-
-		ep4_norm(t, a);
-
-		size = 1 + 8 * RLC_FP_BYTES;
-		//TODO: Implement compression.
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep4_free(t);
-	}
-
-	return size;
-}
-
-void ep4_read_bin(ep4_t a, const uint8_t *bin, int len) {
-	if (len == 1) {
-		if (bin[0] == 0) {
-			ep4_set_infty(a);
-			return;
-		} else {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		}
-	}
-
-	if (len != (8 * RLC_FP_BYTES + 1)) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	a->coord = BASIC;
-	fp4_set_dig(a->z, 1);
-	fp4_read_bin(a->x, bin + 1, 4 * RLC_FP_BYTES);
-
-	if (len == 8 * RLC_FP_BYTES + 1) {
-		if (bin[0] == 4) {
-			fp4_read_bin(a->y, bin + 4 * RLC_FP_BYTES + 1, 4 * RLC_FP_BYTES);
-		} else {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-	}
-
-	if (!ep4_on_curve(a)) {
-		RLC_THROW(ERR_NO_VALID);
-	}
-}
-
-void ep4_write_bin(uint8_t *bin, int len, ep4_t a, int pack) {
-	ep4_t t;
-
-	ep4_null(t);
-
-	memset(bin, 0, len);
-
-	if (ep4_is_infty(a)) {
-		if (len < 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-			return;
-		} else {
-			return;
-		}
-	}
-
-	RLC_TRY {
-		ep4_new(t);
-
-		ep4_norm(t, a);
-
-		if (len < 8 * RLC_FP_BYTES + 1) {
-			RLC_THROW(ERR_NO_BUFFER);
-		} else {
-			bin[0] = 4;
-			fp4_write_bin(bin + 1, 4 * RLC_FP_BYTES, t->x);
-			fp4_write_bin(bin + 4 * RLC_FP_BYTES + 1, 4 * RLC_FP_BYTES, t->y);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		ep4_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_add.c b/src/dashbls/depends/relic/src/fb/relic_fb_add.c
deleted file mode 100644
index 0e8e59277d60..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_add.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of binary field addition and subtraction functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_add(fb_t c, const fb_t a, const fb_t b) {
-	fb_addn_low(c, a, b);
-}
-
-void fb_add_dig(fb_t c, const fb_t a, dig_t b) {
-	fb_add1_low(c, a, b);
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_cmp.c b/src/dashbls/depends/relic/src/fb/relic_fb_cmp.c
deleted file mode 100644
index 9e3dc208578c..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_cmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field comparison functions.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fb_cmp_dig(const fb_t a, dig_t b) {
-	dig_t r = b;
-
-	for (int i = 0; i < RLC_FB_DIGS; i++) {
-		r ^= a[i];
-	}
-
-	return (r == 0 ? RLC_EQ : RLC_NE);
-}
-
-int fb_cmp(const fb_t a, const fb_t b) {
-	return dv_cmp_const(a, b, RLC_FB_DIGS);
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_exp.c b/src/dashbls/depends/relic/src/fb/relic_fb_exp.c
deleted file mode 100644
index 6b3e3146161f..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_exp.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of prime field exponentiation functions.
- *
- * @ingroup bn
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_bn.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_EXP == BASIC || !defined(STRIP)
-
-void fb_exp_basic(fb_t c, const fb_t a, const bn_t b) {
-	int i, l;
-	fb_t r;
-
-	if (bn_is_zero(b)) {
-		fb_set_dig(c, 1);
-		return;
-	}
-
-	fb_null(r);
-
-	RLC_TRY {
-		fb_new(r);
-
-		l = bn_bits(b);
-
-		fb_copy(r, a);
-
-		for (i = l - 2; i >= 0; i--) {
-			fb_sqr(r, r);
-			if (bn_get_bit(b, i)) {
-				fb_mul(r, r, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fb_inv(c, r);
-		} else {
-			fb_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(r);
-	}
-}
-
-#endif
-
-#if FB_EXP == SLIDE || !defined(STRIP)
-
-void fb_exp_slide(fb_t c, const fb_t a, const bn_t b) {
-	fb_t t[1 << (FB_WIDTH - 1)], r;
-	int i, j, l;
-	uint8_t win[RLC_FB_BITS + 1];
-
-	fb_null(r);
-
-	if (bn_is_zero(b)) {
-		fb_set_dig(c, 1);
-		return;
-	}
-
-
-	/* Initialize table. */
-	for (i = 0; i < (1 << (FB_WIDTH - 1)); i++) {
-		fb_null(t[i]);
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (FB_WIDTH - 1)); i ++) {
-			fb_new(t[i]);
-		}
-		fb_new(r);
-
-		fb_copy(t[0], a);
-		fb_sqr(r, a);
-
-		/* Create table. */
-		for (i = 1; i < 1 << (FB_WIDTH - 1); i++) {
-			fb_mul(t[i], t[i - 1], r);
-		}
-
-		fb_set_dig(r, 1);
-		l = RLC_FB_BITS + 1;
-		bn_rec_slw(win, &l, b, FB_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				fb_sqr(r, r);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					fb_sqr(r, r);
-				}
-				fb_mul(r, r, t[win[i] >> 1]);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fb_inv(c, r);
-		} else {
-			fb_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (FB_WIDTH - 1)); i++) {
-			fb_free(t[i]);
-		}
-		fb_free(r);
-	}
-}
-
-#endif
-
-#if FB_EXP == MONTY || !defined(STRIP)
-
-void fb_exp_monty(fb_t c, const fb_t a, const bn_t b) {
-	fb_t t[2];
-
-	if (bn_is_zero(b)) {
-		fb_set_dig(c, 1);
-		return;
-	}
-
-	fb_null(t[0]);
-	fb_null(t[1]);
-
-	RLC_TRY {
-		fb_new(t[0]);
-		fb_new(t[1]);
-
-		fb_set_dig(t[0], 1);
-		fb_copy(t[1], a);
-
-		for (int i = bn_bits(b) - 1; i >= 0; i--) {
-			int j = bn_get_bit(b, i);
-			dv_swap_cond(t[0], t[1], RLC_FB_DIGS, j ^ 1);
-			fb_mul(t[0], t[0], t[1]);
-			fb_sqr(t[1], t[1]);
-			dv_swap_cond(t[0], t[1], RLC_FB_DIGS, j ^ 1);
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fb_inv(c, t[0]);
-		} else {
-			fb_copy(c, t[0]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t[1]);
-		fb_free(t[0]);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_inv.c b/src/dashbls/depends/relic/src/fb/relic_fb_inv.c
deleted file mode 100644
index f0ff337e53ad..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_inv.c
+++ /dev/null
@@ -1,702 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of binary field inversion functions.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "relic_rand.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_INV == BASIC || !defined(STRIP)
-
-void fb_inv_basic(fb_t c, const fb_t a) {
-	fb_t t, u, v;
-	int i, x;
-
-	fb_null(t);
-	fb_null(u);
-	fb_null(v);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		fb_new(t);
-		fb_new(u);
-		fb_new(v);
-
-#if (FB_POLYN % 2) == 0
-		fb_sqr(v, a);
-		for (i = 2; i < RLC_FB_BITS; i++) {
-			fb_sqr(u, a);
-			for (int j = 1; j < i; j++) {
-				fb_sqr(u, u);
-			}
-			fb_mul(v, v, u);
-		}
-		fb_copy(c, v);
-#else
-		/* u = a^2, v = 1, x = (m - 1)/2. */
-		fb_sqr(u, a);
-		fb_set_dig(v, 1);
-		x = (RLC_FB_BITS - 1) >> 1;
-
-		while (x != 0) {
-			/* u = u * a^{2x}. */
-			fb_copy(t, u);
-			for (i = 0; i < x; i++) {
-				fb_sqr(t, t);
-			}
-			fb_mul(u, u, t);
-			if ((x & 0x01) == 0) {
-				x = x >> 1;
-			} else {
-				/* v = v * u, u = u^2, x = (x - 1)/2. */
-				fb_mul(v, v, u);
-				fb_sqr(u, u);
-				x = (x - 1) >> 1;
-			}
-		}
-#endif
-		fb_copy(c, v);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t);
-		fb_free(u);
-		fb_free(v);
-	}
-}
-
-#endif
-
-#if FB_INV == BINAR || !defined(STRIP)
-
-void fb_inv_binar(fb_t c, const fb_t a) {
-	int lu, lv;
-	dv_t u, v, g1, g2;
-
-	dv_null(u);
-	dv_null(v);
-	dv_null(g1);
-	dv_null(g2);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		dv_new(u);
-		dv_new(v);
-		dv_new(g1);
-		dv_new(g2);
-
-		/* u = a, v = f, g1 = 1, g2 = 0. */
-		fb_copy(u, a);
-		fb_copy(v, fb_poly_get());
-		if (RLC_FB_BITS % RLC_DIG == 0) {
-			v[RLC_FB_DIGS] = 1;
-		}
-		dv_zero(g1, 2 * RLC_FB_DIGS);
-		g1[0] = 1;
-		dv_zero(g2, 2 * RLC_FB_DIGS);
-
-		lu = RLC_FB_DIGS;
-		lv = RLC_FB_DIGS + (RLC_FB_BITS % RLC_DIG == 0);
-
-		/* While (u != 1 && v != 1. */
-		while (1) {
-			/* While z divides u do. */
-			while ((u[0] & 0x01) == 0) {
-				/* u = u/z. */
-				bn_rsh1_low(u, u, lu);
-				/* If z divides g1 then g1 = g1/z; else g1 = (g1 + f)/z. */
-				if ((g1[0] & 0x01) == 1) {
-					fb_poly_add(g1, g1);
-					if (RLC_FB_BITS % RLC_DIG == 0) {
-						g1[RLC_FB_DIGS] ^= 1;
-					}
-				}
-				bn_rsh1_low(g1, g1, RLC_FB_DIGS + 1);
-			}
-
-			while (u[lu - 1] == 0)
-				lu--;
-			if (lu == 1 && u[0] == 1)
-				break;
-
-			/* While z divides v do. */
-			while ((v[0] & 0x01) == 0) {
-				/* v = v/z. */
-				bn_rsh1_low(v, v, lv);
-				/* If z divides g2 then g2 = g2/z; else (g2 = g2 + f)/z. */
-				if ((g2[0] & 0x01) == 1) {
-					fb_poly_add(g2, g2);
-					if (RLC_FB_BITS % RLC_DIG == 0) {
-						g2[RLC_FB_DIGS] ^= 1;
-					}
-				}
-				bn_rsh1_low(g2, g2, RLC_FB_DIGS + 1);
-			}
-
-			while (v[lv - 1] == 0)
-				lv--;
-			if (lv == 1 && v[0] == 1)
-				break;
-
-			/* If deg(u) > deg(v) then u = u + v, g1 = g1 + g2. */
-			if (lu > lv || (lu == lv && u[lu - 1] > v[lv - 1])) {
-				fb_addd_low(u, u, v, lv);
-				fb_add(g1, g1, g2);
-			} else {
-				/* Else v = v + u, g2 = g2 + g1. */
-				fb_addd_low(v, v, u, lu);
-				fb_add(g2, g2, g1);
-			}
-		}
-
-		/* If u == 1 then return g1; else return g2. */
-		if (lu == 1 && u[0] == 1) {
-			fb_copy(c, g1);
-		} else {
-			fb_copy(c, g2);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(u);
-		dv_free(v);
-		dv_free(g1);
-		dv_free(g2);
-	}
-}
-
-#endif
-
-#if FB_INV == EXGCD || !defined(STRIP)
-
-void fb_inv_exgcd(fb_t c, const fb_t a) {
-	int j, d, lu, lv, lt, l1, l2, bu, bv;
-	dv_t _u, _v, _g1, _g2;
-	dig_t *t = NULL, *u = NULL, *v = NULL, *g1 = NULL, *g2 = NULL, carry;
-
-	fb_null(_u);
-	fb_null(_v);
-	fb_null(_g1);
-	fb_null(_g2);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		dv_new(_u);
-		dv_new(_v);
-		dv_new(_g1);
-		dv_new(_g2);
-
-		dv_zero(_g1, RLC_FB_DIGS + 1);
-		dv_zero(_g2, RLC_FB_DIGS + 1);
-
-		u = _u;
-		v = _v;
-		g1 = _g1;
-		g2 = _g2;
-
-		/* u = a, v = f, g1 = 1, g2 = 0. */
-		fb_copy(u, a);
-		fb_copy(v, fb_poly_get());
-		g1[0] = 1;
-
-		lu = lv = RLC_FB_DIGS;
-		l1 = l2 = 1;
-
-		bu = fb_bits(u);
-		bv = RLC_FB_BITS + 1;
-		j = bu - bv;
-
-		/* While (u != 1). */
-		while (1) {
-			/* If j < 0 then swap(u, v), swap(g1, g2), j = -j. */
-			if (j < 0) {
-				t = u;
-				u = v;
-				v = t;
-
-				lt = lu;
-				lu = lv;
-				lv = lt;
-
-				t = g1;
-				g1 = g2;
-				g2 = t;
-
-				lt = l1;
-				l1 = l2;
-				l2 = lt;
-
-				j = -j;
-			}
-
-			RLC_RIP(j, d, j);
-
-			/* u = u + v * z^j. */
-			if (j > 0) {
-				carry = fb_lsha_low(u + d, v, j, lv);
-				u[d + lv] ^= carry;
-			} else {
-				fb_addd_low(u + d, u + d, v, lv);
-			}
-
-			/* g1 = g1 + g2 * z^j. */
-			if (j > 0) {
-				carry = fb_lsha_low(g1 + d, g2, j, l2);
-				l1 = (l2 + d >= l1 ? l2 + d : l1);
-				if (carry) {
-					g1[d + l2] ^= carry;
-					l1 = (l2 + d >= l1 ? l1 + 1 : l1);
-				}
-			} else {
-				fb_addd_low(g1 + d, g1 + d, g2, l2);
-				l1 = (l2 + d > l1 ? l2 + d : l1);
-			}
-
-			while (u[lu - 1] == 0)
-				lu--;
-			while (v[lv - 1] == 0)
-				lv--;
-
-			if (lu == 1 && u[0] == 1)
-				break;
-
-			/* j = deg(u) - deg(v). */
-			lt = util_bits_dig(u[lu - 1]) - util_bits_dig(v[lv - 1]);
-			if (lv > lu) {
-				j = -((lv - lu) << RLC_DIG_LOG) + lt;
-			} else {
-				j = ((lu - lv) << RLC_DIG_LOG) + lt;
-			}
-		}
-		/* Return g1. */
-		fb_copy(c, g1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(_u);
-		dv_free(_v);
-		dv_free(_g1);
-		dv_free(_g2);
-	}
-}
-
-#endif
-
-#if FB_INV == ALMOS || !defined(STRIP)
-
-void fb_inv_almos(fb_t c, const fb_t a) {
-	int lu, lv, lt;
-	dv_t _b, _d, _u, _v;
-	dig_t *t = NULL, *u = NULL, *v = NULL, *b = NULL, *d = NULL;
-
-	dv_null(_b);
-	dv_null(_d);
-	dv_null(_u);
-	dv_null(_v);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	/* This is actually the binary version of the Extended Euclidean algorithm
- 	 * discussed in the Almost Inverse paper, so a rename is needed. */
-
-	RLC_TRY {
-		dv_new(_b);
-		dv_new(_d);
-		dv_new(_u);
-		dv_new(_v);
-
-		b = _b;
-		d = _d;
-		u = _u;
-		v = _v;
-
-		/* b = 1, d = 0, u = a, v = f. */
-		dv_zero(b, 2 * RLC_FB_DIGS);
-		fb_set_dig(b, 1);
-		dv_zero(d, 2 * RLC_FB_DIGS);
-		fb_copy(u, a);
-		fb_copy(v, fb_poly_get());
-
-		if (RLC_FB_BITS % RLC_DIG == 0) {
-			v[RLC_FB_DIGS] = 1;
-		}
-
-		lu = RLC_FB_DIGS;
-		lv = RLC_FB_DIGS + (RLC_FB_BITS % RLC_DIG == 0);
-
-		while (1) {
-			/* While z divides u do. */
-			while ((u[0] & 0x01) == 0) {
-				/* u = u/z. */
-				bn_rsh1_low(u, u, lu);
-				/* If z divide v then b = b/z; else b = (b + f)/z. */
-				if ((b[0] & 0x01) == 1) {
-					fb_poly_add(b, b);
-					if (RLC_FB_BITS % RLC_DIG == 0) {
-						b[RLC_FB_DIGS] ^= 1;
-					}
-				}
-				/* b often has RLC_FB_DIGS digits. */
-				bn_rsh1_low(b, b, RLC_FB_DIGS + 1);
-			}
-			/* If u = 1, return b. */
-			while (u[lu - 1] == 0)
-				lu--;
-			if (lu == 1 && u[0] == 1) {
-				break;
-			}
-			/* If deg(u) < deg(v) then swap(u, v), swap(b, d). */
-			if ((lu < lv) || ((lu == lv) && (u[lu - 1] < v[lv - 1]))) {
-				t = u;
-				u = v;
-				v = t;
-
-				/* Swap lu and lv too. */
-				lt = lu;
-				lu = lv;
-				lv = lt;
-
-				t = b;
-				b = d;
-				d = t;
-			}
-			/* u = u + v, b = b + d. */
-			fb_addd_low(u, u, v, lv);
-			fb_addn_low(b, b, d);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_copy(c, b);
-		dv_free(_b);
-		dv_free(_d);
-		dv_free(_u);
-		dv_free(_v);
-	}
-}
-
-#endif
-
-#if FB_INV == ITOHT || !defined(STRIP)
-
-void fb_inv_itoht(fb_t c, const fb_t a) {
-	int i, x, y, len;
-	const int *chain = fb_poly_get_chain(&len);
-	int *u = RLC_ALLOCA(int, len + 1);
-	fb_t *table = RLC_ALLOCA(fb_t, len + 1);
-
-	for (i = 0; i <= len; i++) {
-		fb_null(table[i]);
-	}
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		if (u == NULL || table == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i <= len; i++) {
-			fb_new(table[i]);
-		}
-
-#if (FB_POLYN % 2) == 0
-		fb_sqr(table[0], a);
-		for (i = 2; i < RLC_FB_BITS; i++) {
-			fb_sqr(table[1], a);
-			for (int j = 1; j < i; j++) {
-				fb_sqr(table[1], table[1]);
-			}
-			fb_mul(table[0], table[0], table[1]);
-		}
-		fb_copy(c, table[0]);
-#else
-		u[0] = 1;
-		u[1] = 2;
-		fb_copy(table[0], a);
-		fb_sqr(table[1], table[0]);
-		fb_mul(table[1], table[1], table[0]);
-		for (i = 2; i <= len; i++) {
-			x = chain[i - 1] >> 8;
-			y = chain[i - 1] - (x << 8);
-			if (x == y) {
-				u[i] = 2 * u[i - 1];
-			} else {
-				u[i] = u[x] + u[y];
-			}
-			fb_itr(table[i], table[x], u[y], fb_poly_tab_sqr(y));
-			fb_mul(table[i], table[i], table[y]);
-		}
-		fb_sqr(c, table[len]);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i <= len; i++) {
-			fb_free(table[i]);
-		}
-		RLC_FREE(u);
-		RLC_FREE(table);
-	}
-}
-
-#endif
-
-#if FB_INV == BRUCH || !defined(STRIP)
-
-void fb_inv_bruch(fb_t c, const fb_t a) {
-	fb_t _r, _s, _u, _v;
-	dig_t *r = NULL, *s = NULL, *t = NULL, *u = NULL, *v = NULL;
-	int delta = 0;
-
-	fb_null(_r);
-	fb_null(_s);
-	fb_null(_u);
-	fb_null(_v);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		fb_new(_r);
-		fb_new(_s);
-		fb_new(_u);
-		fb_new(_v);
-
-		fb_copy(_r, a);
-		fb_copy(_s, fb_poly_get());
-		fb_zero(_v);
-		fb_set_dig(_u, 1);
-
-		r = _r;
-		s = _s;
-		u = _u;
-		v = _v;
-
-		for (int i = 1; i <= 2 * RLC_FB_BITS; i++) {
-			if ((r[RLC_FB_DIGS - 1] & ((dig_t)1 << (RLC_FB_BITS % RLC_DIG))) == 0) {
-				fb_lsh(r, r, 1);
-				fb_lsh(u, u, 1);
-				delta++;
-			} else {
-				if ((s[RLC_FB_DIGS - 1] & ((dig_t)1 << (RLC_FB_BITS % RLC_DIG)))) {
-					fb_add(s, s, r);
-					fb_add(v, v, u);
-				}
-				fb_lsh(s, s, 1);
-				if (delta == 0) {
-					t = r;
-					r = s;
-					s = t;
-					t = u;
-					u = v;
-					v = t;
-					fb_lsh(u, u, 1);
-					delta++;
-				} else {
-					fb_rsh(u, u, 1);
-					delta--;
-				}
-			}
-		}
-		fb_copy(c, u);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(_r);
-		fb_free(_s);
-		fb_free(_u);
-		fb_free(_v);
-	}
-}
-
-#endif
-
-#if FB_INV == CTAIA || !defined(STRIP)
-
-void fb_inv_ctaia(fb_t c, const fb_t a) {
-	fb_t r, s, t, u, v;
-	int i, k, d, r0, d0;
-
-	fb_null(r);
-	fb_null(s);
-	fb_null(t);
-	fb_null(u);
-	fb_null(v);
-
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		fb_new(r);
-		fb_new(s);
-		fb_new(t);
-		fb_new(u);
-		fb_new(v);
-
-		fb_copy(r, a);
-		fb_copy(t, fb_poly_get());
-		fb_copy(s, t);
-		fb_set_dig(u, 1);
-		fb_zero(v);
-		d = -1;
-
-		for (k = 1; k < 2 * RLC_FB_BITS; k++) {
-			r0 = r[0] & 1;
-			d0 = d >> (8 * sizeof(int) - 1);
-
-			for (i = 0; i < RLC_FB_DIGS; i++) {
-				r[i] ^= (s[i] & -r0);
-				u[i] ^= (v[i] & -r0);
-				s[i] ^= (r[i] & d0);
-				v[i] ^= (u[i] & d0);
-			}
-
-			d = RLC_SEL(d, -d, r0 & -d0);
-
-			fb_rsh(r, r, 1);
-
-			r0 = u[0] & 1;
-			fb_poly_add(t, u);
-			for (i = 0; i < RLC_FB_DIGS; i++) {
-				u[i] = RLC_SEL(u[i], t[i], r0);
-			}
-			fb_rsh(u, u, 1);
-			d--;
-		}
-
-		fb_copy(c, v);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(r);
-		fb_free(s);
-		fb_free(t);
-		fb_free(u);
-		fb_free(v);
-	}
-}
-
-#endif
-
-#if FB_INV == LOWER || !defined(STRIP)
-
-void fb_inv_lower(fb_t c, const fb_t a) {
-	if (fb_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	fb_invn_low(c, a);
-}
-#endif
-
-void fb_inv_sim(fb_t *c, const fb_t *a, int n) {
-	int i;
-	fb_t u, *t = RLC_ALLOCA(fb_t, n);
-
-	if (t == NULL) {
-		RLC_THROW(ERR_NO_MEMORY);
-	}
-
-	fb_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fb_null(t[i]);
-			fb_new(t[i]);
-		}
-		fb_new(u);
-
-		fb_copy(c[0], a[0]);
-		fb_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fb_copy(t[i], a[i]);
-			fb_mul(c[i], c[i - 1], a[i]);
-		}
-
-		fb_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fb_mul(c[i], u, c[i - 1]);
-			fb_mul(u, u, t[i]);
-		}
-		fb_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fb_free(t[i]);
-		}
-		fb_free(u);
-		RLC_FREE(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_itr.c b/src/dashbls/depends/relic/src/fb/relic_fb_itr.c
deleted file mode 100644
index 7ad4dd761149..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_itr.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the iterated squaring/square-root of a binary field
- * element.
- *
- * @ingroup fb
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_itr_basic(fb_t c, const fb_t a, int b) {
-	fb_copy(c, a);
-	if (b >= 0) {
-		for (int i = 0; i < b; i++) {
-			fb_sqr(c, c);
-		}
-	} else {
-		for (int i = 0; i < -b; i++) {
-			fb_srt(c, c);
-		}
-	}
-}
-
-void fb_itr_pre_quick(fb_st *t, int b) {
-	int i, j, k;
-	fb_t r;
-
-	fb_null(r);
-
-	RLC_TRY {
-		fb_new(r);
-
-		for (i = 0; i < RLC_FB_DIGS * RLC_DIG; i += 4) {
-			for (j = 0; j < 16; j++) {
-				fb_zero(r);
-				fb_set_dig(r, j);
-				fb_lsh(r, r, i);
-				if (b >= 0) {
-					for (k = 0; k < b; k++) {
-						fb_sqr(r, r);
-					}
-				} else {
-					for (k = 0; k < -b; k++) {
-						fb_srt(r, r);
-					}
-				}
-
-				fb_copy((dig_t *)t + (4 * i + j) * RLC_FB_DIGS, r);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(r);
-	}
-}
-
-void fb_itr_quick(fb_t c, const fb_t a, const fb_st *t) {
-	fb_itrn_low(c, a, (dig_t *)t);
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_mul.c b/src/dashbls/depends/relic/src/fb/relic_fb_mul.c
deleted file mode 100644
index d5bed8e4e8a5..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_mul.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*f
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FB_MUL == BASIC
-/**
- * Multiplies two binary field elements using shift-and-add multiplication.
- *
- * @param c					- the result.
- * @param a					- the first binary field element.
- * @param b					- the second binary field element.
- * @param size				- the number of digits to multiply.
- */
-static void fb_mul_basic_imp(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i;
-	dv_t s;
-
-	dv_null(s);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(s);
-		dv_zero(s, 2 * RLC_FB_DIGS);
-
-		dv_copy(s, b, size);
-		dv_zero(c, 2 * size);
-
-		if (a[0] & 1) {
-			dv_copy(c, b, size);
-		}
-		for (i = 1; i <= (RLC_DIG * size) - 1; i++) {
-			fb_lsh1_low(s, s);
-			fb_rdc(s, s);
-			if (fb_get_bit(a, i)) {
-				fb_add(c, c, s);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(s);
-	}
-}
-#endif /* FB_MUL == BASIC */
-
-#if FB_KARAT > 0 || !defined(STRIP)
-/**
- * Multiplies two binary field elements using recursive Karatsuba
- * multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first binary field element.
- * @param[in] b				- the second binary field element.
- * @param[in] size			- the number of digits to multiply.
- * @param[in] level			- the number of Karatsuba steps to apply.
- */
-static void fb_mul_karat_imp(dv_t c, const fb_t a, const fb_t b, int size,
-		int level) {
-	int i, h, h1;
-	dv_t a1, b1, ab;
-	dig_t *a0b0, *a1b1;
-
-	dv_null(a1);
-	dv_null(b1);
-	dv_null(ab);
-
-	/* Compute half the digits of a or b. */
-	h = size >> 1;
-	h1 = size - h;
-
-	RLC_TRY {
-		/* Allocate the temp variables. */
-		dv_new(a1);
-		dv_new(b1);
-		dv_new(ab);
-		a0b0 = ab;
-		a1b1 = ab + 2 * h;
-
-		/* a0b0 = a0 * b0 and a1b1 = a1 * b1 */
-		if (level <= 1) {
-#if FB_MUL == BASIC
-			fb_mul_basic_imp(a0b0, a, b, h);
-			fb_mul_basic_imp(a1b1, a + h, b + h, h1);
-#elif FB_MUL == INTEG || FB_MUL == LODAH
-			fb_muld_low(a0b0, a, b, h);
-			fb_muld_low(a1b1, a + h, b + h, h1);
-#endif
-		} else {
-			fb_mul_karat_imp(a0b0, a, b, h, level - 1);
-			fb_mul_karat_imp(a1b1, a + h, b + h, h1, level - 1);
-		}
-
-		for (i = 0; i < 2 * size; i++) {
-			c[i] = ab[i];
-		}
-
-		/* c = c - (a0*b0 << h digits) */
-		fb_addd_low(c + h, c + h, a0b0, 2 * h);
-
-		/* c = c - (a1*b1 << h digits) */
-		fb_addd_low(c + h, c + h, a1b1, 2 * h1);
-
-		/* a1 = (a1 + a0) */
-		fb_addd_low(a1, a, a + h, h);
-
-		/* b1 = (b1 + b0) */
-		fb_addd_low(b1, b, b + h, h);
-
-		if (h1 > h) {
-			a1[h1 - 1] = a[h + h1 - 1];
-			b1[h1 - 1] = b[h + h1 - 1];
-		}
-
-		if (level <= 1) {
-			/* a1b1 = (a1 + a0)*(b1 + b0) */
-#if FB_MUL == BASIC
-			fb_mul_basic_imp(a1b1, a1, b1, h1);
-#elif FB_MUL == INTEG || FB_MUL == LODAH
-			fb_muld_low(a1b1, a1, b1, h1);
-#endif
-		} else {
-			fb_mul_karat_imp(a1b1, a1, b1, h1, level - 1);
-		}
-
-		/* c = c + [(a1 + a0)*(b1 + b0) << digits] */
-		fb_addd_low(c + h, c + h, a1b1, 2 * h1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(a1);
-		dv_free(b1);
-		dv_free(ab);
-	}
-}
-
-#endif /* FB_KARAT > 0 || !defined(STRIP) */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_MUL == BASIC || !defined(STRIP)
-
-void fb_mul_basic(fb_t c, const fb_t a, const fb_t b) {
-	int i;
-	dv_t s;
-	fb_t t;
-
-	dv_null(s);
-	fb_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		fb_new(t);
-		dv_new(s);
-		fb_zero(t);
-		dv_zero(s + RLC_FB_DIGS, RLC_FB_DIGS);
-		fb_copy(s, b);
-
-		if (a[0] & 1) {
-			fb_copy(t, b);
-		}
-		for (i = 1; i < RLC_FB_BITS; i++) {
-			/* We are already shifting a temporary value, so this is more efficient
-			 * than calling fb_lsh(). */
-			s[RLC_FB_DIGS] = fb_lsh1_low(s, s);
-			fb_rdc(s, s);
-			if (fb_get_bit(a, i)) {
-				fb_add(t, t, s);
-			}
-		}
-
-		if (fb_bits(t) > RLC_FB_BITS) {
-			fb_poly_add(c, t);
-		} else {
-			fb_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t);
-		fb_free(s);
-	}
-}
-
-#endif
-
-#if FB_MUL == INTEG || !defined(STRIP)
-
-void fb_mul_integ(fb_t c, const fb_t a, const fb_t b) {
-	fb_mulm_low(c, a, b);
-}
-
-#endif
-
-#if FB_MUL == LODAH || !defined(STRIP)
-
-void fb_mul_lodah(fb_t c, const fb_t a, const fb_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-
-		fb_muln_low(t, a, b);
-
-		fb_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-#if FB_KARAT > 0 || !defined(STRIP)
-
-void fb_mul_karat(fb_t c, const fb_t a, const fb_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-		dv_zero(t, 2 * RLC_FB_DIGS);
-
-		fb_mul_karat_imp(t, a, b, RLC_FB_DIGS, FB_KARAT);
-
-		fb_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-void fb_mul_dig(fb_t c, const fb_t a, dig_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-
-		fb_mul1_low(t, a, b);
-
-		fb_rdc1_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_param.c b/src/dashbls/depends/relic/src/fb/relic_fb_param.c
deleted file mode 100644
index 4376bb22dd2a..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_param.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field modulus manipulation.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_dv.h"
-#include "relic_fb.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fb_param_get(void) {
-	return core_get()->fb_id;
-}
-
-void fb_param_set(int param) {
-	switch (param) {
-		case PENTA_8:
-			fb_poly_set_penta(4, 3, 2);
-			break;
-		case PENTA_64:
-			fb_poly_set_penta(4, 3, 1);
-			break;
-		case TRINO_113:
-			fb_poly_set_trino(9);
-			break;
-		case TRINO_127:
-			fb_poly_set_trino(63);
-			break;
-		case PENTA_128:
-			fb_poly_set_penta(7, 2, 1);
-			break;
-		case PENTA_131:
-			fb_poly_set_penta(13, 2, 1);
-			break;
-		case SQRT_163:
-			fb_poly_set_penta(57, 49, 29);
-			break;
-		case NIST_163:
-			fb_poly_set_penta(7, 6, 3);
-			break;
-		case TRINO_193:
-			fb_poly_set_trino(15);
-			break;
-		case SQRT_233:
-			fb_poly_set_trino(159);
-			break;
-		case NIST_233:
-			fb_poly_set_trino(74);
-			break;
-		case SQRT_239:
-			fb_poly_set_trino(81);
-			break;
-		case SECG_239:
-			fb_poly_set_trino(158);
-			break;
-		case TRINO_257:
-			fb_poly_set_trino(41);
-			break;
-		case SQRT_251:
-			fb_poly_set_penta(89, 81, 3);
-			break;
-		case PENTA_251:
-			fb_poly_set_penta(7, 4, 2);
-			break;
-		case TRINO_271:
-			fb_poly_set_trino(201);
-			break;
-		case PENTA_271:
-			fb_poly_set_penta(207, 175, 111);
-			break;
-		case SQRT_283:
-			fb_poly_set_penta(97, 89, 87);
-			break;
-		case NIST_283:
-			fb_poly_set_penta(12, 7, 5);
-			break;
-		case TRINO_353:
-#if WSIZE == 8
-			fb_poly_set_trino(69);
-#else
-			fb_poly_set_trino(95);
-#endif
-			break;
-		case TRINO_367:
-			fb_poly_set_trino(21);
-			break;
-		case NIST_409:
-			fb_poly_set_trino(87);
-			break;
-		case TRINO_439:
-			fb_poly_set_trino(49);
-			break;
-		case SQRT_571:
-			fb_poly_set_penta(193, 185, 5);
-			break;
-		case NIST_571:
-			fb_poly_set_penta(10, 5, 2);
-			break;
-		case TRINO_1223:
-			fb_poly_set_trino(255);
-			break;
-		default:
-			RLC_THROW(ERR_NO_VALID);
-			break;
-	}
-	core_get()->fb_id = param;
-}
-
-void fb_param_set_any(void) {
-#if FB_POLYN == 8
-	fb_param_set(PENTA_8);
-
-#elif FB_POLYN == 64
-	fb_param_set(PENTA_64);
-
-#elif FB_POLYN == 113
-	fb_param_set(TRINO_113);
-
-#elif FB_POLYN == 127
-	fb_param_set(TRINO_127);
-
-#elif FB_POLYN == 128
-	fb_param_set(PENTA_128);
-
-#elif FB_POLYN == 131
-	fb_param_set(PENTA_131);
-
-#elif FB_POLYN == 163
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_163);
-#else
-	fb_param_set(NIST_163);
-#endif
-
-#elif FB_POLYN == 193
-	fb_param_set(TRINO_193);
-
-#elif FB_POLYN == 233
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_233);
-#else
-	fb_param_set(NIST_233);
-#endif
-
-#elif FB_POLYN == 239
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_239);
-#else
-	fb_param_set(SECG_239);
-#endif
-
-#elif FB_POLYN == 251
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_251);
-#else
-	fb_param_set(PENTA_251);
-#endif
-
-#elif FB_POLYN == 257
-	fb_param_set(TRINO_257);
-
-#elif FB_POLYN == 271
-#ifdef FB_TRINO
-	fb_param_set(TRINO_271);
-#else
-	fb_param_set(PENTA_271);
-#endif
-
-#elif FB_POLYN == 283
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_283);
-#else
-	fb_param_set(NIST_283);
-#endif
-
-#elif FB_POLYN == 353
-	fb_param_set(TRINO_353);
-
-#elif FB_POLYN == 367
-	fb_param_set(TRINO_367);
-
-#elif FB_POLYN == 409
-	fb_param_set(NIST_409);
-
-#elif FB_POLYN == 439
-	fb_param_set(TRINO_439);
-
-#elif FB_POLYN == 571
-#ifdef FB_SQRTF
-	fb_param_set(SQRT_571);
-#else
-	fb_param_set(NIST_571);
-#endif
-
-#elif FB_POLYN == 1223
-	fb_param_set(TRINO_1223);
-#else
-	RLC_THROW(ERR_NO_FIELD);
-#endif
-}
-
-void fb_param_print(void) {
-	int fa, fb, fc;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	if (fb == 0) {
-		util_banner("Irreducible trinomial:", 0);
-		util_print("   z^%d + z^%d + 1\n", RLC_FB_BITS, fa);
-	} else {
-		util_banner("Irreducible pentanomial:", 0);
-		util_print("   z^%d + z^%d + z^%d + z^%d + 1\n", RLC_FB_BITS, fa, fb, fc);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_poly.c b/src/dashbls/depends/relic/src/fb/relic_fb_poly.c
deleted file mode 100644
index 0e67cf073126..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_poly.c
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field modulus manipulation.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_dv.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FB_TRC == QUICK || !defined(STRIP)
-
-/**
- * Find non-zero bits for fast trace computation.
- *
- * @throw ERR_NO_MEMORY if there is no available memory.
- * @throw ERR_NO_VALID if the polynomial is invalid.
- */
-static void find_trace(void) {
-	fb_t t0, t1;
-	int counter;
-	ctx_t *ctx = core_get();
-
-	fb_null(t0);
-	fb_null(t1);
-
-	ctx->fb_ta = ctx->fb_tb = ctx->fb_tc = -1;
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-
-		counter = 0;
-		for (int i = 0; i < RLC_FB_BITS; i++) {
-			fb_zero(t0);
-			fb_set_bit(t0, i, 1);
-			fb_copy(t1, t0);
-			for (int j = 1; j < RLC_FB_BITS; j++) {
-				fb_sqr(t1, t1);
-				fb_add(t0, t0, t1);
-			}
-			if (!fb_is_zero(t0)) {
-				switch (counter) {
-					case 0:
-						ctx->fb_ta = i;
-						ctx->fb_tb = ctx->fb_tc = -1;
-						break;
-					case 1:
-						ctx->fb_tb = i;
-						ctx->fb_tc = -1;
-						break;
-					case 2:
-						ctx->fb_tc = i;
-						break;
-					default:
-						RLC_THROW(ERR_NO_VALID);
-						break;
-				}
-				counter++;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-	}
-}
-
-#endif
-
-#if FB_SLV == QUICK || !defined(STRIP)
-
-/**
- * Precomputes half-traces for z^i with odd i.
- *
- * @throw ERR_NO_MEMORY if there is no available memory.
- */
-static void find_solve(void) {
-	int i, j, k, l;
-	fb_t t0;
-	ctx_t *ctx = core_get();
-
-	fb_null(t0);
-
-	RLC_TRY {
-		fb_new(t0);
-
-		l = 0;
-		for (i = 0; i < RLC_FB_BITS; i += 8, l++) {
-			for (j = 0; j < 16; j++) {
-				fb_zero(t0);
-				for (k = 0; k < 4; k++) {
-					if (j & (1 << k)) {
-						fb_set_bit(t0, i + 2 * k + 1, 1);
-					}
-				}
-				fb_copy(ctx->fb_half[l][j], t0);
-				for (k = 0; k < (RLC_FB_BITS - 1) / 2; k++) {
-					fb_sqr(ctx->fb_half[l][j], ctx->fb_half[l][j]);
-					fb_sqr(ctx->fb_half[l][j], ctx->fb_half[l][j]);
-					fb_add(ctx->fb_half[l][j], ctx->fb_half[l][j], t0);
-				}
-			}
-			fb_rsh(ctx->fb_half[l][j], ctx->fb_half[l][j], 1);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-	}
-}
-
-#endif
-
-#if FB_SRT == QUICK || !defined(STRIP)
-
-/**
- * Precomputes the square root of z.
- */
-static void find_srz(void) {
-	ctx_t *ctx = core_get();
-
-	fb_set_dig(ctx->fb_srz, 2);
-
-	for (int i = 1; i < RLC_FB_BITS; i++) {
-		fb_sqr(ctx->fb_srz, ctx->fb_srz);
-	}
-
-#ifdef FB_PRECO
-	for (int i = 0; i <= 255; i++) {
-		fb_mul_dig(ctx->fb_tab_srz[i], ctx->fb_srz, i);
-	}
-#endif
-}
-
-#endif
-
-#if FB_INV == ITOHT || !defined(STRIP)
-
-/**
- * Finds an addition chain for (RLC_FB_BITS - 1).
- */
-static void find_chain(void) {
-	int i, j, k, l, x, y, u[RLC_TERMS + 1];
-	ctx_t *ctx = core_get();
-
-	ctx->chain_len = -1;
-	for (int i = 0; i < RLC_TERMS; i++) {
-		ctx->chain[i] = (i << 8) + i;
-	}
-	switch (RLC_FB_BITS) {
-		case 127:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain[4] = (4 << 8) + 2;
-			ctx->chain[7] = (7 << 8) + 2;
-			ctx->chain_len = 9;
-			break;
-		case 193:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain_len = 8;
-			break;
-		case 233:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain[3] = (3 << 8) + 0;
-			ctx->chain[6] = (6 << 8) + 0;
-			ctx->chain_len = 10;
-			break;
-		case 251:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain[2] = (2 << 8) + 1;
-			ctx->chain[4] = (4 << 8) + 3;
-			ctx->chain[5] = (5 << 8) + 4;
-			ctx->chain[7] = (7 << 8) + 6;
-			ctx->chain[8] = (8 << 8) + 7;
-			ctx->chain_len = 10;
-			break;
-		case 283:
-			ctx->chain[4] = (4 << 8) + 0;
-			ctx->chain[6] = (6 << 8) + 0;
-			ctx->chain[9] = (9 << 8) + 0;
-			ctx->chain_len = 11;
-			break;
-		case 353:
-			ctx->chain[2] = (2 << 8) + 0;
-			ctx->chain[4] = (4 << 8) + 0;
-			ctx->chain_len = 10;
-			break;
-		case 367:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain[2] = (2 << 8) + 1;
-			ctx->chain[6] = (6 << 8) + 3;
-			ctx->chain[9] = (9 << 8) + 2;
-			ctx->chain_len = 11;
-			break;
-		case 1223:
-			ctx->chain[1] = (1 << 8) + 0;
-			ctx->chain[2] = (2 << 8) + 0;
-			ctx->chain[4] = (4 << 8) + 2;
-			ctx->chain[5] = (5 << 8) + 4;
-			ctx->chain[10] = (10 << 8) + 2;
-			ctx->chain[11] = (11 << 8) + 10;
-			ctx->chain_len = 13;
-			break;
-		default:
-			l = 0;
-			j = (RLC_FB_BITS - 1);
-			for (k = 16; k >= 0; k--) {
-				if (j & (1 << k)) {
-					break;
-				}
-			}
-			for (i = 1; i < k; i++) {
-				if (j & (1 << i)) {
-					l++;
-				}
-			}
-			i = 0;
-			ctx->chain_len = k + l;
-			while (j != 1) {
-				if ((j & 0x01) != 0) {
-					i++;
-					ctx->chain[ctx->chain_len - i] = ((ctx->chain_len - i) << 8) + 0;
-				}
-				i++;
-				j = j >> 1;
-			}
-			break;
-	}
-
-	u[0] = 1;
-	u[1] = 2;
-	for (i = 2; i <= ctx->chain_len; i++) {
-		x = ctx->chain[i - 1] >> 8;
-		y = ctx->chain[i - 1] - (x << 8);
-		if (x == y) {
-			u[i] = 2 * u[i - 1];
-		} else {
-			u[i] = u[x] + u[y];
-		}
-	}
-
-	for (i = 0; i <= ctx->chain_len; i++) {
-		fb_itr_pre((fb_st *)fb_poly_tab_sqr(i), u[i]);
-	}
-}
-
-#endif
-
-/**
- * Configures the irreducible polynomial of the binary field.
- *
- * @param[in] f				- the new irreducible polynomial.
- */
-static void fb_poly_set(const fb_t f) {
-	fb_copy(core_get()->fb_poly, f);
-#if FB_TRC == QUICK || !defined(STRIP)
-	find_trace();
-#endif
-#if FB_SLV == QUICK || !defined(STRIP)
-	find_solve();
-#endif
-#if FB_SRT == QUICK || !defined(STRIP)
-	find_srz();
-#endif
-#if FB_INV == ITOHT || !defined(STRIP)
-	find_chain();
-#endif
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_poly_init(void) {
-	ctx_t *ctx = core_get();
-
-	fb_zero(ctx->fb_poly);
-	ctx->fb_pa = ctx->fb_pb = ctx->fb_pc = 0;
-	ctx->fb_na = ctx->fb_nb = ctx->fb_nc = -1;
-}
-
-void fb_poly_clean(void) {
-}
-
-dig_t *fb_poly_get(void) {
-	return core_get()->fb_poly;
-}
-
-void fb_poly_add(fb_t c, const fb_t a) {
-	ctx_t *ctx = core_get();
-
-	if (c != a) {
-		fb_copy(c, a);
-	}
-
-	if (ctx->fb_pa != 0) {
-		c[RLC_FB_DIGS - 1] ^= ctx->fb_poly[RLC_FB_DIGS - 1];
-		if (ctx->fb_na != RLC_FB_DIGS - 1) {
-			c[ctx->fb_na] ^= ctx->fb_poly[ctx->fb_na];
-		}
-		if (ctx->fb_pb != 0 && ctx->fb_pc != 0) {
-			if (ctx->fb_nb != ctx->fb_na) {
-				c[ctx->fb_nb] ^= ctx->fb_poly[ctx->fb_nb];
-			}
-			if (ctx->fb_nc != ctx->fb_na && ctx->fb_nc != ctx->fb_nb) {
-				c[ctx->fb_nc] ^= ctx->fb_poly[ctx->fb_nc];
-			}
-		}
-		if (ctx->fb_na != 0 && ctx->fb_nb != 0 && ctx->fb_nc != 0) {
-			c[0] ^= 1;
-		}
-	} else {
-		fb_add(c, a, ctx->fb_poly);
-	}
-}
-
-void fb_poly_set_dense(const fb_t f) {
-	ctx_t *ctx = core_get();
-	fb_poly_set(f);
-	ctx->fb_pa = ctx->fb_pb = ctx->fb_pc = 0;
-	ctx->fb_na = ctx->fb_nb = ctx->fb_nc = -1;
-}
-
-void fb_poly_set_trino(int a) {
-	fb_t f;
-	ctx_t *ctx = core_get();
-
-	fb_null(f);
-
-	RLC_TRY {
-		ctx->fb_pa = a;
-		ctx->fb_pb = ctx->fb_pc = 0;
-
-		ctx->fb_na = ctx->fb_pa >> RLC_DIG_LOG;
-		ctx->fb_nb = ctx->fb_nc = -1;
-
-		fb_new(f);
-		fb_zero(f);
-		fb_set_bit(f, RLC_FB_BITS, 1);
-		fb_set_bit(f, a, 1);
-		fb_set_bit(f, 0, 1);
-		fb_poly_set(f);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(f);
-	}
-}
-
-void fb_poly_set_penta(int a, int b, int c) {
-	fb_t f;
-	ctx_t *ctx = core_get();
-
-	fb_null(f);
-
-	RLC_TRY {
-		fb_new(f);
-
-		ctx->fb_pa = a;
-		ctx->fb_pb = b;
-		ctx->fb_pc = c;
-
-		ctx->fb_na = ctx->fb_pa >> RLC_DIG_LOG;
-		ctx->fb_nb = ctx->fb_pb >> RLC_DIG_LOG;
-		ctx->fb_nc = ctx->fb_pc >> RLC_DIG_LOG;
-
-		fb_zero(f);
-		fb_set_bit(f, RLC_FB_BITS, 1);
-		fb_set_bit(f, a, 1);
-		fb_set_bit(f, b, 1);
-		fb_set_bit(f, c, 1);
-		fb_set_bit(f, 0, 1);
-		fb_poly_set(f);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(f);
-	}
-}
-
-dig_t *fb_poly_get_srz(void) {
-#if FB_SRT == QUICK || !defined(STRIP)
-	return core_get()->fb_srz;
-#else
-	return NULL;
-#endif
-}
-
-const fb_st *fb_poly_tab_sqr(int i) {
-#if FB_INV == ITOHT || !defined(STRIP)
-	/* If ITOHT inversion is used and tables are precomputed, return them. */
-	return (const fb_st *)core_get()->fb_tab_sqr[i];
-#else
-	return NULL;
-#endif
-}
-
-const dig_t *fb_poly_tab_srz(int i) {
-#if FB_SRT == QUICK || !defined(STRIP)
-
-#ifdef FB_PRECO
-	return core_get()->fb_tab_srz[i];
-#else
-	return NULL;
-#endif
-
-#else
-	return NULL;
-#endif
-}
-
-void fb_poly_get_trc(int *a, int *b, int *c) {
-#if FB_TRC == QUICK || !defined(STRIP)
-	ctx_t *ctx = core_get();
-	*a = ctx->fb_ta;
-	*b = ctx->fb_tb;
-	*c = ctx->fb_tc;
-#else
-	*a = *b = *c = -1;
-#endif
-}
-
-void fb_poly_get_rdc(int *a, int *b, int *c) {
-	ctx_t *ctx = core_get();
-	*a = ctx->fb_pa;
-	*b = ctx->fb_pb;
-	*c = ctx->fb_pc;
-}
-
-const dig_t *fb_poly_get_slv(void) {
-#if FB_SLV == QUICK || !defined(STRIP)
-	return (dig_t *)&(core_get()->fb_half);
-#else
-	return NULL;
-#endif
-}
-
-const int *fb_poly_get_chain(int *len) {
-#if FB_INV == ITOHT || !defined(STRIP)
-	ctx_t *ctx = core_get();
-	if (ctx->chain_len > 0 && ctx->chain_len < RLC_TERMS) {
-		if (len != NULL) {
-			*len = ctx->chain_len;
-		}
-		return ctx->chain;
-	} else {
-		if (len != NULL) {
-			*len = 0;
-		}
-		return NULL;
-	}
-#else
-	return NULL;
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_rdc.c b/src/dashbls/depends/relic/src/fb/relic_fb_rdc.c
deleted file mode 100644
index ef4ff020bba4..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_rdc.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field modular reduction.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_bn_low.h"
-#include "relic_dv.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_RDC == BASIC || !defined(STRIP)
-
-void fb_rdc_basic(fb_t c, dv_t a) {
-	int j, k;
-	dig_t *tmpa;
-	dv_t r;
-
-	dv_null(r);
-
-	RLC_TRY {
-		dv_new(r);
-
-		tmpa = a + RLC_FB_DIGS;
-
-		/* First reduce the high part. */
-		for (int i = fb_bits(tmpa) - 1; i >= 0; i--) {
-			if (fb_get_bit(tmpa, i)) {
-				RLC_RIP(k, j, i - RLC_FB_BITS);
-				if (k <= 0) {
-					fb_addd_low(tmpa + j, tmpa + j, fb_poly_get(), RLC_FB_DIGS);
-				} else {
-					r[RLC_FB_DIGS] = fb_lshb_low(r, fb_poly_get(), k);
-					fb_addd_low(tmpa + j, tmpa + j, r, RLC_FB_DIGS + 1);
-				}
-			}
-		}
-		for (int i = fb_bits(a) - 1; i >= RLC_FB_BITS; i--) {
-			if (fb_get_bit(a, i)) {
-				RLC_RIP(k, j, i - RLC_FB_BITS);
-				if (k == 0) {
-					fb_addd_low(a + j, a + j, fb_poly_get(), RLC_FB_DIGS);
-				} else {
-					r[RLC_FB_DIGS] = fb_lshb_low(r, fb_poly_get(), k);
-					fb_addd_low(a + j, a + j, r, RLC_FB_DIGS + 1);
-				}
-			}
-		}
-
-		fb_copy(c, a);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(r);
-	}
-}
-
-#endif
-
-#if FB_RDC == QUICK || !defined(STRIP)
-
-void fb_rdc_quick(fb_t c, dv_t a) {
-	fb_rdcn_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_shift.c b/src/dashbls/depends/relic/src/fb/relic_fb_shift.c
deleted file mode 100644
index 9ea0eaed1b9a..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_shift.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field multiplication by the basis.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_lsh(fb_t c, const fb_t a, int bits) {
-	int digits;
-
-	RLC_RIP(bits, digits, bits);
-
-	if (digits) {
-		dv_lshd(c, a, RLC_FB_DIGS, digits);
-	} else {
-		if (c != a) {
-			fb_copy(c, a);
-		}
-	}
-
-	switch (bits) {
-		case 0:
-			break;
-		case 1:
-			fb_lsh1_low(c, c);
-			break;
-		default:
-			fb_lshb_low(c, c, bits);
-			break;
-	}
-}
-
-void fb_rsh(fb_t c, const fb_t a, int bits) {
-	int digits;
-
-	RLC_RIP(bits, digits, bits);
-
-	if (digits) {
-		dv_rshd(c, a, RLC_FB_DIGS, digits);
-	} else {
-		if (c != a) {
-			fb_copy(c, a);
-		}
-	}
-
-	switch (bits) {
-		case 0:
-			break;
-		case 1:
-			fb_rsh1_low(c, c);
-			break;
-		default:
-			fb_rshb_low(c, c, bits);
-			break;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_slv.c b/src/dashbls/depends/relic/src/fb/relic_fb_slv.c
deleted file mode 100644
index 87bd39db3370..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_slv.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of quadratic equation solution on binary fields.
- *
- * @ingroup fb
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_SLV == BASIC || !defined(STRIP)
-
-void fb_slv_basic(fb_t c, const fb_t a) {
-	int i;
-	fb_t t0;
-
-	fb_null(t0);
-
-	RLC_TRY {
-		fb_new(t0);
-
-		fb_copy(t0, a);
-		fb_copy(c, a);
-
-		for (i = 0; i < (RLC_FB_BITS - 1) / 2; i++) {
-			fb_sqr(c, c);
-			fb_sqr(c, c);
-			fb_add(c, c, t0);
-		}
-
-		fb_add_dig(c, c, fb_trc(c));
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t0);
-	}
-}
-
-#endif
-
-#if FB_SLV == QUICK || !defined(STRIP)
-
-void fb_slv_quick(fb_t c, const fb_t a) {
-	fb_slvn_low(c, a);
-	fb_add_dig(c, c, fb_trc(c));
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_sqr.c b/src/dashbls/depends/relic/src/fb/relic_fb_sqr.c
deleted file mode 100644
index ebf22cfb2777..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_sqr.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field squaring.
- *
- * @ingroup fb
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_SQR == BASIC || !defined(STRIP)
-
-void fb_sqr_basic(fb_t c, const fb_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-		fb_sqrn_low(t, a);
-		fb_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-#if FB_SQR == QUICK || !defined(STRIP)
-
-void fb_sqr_quick(fb_t c, const fb_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-		fb_sqrl_low(t, a);
-		fb_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-#if FB_SQR == INTEG || !defined(STRIP)
-
-void fb_sqr_integ(fb_t c, const fb_t a) {
-	fb_sqrm_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_srt.c b/src/dashbls/depends/relic/src/fb/relic_fb_srt.c
deleted file mode 100644
index 7f926035c06c..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_srt.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the binary field square root.
- *
- * @ingroup fb
- */
-
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FB_SRT == BASIC || !defined(STRIP)
-
-void fb_srt_basic(fb_t c, const fb_t a) {
-	if (c != a) {
-		fb_copy(c, a);
-	}
-
-	for (int i = 1; i < RLC_FB_BITS; i++) {
-		fb_sqr(c, c);
-	}
-}
-
-#endif
-
-#if FB_SRT == QUICK || !defined(STRIP)
-
-void fb_srt_quick(fb_t c, const fb_t a) {
-	fb_srtn_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_trc.c b/src/dashbls/depends/relic/src/fb/relic_fb_trc.c
deleted file mode 100644
index 889cd007b919..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_trc.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of binary field trace function.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_trc_basic(const fb_t a) {
-	int r = 0;
-	fb_t t, u;
-
-	fb_null(t);
-	fb_null(u);
-
-	RLC_TRY {
-		fb_new(t);
-		fb_new(u);
-
-		fb_copy(t, a);
-		fb_copy(u, a);
-		for (int i = 1; i < RLC_FB_BITS; i++) {
-			fb_sqr(t, t);
-			fb_add(u, u, t);
-		}
-
-		r = u[0] & 1;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t);
-		fb_free(u);
-	}
-
-	return r;
-}
-
-dig_t fb_trc_quick(const fb_t a) {
-	return fb_trcn_low(a);
-}
diff --git a/src/dashbls/depends/relic/src/fb/relic_fb_util.c b/src/dashbls/depends/relic/src/fb/relic_fb_util.c
deleted file mode 100644
index f8964ec736c1..000000000000
--- a/src/dashbls/depends/relic/src/fb/relic_fb_util.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the basic functions to manipulate binary field elements.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_rand.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Checks if a radix is a power of two.
- *
- * @param[in] radix				- the radix to check.
- * @return if radix is a valid radix.
- */
-static int valid_radix(int radix) {
-	while (radix > 0) {
-		if (radix != 1 && radix % 2 == 1)
-			return 0;
-		radix = radix / 2;
-	}
-	return 1;
-}
-
-/**
- * Computes the logarithm of a valid radix in basis two.
- *
- * @param[in] radix				- the valid radix.
- * @return the logarithm of the radix in basis two.
- */
-static int log_radix(int radix) {
-	int l = 0;
-
-	while (radix > 0) {
-		radix = radix / 2;
-		l++;
-	}
-	return --l;
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_copy(fb_t c, const fb_t a) {
-	dv_copy(c, a, RLC_FB_DIGS);
-}
-
-void fb_zero(fb_t a) {
-	dv_zero(a, RLC_FB_DIGS);
-}
-
-int fb_is_zero(const fb_t a) {
-	int i;
-	dig_t t = 0;
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		t |= a[i];
-	}
-
-	return !t;
-}
-
-int fb_get_bit(const fb_t a, int bit) {
-	int d;
-
-	RLC_RIP(bit, d, bit);
-
-	return (a[d] >> bit) & 1;
-}
-
-void fb_set_bit(fb_t a, int bit, int value) {
-	int d;
-	dig_t mask;
-
-	RLC_RIP(bit, d, bit);
-
-	mask = (dig_t)1 << bit;
-
-	if (value == 1) {
-		a[d] |= mask;
-	} else {
-		a[d] &= ~mask;
-	}
-}
-
-int fb_bits(const fb_t a) {
-	int i = RLC_FB_DIGS - 1;
-
-	while (i >= 0 && a[i] == 0) {
-		i--;
-	}
-
-	if (i > 0) {
-		return (i << RLC_DIG_LOG) + util_bits_dig(a[i]);
-	} else {
-		return util_bits_dig(a[0]);
-	}
-}
-
-void fb_set_dig(fb_t c, dig_t a) {
-	fb_zero(c);
-	c[0] = a;
-}
-
-void fb_rand(fb_t a) {
-	int bits, digits;
-
-	rand_bytes((uint8_t *)a, RLC_FB_DIGS * sizeof(dig_t));
-
-	RLC_RIP(bits, digits, RLC_FB_BITS);
-	if (bits > 0) {
-		dig_t mask = RLC_MASK(bits);
-		a[RLC_FB_DIGS - 1] &= mask;
-	}
-}
-
-void fb_print(const fb_t a) {
-	int i;
-
-	/* Suppress possible unused parameter warning. */
-	(void)a;
-	for (i = RLC_FB_DIGS - 1; i > 0; i--) {
-		util_print_dig(a[i], 1);
-		util_print(" ");
-	}
-	util_print_dig(a[0], 1);
-	util_print("\n");
-}
-
-int fb_size_str(const fb_t a, int radix) {
-	bn_t t;
-	int digits = 0;
-
-	bn_null(t);
-
-	if (!valid_radix(radix)) {
-		RLC_THROW(ERR_NO_VALID);
-		return 0;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-
-		bn_read_raw(t, a, RLC_FB_DIGS);
-
-		digits = bn_size_str(t, radix);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-
-	return digits;
-}
-
-void fb_read_str(fb_t a, const char *str, int len, int radix) {
-	int i, j, l;
-	char c;
-	dig_t carry;
-
-	fb_zero(a);
-
-	l = log_radix(radix);
-	if (!valid_radix(radix)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (RLC_CEIL(l * (len - 1), RLC_DIG) > RLC_FB_DIGS) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	j = 0;
-	while (j < len) {
-		if (str[j] == 0) {
-			break;
-		}
-		c = (char)((radix < 36) ? RLC_UPP(str[j]) : str[j]);
-		for (i = 0; i < 64; i++) {
-			if (c == util_conv_char(i)) {
-				break;
-			}
-		}
-
-		if (i < radix) {
-			carry = fb_lshb_low(a, a, l);
-			if (carry != 0) {
-				RLC_THROW(ERR_NO_BUFFER);
-				break;
-			}
-			fb_add_dig(a, a, (dig_t)i);
-		} else {
-			break;
-		}
-		j++;
-	}
-}
-
-void fb_write_str(char *str, int len, const fb_t a, int radix) {
-	fb_t t;
-	int d, l, i, j;
-	char c;
-
-	fb_null(t);
-
-	l = fb_size_str(a, radix);
-	if (len < l) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	len = l;
-
-	l = log_radix(radix);
-	if (!valid_radix(radix)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (fb_is_zero(a) == 1) {
-		*str++ = '0';
-		*str = '\0';
-		return;
-	}
-
-	RLC_TRY {
-		fb_new(t);
-		fb_copy(t, a);
-
-		j = 0;
-		while (!fb_is_zero(t)) {
-			d = t[0] % radix;
-			fb_rshb_low(t, t, l);
-			str[j] = util_conv_char(d);
-			j++;
-		}
-
-		/* Reverse the digits of the string. */
-		i = 0;
-		j = len - 2;
-		while (i < j) {
-			c = str[i];
-			str[i] = str[j];
-			str[j] = c;
-			++i;
-			--j;
-		}
-
-		str[len - 1] = '\0';
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fb_free(t);
-	}
-}
-
-void fb_read_bin(fb_t a, const uint8_t *bin, int len) {
-	bn_t t;
-
-	bn_null(t);
-
-	if (len != RLC_FB_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-
-		bn_read_bin(t, bin, len);
-
-		fb_copy(a, t->dp);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void fb_write_bin(uint8_t *bin, int len, const fb_t a) {
-	bn_t t;
-
-	bn_null(t);
-
-	if (len != RLC_FB_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-
-		bn_read_raw(t, a, RLC_FB_DIGS);
-
-		bn_write_bin(bin, len, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fbx/relic_fb2_inv.c b/src/dashbls/depends/relic/src/fbx/relic_fb2_inv.c
deleted file mode 100644
index 7f8187c023a8..000000000000
--- a/src/dashbls/depends/relic/src/fbx/relic_fb2_inv.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of inversion in binary fields extensions.
- *
- * @ingroup fbx
- */
-
-#include "relic_core.h"
-#include "relic_fbx.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb2_inv(fb2_t c, fb2_t a) {
-	fb_t a0, a1, m0, m1;
-
-	fb_null(a0);
-	fb_null(a1);
-	fb_null(m0);
-	fb_null(m1);
-
-	RLC_TRY {
-		fb_new(a0);
-		fb_new(a1);
-		fb_new(m0);
-		fb_new(m1);
-
-		fb_add(a0, a[0], a[1]);
-		fb_sqr(m0, a[0]);
-		fb_mul(m1, a0, a[1]);
-		fb_add(a1, m0, m1);
-		fb_inv(a1, a1);
-		fb_mul(c[0], a0, a1);
-		fb_mul(c[1], a[1], a1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(a0);
-		fb_free(a1);
-		fb_free(m0);
-		fb_free(m1);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fbx/relic_fb2_mul.c b/src/dashbls/depends/relic/src/fbx/relic_fb2_mul.c
deleted file mode 100644
index 427b0764d7a5..000000000000
--- a/src/dashbls/depends/relic/src/fbx/relic_fb2_mul.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in quadratic extensions of binary fields.
- *
- * @ingroup fbx
- */
-
-#include "relic_core.h"
-#include "relic_fbx.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb2_mul(fb2_t c, fb2_t a, fb2_t b) {
-	fb_t t0, t1, t2;
-
-	fb_null(t0);
-	fb_null(t1);
-	fb_null(t2);
-
-	RLC_TRY {
-		fb_new(t0);
-		fb_new(t1);
-		fb_new(t2);
-
-		fb_add(t0, a[0], a[1]);
-		fb_add(t1, b[0], b[1]);
-
-		fb_mul(t0, t0, t1);
-		fb_mul(t1, a[0], b[0]);
-		fb_mul(t2, a[1], b[1]);
-
-		fb_add(c[0], t1, t2);
-		fb_add(c[1], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(t0);
-		fb_free(t1);
-		fb_free(t2);
-	}
-}
-
-void fb2_mul_nor(fb2_t c, fb2_t a) {
-	fb_t t;
-
-	fb_null(t);
-
-	RLC_TRY {
-		fb_new(t);
-
-		fb_copy(t, a[1]);
-		fb_add(c[1], a[0], a[1]);
-		fb_copy(c[0], t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fb_free(t);
-	}
-}
-
diff --git a/src/dashbls/depends/relic/src/fbx/relic_fb2_slv.c b/src/dashbls/depends/relic/src/fbx/relic_fb2_slv.c
deleted file mode 100644
index 2c6df6e07199..000000000000
--- a/src/dashbls/depends/relic/src/fbx/relic_fb2_slv.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of quadratic equation solution on binary extension fields.
- *
- * @ingroup fb
- */
-
-#include "relic_core.h"
-#include "relic_fbx.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb2_slv(fb2_t c, fb2_t a) {
-	/* Compute c_0 = a_0 + a_1. */
-	fb_add(c[0], a[0], a[1]);
-	/* Compute c_1^2 + c_1 = a_1. */
-	fb_slv(c[1], a[1]);
-	/* Compute c_0 = a_0 + a_1 + c_1 + Tr(c_1). */
-	fb_add(c[0], c[0], c[1]);
-	fb_add_dig(c[0], c[0], fb_trc(c[1]));
-	/* Make Tr(c_0) = 0. */
-	fb_slv(c[0], c[0]);
-	/* Compute c_0^2 + c_0 = c_0. */
-	fb_add_dig(c[1], c[1], fb_trc(c[1]));
-}
diff --git a/src/dashbls/depends/relic/src/fbx/relic_fb2_sqr.c b/src/dashbls/depends/relic/src/fbx/relic_fb2_sqr.c
deleted file mode 100644
index 8cb451d5d407..000000000000
--- a/src/dashbls/depends/relic/src/fbx/relic_fb2_sqr.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in binary fields extensions.
- *
- * @ingroup fbx
- */
-
-#include "relic_core.h"
-#include "relic_fbx.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb2_sqr(fb2_t c, fb2_t a) {
-	fb_sqr(c[1], a[1]);
-	fb_sqr(c[0], a[0]);
-	fb_add(c[0], c[0], c[1]);
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_add.c b/src/dashbls/depends/relic/src/fp/relic_fp_add.c
deleted file mode 100644
index 8f8034dec2db..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_add.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field addition and subtraction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FP_ADD == BASIC || !defined(STRIP)
-
-void fp_add_basic(fp_t c, const fp_t a, const fp_t b) {
-	dig_t carry;
-
-	carry = fp_addn_low(c, a, b);
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-
-void fp_add_integ(fp_t c, const fp_t a, const fp_t b) {
-	fp_addm_low(c, a, b);
-}
-
-#endif
-
-void fp_add_dig(fp_t c, const fp_t a, dig_t b) {
-#if FP_RDC == MONTY
-	if (b == 1) {
-		fp_add(c, a, core_get()->one.dp);
-	} else {
-		fp_t t;
-
-		fp_null(t);
-
-		RLC_TRY {
-			fp_new(t);
-
-			fp_set_dig(t, b);
-			fp_add(c, a, t);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			fp_free(t);
-		}
-	}
-#else
-	dig_t carry;
-
-	carry = fp_add1_low(c, a, b);
-	if (carry || dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-#endif
-}
-
-#if FP_ADD == BASIC || !defined(STRIP)
-
-void fp_sub_basic(fp_t c, const fp_t a, const fp_t b) {
-	dig_t carry;
-
-	carry = fp_subn_low(c, a, b);
-	if (carry) {
-		fp_addn_low(c, c, fp_prime_get());
-	}
-}
-
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-
-void fp_sub_integ(fp_t c, const fp_t a, const fp_t b) {
-	fp_subm_low(c, a, b);
-}
-
-#endif
-
-void fp_sub_dig(fp_t c, const fp_t a, dig_t b) {
-#if FP_RDC == MONTY
-	if (b == 1) {
-		fp_sub(c, a, core_get()->one.dp);
-	} else {
-		fp_t t;
-
-		fp_null(t);
-
-		RLC_TRY {
-			fp_new(t);
-
-			fp_set_dig(t, b);
-			fp_sub(c, a, t);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			fp_free(t);
-		}
-	}
-#else
-	dig_t carry;
-
-	carry = fp_sub1_low(c, a, b);
-	if (carry) {
-		fp_addn_low(c, c, fp_prime_get());
-	}
-#endif
-}
-
-#if FP_ADD == BASIC || !defined(STRIP)
-
-void fp_neg_basic(fp_t c, const fp_t a) {
-	if (fp_is_zero(a)) {
-		fp_zero(c);
-	} else {
-		fp_subn_low(c, fp_prime_get(), a);
-	}
-}
-
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-
-void fp_neg_integ(fp_t c, const fp_t a) {
-	fp_negm_low(c, a);
-}
-
-#endif
-
-#if FP_ADD == BASIC || !defined(STRIP)
-
-void fp_dbl_basic(fp_t c, const fp_t a) {
-	dig_t carry;
-
-	carry = fp_lsh1_low(c, a);
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-
-void fp_dbl_integ(fp_t c, const fp_t a) {
-	fp_dblm_low(c, a);
-}
-
-#endif
-
-#if FP_ADD == BASIC || !defined(STRIP)
-
-void fp_hlv_basic(fp_t c, const fp_t a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		fp_copy(c, a);
-	}
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
-
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-
-void fp_hlv_integ(fp_t c, const fp_t a) {
-	fp_hlvm_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_cmp.c b/src/dashbls/depends/relic/src/fp/relic_fp_cmp.c
deleted file mode 100644
index d9e401385b8a..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_cmp.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-/**
- * @file
- *
- * Implementation of the prime field comparison functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp_cmp_dig(const fp_t a, dig_t b) {
-	fp_t t;
-	int r = RLC_EQ;
-
-	fp_null(t);
-
-	RLC_TRY {
-		fp_new(t);
-		fp_prime_conv_dig(t, b);
-		r = fp_cmp(a, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(t);
-	}
-
-	return r;
-}
-
-int fp_cmp(const fp_t a, const fp_t b) {
-	return dv_cmp_const(a, b, RLC_FP_DIGS);
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_exp.c b/src/dashbls/depends/relic/src/fp/relic_fp_exp.c
deleted file mode 100644
index 54cc11cac3a5..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_exp.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of prime field exponentiation functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FP_EXP == BASIC || !defined(STRIP)
-
-void fp_exp_basic(fp_t c, const fp_t a, const bn_t b) {
-	int i, l;
-	fp_t r;
-
-	fp_null(r);
-
-	if (bn_is_zero(b)) {
-		fp_set_dig(c, 1);
-		return;
-	}
-
-	RLC_TRY {
-		fp_new(r);
-
-		l = bn_bits(b);
-
-		fp_copy(r, a);
-
-		for (i = l - 2; i >= 0; i--) {
-			fp_sqr(r, r);
-			if (bn_get_bit(b, i)) {
-				fp_mul(r, r, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp_inv(c, r);
-		} else {
-			fp_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(r);
-	}
-}
-
-#endif
-
-#if FP_EXP == SLIDE || !defined(STRIP)
-
-void fp_exp_slide(fp_t c, const fp_t a, const bn_t b) {
-	fp_t t[1 << (FP_WIDTH - 1)], r;
-	int i, j, l;
-	uint8_t win[RLC_FP_BITS + 1];
-
-	fp_null(r);
-
-	if (bn_is_zero(b)) {
-		fp_set_dig(c, 1);
-		return;
-	}
-
-
-	/* Initialize table. */
-	for (i = 0; i < (1 << (FP_WIDTH - 1)); i++) {
-		fp_null(t[i]);
-	}
-
-	RLC_TRY {
-		for (i = 0; i < (1 << (FP_WIDTH - 1)); i ++) {
-			fp_new(t[i]);
-		}
-		fp_new(r);
-
-		fp_copy(t[0], a);
-		fp_sqr(r, a);
-
-		/* Create table. */
-		for (i = 1; i < 1 << (FP_WIDTH - 1); i++) {
-			fp_mul(t[i], t[i - 1], r);
-		}
-
-		fp_set_dig(r, 1);
-		l = RLC_FP_BITS + 1;
-		bn_rec_slw(win, &l, b, FP_WIDTH);
-		for (i = 0; i < l; i++) {
-			if (win[i] == 0) {
-				fp_sqr(r, r);
-			} else {
-				for (j = 0; j < util_bits_dig(win[i]); j++) {
-					fp_sqr(r, r);
-				}
-				fp_mul(r, r, t[win[i] >> 1]);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp_inv(c, r);
-		} else {
-			fp_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < (1 << (FP_WIDTH - 1)); i++) {
-			fp_free(t[i]);
-		}
-		fp_free(r);
-	}
-}
-
-#endif
-
-#if FP_EXP == MONTY || !defined(STRIP)
-
-void fp_exp_monty(fp_t c, const fp_t a, const bn_t b) {
-	fp_t t[2];
-
-	fp_null(t[0]);
-	fp_null(t[1]);
-
-	if (bn_is_zero(b)) {
-		fp_set_dig(c, 1);
-		return;
-	}
-
-	RLC_TRY {
-		fp_new(t[0]);
-		fp_new(t[1]);
-
-		fp_set_dig(t[0], 1);
-		fp_copy(t[1], a);
-
-		for (int i = bn_bits(b) - 1; i >= 0; i--) {
-			int j = bn_get_bit(b, i);
-			dv_swap_cond(t[0], t[1], RLC_FP_DIGS, j ^ 1);
-			fp_mul(t[0], t[0], t[1]);
-			fp_sqr(t[1], t[1]);
-			dv_swap_cond(t[0], t[1], RLC_FP_DIGS, j ^ 1);
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp_inv(c, t[0]);
-		} else {
-			fp_copy(c, t[0]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t[1]);
-		fp_free(t[0]);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_inv.c b/src/dashbls/depends/relic/src/fp/relic_fp_inv.c
deleted file mode 100644
index b8a06077fbb2..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_inv.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field inversion functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FP_INV == BASIC || !defined(STRIP)
-
-void fp_inv_basic(fp_t c, const fp_t a) {
-	bn_t e;
-
-	bn_null(e);
-
-	if (fp_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(e);
-
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_sub_dig(e, e, 2);
-
-		fp_exp(c, a, e);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(e);
-	}
-}
-
-#endif
-
-#if FP_INV == BINAR || !defined(STRIP)
-
-void fp_inv_binar(fp_t c, const fp_t a) {
-	bn_t u, v, g1, g2, p;
-
-	bn_null(u);
-	bn_null(v);
-	bn_null(g1);
-	bn_null(g2);
-	bn_null(p);
-
-	if (fp_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-		bn_new(g1);
-		bn_new(g2);
-		bn_new(p);
-
-		/* u = a, v = p, g1 = 1, g2 = 0. */
-		fp_prime_back(u, a);
-		p->used = RLC_FP_DIGS;
-		dv_copy(p->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_copy(v, p);
-		bn_set_dig(g1, 1);
-		bn_zero(g2);
-
-		/* While (u != 1 && v != 1). */
-		while (1) {
-			/* While u is even do. */
-			while (!(u->dp[0] & 1)) {
-				/* u = u/2. */
-				fp_rsh1_low(u->dp, u->dp);
-				/* If g1 is even then g1 = g1/2; else g1 = (g1 + p)/2. */
-				if (g1->dp[0] & 1) {
-					bn_add(g1, g1, p);
-				}
-				bn_hlv(g1, g1);
-			}
-
-			while (u->dp[u->used - 1] == 0) {
-				u->used--;
-			}
-			if (u->used == 1 && u->dp[0] == 1)
-				break;
-
-			/* While z divides v do. */
-			while (!(v->dp[0] & 1)) {
-				/* v = v/2. */
-				fp_rsh1_low(v->dp, v->dp);
-				/* If g2 is even then g2 = g2/2; else (g2 = g2 + p)/2. */
-				if (g2->dp[0] & 1) {
-					bn_add(g2, g2, p);
-				}
-				bn_hlv(g2, g2);
-			}
-
-			while (v->dp[v->used - 1] == 0) {
-				v->used--;
-			}
-			if (v->used == 1 && v->dp[0] == 1)
-				break;
-
-			/* If u > v then u = u - v, g1 = g1 - g2. */
-			if (bn_cmp(u, v) == RLC_GT) {
-				bn_sub(u, u, v);
-				bn_sub(g1, g1, g2);
-			} else {
-				bn_sub(v, v, u);
-				bn_sub(g2, g2, g1);
-			}
-		}
-		/* If u == 1 then return g1; else return g2. */
-		if (bn_cmp_dig(u, 1) == RLC_EQ) {
-			while (bn_sign(g1) == RLC_NEG) {
-				bn_add(g1, g1, p);
-			}
-			while (bn_cmp(g1, p) != RLC_LT) {
-				bn_sub(g1, g1, p);
-			}
-#if FP_RDC == MONTY
-			fp_prime_conv(c, g1);
-#else
-			dv_copy(c, g1->dp, RLC_FP_DIGS);
-#endif
-		} else {
-			while (bn_sign(g2) == RLC_NEG) {
-				bn_add(g2, g2, p);
-			}
-			while (bn_cmp(g2, p) != RLC_LT) {
-				bn_sub(g2, g2, p);
-			}
-#if FP_RDC == MONTY
-			fp_prime_conv(c, g2);
-#else
-			dv_copy(c, g2->dp, RLC_FP_DIGS);
-#endif
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-		bn_free(g1);
-		bn_free(g2);
-		bn_free(p);
-	}
-}
-
-#endif
-
-#if FP_INV == MONTY || !defined(STRIP)
-
-void fp_inv_monty(fp_t c, const fp_t a) {
-	bn_t _a, _p, u, v, x1, x2;
-	const dig_t *p = NULL;
-	dig_t carry;
-	int i, k, flag = 0;
-
-	bn_null(_a);
-	bn_null(_p);
-	bn_null(u);
-	bn_null(v);
-	bn_null(x1);
-	bn_null(x2);
-
-	if (fp_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(_a);
-		bn_new(_p);
-		bn_new(u);
-		bn_new(v);
-		bn_new(x1);
-		bn_new(x2);
-
-		p = fp_prime_get();
-
-		/* u = a, v = p, x1 = 1, x2 = 0, k = 0. */
-		k = 0;
-		bn_set_dig(x1, 1);
-		bn_zero(x2);
-
-#if FP_RDC != MONTY
-		bn_read_raw(_a, a, RLC_FP_DIGS);
-		bn_read_raw(_p, p, RLC_FP_DIGS);
-		bn_mod_monty_conv(u, _a, _p);
-#else
-		bn_read_raw(u, a, RLC_FP_DIGS);
-#endif
-		bn_read_raw(v, p, RLC_FP_DIGS);
-
-		while (!bn_is_zero(v)) {
-			/* If v is even then v = v/2, x1 = 2 * x1. */
-			if (!(v->dp[0] & 1)) {
-				fp_rsh1_low(v->dp, v->dp);
-				bn_dbl(x1, x1);
-			} else {
-				/* If u is even then u = u/2, x2 = 2 * x2. */
-				if (!(u->dp[0] & 1)) {
-					fp_rsh1_low(u->dp, u->dp);
-					bn_dbl(x2, x2);
-					/* If v >= u,then v = (v - u)/2, x2 += x1, x1 = 2 * x1. */
-				} else {
-					if (bn_cmp(v, u) != RLC_LT) {
-						fp_subn_low(v->dp, v->dp, u->dp);
-						fp_rsh1_low(v->dp, v->dp);
-						bn_add(x2, x2, x1);
-						bn_dbl(x1, x1);
-					} else {
-						/* u = (u - v)/2, x1 += x2, x2 = 2 * x2. */
-						fp_subn_low(u->dp, u->dp, v->dp);
-						fp_rsh1_low(u->dp, u->dp);
-						bn_add(x1, x1, x2);
-						bn_dbl(x2, x2);
-					}
-				}
-			}
-			bn_trim(u);
-			bn_trim(v);
-			k++;
-		}
-
-		/* If x1 > p then x1 = x1 - p. */
-		for (i = x1->used; i < RLC_FP_DIGS; i++) {
-			x1->dp[i] = 0;
-		}
-
-		while (x1->used > RLC_FP_DIGS) {
-			carry = bn_subn_low(x1->dp, x1->dp, fp_prime_get(), RLC_FP_DIGS);
-			bn_sub1_low(x1->dp + RLC_FP_DIGS, x1->dp + RLC_FP_DIGS, carry,
-					x1->used - RLC_FP_DIGS);
-			bn_trim(x1);
-		}
-		if (dv_cmp(x1->dp, fp_prime_get(), RLC_FP_DIGS) == RLC_GT) {
-			fp_subn_low(x1->dp, x1->dp, fp_prime_get());
-		}
-
-		dv_copy(x2->dp, fp_prime_get_conv(), RLC_FP_DIGS);
-
-		/* If k < Wt then x1 = x1 * R^2 * R^{-1} mod p. */
-		if (k <= RLC_FP_DIGS * RLC_DIG) {
-			flag = 1;
-			fp_mul(x1->dp, x1->dp, x2->dp);
-			k = k + RLC_FP_DIGS * RLC_DIG;
-		}
-
-		/* x1 = x1 * R^2 * R^{-1} mod p. */
-		fp_mul(x1->dp, x1->dp, x2->dp);
-
-		/* c = x1 * 2^(2Wt - k) * R^{-1} mod p. */
-		fp_copy(c, x1->dp);
-		dv_zero(x1->dp, RLC_FP_DIGS);
-		bn_set_2b(x1, 2 * RLC_FP_DIGS * RLC_DIG - k);
-		fp_mul(c, c, x1->dp);
-
-#if FP_RDC != MONTY
-		/*
-		 * If we do not use Montgomery reduction, the result of inversion is
-		 * a^{-1}R^3 mod p or a^{-1}R^4 mod p, depending on flag.
-		 * Hence we must reduce the result three or four times.
-		 */
-		_a->used = RLC_FP_DIGS;
-		dv_copy(_a->dp, c, RLC_FP_DIGS);
-		bn_mod_monty_back(_a, _a, _p);
-		bn_mod_monty_back(_a, _a, _p);
-		bn_mod_monty_back(_a, _a, _p);
-
-		if (flag) {
-			bn_mod_monty_back(_a, _a, _p);
-		}
-		fp_zero(c);
-		dv_copy(c, _a->dp, _a->used);
-#endif
-		(void)flag;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(_a);
-		bn_free(_p);
-		bn_free(u);
-		bn_free(v);
-		bn_free(x1);
-		bn_free(x2);
-	}
-}
-
-#endif
-
-#if FP_INV == EXGCD || !defined(STRIP)
-
-void fp_inv_exgcd(fp_t c, const fp_t a) {
-	bn_t u, v, g1, g2, p, q, r;
-
-	bn_null(u);
-	bn_null(v);
-	bn_null(g1);
-	bn_null(g2);
-	bn_null(p);
-	bn_null(q);
-	bn_null(r);
-
-	if (fp_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(u);
-		bn_new(v);
-		bn_new(g1);
-		bn_new(g2);
-		bn_new(p);
-		bn_new(q);
-		bn_new(r);
-
-		/* u = a, v = p, g1 = 1, g2 = 0. */
-		fp_prime_back(u, a);
-		p->used = RLC_FP_DIGS;
-		dv_copy(p->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_copy(v, p);
-		bn_set_dig(g1, 1);
-		bn_zero(g2);
-
-		/* While (u != 1. */
-		while (bn_cmp_dig(u, 1) != RLC_EQ) {
-			/* q = [v/u], r = v mod u. */
-			bn_div_rem(q, r, v, u);
-			/* v = u, u = r. */
-			bn_copy(v, u);
-			bn_copy(u, r);
-			/* r = g2 - q * g1. */
-			bn_mul(r, q, g1);
-			bn_sub(r, g2, r);
-			/* g2 = g1, g1 = r. */
-			bn_copy(g2, g1);
-			bn_copy(g1, r);
-		}
-
-		if (bn_sign(g1) == RLC_NEG) {
-			bn_add(g1, g1, p);
-		}
-		fp_prime_conv(c, g1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(u);
-		bn_free(v);
-		bn_free(g1);
-		bn_free(g2);
-		bn_free(p);
-		bn_free(q);
-		bn_free(r);
-	}
-}
-
-#endif
-
-#if FP_INV == DIVST || !defined(STRIP)
-
-void fp_inv_divst(fp_t c, const fp_t a) {
-	/* Compute number of iteratios based on modulus size. */
-#if FP_PRIME < 46
-	int d = (49 * FP_PRIME + 80)/17;
-#else
-	int d = (49 * FP_PRIME + 57)/17;
-#endif
-	dig_t g0, d0, fs, gs;
-	int delta = 1;
-	bn_t _t;
-	dv_t f, g, t, u;
-	fp_t precomp, v, r;
-
-	bn_null(_t);
-	dv_null(f);
-	dv_null(g);
-	dv_null(t);
-	dv_null(u);
-	fp_null(v);
-	fp_null(r);
-	fp_null(precomp);
-
-	if (fp_is_zero(a)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(_t);
-		dv_new(f);
-		dv_new(g);
-		dv_new(t);
-		dv_new(u);
-		fp_new(v);
-		fp_new(r);
-		fp_new(precomp);
-
-#if WSIZE == 8
-		bn_set_dig(_t, d >> 8);
-		bn_lsh(_t, _t, 8);
-		bn_add_dig(_t, _t, d & 0xFF);
-#else
-		bn_set_dig(_t, d);
-#endif
-		dv_copy(precomp, fp_prime_get(), RLC_FP_DIGS);
-		fp_add_dig(precomp, precomp, 1);
-		fp_hlv(precomp, precomp);
-		fp_exp(precomp, precomp, _t);
-
-		fp_zero(v);
-		fp_set_dig(r, 1);
-		fp_prime_back(_t, a);
-		dv_zero(g, RLC_FP_DIGS);
-		dv_copy(g, _t->dp, _t->used);
-		dv_copy(f, fp_prime_get(), RLC_FP_DIGS);
-		fs = gs = RLC_POS;
-
-		for (int i = 0; i < d; i++) {
-			g0 = g[0] & 1;
-			d0 = delta >> (RLC_DIG - 1);
-			d0 = g0 & ~d0;
-			/* Conditionally negate delta if d0 is set. */
-			delta = (delta ^ -d0) + d0;
-			/* Conditionally swap based on d0. */
-			dv_swap_cond(r, v, RLC_FP_DIGS, d0);
-			fp_negm_low(t, r);
-			dv_swap_cond(f, g, RLC_FP_DIGS, d0);
-			dv_copy_cond(r, t, RLC_FP_DIGS, d0);
-			for (int j = 0; j < RLC_FP_DIGS; j++) {
-				g[j] = RLC_SEL(g[j], ~g[j], d0);
-			}
-			fp_add1_low(g, g, d0);
-			t[0] = (fs ^ gs) & (-d0);
-			fs ^= t[0];
-			gs ^= t[0] ^ d0;
-
-			delta++;
-			g0 = g[0] & 1;
-			for (int j = 0; j < RLC_FP_DIGS; j++) {
-				t[j] = v[j] & (-g0);
-				u[j] = f[j] & (-g0);
-			}
-			fp_addm_low(r, r, t);
-			fp_dblm_low(v, v);
-
-			/* Compute g = (g + g0*f) div 2 by conditionally copying f to u and
-			 * updating the sign of g. */
-			gs ^= g0 & (fs ^ bn_addn_low(g, g, u, RLC_FP_DIGS));
-			/* Shift and restore the sign. */
-			fp_rsh1_low(g, g);
-			g[RLC_FP_DIGS - 1] |= (dig_t)gs << (RLC_DIG - 1);
-		}
-		fp_neg(t, v);
-		dv_copy_cond(v, t, RLC_FP_DIGS, fs);
-		fp_mul(c, v, precomp);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT)
-	} RLC_FINALLY {
-		bn_free(_t);
-		dv_free(f);
-		dv_free(g);
-		dv_free(t);
-		dv_free(u);
-		fp_free(v);
-		fp_free(r);
-		fp_free(precomp);
-	}
-}
-
-#endif
-
-#if FP_INV == LOWER || !defined(STRIP)
-
-void fp_inv_lower(fp_t c, const fp_t a) {
-	fp_invm_low(c, a);
-}
-
-#endif
-
-void fp_inv_sim(fp_t *c, const fp_t *a, int n) {
-	int i;
-	fp_t u, *t = RLC_ALLOCA(fp_t, n);
-
-	fp_null(u);
-
-	RLC_TRY {
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < n; i++) {
-			fp_null(t[i]);
-			fp_new(t[i]);
-		}
-		fp_new(u);
-
-		fp_copy(c[0], a[0]);
-		fp_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp_copy(t[i], a[i]);
-			fp_mul(c[i], c[i - 1], a[i]);
-		}
-
-		fp_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp_mul(c[i], u, c[i - 1]);
-			fp_mul(u, u, t[i]);
-		}
-		fp_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp_free(t[i]);
-		}
-		fp_free(u);
-		RLC_FREE(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_mul.c b/src/dashbls/depends/relic/src/fp/relic_fp_mul.c
deleted file mode 100644
index a9cf0aa67509..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_mul.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-/**
- * @file
- *
- * Implementation of the prime field multiplication functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FP_KARAT > 0 || !defined(STRIP)
-
-/**
- * Multiplies two prime field elements using recursive Karatsuba
- * multiplication.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the first prime field element.
- * @param[in] b				- the second prime field element.
- * @param[in] size			- the number of digits to multiply.
- * @param[in] level			- the number of Karatsuba steps to apply.
- */
-static void fp_mul_karat_imp(dv_t c, const fp_t a, const fp_t b, int size,
-		int level) {
-	/* Compute half the digits of a or b. */
-	int h = size >> 1;
-	int h1 = size - h;
-	dv_t a1, b1, a0b0, a1b1, t;
-	dig_t carry;
-
-	dv_null(a1);
-	dv_null(b1);
-	dv_null(a0b0);
-	dv_null(a1b1);
-
-	RLC_TRY {
-		/* Allocate the temp variables. */
-		dv_new(a1);
-		dv_new(b1);
-		dv_new(a0b0);
-		dv_new(a1b1);
-		dv_new(t);
-		dv_zero(a1, h1 + 1);
-		dv_zero(b1, h1 + 1);
-
-		/* a0b0 = a0 * b0 and a1b1 = a1 * b1 */
-		if (level <= 1) {
-#if FP_MUL == BASIC
-			dv_zero(a0b0, h);
-			dv_zero(a1b1, h);
-			for (int i = 0; i < h; i++) {
-				carry = bn_mula_low(a0b0 + i, a, *(b + i), h);
-				*(a0b0 + i + h) = carry;
-			}
-			for (int i = 0; i < h1; i++) {
-				carry = bn_mula_low(a1b1 + i, a + h, *(b + h + i), h1);
-				*(a1b1 + i + h1) = carry;
-			}
-#elif FP_MUL == COMBA || FP_MUL == INTEG
-			bn_muln_low(a0b0, a, b, h);
-			bn_muln_low(a1b1, a + h, b + h, h1);
-#endif
-		} else {
-			fp_mul_karat_imp(a0b0, a, b, h, level - 1);
-			fp_mul_karat_imp(a1b1, a + h, b + h, h1, level - 1);
-		}
-
-		dv_copy(c, a0b0, 2 * h);
-		dv_copy(c + 2 * h, a1b1, 2 * h1 + 1);
-
-		/* a1 = (a1 + a0) */
-		carry = bn_addn_low(a1, a, a + h, h);
-		if (h1 > h) {
-			a1[h] = a[2 * h];
-		}
-		bn_add1_low(a1 + h, a1 + h, carry, 2);
-
-		/* b1 = (b1 + b0) */
-		carry = bn_addn_low(b1, b, b + h, h);
-		if (h1 > h) {
-			b1[h] = b[2 * h];
-		}
-		bn_add1_low(b1 + h, b1 + h, carry, 2);
-
-		if (level <= 1) {
-			/* t = (a1 + a0)*(b1 + b0) */
-#if FP_MUL == BASIC
-			dv_zero(t, h1 + 1);
-			for (int i = 0; i < h1 + 1; i++) {
-				carry = bn_mula_low(t + i, a1, *(b1 + i), h1 + 1);
-				*(t + i + h1 + 1) = carry;
-			}
-#elif FP_MUL == COMBA || FP_MUL == INTEG
-			bn_muln_low(t, a1, b1, h1 + 1);
-#endif
-		} else {
-			fp_mul_karat_imp(t, a1, b1, h1 + 1, level - 1);
-		}
-
-		/* t = t - (a0*b0 << h digits) */
-		carry = bn_subn_low(t, t, a0b0, 2 * h);
-		bn_sub1_low(t + 2 * h, t + 2 * h, carry, 2 * (h1 + 1) - 2 * h);
-
-		/* t = t - (a1*b1 << h digits) */
-		carry = bn_subn_low(t, t, a1b1, 2 * h1);
-		bn_sub1_low(t + 2 * h1, t + 2 * h1, carry, 2 * (h1 + 1) - 2 * h1);
-
-		/* c = c + [(a1 + a0)*(b1 + b0) << digits] */
-		c += h;
-		carry = bn_addn_low(c, c, t, 2 * (h1 + 1));
-		c += 2 * (h1 + 1);
-		if (2 * size > h + 2 * (h1 + 1)) {
-			bn_add1_low(c, c, carry, 2 * size - h - 2 * (h1 + 1));
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(a1);
-		dv_free(b1);
-		dv_free(a0b0);
-		dv_free(a1b1);
-		dv_free(t);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_mul_dig(fp_t c, const fp_t a, dig_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		fp_prime_conv_dig(t, b);
-		fp_mul(c, a, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#if FP_MUL == BASIC || !defined(STRIP)
-
-void fp_mul_basic(fp_t c, const fp_t a, const fp_t b) {
-	int i;
-	dv_t t;
-	dig_t carry;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-		dv_zero(t, 2 * RLC_FP_DIGS);
-		for (i = 0; i < RLC_FP_DIGS; i++) {
-			carry = fp_mula_low(t + i, b, *(a + i));
-			*(t + i + RLC_FP_DIGS) = carry;
-		}
-
-		fp_rdc(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-#if FP_MUL == COMBA || !defined(STRIP)
-
-void fp_mul_comba(fp_t c, const fp_t a, const fp_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-
-		fp_muln_low(t, a, b);
-		fp_rdc(c, t);
-		dv_free(t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
-
-#if FP_MUL == INTEG || !defined(STRIP)
-
-void fp_mul_integ(fp_t c, const fp_t a, const fp_t b) {
-	fp_mulm_low(c, a, b);
-}
-
-#endif
-
-#if FP_KARAT > 0 || !defined(STRIP)
-
-void fp_mul_karat(fp_t c, const fp_t a, const fp_t b) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		/* We need a temporary variable so that c can be a or b. */
-		dv_new(t);
-
-		dv_zero(t, 2 * RLC_FP_DIGS);
-
-		if (RLC_FP_DIGS > 1) {
-			fp_mul_karat_imp(t, a, b, RLC_FP_DIGS, FP_KARAT);
-		} else {
-			fp_muln_low(t, a, b);
-		}
-
-		fp_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_param.c b/src/dashbls/depends/relic/src/fp/relic_fp_param.c
deleted file mode 100644
index ffc8b55f6a3e..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_param.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field modulus manipulation.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fpx.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FP_PRIME == 255
-
-/**
- * Primes with high 2-adicity for curves Tweedledum and Tweedledee.
- */
-#define STR_H2ADC	"38AA1276C3F59B9A14064E2"
-
-#elif FP_PRIME == 256
-/**
- * Random prime modulus for the Brainpool P256r1.
- */
-#define STR_P256	"A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377"
-
-#elif FP_PRIME == 544
-/**
- * Random prime modulus for the Cocks-Pinch curve of embedding degree 8.
- */
-#define STR_P544	"BB9DFD549299F1C803DDD5D7C05E7CC0373D9B1AC15B47AA5AA84626F33E58FE66943943049031AE4CA1D2719B3A84FA363BCD2539A5CD02C6F4B6B645A58C1085E14411"
-
-#elif FP_PRIME == 1536
-/**
- * Cofactor description of 1536-bit prime modulus.
- */
-#define STR_P1536	"83093742908D4D529CEF06C72191A05D5E6073FE861E637D7747C3E52FBB92DAA5DDF3EF1C61F5F70B256802481A36CAFE995FE33CD54014B846751364C0D3B8327D9E45366EA08F1B3446AC23C9D4B656886731A8D05618CFA1A3B202A2445ABA0E77C5F4F00CA1239975A05377084F256DEAA07D21C4CF2A4279BC117603ACB7B10228C3AB8F8C1742D674395701BB02071A88683041D9C4231E8EE982B8DA"
-
-#elif FP_PRIME == 3072
-
-/**
- * Cofactor description of 3072-bit prime modulus.
- */
-#define STR_P3072	"D2DECB54BA1C33C49BD7B174FBC6E56AD9B05D1B2B4100708AA3B6AA620B5CD167F66D33818B608FC25C9F56A0C685129B9DDAA342ADB37B2CEA7E09DEB49F3BC85B467801ED7507149CF025A021D8109926CAC3C774AD8E3C0B4D175CF1C94A6641A8E5BBBE63FB40EC52B206315D20C074B538785E63174FB8A72C912F51B6A3D132A185FD95B067B817AB9F4C01ABA6CC7BF1546D94FD79AC2D0183814FD8"
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp_param_get(void) {
-	return core_get()->fp_id;
-}
-
-void fp_param_set(int param) {
-	bn_t t0, t1, t2, p;
-	int f[10] = { 0 };
-
-	bn_null(t0);
-	bn_null(t1);
-	bn_null(t2);
-	bn_null(p);
-
-	/* Suppress possible unused parameter warning. */
-	(void) f;
-
-	RLC_TRY {
-		bn_new(t0);
-		bn_new(t1);
-		bn_new(t2);
-		bn_new(p);
-
-		core_get()->fp_id = param;
-
-		switch (param) {
-#if FP_PRIME == 158
-			case BN_158:
-				/* x = 0x4000000031. */
-				bn_set_2b(t0, 38);
-				bn_add_dig(t0, t0, 0x31);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-#elif FP_PRIME == 160
-			case SECG_160:
-				/* p = 2^160 - 2^31 - 1. */
-				f[0] = -1;
-				f[1] = -31;
-				f[2] = 160;
-				fp_prime_set_pmers(f, 3);
-				break;
-			case SECG_160D:
-				/* p = 2^160 - 2^32 - 2^14 - 2^12 - 2^9 - 2^8 - 2^7 - 2^3 - 2^2 - 1. */
-				f[0] = -1;
-				f[1] = -2;
-				f[2] = -3;
-				f[3] = -7;
-				f[4] = -8;
-				f[5] = -9;
-				f[6] = -12;
-				f[7] = -14;
-				f[8] = -32;
-				f[9] = 160;
-				fp_prime_set_pmers(f, 10);
-				break;
-#elif FP_PRIME == 192
-			case NIST_192:
-				/* p = 2^192 - 2^64 - 1. */
-				f[0] = -1;
-				f[1] = -64;
-				f[2] = 192;
-				fp_prime_set_pmers(f, 3);
-				break;
-			case SECG_192:
-				/* p = 2^192 - 2^32 - 2^12 - 2^8 - 2^7 - 2^6 - 2^3 - 1. */
-				f[0] = -1;
-				f[1] = -3;
-				f[2] = -6;
-				f[3] = -7;
-				f[4] = -8;
-				f[5] = -12;
-				f[6] = -32;
-				f[7] = 192;
-				fp_prime_set_pmers(f, 8);
-				break;
-#elif FP_PRIME == 221
-			case PRIME_22103:
-				bn_set_2b(p, 221);
-				bn_sub_dig(p, p, 3);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 224
-			case NIST_224:
-				/* p = 2^224 - 2^96 + 1. */
-				f[0] = 1;
-				f[1] = -96;
-				f[2] = 224;
-				fp_prime_set_pmers(f, 3);
-				break;
-			case SECG_224:
-				/* p = 2^224 - 2^32 - 2^12 - 2^11 - 2^9 - 2^7 - 2^4 - 2 - 1.*/
-				f[0] = -1;
-				f[1] = -1;
-				f[2] = -4;
-				f[3] = -7;
-				f[4] = -9;
-				f[5] = -11;
-				f[6] = -12;
-				f[7] = -32;
-				f[8] = 224;
-				fp_prime_set_pmers(f, 9);
-				break;
-#elif FP_PRIME == 226
-			case PRIME_22605:
-				bn_set_2b(p, 226);
-				bn_sub_dig(p, p, 5);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 251
-			case PRIME_25109:
-				bn_set_2b(p, 251);
-				bn_sub_dig(p, p, 9);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 254
-			case BN_254:
-				/* x = -(2^62 + 2^55 + 1). */
-				bn_set_2b(t0, 62);
-				bn_set_bit(t0, 55, 1);
-				bn_add_dig(t0, t0, 1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-#elif FP_PRIME == 255
-			case PRIME_25519:
-				bn_set_2b(p, 255);
-				bn_sub_dig(p, p, 19);
-				fp_prime_set_dense(p);
-				break;
-			case PRIME_H2ADC:
-				bn_set_2b(p, 222);
-				bn_read_str(t0, STR_H2ADC, strlen(STR_H2ADC), 16);
-				bn_add(p, p, t0);
-				bn_lsh(p, p, 32);
-				bn_add_dig(p, p, 1);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 256
-			case NIST_256:
-				/* p = 2^256 - 2^224 + 2^192 + 2^96 - 1. */
-				f[0] = -1;
-				f[1] = 96;
-				f[2] = 192;
-				f[3] = -224;
-				f[4] = 256;
-				fp_prime_set_pmers(f, 5);
-				break;
-			case BSI_256:
-				bn_read_str(p, STR_P256, strlen(STR_P256), 16);
-				fp_prime_set_dense(p);
-				break;
-			case SECG_256:
-				/* p = 2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6 - 2^4 - 1. */
-				f[0] = -1;
-				f[1] = -4;
-				f[2] = -6;
-				f[3] = -7;
-				f[4] = -8;
-				f[5] = -9;
-				f[6] = -32;
-				f[7] = 256;
-				fp_prime_set_pmers(f, 8);
-				break;
-			case BN_256:
-				/* x = -0x600000000000219B. */
-				bn_set_2b(t0, 62);
-				bn_set_bit(t0, 61, 1);
-				bn_set_dig(t1, 0x21);
-				bn_lsh(t1, t1, 8);
-				bn_add(t0, t0, t1);
-				bn_add_dig(t0, t0, 0x9B);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-			case SM9_256:
-				/* x = 0x600000000058F98A */
-				bn_set_2b(t0, 62);
-				bn_set_bit(t0, 61, 1);
-				bn_set_dig(t1, 0x58);
-				bn_lsh(t1, t1, 8);
-				bn_add_dig(t1, t1, 0xF9);
-				bn_lsh(t1, t1, 8);
-				bn_add(t0, t0, t1);
-				bn_add_dig(t0, t0, 0x8A);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-#elif FP_PRIME == 381
-			case B12_381:
-				/* x = -(2^63 + 2^62 + 2^60 + 2^57 + 2^48 + 2^16). */
-				bn_set_2b(t0, 63);
-				bn_set_bit(t0, 62, 1);
-				bn_set_bit(t0, 60, 1);
-				bn_set_bit(t0, 57, 1);
-				bn_set_bit(t0, 48, 1);
-				bn_set_bit(t0, 16, 1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_B12);
-				break;
-#elif FP_PRIME == 382
-			case PRIME_382105:
-				bn_set_2b(p, 382);
-				bn_sub_dig(p, p, 105);
-				fp_prime_set_dense(p);
-				break;
-			case BN_382:
-				/* x = -(2^94 + 2^78 + 2^67 + 2^64 + 2^48 + 1). */
-				bn_set_2b(t0, 94);
-				bn_set_bit(t0, 78, 1);
-				bn_set_bit(t0, 67, 1);
-				bn_set_bit(t0, 64, 1);
-				bn_set_bit(t0, 48, 1);
-				bn_add_dig(t0, t0, 1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-#elif FP_PRIME == 383
-			case PRIME_383187:
-				bn_set_2b(p, 383);
-				bn_sub_dig(p, p, 187);
-				fp_prime_set_dense(p);
-				break;
-			case B12_383:
-				/* x = 2^64 + 2^51 + 2^24 + 2^12 + 2^9 */
-				bn_set_2b(t0, 64);
-				bn_set_bit(t0, 51, 1);
-				bn_set_bit(t0, 24, 1);
-				bn_set_bit(t0, 12, 1);
-				bn_set_bit(t0, 9, 1);
-				fp_prime_set_pairf(t0, EP_B12);
-				break;
-#elif FP_PRIME == 384
-			case NIST_384:
-				/* p = 2^384 - 2^128 - 2^96 + 2^32 - 1. */
-				f[0] = -1;
-				f[1] = 32;
-				f[2] = -96;
-				f[3] = -128;
-				f[4] = 384;
-				fp_prime_set_pmers(f, 5);
-				break;
-#elif FP_PRIME == 446
-			case BN_446:
-				/* x = 2^110 + 2^36 + 1. */
-				bn_set_2b(t0, 110);
-				bn_set_bit(t0, 36, 1);
-				bn_add_dig(t0, t0, 1);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-			case B12_446:
-				/* x = -(2^75 - 2^73 + 2^63 + 2^57 + 2^50 + 2^17 + 1). */
-				bn_set_2b(t0, 75);
-				bn_set_bit(t0, 63, 1);
-				bn_set_bit(t0, 57, 1);
-				bn_set_bit(t0, 50, 1);
-				bn_set_bit(t0, 17, 1);
-				bn_add_dig(t0, t0, 1);
-				bn_set_2b(t1, 73);
-				bn_sub(t0, t0, t1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_B12);
-				break;
-#elif FP_PRIME == 448
-			case PRIME_448:
-				/* p = 2^448 - 2^224 + 1. */
-				f[0] = -1;
-				f[1] = -224;
-				f[2] = 448;
-				fp_prime_set_pmers(f, 3);
-				break;
-#elif FP_PRIME == 455
-			case B12_455:
-				/* x = 2^76 + 2^53 + 2^31 + 2^11. */
-				bn_set_2b(t0, 76);
-				bn_set_bit(t0, 53, 1);
-				bn_set_bit(t0, 31, 1);
-				bn_set_bit(t0, 11, 1);
-				fp_prime_set_pairf(t0, EP_B12);
-				break;
-#elif FP_PRIME == 508
-			case KSS_508:
-				/* x = -(2^64 + 2^51 - 2^46 - 2^12). */
-				bn_set_2b(t0, 64);
-				bn_set_2b(t1, 51);
-				bn_add(t0, t0, t1);
-				bn_set_2b(t1, 46);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 12);
-				bn_sub(t0, t0, t1);
-				bn_neg(t0, t0);
-				/* h = (49*u^2 + 245 * u + 343)/3 */
-				bn_mul_dig(p, t0, 245);
-				bn_add_dig(p, p, 200);
-				bn_add_dig(p, p, 143);
-				bn_sqr(t1, t0);
-				bn_mul_dig(t2, t1, 49);
-				bn_add(p, p, t2);
-				bn_div_dig(p, p, 3);
-				/* n = (u^6 + 37 * u^3 + 343)/343. */
-				bn_mul(t1, t1, t0);
-				bn_mul_dig(t2, t1, 37);
-				bn_sqr(t1, t1);
-				bn_add(t2, t2, t1);
-				bn_add_dig(t2, t2, 200);
-				bn_add_dig(t2, t2, 143);
-				bn_div_dig(t2, t2, 49);
-				bn_div_dig(t2, t2, 7);
-				bn_mul(p, p, t2);
-				/* t = (u^4 + 16 * u + 7)/7. */
-				bn_mul_dig(t1, t0, 16);
-				bn_add_dig(t1, t1, 7);
-				bn_sqr(t2, t0);
-				bn_sqr(t2, t2);
-				bn_add(t2, t2, t1);
-				bn_div_dig(t2, t2, 7);
-				bn_add(p, p, t2);
-				bn_sub_dig(p, p, 1);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 509
-			case B24_509:
-				/* x = -2^51 - 2^28 + 2^11 - 1. */
-				bn_set_2b(t0, 51);
-				bn_set_2b(t1, 28);
-				bn_add(t0, t0, t1);
-				bn_set_2b(t1, 11);
-				bn_sub(t0, t0, t1);
-				bn_add_dig(t0, t0, 1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_B24);
-				break;
-#elif FP_PRIME == 511
-			case OT_511:
-				bn_set_2b(t0, 52);
-				bn_add_dig(t0, t0, 0xAB);
-				bn_lsh(t0, t0, 12);
-				fp_prime_set_pairf(t0, EP_OT8);
-				break;
-			case PRIME_511187:
-				bn_set_2b(p, 511);
-				bn_sub_dig(p, p, 187);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 521
-			case NIST_521:
-				/* p = 2^521 - 1. */
-				f[0] = -1;
-				f[1] = 521;
-				fp_prime_set_pmers(f, 2);
-				break;
-#elif FP_PRIME == 544
-			case GMT8_544:
-				bn_read_str(p, STR_P544, strlen(STR_P544), 16);
-				/* T = 2^64 - 2^54 + 2^37 + 2^32 - 4 */
-				bn_set_2b(t0, 64);
-				bn_set_2b(t1, 54);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 37);
-				bn_add(t0, t0, t1);
-				bn_set_2b(t1, 32);
-				bn_add(t0, t0, t1);
-				bn_sub_dig(t0, t0, 4);
-				fp_prime_set_pairf(t0, EP_GMT8);
-				fp_prime_set_dense(p);
-				break;
-#elif FP_PRIME == 569
-			case K54_569:
-				/* 2^27 + 2^26 + 2^22 + 2^14 + 2^6 + 2 */
-				bn_set_2b(t0, 27);
-				bn_set_2b(t1, 26);
-				bn_add(t0, t0, t1);
-				bn_set_2b(t1, 22);
-				bn_add(t0, t0, t1);
-				bn_set_2b(t1, 14);
-				bn_add(t0, t0, t1);
-				bn_add_dig(t0, t0, 66);
-				fp_prime_set_pairf(t0, EP_K54);
-				break;
-#elif FP_PRIME == 575
-			case B48_575:
-				/* x = 2^32 - 2^18 - 2^10 - 2^4. */
-				bn_set_2b(t0, 32);
-				bn_set_2b(t1, 18);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 10);
-				bn_sub(t0, t0, t1);
-				bn_sub_dig(t0, t0, 16);
-				fp_prime_set_pairf(t0, EP_B48);
-				break;
-#elif FP_PRIME == 638
-			case BN_638:
-				/* x = 2^158 - 2^128 - 2^68 + 1. */
-				bn_set_2b(t0, 158);
-				bn_set_2b(t1, 128);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 68);
-				bn_sub(t0, t0, t1);
-				bn_add_dig(t0, t0, 1);
-				fp_prime_set_pairf(t0, EP_BN);
-				break;
-			case B12_638:
-				/* x = -2^107 + 2^105 + 2^93 + 2^5. */
-				bn_set_2b(t0, 107);
-				bn_set_2b(t1, 105);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 93);
-				bn_sub(t0, t0, t1);
-				bn_set_2b(t1, 5);
-				bn_sub(t0, t0, t1);
-				bn_neg(t0, t0);
-				fp_prime_set_pairf(t0, EP_B12);
-				break;
-#elif FP_PRIME == 1536
-			case SS_1536:
-				/* x = 2^255 + 2^41 + 1. */
-				bn_set_2b(t0, 255);
-				bn_set_bit(t0, 41, 1);
-				bn_add_dig(t0, t0, 1);
-				bn_read_str(p, STR_P1536, strlen(STR_P1536), 16);
-				bn_mul(p, p, t0);
-				bn_dbl(p, p);
-				bn_sub_dig(p, p, 1);
-				fp_prime_set_dense(p);
-				fp_prime_set_pairf(t0, EP_SS2);
-				break;
-#elif FP_PRIME == 3072
-			case SS_3072:
-				/* x = 2^256 + 2^96 - 1. */
-				bn_set_2b(t0, 256);
-				bn_set_bit(t0, 96, 1);
-				bn_sub_dig(t0, t0, 1);
-				bn_read_str(p, STR_P3072, strlen(STR_P3072), 16);
-				bn_mul(p, p, t0);
-				bn_sqr(p, p);
-				bn_add_dig(p, p, 1);
-				fp_prime_set_dense(p);
-				fp_prime_set_pairf(t0, EP_SS1);
-				break;
-#else
-			default:
-				fp_param_set_any_dense();
-				core_get()->fp_id = 0;
-				break;
-#endif
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t0);
-		bn_free(t1);
-		bn_free(t2);
-		bn_free(p);
-	}
-}
-
-int fp_param_set_any(void) {
-	int r = fp_param_set_any_pmers();
-	if (r == RLC_ERR) {
-		r = fp_param_set_any_h2adc();
-		if (r == RLC_ERR) {
-			r = fp_param_set_any_tower();
-			if (r == RLC_ERR) {
-				r = fp_param_set_any_dense();
-				if (r == RLC_ERR) {
-					return RLC_ERR;
-				}
-			}
-		}
-	}
-	return RLC_OK;
-}
-
-int fp_param_set_any_dense(void) {
-	bn_t p;
-	int result = RLC_OK;
-
-	bn_null(p);
-
-	RLC_TRY {
-		bn_new(p);
-#ifdef FP_QNRES
-		do {
-			bn_gen_prime(p, RLC_FP_BITS);
-		} while ((p->dp[0] & 0x7) != 3);
-#else
-		bn_gen_prime(p, RLC_FP_BITS);
-#endif
-		if (!bn_is_prime(p)) {
-			result = RLC_ERR;
-		} else {
-			fp_prime_set_dense(p);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(p);
-	}
-	return result;
-}
-
-int fp_param_set_any_pmers(void) {
-#if FP_PRIME == 160
-	fp_param_set(SECG_160);
-#elif FP_PRIME == 192
-	fp_param_set(NIST_192);
-#elif FP_PRIME == 224
-	fp_param_set(NIST_224);
-#elif FP_PRIME == 255
-	fp_param_set(PRIME_25519);
-#elif FP_PRIME == 256
-	fp_param_set(NIST_256);
-#elif FP_PRIME == 384
-	fp_param_set(NIST_384);
-#elif FP_PRIME == 448
-	fp_param_set(PRIME_448);
-#elif FP_PRIME == 521
-	fp_param_set(NIST_521);
-#else
-	return RLC_ERR;
-#endif
-	return RLC_OK;
-}
-
-int fp_param_set_any_h2adc(void) {
-#if FP_PRIME == 255
-	fp_param_set(PRIME_H2ADC);
-#else
-	return RLC_ERR;
-#endif
-	return RLC_OK;
-}
-
-int fp_param_set_any_tower(void) {
-#if FP_PRIME == 158
-	fp_param_set(BN_158);
-#elif FP_PRIME == 254
-	fp_param_set(BN_254);
-#elif FP_PRIME == 256
-	fp_param_set(BN_256);
-#elif FP_PRIME == 381
-	fp_param_set(B12_381);
-#elif FP_PRIME == 382
-	fp_param_set(BN_382);
-#elif FP_PRIME == 383
-	fp_param_set(B12_383);
-#elif FP_PRIME == 446
-#ifdef FP_QNRES
-	fp_param_set(B12_446);
-#else
-	fp_param_set(BN_446);
-#endif
-#elif FP_PRIME == 455
-	fp_param_set(B12_455);
-#elif FP_PRIME == 508
-	fp_param_set(KSS_508);
-#elif FP_PRIME == 509
-	fp_param_set(B24_509);
-#elif FP_PRIME == 511
-	fp_param_set(OT_511);
-#elif FP_PRIME == 544
-	fp_param_set(GMT8_544);
-#elif FP_PRIME == 569
-	fp_param_set(K54_569);
-#elif FP_PRIME == 575
-	fp_param_set(B48_575);
-#elif FP_PRIME == 638
-#ifdef FP_QNRES
-	fp_param_set(B12_638);
-#else
-	fp_param_set(BN_638);
-#endif
-#elif FP_PRIME == 1536
-	fp_param_set(SS_1536);
-#else
-	do {
-		/* Since we have to generate a prime number, pick a nice towering. */
-		fp_param_set_any_dense();
-	} while (fp_prime_get_mod8() == 1 || fp_prime_get_mod8() == 5);
-#endif
-
-	return RLC_OK;
-}
-
-void fp_param_print(void) {
-	util_banner("Prime modulus:", 0);
-	util_print("   ");
-#if ALLOC == AUTO
-	fp_print(fp_prime_get());
-#else
-	fp_print((const fp_t)fp_prime_get());
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_prime.c b/src/dashbls/depends/relic/src/fp/relic_fp_prime.c
deleted file mode 100644
index da1a783a796c..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_prime.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field prime manipulation functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_ep.h"
-#include "relic_fpx.h"
-#include "relic_bn_low.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Assigns the prime field modulus.
- *
- * @param[in] p			- the new prime field modulus.
- */
-static void fp_prime_set(const bn_t p) {
-	bn_t t;
-	fp_t r;
-	ctx_t *ctx = core_get();
-
-	if (p->used != RLC_FP_DIGS) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	bn_null(t);
-	fp_null(r);
-
-	RLC_TRY {
-		bn_new(t);
-		fp_new(r);
-
-		bn_copy(&(ctx->prime), p);
-
-		#if FP_RDC == MONTY || !defined(STRIP)
-
-		bn_mod_pre_monty(t, &(ctx->prime));
-		ctx->u = t->dp[0];
-
-		/* compute R mod p */
-		bn_set_dig(&(ctx->one), 1);
-		bn_lsh(&(ctx->one), &(ctx->one), RLC_FP_DIGS * RLC_DIG);
-		bn_mod(&(ctx->one), &(ctx->one), &(ctx->prime));
-
-		/* compute the R^2 mod p */
-		fp_add(r, ctx->one.dp, ctx->one.dp);
-		bn_set_dig(t, RLC_FP_DIGS);
-		bn_lsh(t, t, RLC_DIG_LOG);
-		fp_exp(ctx->conv.dp, r, t);
-		ctx->conv.used = RLC_FP_DIGS;
-		bn_trim(&(ctx->conv));
-
-		#endif /* FP_RDC == MONTY */
-
-		/* Now look for proper quadratic/cubic non-residues. */
-		ctx->qnr = ctx->cnr = 0;
-		bn_mod_dig(&(ctx->mod8), &(ctx->prime), 8);
-
-		switch (ctx->mod8) {
-			case 3:
-				ctx->qnr = -1;
-				ctx->cnr = 2;
-				break;
-			case 7:
-				ctx->qnr = -1;
-				ctx->cnr = -2;
-				/* TODO: implement cube root to handle this better. */
-#if FP_PRIME == 638
-				ctx->cnr = -3;
-#endif
-				break;
-			case 1:
-			case 5:
-				ctx->qnr = -2;
-				ctx->cnr = 2;
-				/* Check if it is a quadratic non-residue or find another. */
-				fp_set_dig(r, -ctx->qnr);
-				fp_neg(r, r);
-				while (fp_srt(r, r) == 1) {
-					ctx->qnr--;
-					fp_set_dig(r, -ctx->qnr);
-					fp_neg(r, r);
-					/* We cannot guarantee a cubic extension anymore. */
-					ctx->cnr = 0;
-				};
-				break;
-		}
-#ifdef FP_QNRES
-		if (ctx->mod8 != 3) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-#endif
-
-		ctx->ad2 = 0;
-		bn_sub_dig(t, p, 1);
-		while (bn_is_even(t)) {
-			ctx->ad2++;
-			bn_hlv(t, t);
-		}
-
-		fp_prime_calc();
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-		fp_free(r);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_prime_init(void) {
-	ctx_t *ctx = core_get();
-	ctx->fp_id = 0;
-	bn_make(&(ctx->prime), RLC_FP_DIGS);
-	bn_make(&(ctx->par), RLC_FP_DIGS);
-#if FP_RDC == QUICK || !defined(STRIP)
-	ctx->sps_len = 0;
-	memset(ctx->sps, 0, sizeof(ctx->sps));
-#endif
-#if FP_RDC == MONTY || !defined(STRIP)
-	bn_make(&(ctx->conv), RLC_FP_DIGS);
-	bn_make(&(ctx->one), RLC_FP_DIGS);
-#endif
-}
-
-void fp_prime_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		ctx->fp_id = 0;
-#if FP_RDC == QUICK || !defined(STRIP)
-		ctx->sps_len = 0;
-		memset(ctx->sps, 0, sizeof(ctx->sps));
-#endif
-#if FP_RDC == MONTY || !defined(STRIP)
-		bn_clean(&(ctx->one));
-		bn_clean(&(ctx->conv));
-#endif
-		bn_clean(&(ctx->prime));
-		bn_clean(&(ctx->par));
-	}
-}
-
-const dig_t *fp_prime_get(void) {
-	return core_get()->prime.dp;
-}
-
-const dig_t *fp_prime_get_rdc(void) {
-	return &(core_get()->u);
-}
-
-void fp_prime_get_par(bn_t x) {
-	bn_copy(x, &(core_get()->par));
-}
-
-const int *fp_prime_get_par_sps(int *len) {
-	ctx_t *ctx = core_get();
-	if (ctx->par_len > 0) {
-		if (len != NULL) {
-			*len = ctx->par_len;
-		}
-		return ctx->par_sps;
-	}
-	if (len != NULL) {
-		*len = 0;
-	}
-	return NULL;
-}
-
-const int *fp_prime_get_sps(int *len) {
-#if FP_RDC == QUICK || !defined(STRIP)
-	ctx_t *ctx = core_get();
-	if (ctx->sps_len > 0 && ctx->sps_len < RLC_TERMS) {
-		if (len != NULL) {
-			*len = ctx->sps_len;
-		}
-		return ctx->sps;
-	} else {
-		if (len != NULL) {
-			*len = 0;
-		}
-		return NULL;
-	}
-#else
-	return NULL;
-#endif
-}
-
-const dig_t *fp_prime_get_conv(void) {
-#if FP_RDC == MONTY || !defined(STRIP)
-	return core_get()->conv.dp;
-#else
-	return NULL;
-#endif
-}
-
-dig_t fp_prime_get_mod8(void) {
-	return core_get()->mod8;
-}
-
-int fp_prime_get_qnr(void) {
-	return core_get()->qnr;
-}
-
-int fp_prime_get_cnr(void) {
-	return core_get()->cnr;
-}
-
-int fp_prime_get_2ad(void) {
-	return core_get()->ad2;
-}
-
-void fp_prime_set_dense(const bn_t p) {
-	fp_prime_set(p);
-#if FP_RDC == QUICK
-	RLC_THROW(ERR_NO_CONFIG);
-#endif
-}
-
-void fp_prime_set_pairf(const bn_t x, int pairf) {
-	bn_t p, t0, t1;
-	ctx_t *ctx = core_get();
-	int len = bn_bits(x) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	bn_null(p);
-	bn_null(t0);
-	bn_null(t1);
-
-	RLC_TRY {
-		bn_new(p);
-		bn_new(t0);
-		bn_new(t1);
-
-		bn_copy(&(ctx->par), x);
-		bn_copy(t0, x);
-
-		switch (pairf) {
-			case EP_BN:
-				/* p = 36 * x^4 + 36 * x^3 + 24 * x^2 + 6 * x + 1. */
-				bn_set_dig(p, 1);
-				bn_mul_dig(t1, t0, 6);
-				bn_add(p, p, t1);
-				bn_mul(t1, t0, t0);
-				bn_mul_dig(t1, t1, 24);
-				bn_add(p, p, t1);
-				bn_mul(t1, t0, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul_dig(t1, t1, 36);
-				bn_add(p, p, t1);
-				bn_mul(t0, t0, t0);
-				bn_mul(t1, t0, t0);
-				bn_mul_dig(t1, t1, 36);
-				bn_add(p, p, t1);
-				fp_prime_set_dense(p);
-				break;
-			case EP_B12:
-				/* p = (x^2 - 2x + 1) * (x^4 - x^2 + 1)/3 + x. */
-				bn_sqr(t1, t0);
-				bn_sqr(p, t1);
-				bn_sub(p, p, t1);
-				bn_add_dig(p, p, 1);
-				bn_sub(t1, t1, t0);
-				bn_sub(t1, t1, t0);
-				bn_add_dig(t1, t1, 1);
-				bn_mul(p, p, t1);
-				bn_div_dig(p, p, 3);
-				bn_add(p, p, t0);
-				fp_prime_set_dense(p);
-				break;
-			case EP_OT8:
-				/* p = (x^8 + x^6 + 5*x^4 + x^2 + 4*x + 4) / 4. */
-				bn_set_dig(p, 4);
-				bn_mul_dig(t1, t0, 4);
-				bn_add(p, p, t1);
-				bn_sqr(t0, t0);
-				bn_add(p, p, t0);
-				bn_sqr(t1, t0);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_div_dig(p, p, 4);
-				fp_prime_set_dense(p);
-				break;
-			case EP_B24:
-				/* p = (x - 1)^2 * (x^8 - x^4 + 1)/3 + x. */
-				bn_sqr(t1, t0);
-				bn_sqr(t1, t1);
-				bn_sqr(p, t1);
-				bn_sub(p, p, t1);
-				bn_add_dig(p, p, 1);
-				bn_sub_dig(t1, t0, 1);
-				bn_sqr(t1, t1);
-				bn_mul(p, p, t1);
-				bn_div_dig(p, p, 3);
-				bn_add(p, p, t0);
-				fp_prime_set_dense(p);
-				break;
-			case EP_B48:
-				/* p = (x - 1)^2*(x^16 - x^8 + 1) / 3 + x. */
-				bn_sqr(t1, t0);
-				bn_sqr(t1, t1);
-				bn_sqr(p, t1);
-				bn_sqr(t1, p);
-				bn_sub(t1, t1, p);
-				bn_add_dig(t1, t1, 1);
-				bn_sub_dig(p, t0, 1);
-				bn_sqr(p, p);
-				bn_mul(p, p, t1);
-				bn_div_dig(p, p, 3);
-				bn_add(p, p, t0);
-				fp_prime_set_dense(p);
-				break;
-			case EP_K54:
-				/* p = (1+3*x+3*x^2+(3^5)*x^9+(3^5)*x^10+(3^6)*x^10+(3^6)*x^11+(3^9)*x^18+(3^10)*x^19+(3^10)*x^20) */
-				bn_set_dig(p, 1);
-				bn_mul_dig(t1, t0, 3);
-				bn_add(p, p, t1);
-				bn_sqr(t1, t0);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_add(p, p, t1);
-				bn_sqr(t1, t1);
-				bn_sqr(t1, t1);
-				bn_mul(t1, t1, t0);
-				bn_mul_dig(t1, t1, 243);
-				bn_add(p, p, t1);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_mul_dig(t1, t1, 3);
-				bn_add(p, p, t1);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_mul_dig(t1, t1, 27);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_mul_dig(t1, t1, 3);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				bn_mul(t1, t1, t0);
-				bn_add(p, p, t1);
-				fp_prime_set_dense(p);
-				break;
-		}
-
-		/* Store parameter in NAF form. */
-		ctx->par_len = 0;
-		bn_rec_naf(s, &len, &(ctx->par), 2);
-		/* Fix corner case to avoid problems with sparse representation. */
-		if (s[0] == -1) {
-			s[0] = 1;
-			s[1] = -1;
-		}
-		for (int i = 0; i < len && ctx->par_len < RLC_TERMS; i++) {
-			if (s[i] > 0) {
-				ctx->par_sps[ctx->par_len++] = i;
-			}
-			if (s[i] < 0) {
-				ctx->par_sps[ctx->par_len++] = -i;
-			}
-		}
-		if (ctx->par_len == RLC_TERMS) {
-			RLC_THROW(ERR_NO_VALID);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(p);
-		bn_free(t0);
-		bn_free(t1);
-	}
-}
-
-void fp_prime_set_pmers(const int *f, int len) {
-	bn_t p, t;
-
-	bn_null(p);
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(p);
-		bn_new(t);
-
-		if (len >= RLC_TERMS) {
-			RLC_THROW(ERR_NO_VALID);
-			return;
-		}
-
-		bn_set_2b(p, f[len - 1]);
-		for (int i = len - 2; i > 0; i--) {
-			if (f[i] > 0) {
-				bn_set_2b(t, f[i]);
-				bn_add(p, p, t);
-			} else {
-				bn_set_2b(t, -f[i]);
-				bn_sub(p, p, t);
-			}
-		}
-		if (f[0] > 0) {
-			bn_add_dig(p, p, f[0]);
-		} else {
-			bn_sub_dig(p, p, -f[0]);
-		}
-
-#if FP_RDC == QUICK || !defined(STRIP)
-		ctx_t *ctx = core_get();
-		for (int i = 0; i < len; i++) {
-			ctx->sps[i] = f[i];
-		}
-		ctx->sps[len] = 0;
-		ctx->sps_len = len;
-#endif /* FP_RDC == QUICK */
-
-		fp_prime_set(p);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(p);
-		bn_free(t);
-	}
-}
-
-void fp_prime_calc(void) {
-#ifdef WITH_FPX
-	if (fp_prime_get_qnr() != 0) {
-		fp2_field_init();
-		fp4_field_init();
-	}
-	if (fp_prime_get_cnr() != 0) {
-		fp3_field_init();
-	}
-#endif
-}
-
-void fp_prime_conv(fp_t c, const bn_t a) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		/* Reduce a modulo the prime to ensure bounds. */
-		bn_mod(t, a, &(core_get()->prime));
-
-		if (bn_is_zero(t)) {
-			fp_zero(c);
-		} else {
-			/* Copy used digits, fill the rest with zero. */
-			dv_copy(c, t->dp, t->used);
-			dv_zero(c + t->used, RLC_FP_DIGS - t->used);
-#if FP_RDC == MONTY
-			fp_mul(c, c, core_get()->conv.dp);
-#endif
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void fp_prime_conv_dig(fp_t c, dig_t a) {
-	dv_t t;
-	ctx_t *ctx = core_get();
-
-	bn_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-
-#if FP_RDC == MONTY
-		if (a != 1) {
-			dv_zero(t, 2 * RLC_FP_DIGS + 1);
-			t[RLC_FP_DIGS] = fp_mul1_low(t, ctx->conv.dp, a);
-			fp_rdc(c, t);
-		} else {
-			dv_copy(c, ctx->one.dp, RLC_FP_DIGS);
-		}
-#else
-		(void)ctx;
-		fp_zero(c);
-		c[0] = a;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-void fp_prime_back(bn_t c, const fp_t a) {
-	dv_t t;
-	int i;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-
-		bn_grow(c, RLC_FP_DIGS);
-		for (i = 0; i < RLC_FP_DIGS; i++) {
-			c->dp[i] = a[i];
-		}
-#if FP_RDC == MONTY
-		dv_zero(t, 2 * RLC_FP_DIGS + 1);
-		dv_copy(t, a, RLC_FP_DIGS);
-		fp_rdc(c->dp, t);
-#endif
-		c->used = RLC_FP_DIGS;
-		c->sign = RLC_POS;
-		bn_trim(c);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_rdc.c b/src/dashbls/depends/relic/src/fp/relic_fp_rdc.c
deleted file mode 100644
index e566a7d48607..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_rdc.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FP_RDC == BASIC || !defined(STRIP)
-
-void fp_rdc_basic(fp_t c, dv_t a) {
-	dv_t t0, t1, t2, t3;
-
-	dv_null(t0);
-	dv_null(t1);
-	dv_null(t2);
-	dv_null(t3);
-
-	RLC_TRY {
-		dv_new(t0);
-		dv_new(t1);
-		dv_new(t2);
-		dv_new(t3);
-
-		dv_copy(t2, a, 2 * RLC_FP_DIGS);
-		dv_copy(t3, fp_prime_get(), RLC_FP_DIGS);
-		bn_divn_low(t0, t1, t2, 2 * RLC_FP_DIGS, t3, RLC_FP_DIGS);
-		fp_copy(c, t1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv_free(t0);
-		dv_free(t1);
-		dv_free(t2);
-		dv_free(t3);
-	}
-}
-
-#endif
-
-#if FP_RDC == MONTY || !defined(STRIP)
-
-#if FP_MUL == BASIC || !defined(STRIP)
-
-void fp_rdc_monty_basic(fp_t c, dv_t a) {
-	int i;
-	dig_t r, u0;
-
-	u0 = *(fp_prime_get_rdc());
-
-	for (i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r = (dig_t)(*a * u0);
-		*a = fp_mula_low(a, fp_prime_get(), r);
-	}
-	fp_addm_low(c, a, a - RLC_FP_DIGS);
-}
-
-#endif
-
-#if FP_MUL == COMBA || FP_MUL == INTEG || !defined(STRIP)
-
-void fp_rdc_monty_comba(fp_t c, dv_t a) {
-	fp_rdcn_low(c, a);
-}
-
-#endif
-
-#endif
-
-#if FP_RDC == QUICK || !defined(STRIP)
-
-void fp_rdc_quick(fp_t c, dv_t a) {
-	fp_rdcs_low(c, a, fp_prime_get());
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_shift.c b/src/dashbls/depends/relic/src/fp/relic_fp_shift.c
deleted file mode 100644
index b23b95cefe92..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_shift.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field arithmetic shift functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_lsh(fp_t c, const fp_t a, int bits) {
-	int digits;
-
-	RLC_RIP(bits, digits, bits);
-
-	if (digits) {
-		dv_lshd(c, a, RLC_FP_DIGS, digits);
-	} else {
-		if (c != a) {
-			fp_copy(c, a);
-		}
-	}
-
-	switch (bits) {
-		case 0:
-			break;
-		case 1:
-			fp_lsh1_low(c, c);
-			break;
-		default:
-			fp_lshb_low(c, c, bits);
-			break;
-	}
-
-}
-
-void fp_rsh(fp_t c, const fp_t a, int bits) {
-	int digits;
-
-	RLC_RIP(bits, digits, bits);
-
-	if (digits) {
-		dv_rshd(c, a, RLC_FP_DIGS, digits);
-	} else {
-		if (c != a) {
-			fp_copy(c, a);
-		}
-	}
-
-	switch (bits) {
-		case 0:
-			break;
-		case 1:
-			fp_rsh1_low(c, c);
-			break;
-		default:
-			fp_rshb_low(c, c, bits);
-			break;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_sqr.c b/src/dashbls/depends/relic/src/fp/relic_fp_sqr.c
deleted file mode 100644
index 2d2f83be0018..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_sqr.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic squaring
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FP_KARAT > 0 || !defined(STRIP)
-
-/**
- * Computes the square of a multiple precision integer using recursive Karatsuba
- * squaring.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to square.
- * @param[in] size			- the number of digits to square.
- * @param[in] level			- the number of Karatsuba steps to apply.
- */
-static void fp_sqr_karat_imp(dv_t c, const fp_t a, int size, int level) {
-	int i, h, h1;
-	dv_t t0, t1, a0a0, a1a1;
-	dig_t carry;
-
-	/* Compute half the digits of a or b. */
-	h = size >> 1;
-	h1 = size - h;
-
-	dv_null(t0);
-	dv_null(t1);
-	dv_null(a0a0);
-	dv_null(a1a1);
-
-	RLC_TRY {
-		/* Allocate the temp variables. */
-		dv_new(t0);
-		dv_new(t1);
-		dv_new(a0a0);
-		dv_new(a1a1);
-		dv_zero(t0, 2 * h1);
-		dv_zero(t1, 2 * (h1 + 1));
-		dv_zero(a0a0, 2 * h);
-		dv_zero(a1a1, 2 * h1);
-
-		if (level <= 1) {
-			/* a0a0 = a0 * a0 and a1a1 = a1 * a1 */
-#if FP_SQR == BASIC
-			for (i = 0; i < h - 1; i++) {
-				a0a0[h + i + 1] = bn_sqra_low(a0a0 + 2 * i, a + i, h - i);
-			}
-			bn_sqra_low(a0a0 + 2 * i, a + i, 1);
-			for (i = 0; i < h1 - 1; i++) {
-				a1a1[h1 + i + 1] = bn_sqra_low(a1a1 + 2 * i, a + h + i, h1 - i);
-			}
-			bn_sqra_low(a1a1 + 2 * i, a + h + i, 1);
-#elif FP_SQR == COMBA || FP_SQR == INTEG
-			bn_sqrn_low(a0a0, a, h);
-			bn_sqrn_low(a1a1, a + h, h1);
-#elif FP_SQR == MULTP
-			bn_muln_low(a0a0, a, a, h);
-			bn_muln_low(a1a1, a + h, a + h, h1);
-#endif
-		} else {
-			fp_sqr_karat_imp(a0a0, a, h, level - 1);
-			fp_sqr_karat_imp(a1a1, a + h, h1, level - 1);
-		}
-
-		/* t2 = a1 * a1 << 2*h digits + a0 * a0. */
-		for (i = 0; i < 2 * h; i++) {
-			c[i] = a0a0[i];
-		}
-		for (i = 0; i < 2 * h1; i++) {
-			c[2 * h + i] = a1a1[i];
-		}
-
-		/* t = (a1 + a0) */
-		carry = bn_addn_low(t0, a, a + h, h);
-		carry = bn_add1_low(t0 + h, t0 + h, carry, 2);
-		if (h1 > h) {
-			carry = bn_add1_low(t0 + h, t0 + h, *(a + 2 * h), 2);
-		}
-
-		if (level <= 1) {
-			/* a1a1 = (a1 + a0)*(a1 + a0) */
-#if FP_SQR == BASIC
-			for (i = 0; i < h1; i++) {
-				t1[h1 + i + 2] = bn_sqra_low(t1 + (2 * i), t0 + i, h1 + 1 - i);
-			}
-			bn_sqra_low(t1 + (2 * i), t0 + i, 1);
-#elif FP_SQR == COMBA || FP_SQR == INTEG
-			bn_sqrn_low(t1, t0, h1 + 1);
-#elif FP_SQR == MULTP
-			bn_muln_low(t1, t0, t0, h1 + 1);
-#endif
-		} else {
-			fp_sqr_karat_imp(t1, t0, h1 + 1, level - 1);
-		}
-
-		/* t = t - (a0*a0 << h digits) */
-		carry = bn_subn_low(t1, t1, a0a0, 2 * h);
-		bn_sub1_low(t1 + 2 * h, t1 + 2 * h, carry, 2 * (h1 + 1) - 2 * h);
-
-		/* t = t - (a1*a1 << h digits) */
-		carry = bn_subn_low(t1, t1, a1a1, 2 * h1);
-		bn_sub1_low(t1 + 2 * h, t1 + 2 * h, carry, 2 * (h1 + 1) - 2 * h);
-
-		/* c = c + [(a1 + a0)*(a1 + a0) << digits] */
-		c += h;
-		carry = bn_addn_low(c, c, t1, 2 * (h1 + 1));
-		c += 2 * (h1 + 1);
-		if (2 * size > h + 2 * (h1 + 1)) {
-			carry = bn_add1_low(c, c, carry, 2 * size - h - 2 * (h1 + 1));
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t0);
-		dv_free(t1);
-		dv_free(a0a0);
-		dv_free(a1a1);
-	}
-}
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FP_SQR == BASIC || !defined(STRIP)
-
-void fp_sqr_basic(fp_t c, const fp_t a) {
-	int i;
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_zero(t, 2 * RLC_FP_DIGS);
-
-		for (i = 0; i < RLC_FP_DIGS - 1; i++) {
-			t[RLC_FP_DIGS + i + 1] =
-					bn_sqra_low(t + 2 * i, a + i, RLC_FP_DIGS - i);
-		}
-		bn_sqra_low(t + 2 * i, a + i, 1);
-
-		fp_rdc(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-}
-
-#endif
-
-#if FP_SQR == COMBA || !defined(STRIP)
-
-void fp_sqr_comba(fp_t c, const fp_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-
-		fp_sqrn_low(t, a);
-
-		fp_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-}
-
-#endif
-
-#if FP_SQR == INTEG || !defined(STRIP)
-
-void fp_sqr_integ(fp_t c, const fp_t a) {
-	fp_sqrm_low(c, a);
-}
-
-#endif
-
-#if FP_KARAT > 0 || !defined(STRIP)
-
-void fp_sqr_karat(fp_t c, const fp_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_zero(t, 2 * RLC_FP_DIGS);
-
-		if (RLC_FP_DIGS > 1) {
-			fp_sqr_karat_imp(t, a, RLC_FP_DIGS, FP_KARAT);
-		} else {
-			fp_sqrn_low(t, a);
-		}
-
-
-		fp_rdc(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_srt.c b/src/dashbls/depends/relic/src/fp/relic_fp_srt.c
deleted file mode 100644
index 31bd0a765b67..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_srt.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the square root function.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp_srt(fp_t c, const fp_t a) {
-	bn_t e;
-	fp_t t0;
-	fp_t t1;
-	int r = 0;
-
-	bn_null(e);
-	fp_null(t0);
-	fp_null(t1);
-
-	if (fp_is_zero(a)) {
-		fp_zero(c);
-		return 1;
-	}
-
-	RLC_TRY {
-		bn_new(e);
-		fp_new(t0);
-		fp_new(t1);
-
-		/* Make e = p. */
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-
-		if (fp_prime_get_mod8() == 3 || fp_prime_get_mod8() == 7) {
-			/* Easy case, compute a^((p + 1)/4). */
-			bn_add_dig(e, e, 1);
-			bn_rsh(e, e, 2);
-
-			fp_exp(t0, a, e);
-			fp_sqr(t1, t0);
-			r = (fp_cmp(t1, a) == RLC_EQ);
-			fp_copy(c, t0);
-		} else {
-			int f = 0, m = 0;
-
-			/* First, check if there is a root. Compute t1 = a^((p - 1)/2). */
-			bn_rsh(e, e, 1);
-			fp_exp(t0, a, e);
-
-			if (fp_cmp_dig(t0, 1) != RLC_EQ) {
-				/* Nope, there is no square root. */
-				r = 0;
-			} else {
-				r = 1;
-				/* Find a quadratic non-residue modulo p, that is a number t2
-				 * such that (t2 | p) = t2^((p - 1)/2)!= 1. */
-				do {
-					fp_rand(t1);
-					fp_exp(t0, t1, e);
-				} while (fp_cmp_dig(t0, 1) == RLC_EQ);
-
-				/* Write p - 1 as (e * 2^f), odd e. */
-				bn_lsh(e, e, 1);
-				while (bn_is_even(e)) {
-					bn_rsh(e, e, 1);
-					f++;
-				}
-
-				/* Compute t2 = t2^e. */
-				fp_exp(t1, t1, e);
-
-				/* Compute t1 = a^e, c = a^((e + 1)/2) = a^(e/2 + 1), odd e. */
-				bn_rsh(e, e, 1);
-				fp_exp(t0, a, e);
-				fp_mul(e->dp, t0, a);
-				fp_sqr(t0, t0);
-				fp_mul(t0, t0, a);
-				fp_copy(c, e->dp);
-
-				while (1) {
-					if (fp_cmp_dig(t0, 1) == RLC_EQ) {
-						break;
-					}
-					fp_copy(e->dp, t0);
-					for (m = 0; (m < f) && (fp_cmp_dig(t0, 1) != RLC_EQ); m++) {
-						fp_sqr(t0, t0);
-					}
-					fp_copy(t0, e->dp);
-					for (int i = 0; i < f - m - 1; i++) {
-						fp_sqr(t1, t1);
-					}
-					fp_mul(c, c, t1);
-					fp_sqr(t1, t1);
-					fp_mul(t0, t0, t1);
-					f = m;
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(e);
-		fp_free(t0);
-		fp_free(t1);
-	}
-	return r;
-}
diff --git a/src/dashbls/depends/relic/src/fp/relic_fp_util.c b/src/dashbls/depends/relic/src/fp/relic_fp_util.c
deleted file mode 100644
index 84d2c50ac49b..000000000000
--- a/src/dashbls/depends/relic/src/fp/relic_fp_util.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the prime field utilities.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_copy(fp_t c, const fp_t a) {
-	dv_copy(c, a, RLC_FP_DIGS);
-}
-
-void fp_zero(fp_t a) {
-	dv_zero(a, RLC_FP_DIGS);
-}
-
-int fp_is_zero(const fp_t a) {
-	int i;
-	dig_t t = 0;
-
-	for (i = 0; i < RLC_FP_DIGS; i++) {
-		t |= a[i];
-	}
-
-	return !t;
-}
-
-int fp_is_even(const fp_t a) {
-	if ((a[0] & 0x01) == 0) {
-		return 1;
-	}
-	return 0;
-}
-
-int fp_get_bit(const fp_t a, int bit) {
-	int d;
-
-	RLC_RIP(bit, d, bit);
-
-	return (a[d] >> bit) & 1;
-}
-
-void fp_set_bit(fp_t a, int bit, int value) {
-	int d;
-	dig_t mask;
-
-	RLC_RIP(bit, d, bit);
-
-	mask = (dig_t)1 << bit;
-
-	if (value == 1) {
-		a[d] |= mask;
-	} else {
-		a[d] &= ~mask;
-	}
-}
-
-int fp_bits(const fp_t a) {
-	int i = RLC_FP_DIGS - 1;
-
-	while (i >= 0 && a[i] == 0) {
-		i--;
-	}
-
-	if (i > 0) {
-		return (i << RLC_DIG_LOG) + util_bits_dig(a[i]);
-	} else {
-		return util_bits_dig(a[0]);
-	}
-}
-
-void fp_set_dig(fp_t c, dig_t a) {
-	fp_prime_conv_dig(c, a);
-}
-
-void fp_rand(fp_t a) {
-	int bits, digits;
-
-	rand_bytes((uint8_t *)a, RLC_FP_DIGS * sizeof(dig_t));
-
-	RLC_RIP(bits, digits, RLC_FP_BITS);
-	if (bits > 0) {
-		dig_t mask = ((dig_t)1 << (dig_t)bits) - 1;
-		a[RLC_FP_DIGS - 1] &= mask;
-	}
-
-	while (dv_cmp(a, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		fp_subm_low(a, a, fp_prime_get());
-	}
-}
-
-void fp_print(const fp_t a) {
-	int i;
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-#if FP_RDC == MONTY
-		if (a != fp_prime_get()) {
-			fp_prime_back(t, a);
-		} else {
-			bn_read_raw(t, a, RLC_FP_DIGS);
-		}
-#else
-		bn_read_raw(t, a, RLC_FP_DIGS);
-#endif
-
-		for (i = RLC_FP_DIGS - 1; i > 0; i--) {
-			if (i >= t->used) {
-				util_print_dig(0, 1);
-			} else {
-				util_print_dig(t->dp[i], 1);
-			}
-			util_print(" ");
-		}
-		util_print_dig(t->dp[0], 1);
-		util_print("\n");
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-int fp_size_str(const fp_t a, int radix) {
-	bn_t t;
-	int digits = 0;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		fp_prime_back(t, a);
-
-		digits = bn_size_str(t, radix);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-
-	return digits;
-}
-
-void fp_read_str(fp_t a, const char *str, int len, int radix) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-		bn_read_str(t, str, len, radix);
-		if (bn_is_zero(t)) {
-			fp_zero(a);
-		} else {
-			if (t->used == 1) {
-				fp_prime_conv_dig(a, t->dp[0]);
-				if (bn_sign(t) == RLC_NEG) {
-					fp_neg(a, a);
-				}
-			} else {
-				fp_prime_conv(a, t);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void fp_write_str(char *str, int len, const fp_t a, int radix) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		fp_prime_back(t, a);
-
-		bn_write_str(str, len, t, radix);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void fp_read_bin(fp_t a, const uint8_t *bin, int len) {
-	bn_t t;
-
-	bn_null(t);
-
-	if (len != RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-		bn_read_bin(t, bin, len);
-
-		/* Reject values out of bounds. */
-		if (bn_sign(t) == RLC_NEG || bn_cmp(t, &core_get()->prime) != RLC_LT) {
-			RLC_THROW(ERR_NO_VALID);
-		} else {
-			if (bn_is_zero(t)) {
-				fp_zero(a);
-			} else {
-				if (t->used == 1) {
-					fp_prime_conv_dig(a, t->dp[0]);
-				} else {
-					fp_prime_conv(a, t);
-				}
-			}	
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void fp_write_bin(uint8_t *bin, int len, const fp_t a) {
-	bn_t t;
-
-	bn_null(t);
-
-	if (len != RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(t);
-
-		fp_prime_back(t, a);
-
-		bn_write_bin(bin, len, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp12_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp12_mul.c
deleted file mode 100644
index c2e5be967786..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp12_mul.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a dodecic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-inline static void fp6_mul_dxs_unr_lazyr(dv6_t c, fp6_t a, fp6_t b) {
-	dv2_t u0, u1, u2, u3;
-	fp2_t t0, t1;
-
-	dv2_null(u0);
-	dv2_null(u1);
-	dv2_null(u2);
-	dv2_null(u3);
-	fp2_null(t0);
-	fp2_null(t1);
-
-	RLC_TRY {
-		dv2_new(u0);
-		dv2_new(u1);
-		dv2_new(u2);
-		dv2_new(u3);
-		fp2_new(t0);
-		fp2_new(t1);
-
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u0, a[0], b[0]);
-		fp2_mulc_low(u1, a[1], b[1]);
-		fp2_addn_low(t0, a[0], a[1]);
-		fp2_addn_low(t1, b[0], b[1]);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - a_0b_0 - a_1b_1 */
-		fp2_muln_low(u2, t0, t1);
-		fp2_subc_low(u2, u2, u0);
-		fp2_subc_low(c[1], u2, u1);
-
-		/* c_0 = a_0b_0 + E a_2b_1 */
-		fp2_mulc_low(u2, a[2], b[1]);
-		fp2_norh_low(c[0], u2);
-		fp2_addc_low(c[0], u0, c[0]);
-
-		/* c_2 = a_0b_2 + a_1b_1 */
-		fp2_mulc_low(u2, a[2], b[0]);
-		fp2_addc_low(c[2], u1, u2);
-#else
-		fp2_muln_low(u0, a[0], b[0]);
-		fp2_muln_low(u1, a[1], b[1]);
-		fp2_addm_low(t0, a[0], a[1]);
-		fp2_addm_low(t1, b[0], b[1]);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - a_0b_0 - a_1b_1 */
-		fp2_muln_low(u2, t0, t1);
-		fp2_subc_low(u2, u2, u0);
-		fp2_subc_low(c[1], u2, u1);
-
-		/* c_0 = a_0b_0 + E a_2b_1 */
-		fp2_muln_low(u2, a[2], b[1]);
-		fp2_nord_low(c[0], u2);
-		fp2_addc_low(c[0], u0, c[0]);
-
-		/* c_2 = a_0b_2 + a_1b_1 */
-		fp2_muln_low(u2, a[2], b[0]);
-		fp2_addc_low(c[2], u1, u2);
-#endif
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(u0);
-		dv2_free(u1);
-		dv2_free(u2);
-		dv2_free(u3);
-		fp2_free(t0);
-		fp2_free(t1);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp12_mul_basic(fp12_t c, fp12_t a, fp12_t b) {
-	fp6_t t0, t1, t2;
-
-	fp6_null(t0);
-	fp6_null(t1);
-	fp6_null(t2);
-
-	RLC_TRY {
-		fp6_new(t0);
-		fp6_new(t1);
-		fp6_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp6_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp6_mul(t1, a[1], b[1]);
-		/* t2 = b_0 + b_1. */
-		fp6_add(t2, b[0], b[1]);
-
-		/* c_1 = a_0 + a_1. */
-		fp6_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp6_mul(c[1], c[1], t2);
-		fp6_sub(c[1], c[1], t0);
-		fp6_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp6_mul_art(t1, t1);
-		fp6_add(c[0], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp6_free(t0);
-		fp6_free(t1);
-		fp6_free(t2);
-	}
-}
-
-void fp12_mul_dxs_basic(fp12_t c, fp12_t a, fp12_t b) {
-	fp6_t t0, t1, t2;
-
-	fp6_null(t0);
-	fp6_null(t1);
-	fp6_null(t2);
-
-	RLC_TRY {
-		fp6_new(t0);
-		fp6_new(t1);
-		fp6_new(t2);
-
-		if (ep2_curve_is_twist() == RLC_EP_DTYPE) {
-#if EP_ADD == BASIC
-			/* t0 = a_0 * b_0 */
-			fp_mul(t0[0][0], a[0][0][0], b[0][0][0]);
-			fp_mul(t0[0][1], a[0][0][1], b[0][0][0]);
-			fp_mul(t0[1][0], a[0][1][0], b[0][0][0]);
-			fp_mul(t0[1][1], a[0][1][1], b[0][0][0]);
-			fp_mul(t0[2][0], a[0][2][0], b[0][0][0]);
-			fp_mul(t0[2][1], a[0][2][1], b[0][0][0]);
-			/* t2 = b_0 + b_1. */
-			fp_add(t2[0][0], b[0][0][0], b[1][0][0]);
-			fp_copy(t2[0][1], b[1][0][1]);
-			fp2_copy(t2[1], b[1][1]);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-			/* t0 = a_0 * b_0 */
-			fp2_mul(t0[0], a[0][0], b[0][0]);
-			fp2_mul(t0[1], a[0][1], b[0][0]);
-			fp2_mul(t0[2], a[0][2], b[0][0]);
-			/* t2 = b_0 + b_1. */
-			fp2_add(t2[0], b[0][0], b[1][0]);
-			fp2_copy(t2[1], b[1][1]);
-#endif
-			/* t1 = a_1 * b_1. */
-			fp6_mul_dxs(t1, a[1], b[1]);
-		} else {
-			/* t0 = a_0 * b_0. */
-			fp6_mul_dxs(t0, a[0], b[0]);
-#if EP_ADD == BASIC
-			/* t1 = a_1 * b_1. */
-			fp_mul(t2[0][0], a[1][2][0], b[1][1][0]);
-			fp_mul(t2[0][1], a[1][2][1], b[1][1][0]);
-			fp2_mul_nor(t1[0], t2[0]);
-			fp_mul(t1[1][0], a[1][0][0], b[1][1][0]);
-			fp_mul(t1[1][1], a[1][0][1], b[1][1][0]);
-			fp_mul(t1[2][0], a[1][1][0], b[1][1][0]);
-			fp_mul(t1[2][1], a[1][1][1], b[1][1][0]);
-			/* t2 = b_0 + b_1. */
-			fp2_copy(t2[0], b[0][0]);
-			fp_add(t2[1][0], b[0][1][0], b[1][1][0]);
-			fp_copy(t2[1][1], b[0][1][1]);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-			/* t1 = a_1 * b_1. */
-			fp2_mul(t2[0], a[1][2], b[1][1]);
-			fp2_mul_nor(t1[0], t2[0]);
-			fp2_mul(t1[1], a[1][0], b[1][1]);
-			fp2_mul(t1[2], a[1][1], b[1][1]);
-			/* t2 = b_0 + b_1. */
-			fp2_copy(t2[0], b[0][0]);
-			fp2_add(t2[1], b[0][1], b[1][1]);
-#endif
-		}
-		/* c_1 = a_0 + a_1. */
-		fp6_add(c[1], a[0], a[1]);
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) - a_0 * b_0 - a_1 * b_1. */
-		fp6_mul_dxs(c[1], c[1], t2);
-		fp6_sub(c[1], c[1], t0);
-		fp6_sub(c[1], c[1], t1);
-		/* c_0 = a_0 * b_0 + v * a_1 * b_1. */
-		fp6_mul_art(t1, t1);
-		fp6_add(c[0], t0, t1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp6_free(t0);
-		fp6_free(t1);
-		fp6_free(t2);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp12_mul_unr(dv12_t c, fp12_t a, fp12_t b) {
-	fp6_t t0, t1;
-	dv6_t u0, u1, u2, u3;
-
-	dv6_null(u0);
-	dv6_null(u1);
-	dv6_null(u2);
-	dv6_null(u3);
-	fp6_null(t0);
-	fp6_null(t1);
-
-	RLC_TRY {
-		dv6_new(u0);
-		dv6_new(u1);
-		dv6_new(u2);
-		dv6_new(u3);
-		fp6_new(t0);
-		fp6_new(t1);
-
-		/* Karatsuba algorithm. */
-
-		/* u0 = a_0 * b_0. */
-		fp6_mul_unr(u0, a[0], b[0]);
-		/* u1 = a_1 * b_1. */
-		fp6_mul_unr(u1, a[1], b[1]);
-		/* t1 = a_0 + a_1. */
-		fp6_add(t0, a[0], a[1]);
-		/* t0 = b_0 + b_1. */
-		fp6_add(t1, b[0], b[1]);
-		/* u2 = (a_0 + a_1) * (b_0 + b_1) */
-		fp6_mul_unr(u2, t0, t1);
-		/* c_1 = u2 - a_0b_0 - a_1b_1. */
-		for (int i = 0; i < 3; i++) {
-			fp2_addc_low(u3[i], u0[i], u1[i]);
-			fp2_subc_low(c[1][i], u2[i], u3[i]);
-		}
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp2_nord_low(u2[0], u1[2]);
-		fp2_addc_low(c[0][0], u0[0], u2[0]);
-		fp2_addc_low(c[0][1], u0[1], u1[0]);
-		fp2_addc_low(c[0][2], u0[2], u1[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv6_free(u0);
-		dv6_free(u1);
-		dv6_free(u2);
-		dv6_free(u3);
-		fp6_free(t0);
-		fp6_free(t1);
-	}
-}
-
-void fp12_mul_lazyr(fp12_t c, fp12_t a, fp12_t b) {
-	dv12_t t;
-
-	dv12_null(t);
-
-	RLC_TRY {
-		dv12_new(t);
-		fp12_mul_unr(t, a, b);
-		for (int i = 0; i < 3; i++) {
-			fp2_rdcn_low(c[0][i], t[0][i]);
-			fp2_rdcn_low(c[1][i], t[1][i]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv12_free(t);
-	}
-}
-
-void fp12_mul_dxs_lazyr(fp12_t c, fp12_t a, fp12_t b) {
-	fp6_t t0;
-	dv6_t u0, u1, u2;
-
-	fp6_null(t0);
-	dv6_null(u0);
-	dv6_null(u1);
-	dv6_null(u2);
-
-	RLC_TRY {
-		fp6_new(t0);
-		dv6_new(u0);
-		dv6_new(u1);
-		dv6_new(u2);
-
-		if (ep2_curve_is_twist() == RLC_EP_DTYPE) {
-#if EP_ADD == BASIC
-			/* t0 = a_0 * b_0. */
-			fp_muln_low(u0[0][0], a[0][0][0], b[0][0][0]);
-			fp_muln_low(u0[0][1], a[0][0][1], b[0][0][0]);
-			fp_muln_low(u0[1][0], a[0][1][0], b[0][0][0]);
-			fp_muln_low(u0[1][1], a[0][1][1], b[0][0][0]);
-			fp_muln_low(u0[2][0], a[0][2][0], b[0][0][0]);
-			fp_muln_low(u0[2][1], a[0][2][1], b[0][0][0]);
-			/* t2 = b_0 + b_1. */
-			fp_add(t0[0][0], b[0][0][0], b[1][0][0]);
-			fp_copy(t0[0][1], b[1][0][1]);
-			fp2_copy(t0[1], b[1][1]);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-			/* t0 = a_0 * b_0. */
-#ifdef RLC_FP_ROOM
-			fp2_mulc_low(u0[0], a[0][0], b[0][0]);
-			fp2_mulc_low(u0[1], a[0][1], b[0][0]);
-			fp2_mulc_low(u0[2], a[0][2], b[0][0]);
-#else
-			fp2_muln_low(u0[0], a[0][0], b[0][0]);
-			fp2_muln_low(u0[1], a[0][1], b[0][0]);
-			fp2_muln_low(u0[2], a[0][2], b[0][0]);
-#endif
-			/* t2 = b_0 + b_1. */
-			fp2_add(t0[0], b[0][0], b[1][0]);
-			fp2_copy(t0[1], b[1][1]);
-#endif
-			/* t1 = a_1 * b_1. */
-			fp6_mul_dxs_unr_lazyr(u1, a[1], b[1]);
-		} else {
-			/* t0 = a_0 * b_0. */
-			fp6_mul_dxs_unr_lazyr(u0, a[0], b[0]);
-#if EP_ADD == BASIC
-			/* t0 = a_0 * b_0. */
-			fp_muln_low(u1[1][0], a[1][2][0], b[1][1][0]);
-			fp_muln_low(u1[1][1], a[1][2][1], b[1][1][0]);
-			fp2_nord_low(u1[0], u1[1]);
-			fp_muln_low(u1[1][0], a[1][0][0], b[1][1][0]);
-			fp_muln_low(u1[1][1], a[1][0][1], b[1][1][0]);
-			fp_muln_low(u1[2][0], a[1][1][0], b[1][1][0]);
-			fp_muln_low(u1[2][1], a[1][1][1], b[1][1][0]);
-			/* t2 = b_0 + b_1. */
-			fp2_copy(t0[0], b[0][0]);
-			fp_add(t0[1][0], b[0][1][0], b[1][1][0]);
-			fp_copy(t0[1][1], b[0][1][1]);
-#elif EP_ADD == PROJC || EP_ADD == JACOB
-			/* t1 = a_1 * b_1. */
-			fp2_muln_low(u1[1], a[1][2], b[1][1]);
-			fp2_nord_low(u1[0], u1[1]);
-			fp2_muln_low(u1[1], a[1][0], b[1][1]);
-			fp2_muln_low(u1[2], a[1][1], b[1][1]);
-			/* t2 = b_0 + b_1. */
-			fp2_copy(t0[0], b[0][0]);
-			fp2_add(t0[1], b[0][1], b[1][1]);
-#endif
-		}
-		/* c_1 = a_0 + a_1. */
-		fp6_add(c[1], a[0], a[1]);
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp6_mul_dxs_unr_lazyr(u2, c[1], t0);
-		for (int i = 0; i < 3; i++) {
-			fp2_subc_low(u2[i], u2[i], u0[i]);
-			fp2_subc_low(u2[i], u2[i], u1[i]);
-		}
-		fp2_rdcn_low(c[1][0], u2[0]);
-		fp2_rdcn_low(c[1][1], u2[1]);
-		fp2_rdcn_low(c[1][2], u2[2]);
-
-		fp2_nord_low(u2[0], u1[2]);
-		fp2_addc_low(u0[0], u0[0], u2[0]);
-		fp2_addc_low(u0[1], u0[1], u1[0]);
-		fp2_addc_low(u0[2], u0[2], u1[1]);
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp2_rdcn_low(c[0][0], u0[0]);
-		fp2_rdcn_low(c[0][1], u0[1]);
-		fp2_rdcn_low(c[0][2], u0[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp6_free(t0);
-		dv6_free(u0);
-		dv6_free(u1);
-		dv6_free(u2);
-	}
-}
-
-#endif
-
-void fp12_mul_art(fp12_t c, fp12_t a) {
-	fp6_t t0;
-
-	fp6_null(t0);
-
-	RLC_TRY {
-		fp6_new(t0);
-
-		/* (a_0 + a_1 * v) * v = a_0 * v + a_1 * v^2 */
-		fp6_copy(t0, a[0]);
-		fp6_mul_art(c[0], a[1]);
-		fp6_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp6_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp12_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp12_sqr.c
deleted file mode 100644
index fee988beb4d9..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp12_sqr.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a dodecic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp12_sqr_basic(fp12_t c, fp12_t a) {
-	fp6_t t0, t1;
-
-	fp6_null(t0);
-	fp6_null(t1);
-
-	RLC_TRY {
-		fp6_new(t0);
-		fp6_new(t1);
-
-		fp6_add(t0, a[0], a[1]);
-		fp6_mul_art(t1, a[1]);
-		fp6_add(t1, a[0], t1);
-		fp6_mul(t0, t0, t1);
-		fp6_mul(c[1], a[0], a[1]);
-		fp6_sub(c[0], t0, c[1]);
-		fp6_mul_art(t1, c[1]);
-		fp6_sub(c[0], c[0], t1);
-		fp6_dbl(c[1], c[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp6_free(t0);
-		fp6_free(t1);
-	}
-}
-
-void fp12_sqr_cyc_basic(fp12_t c, fp12_t a) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		/* Define z = sqrt(E) */
-
-		/* Now a is seen as (t0,t1) + (t2,t3) * w + (t4,t5) * w^2 */
-
-		/* (t0, t1) = (a00 + a11*z)^2. */
-		fp2_sqr(t2, a[0][0]);
-		fp2_sqr(t3, a[1][1]);
-		fp2_add(t1, a[0][0], a[1][1]);
-
-		fp2_mul_nor(t0, t3);
-		fp2_add(t0, t0, t2);
-
-		fp2_sqr(t1, t1);
-		fp2_sub(t1, t1, t2);
-		fp2_sub(t1, t1, t3);
-
-		fp2_sub(c[0][0], t0, a[0][0]);
-		fp2_add(c[0][0], c[0][0], c[0][0]);
-		fp2_add(c[0][0], t0, c[0][0]);
-
-		fp2_add(c[1][1], t1, a[1][1]);
-		fp2_add(c[1][1], c[1][1], c[1][1]);
-		fp2_add(c[1][1], t1, c[1][1]);
-
-		fp2_sqr(t0, a[0][1]);
-		fp2_sqr(t1, a[1][2]);
-		fp2_add(t5, a[0][1], a[1][2]);
-		fp2_sqr(t2, t5);
-
-		fp2_add(t3, t0, t1);
-		fp2_sub(t5, t2, t3);
-
-		fp2_add(t6, a[1][0], a[0][2]);
-		fp2_sqr(t3, t6);
-		fp2_sqr(t2, a[1][0]);
-
-		fp2_mul_nor(t6, t5);
-		fp2_add(t5, t6, a[1][0]);
-		fp2_dbl(t5, t5);
-		fp2_add(c[1][0], t5, t6);
-
-		fp2_mul_nor(t4, t1);
-		fp2_add(t5, t0, t4);
-		fp2_sub(t6, t5, a[0][2]);
-
-		fp2_sqr(t1, a[0][2]);
-
-		fp2_dbl(t6, t6);
-		fp2_add(c[0][2], t6, t5);
-
-		fp2_mul_nor(t4, t1);
-		fp2_add(t5, t2, t4);
-		fp2_sub(t6, t5, a[0][1]);
-		fp2_dbl(t6, t6);
-		fp2_add(c[0][1], t6, t5);
-
-		fp2_add(t0, t2, t1);
-		fp2_sub(t5, t3, t0);
-		fp2_add(t6, t5, a[1][2]);
-		fp2_dbl(t6, t6);
-		fp2_add(c[1][2], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-}
-
-void fp12_sqr_pck_basic(fp12_t c, fp12_t a) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		fp2_sqr(t0, a[0][1]);
-		fp2_sqr(t1, a[1][2]);
-		fp2_add(t5, a[0][1], a[1][2]);
-		fp2_sqr(t2, t5);
-
-		fp2_add(t3, t0, t1);
-		fp2_sub(t5, t2, t3);
-
-		fp2_add(t6, a[1][0], a[0][2]);
-		fp2_sqr(t3, t6);
-		fp2_sqr(t2, a[1][0]);
-
-		fp2_mul_nor(t6, t5);
-		fp2_add(t5, t6, a[1][0]);
-		fp2_dbl(t5, t5);
-		fp2_add(c[1][0], t5, t6);
-
-		fp2_mul_nor(t4, t1);
-		fp2_add(t5, t0, t4);
-		fp2_sub(t6, t5, a[0][2]);
-
-		fp2_sqr(t1, a[0][2]);
-
-		fp2_dbl(t6, t6);
-		fp2_add(c[0][2], t6, t5);
-
-		fp2_mul_nor(t4, t1);
-		fp2_add(t5, t2, t4);
-		fp2_sub(t6, t5, a[0][1]);
-		fp2_dbl(t6, t6);
-		fp2_add(c[0][1], t6, t5);
-
-		fp2_add(t0, t2, t1);
-		fp2_sub(t5, t3, t0);
-		fp2_add(t6, t5, a[1][2]);
-		fp2_dbl(t6, t6);
-		fp2_add(c[1][2], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp12_sqr_unr(dv12_t c, fp12_t a) {
-	fp4_t t0, t1;
-	dv4_t u0, u1, u2, u3, u4;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	dv4_null(u0);
-	dv4_null(u1);
-	dv4_null(u2);
-	dv4_null(u3);
-	dv4_null(u4);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		dv4_new(u0);
-		dv4_new(u1);
-		dv4_new(u2);
-		dv4_new(u3);
-		dv4_new(u4);
-
-		/* a0 = (a00, a11). */
-		/* a1 = (a10, a02). */
-		/* a2 = (a01, a12). */
-
-		/* (t0,t1) = a0^2 */
-		fp2_copy(t0[0], a[0][0]);
-		fp2_copy(t0[1], a[1][1]);
-		fp4_sqr_unr(u0, t0);
-
-		/* (t2,t3) = 2 * a1 * a2 */
-		fp2_copy(t0[0], a[1][0]);
-		fp2_copy(t0[1], a[0][2]);
-		fp2_copy(t1[0], a[0][1]);
-		fp2_copy(t1[1], a[1][2]);
-		fp4_mul_unr(u1, t0, t1);
-		fp2_addc_low(u1[0], u1[0], u1[0]);
-		fp2_addc_low(u1[1], u1[1], u1[1]);
-
-		/* (t4,t5) = a2^2. */
-		fp4_sqr_unr(u2, t1);
-
-		/* c2 = a0 + a2. */
-		fp2_addm_low(t1[0], a[0][0], a[0][1]);
-		fp2_addm_low(t1[1], a[1][1], a[1][2]);
-
-		/* (t6,t7) = (a0 + a2 + a1)^2. */
-		fp2_addm_low(t0[0], t1[0], a[1][0]);
-		fp2_addm_low(t0[1], t1[1], a[0][2]);
-		fp4_sqr_unr(u3, t0);
-
-		/* c2 = (a0 + a2 - a1)^2. */
-		fp2_subm_low(t0[0], t1[0], a[1][0]);
-		fp2_subm_low(t0[1], t1[1], a[0][2]);
-		fp4_sqr_unr(u4, t0);
-
-		/* c2 = (c2 + (t6,t7))/2. */
-#ifdef RLC_FP_ROOM
-		fp2_addd_low(u4[0], u4[0], u3[0]);
-		fp2_addd_low(u4[1], u4[1], u3[1]);
-#else
-		fp2_addc_low(u4[0], u4[0], u3[0]);
-		fp2_addc_low(u4[1], u4[1], u3[1]);
-#endif
-		fp_hlvd_low(u4[0][0], u4[0][0]);
-		fp_hlvd_low(u4[0][1], u4[0][1]);
-		fp_hlvd_low(u4[1][0], u4[1][0]);
-		fp_hlvd_low(u4[1][1], u4[1][1]);
-
-		/* (t6,t7) = (t6,t7) - c2 - (t2,t3). */
-		fp2_subc_low(u3[0], u3[0], u4[0]);
-		fp2_subc_low(u3[1], u3[1], u4[1]);
-		fp2_subc_low(u3[0], u3[0], u1[0]);
-		fp2_subc_low(u3[1], u3[1], u1[1]);
-
-		/* c2 = c2 - (t0,t1) - (t4,t5). */
-		fp2_subc_low(u4[0], u4[0], u0[0]);
-		fp2_subc_low(u4[1], u4[1], u0[1]);
-		fp2_subc_low(c[0][1], u4[0], u2[0]);
-		fp2_subc_low(c[1][2], u4[1], u2[1]);
-
-		/* c1 = (t6,t7) + (t4,t5) * E. */
-		fp2_nord_low(u4[1], u2[1]);
-		fp2_addc_low(c[1][0], u3[0], u4[1]);
-		fp2_addc_low(c[0][2], u3[1], u2[0]);
-
-		/* c0 = (t0,t1) + (t2,t3) * E. */
-		fp2_nord_low(u4[1], u1[1]);
-		fp2_addc_low(c[0][0], u0[0], u4[1]);
-		fp2_addc_low(c[1][1], u0[1], u1[0]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		dv4_free(u0);
-		dv4_free(u1);
-		dv4_free(u2);
-		dv4_free(u3);
-		dv4_free(u4);
-	}
-}
-
-void fp12_sqr_lazyr(fp12_t c, fp12_t a) {
-	dv12_t t;
-
-	dv12_null(t);
-
-	RLC_TRY {
-		dv12_new(t);
-		fp12_sqr_unr(t, a);
-		for (int i = 0; i < 3; i++) {
-			fp2_rdcn_low(c[0][i], t[0][i]);
-			fp2_rdcn_low(c[1][i], t[1][i]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv12_free(t);
-	}
-}
-
-void fp12_sqr_cyc_lazyr(fp12_t c, fp12_t a) {
-	fp2_t t0, t1, t2;
-	dv2_t u0, u1, u2, u3;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	dv2_null(u0);
-	dv2_null(u1);
-	dv2_null(u2);
-	dv2_null(u3);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		dv2_new(u0);
-		dv2_new(u1);
-		dv2_new(u2);
-		dv2_new(u3);
-
-		fp2_sqrn_low(u2, a[0][0]);
-		fp2_sqrn_low(u3, a[1][1]);
-		fp2_addm_low(t1, a[0][0], a[1][1]);
-
-		fp2_norh_low(u0, u3);
-		fp2_addc_low(u0, u0, u2);
-		fp2_rdcn_low(t0, u0);
-
-		fp2_sqrn_low(u1, t1);
-		fp2_addc_low(u2, u2, u3);
-		fp2_subc_low(u1, u1, u2);
-		fp2_rdcn_low(t1, u1);
-
-		fp2_subm_low(c[0][0], t0, a[0][0]);
-		fp2_addm_low(c[0][0], c[0][0], c[0][0]);
-		fp2_addm_low(c[0][0], t0, c[0][0]);
-
-		fp2_addm_low(c[1][1], t1, a[1][1]);
-		fp2_addm_low(c[1][1], c[1][1], c[1][1]);
-		fp2_addm_low(c[1][1], t1, c[1][1]);
-
-		fp2_sqrn_low(u0, a[0][1]);
-		fp2_sqrn_low(u1, a[1][2]);
-		fp2_addm_low(t0, a[0][1], a[1][2]);
-		fp2_sqrn_low(u2, t0);
-
-		fp2_addc_low(u3, u0, u1);
-		fp2_subc_low(u3, u2, u3);
-		fp2_rdcn_low(t0, u3);
-
-		fp2_addm_low(t1, a[1][0], a[0][2]);
-		fp2_sqrm_low(t2, t1);
-		fp2_sqrn_low(u2, a[1][0]);
-
-		fp2_norm_low(t1, t0);
-		fp2_addm_low(t0, t1, a[1][0]);
-		fp2_addm_low(t0, t0, t0);
-		fp2_addm_low(c[1][0], t0, t1);
-
-		fp2_norh_low(u3, u1);
-		fp2_addc_low(u3, u0, u3);
-		fp2_rdcn_low(t0, u3);
-		fp2_subm_low(t1, t0, a[0][2]);
-
-		fp2_sqrn_low(u1, a[0][2]);
-
-		fp2_addm_low(t1, t1, t1);
-		fp2_addm_low(c[0][2], t1, t0);
-
-		fp2_norh_low(u3, u1);
-		fp2_addc_low(u3, u2, u3);
-		fp2_rdcn_low(t0, u3);
-		fp2_subm_low(t1, t0, a[0][1]);
-		fp2_addm_low(t1, t1, t1);
-		fp2_addm_low(c[0][1], t1, t0);
-
-		fp2_addc_low(u0, u2, u1);
-		fp2_rdcn_low(t0, u0);
-		fp2_subm_low(t0, t2, t0);
-		fp2_addm_low(t1, t0, a[1][2]);
-		fp2_dblm_low(t1, t1);
-		fp2_addm_low(c[1][2], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		dv2_free(u0);
-		dv2_free(u1);
-		dv2_free(u2);
-		dv2_free(u3);
-	}
-}
-
-void fp12_sqr_pck_lazyr(fp12_t c, fp12_t a) {
-	fp2_t t0, t1, t2;
-	dv2_t u0, u1, u2, u3;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	dv2_null(u0);
-	dv2_null(u1);
-	dv2_null(u2);
-	dv2_null(u3);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		dv2_new(u0);
-		dv2_new(u1);
-		dv2_new(u2);
-		dv2_new(u3);
-
-		fp2_sqrn_low(u0, a[0][1]);
-		fp2_sqrn_low(u1, a[1][2]);
-		fp2_addm_low(t0, a[0][1], a[1][2]);
-		fp2_sqrn_low(u2, t0);
-
-		fp2_addc_low(u3, u0, u1);
-		fp2_subc_low(u3, u2, u3);
-		fp2_rdcn_low(t0, u3);
-
-		fp2_addm_low(t1, a[1][0], a[0][2]);
-		fp2_sqrm_low(t2, t1);
-		fp2_sqrn_low(u2, a[1][0]);
-
-		fp2_norm_low(t1, t0);
-		fp2_addm_low(t0, t1, a[1][0]);
-		fp2_dblm_low(t0, t0);
-		fp2_addm_low(c[1][0], t0, t1);
-
-		fp2_norh_low(u3, u1);
-		fp2_sqrn_low(u1, a[0][2]);
-		fp2_addc_low(u3, u0, u3);
-		fp2_rdcn_low(t0, u3);
-		fp2_subm_low(t1, t0, a[0][2]);
-		fp2_dblm_low(t1, t1);
-		fp2_addm_low(c[0][2], t1, t0);
-
-		fp2_addc_low(u0, u2, u1);
-		fp2_rdcn_low(t0, u0);
-		fp2_subm_low(t0, t2, t0);
-		fp2_addm_low(t1, t0, a[1][2]);
-		fp2_dblm_low(t1, t1);
-		fp2_addm_low(c[1][2], t0, t1);
-
-		fp2_norh_low(u3, u1);
-		fp2_addc_low(u3, u2, u3);
-		fp2_rdcn_low(t0, u3);
-		fp2_subm_low(t1, t0, a[0][1]);
-		fp2_dblm_low(t1, t1);
-		fp2_addm_low(c[0][1], t1, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		dv2_free(u0);
-		dv2_free(u1);
-		dv2_free(u2);
-		dv2_free(u3);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp18_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp18_mul.c
deleted file mode 100644
index eeba2d364c97..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp18_mul.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a octodecic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp18_mul_basic(fp18_t c, fp18_t a, fp18_t b) {
-	fp9_t t0, t1, t2;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp9_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp9_mul(t1, a[1], b[1]);
-		/* t2 = b_0 + b_1. */
-		fp9_add(t2, b[0], b[1]);
-
-		/* c_1 = a_0 + a_1. */
-		fp9_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp9_mul(c[1], c[1], t2);
-		fp9_sub(c[1], c[1], t0);
-		fp9_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp9_mul_art(t1, t1);
-		fp9_add(c[0], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp18_mul_unr(dv18_t c, fp18_t a, fp18_t b) {
-	fp9_t t0, t1;
-	dv9_t u0, u1, u2, u3;
-
-	dv9_null(u0);
-	dv9_null(u1);
-	dv9_null(u2);
-	dv9_null(u3);
-	fp9_null(t0);
-	fp9_null(t1);
-
-	RLC_TRY {
-		dv9_new(u0);
-		dv9_new(u1);
-		dv9_new(u2);
-		dv9_new(u3);
-		fp9_new(t0);
-		fp9_new(t1);
-
-		/* Karatsuba algorithm. */
-
-		/* u0 = a_0 * b_0. */
-		fp9_mul_unr(u0, a[0], b[0]);
-		/* u1 = a_1 * b_1. */
-		fp9_mul_unr(u1, a[1], b[1]);
-		/* t1 = a_0 + a_1. */
-		fp9_add(t0, a[0], a[1]);
-		/* t0 = b_0 + b_1. */
-		fp9_add(t1, b[0], b[1]);
-		/* u2 = (a_0 + a_1) * (b_0 + b_1) */
-		fp9_mul_unr(u2, t0, t1);
-		/* c_1 = u2 - a_0b_0 - a_1b_1. */
-		for (int i = 0; i < 3; i++) {
-			fp3_addc_low(u3[i], u0[i], u1[i]);
-			fp3_subc_low(c[1][i], u2[i], u3[i]);
-		}
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp3_nord_low(u2[0], u1[2]);
-		fp3_addc_low(c[0][0], u0[0], u2[0]);
-		fp3_addc_low(c[0][1], u0[1], u1[0]);
-		fp3_addc_low(c[0][2], u0[2], u1[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv9_free(u0);
-		dv9_free(u1);
-		dv9_free(u2);
-		dv9_free(u3);
-		fp9_free(t0);
-		fp9_free(t1);
-	}
-}
-
-void fp18_mul_lazyr(fp18_t c, fp18_t a, fp18_t b) {
-	dv18_t t;
-
-	dv18_null(t);
-
-	RLC_TRY {
-		dv18_new(t);
-		fp18_mul_unr(t, a, b);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 3; j++) {
-				fp3_rdcn_low(c[i][j], t[i][j]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv18_free(t);
-	}
-}
-
-#endif
-
-void fp18_mul_dxs(fp18_t c, fp18_t a, fp18_t b) {
-	fp9_t t0, t1, t2;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp9_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 3; j++) {
-				fp_mul(t1[i][j], a[1][i][j], b[1][0][0]);
-			}
-		}
-		/* t2 = b_0 + b_1. */
-		fp9_copy(t2, b[0]);
-		fp_add(t2[0][0], b[0][0][0], b[1][0][0]);
-
-		/* c_1 = a_0 + a_1. */
-		fp9_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp9_mul(c[1], c[1], t2);
-		fp9_sub(c[1], c[1], t0);
-		fp9_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp9_mul_art(t1, t1);
-		fp9_add(c[0], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-	}
-}
-
-void fp18_mul_art(fp18_t c, fp18_t a) {
-	fp9_t t0;
-
-	fp9_null(t0);
-
-	RLC_TRY {
-		fp9_new(t0);
-
-		/* (a_0 + a_1 * v) * v = a_0 * v + a_1 * v^9 */
-		fp9_copy(t0, a[0]);
-		fp9_mul_art(c[0], a[1]);
-		fp9_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp18_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp18_sqr.c
deleted file mode 100644
index 74fe09dc3428..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp18_sqr.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a octodecic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp18_sqr_basic(fp18_t c, fp18_t a) {
-	fp9_t t0, t1;
-
-	fp9_null(t0);
-	fp9_null(t1);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-
-		fp9_add(t0, a[0], a[1]);
-		fp9_mul_art(t1, a[1]);
-		fp9_add(t1, a[0], t1);
-		fp9_mul(t0, t0, t1);
-		fp9_mul(c[1], a[0], a[1]);
-		fp9_sub(c[0], t0, c[1]);
-		fp9_mul_art(t1, c[1]);
-		fp9_sub(c[0], c[0], t1);
-		fp9_dbl(c[1], c[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp18_sqr_unr(dv18_t c, fp18_t a) {
-	fp9_t t;
-	dv9_t u0, u1, u2;
-
-	fp9_null(t);
-	dv9_null(u0);
-	dv9_null(u1);
-	dv9_null(u2);
-
-	RLC_TRY {
-		fp9_new(t);
-		dv9_new(u0);
-		dv9_new(u1);
-		dv9_new(u2);
-
-		/* t0 = a^2. */
-		fp9_sqr_unr(u0, a[0]);
-		/* t1 = b^2. */
-		fp9_sqr_unr(u1, a[1]);
-
-		fp9_add(t, a[0], a[1]);
-
-		/* c = a^2 + b^2 * E. */
-		dv_copy(u2[1][0], u1[0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u2[1][1], u1[0][1], 2 * RLC_FP_DIGS);
-		dv_copy(u2[1][2], u1[0][2], 2 * RLC_FP_DIGS);
-		dv_copy(u2[2][0], u1[1][0], 2 * RLC_FP_DIGS);
-		dv_copy(u2[2][1], u1[1][1], 2 * RLC_FP_DIGS);
-		dv_copy(u2[2][2], u1[1][2], 2 * RLC_FP_DIGS);
-		fp3_nord_low(u2[0], u1[2]);
-		fp3_addc_low(c[0][0], u2[0], u0[0]);
-		fp3_addc_low(c[0][1], u2[1], u0[1]);
-		fp3_addc_low(c[0][2], u2[2], u0[2]);
-
-		/* d = (a + b)^2 - a^2 - b^2 = 2 * a * b. */
-		fp3_addc_low(u1[0], u1[0], u0[0]);
-		fp3_addc_low(u1[1], u1[1], u0[1]);
-		fp3_addc_low(u1[2], u1[2], u0[2]);
-
-		fp9_sqr_unr(u0, t);
-		fp3_subc_low(c[1][0], u0[0], u1[0]);
-		fp3_subc_low(c[1][1], u0[1], u1[1]);
-		fp3_subc_low(c[1][2], u0[2], u1[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t);
-		dv9_free(u0);
-		dv9_free(u1);
-		dv9_free(u2);
-	}
-}
-
-void fp18_sqr_lazyr(fp18_t c, fp18_t a) {
-	dv18_t t;
-
-	dv18_null(t);
-
-	RLC_TRY {
-		dv18_new(t);
-		fp18_sqr_unr(t, a);
-		for (int i = 0; i < 3; i++) {
-			fp3_rdcn_low(c[0][i], t[0][i]);
-			fp3_rdcn_low(c[1][i], t[1][i]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv18_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp24_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp24_mul.c
deleted file mode 100644
index 59701def7ab4..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp24_mul.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 4007-4019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 4.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 4.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a 24-degree extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp24_mul_basic(fp24_t c, fp24_t a, fp24_t b) {
-	fp8_t t0, t1, t2, t3, t4, t5;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-	fp8_null(t5);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		fp8_new(t5);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp8_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp8_mul(t1, a[1], b[1]);
-		/* t2 = a_2 * b_2. */
-		fp8_mul(t2, a[2], b[2]);
-
-		fp8_add(t3, a[1], a[2]);
-		fp8_add(t4, b[1], b[2]);
-		fp8_mul(t3, t3, t4);
-		fp8_sub(t3, t3, t1);
-		fp8_sub(t3, t3, t2);
-		fp8_mul_art(t3, t3);
-		fp8_add(t3, t3, t0);
-
-		fp8_add(t4, a[0], a[1]);
-		fp8_add(t5, b[0], b[1]);
-		fp8_mul(t4, t4, t5);
-		fp8_sub(t4, t4, t0);
-		fp8_sub(t4, t4, t1);
-		fp8_mul_art(t5, t2);
-		fp8_add(c[1], t4, t5);
-
-		fp8_add(t4, a[0], a[2]);
-		fp8_add(t5, b[0], b[2]);
-		fp8_mul(c[2], t4, t5);
-		fp8_sub(c[2], c[2], t0);
-		fp8_add(c[2], c[2], t1);
-		fp8_sub(c[2], c[2], t2);
-
-		fp8_copy(c[0], t3);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		fp8_free(t5);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp24_mul_unr(dv24_t c, fp24_t a, fp24_t b) {
-	dv8_t u0, u1, u2, u3, u4;
-	fp8_t t0, t1;
-
-	dv8_null(u0);
-	dv8_null(u1);
-	dv8_null(u2);
-	dv8_null(u3);
-	dv8_null(u4);
-	fp8_null(t0);
-	fp8_null(t1);
-
-	RLC_TRY {
-		dv8_new(u0);
-		dv8_new(u1);
-		dv8_new(u2);
-		dv8_new(u3);
-		dv8_new(u4);
-		fp8_new(t0);
-		fp8_new(t1);
-
-		/* Karatsuba algorithm. */
-
-		/* u0 = a_0 * b_0. */
-		fp8_mul_unr(u0, a[0], b[0]);
-		/* u1 = a_1 * b_1. */
-		fp8_mul_unr(u1, a[1], b[1]);
-		/* u2 = a_2 * b_2. */
-		fp8_mul_unr(u2, a[2], b[2]);
-
-		fp8_add(t0, a[1], a[2]);
-		fp8_add(t1, b[1], b[2]);
-		fp8_mul_unr(u3, t0, t1);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_subc_low(u3[i][j], u3[i][j], u1[i][j]);
-				fp2_subc_low(u3[i][j], u3[i][j], u2[i][j]);
-			}
-		}
-
-		fp2_nord_low(u4[0][0], u3[1][1]);
-		dv_copy(u4[0][1][0], u3[1][0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u4[0][1][1], u3[1][0][1], 2 * RLC_FP_DIGS);
-		for (int j = 0; j < 2; j++) {
-			fp2_addc_low(c[0][0][j], u4[0][j], u0[0][j]);
-			fp2_addc_low(c[0][1][j], u3[0][j], u0[1][j]);
-		}
-
-		fp8_add(t0, a[0], a[1]);
-		fp8_add(t1, b[0], b[1]);
-		fp8_mul_unr(u4, t0, t1);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_subc_low(u4[i][j], u4[i][j], u0[i][j]);
-				fp2_subc_low(u4[i][j], u4[i][j], u1[i][j]);
-			}
-		}
-		fp2_nord_low(u3[0][0], u2[1][1]);
-		dv_copy(u3[0][1][0], u2[1][0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u3[0][1][1], u2[1][0][1], 2 * RLC_FP_DIGS);
-		for (int j = 0; j < 2; j++) {
-			fp2_addc_low(c[1][0][j], u4[0][j], u3[0][j]);
-			fp2_addc_low(c[1][1][j], u4[1][j], u2[0][j]);
-		}
-
-		fp8_add(t0, a[0], a[2]);
-		fp8_add(t1, b[0], b[2]);
-		fp8_mul_unr(u4, t0, t1);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_subc_low(u4[i][j], u4[i][j], u0[i][j]);
-				fp2_addc_low(u4[i][j], u4[i][j], u1[i][j]);
-				fp2_subc_low(c[2][i][j], u4[i][j], u2[i][j]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv8_free(u0);
-		dv8_free(u1);
-		dv8_free(u2);
-		dv8_free(u3);
-		dv8_free(u4);
-		fp8_free(t0);
-		fp8_free(t1);
-	}
-}
-
-void fp24_mul_lazyr(fp24_t c, fp24_t a, fp24_t b) {
-	dv24_t t;
-
-	dv24_null(t);
-
-	RLC_TRY {
-		dv24_new(t);
-		fp24_mul_unr(t, a, b);
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_rdcn_low(c[i][j][0], t[i][j][0]);
-				fp2_rdcn_low(c[i][j][1], t[i][j][1]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv24_free(t);
-	}
-}
-
-#endif
-
-void fp24_mul_art(fp24_t c, fp24_t a) {
-	fp8_t t0;
-
-	fp8_null(t0);
-
-	RLC_TRY {
-		fp8_new(t0);
-
-		/* (a_0 + a_1 * v + a_2 * v^2) * v = a_2 + a_0 * v + a_1 * v^2 */
-		fp8_copy(t0, a[0]);
-		fp8_mul_art(c[0], a[2]);
-		fp8_copy(c[2], a[1]);
-		fp8_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-	}
-}
-
-void fp24_mul_dxs(fp24_t c, fp24_t a, fp24_t b) {
-	fp8_t t0, t1, t2, t3, t4;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp8_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp8_mul(t1, a[1], b[1]);
-		/* b_2 = 0. */
-
-		fp8_add(t3, a[1], a[2]);
-		fp8_mul(t3, t3, b[1]);
-		fp8_sub(t3, t3, t1);
-		fp8_mul_art(t3, t3);
-		fp8_add(t3, t3, t0);
-
-		fp8_add(t4, a[0], a[1]);
-		fp8_add(t2, b[0], b[1]);
-		fp8_mul(t4, t4, t2);
-		fp8_sub(t4, t4, t0);
-		fp8_sub(c[1], t4, t1);
-
-		fp8_add(t4, a[0], a[2]);
-		fp8_mul(c[2], t4, b[0]);
-		fp8_sub(c[2], c[2], t0);
-		fp8_add(c[2], c[2], t1);
-
-		fp8_copy(c[0], t3);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp24_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp24_sqr.c
deleted file mode 100644
index 0e45d998c8db..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp24_sqr.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a 24-degree extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp24_sqr_basic(fp24_t c, fp24_t a) {
-	fp8_t t0, t1, t2, t3, t4;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-
-		/* t0 = a_0^2 */
-		fp8_sqr(t0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp8_mul(t1, a[1], a[2]);
-		fp8_dbl(t1, t1);
-
-		/* t2 = a_2^2. */
-		fp8_sqr(t2, a[2]);
-
-		/* c_2 = a_0 + a_2. */
-		fp8_add(c[2], a[0], a[2]);
-
-		/* t3 = (a_0 + a_2 + a_1)^2. */
-		fp8_add(t3, c[2], a[1]);
-		fp8_sqr(t3, t3);
-
-		/* c_2 = (a_0 + a_2 - a_1)^2. */
-		fp8_sub(c[2], c[2], a[1]);
-		fp8_sqr(c[2], c[2]);
-
-		/* c_2 = (c_2 + t3)/2. */
-		fp8_add(c[2], c[2], t3);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp_hlv(c[2][0][i][j], c[2][0][i][j]);
-				fp_hlv(c[2][1][i][j], c[2][1][i][j]);
-			}
-		}
-
-		/* t3 = t3 - c_2 - t1. */
-		fp8_sub(t3, t3, c[2]);
-		fp8_sub(t3, t3, t1);
-
-		/* c_2 = c_2 - t0 - t2. */
-		fp8_sub(c[2], c[2], t0);
-		fp8_sub(c[2], c[2], t2);
-
-		/* c_0 = t0 + t1 * E. */
-		fp8_mul_art(t4, t1);
-		fp8_add(c[0], t0, t4);
-
-		/* c_1 = t3 + t2 * E. */
-		fp8_mul_art(t4, t2);
-		fp8_add(c[1], t3, t4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-	}
-}
-
-void fp24_sqr_cyc_basic(fp24_t c, fp24_t a) {
-	fp4_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-	fp4_null(t6);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-		fp4_new(t5);
-		fp4_new(t6);
-
-		fp4_sqr(t2, a[0][0]);
-		fp4_sqr(t3, a[0][1]);
-		fp4_add(t1, a[0][0], a[0][1]);
-
-		fp4_mul_art(t0, t3);
-		fp4_add(t0, t0, t2);
-
-		fp4_sqr(t1, t1);
-		fp4_sub(t1, t1, t2);
-		fp4_sub(t1, t1, t3);
-
-		fp4_sub(c[0][0], t0, a[0][0]);
-		fp4_add(c[0][0], c[0][0], c[0][0]);
-		fp4_add(c[0][0], t0, c[0][0]);
-
-		fp4_add(c[0][1], t1, a[0][1]);
-		fp4_add(c[0][1], c[0][1], c[0][1]);
-		fp4_add(c[0][1], t1, c[0][1]);
-
-		fp4_sqr(t0, a[2][0]);
-		fp4_sqr(t1, a[2][1]);
-		fp4_add(t5, a[2][0], a[2][1]);
-		fp4_sqr(t2, t5);
-
-		fp4_add(t3, t0, t1);
-		fp4_sub(t5, t2, t3);
-
-		fp4_add(t6, a[1][0], a[1][1]);
-		fp4_sqr(t3, t6);
-		fp4_sqr(t2, a[1][0]);
-
-		fp4_mul_art(t6, t5);
-		fp4_add(t5, t6, a[1][0]);
-		fp4_dbl(t5, t5);
-		fp4_add(c[1][0], t5, t6);
-
-		fp4_mul_art(t4, t1);
-		fp4_add(t5, t0, t4);
-		fp4_sub(t6, t5, a[1][1]);
-
-		fp4_sqr(t1, a[1][1]);
-
-		fp4_dbl(t6, t6);
-		fp4_add(c[1][1], t6, t5);
-
-		fp4_mul_art(t4, t1);
-		fp4_add(t5, t2, t4);
-		fp4_sub(t6, t5, a[2][0]);
-		fp4_dbl(t6, t6);
-		fp4_add(c[2][0], t6, t5);
-
-		fp4_add(t0, t2, t1);
-		fp4_sub(t5, t3, t0);
-		fp4_add(t6, t5, a[2][1]);
-		fp4_dbl(t6, t6);
-		fp4_add(c[2][1], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-		fp4_free(t6);
-	}
-}
-
-void fp24_sqr_pck_basic(fp24_t c, fp24_t a) {
-	fp4_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-	fp4_null(t6);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-		fp4_new(t5);
-		fp4_new(t6);
-
-		fp4_sqr(t0, a[2][0]);
-		fp4_sqr(t1, a[2][1]);
-		fp4_add(t5, a[2][0], a[2][1]);
-		fp4_sqr(t2, t5);
-
-		fp4_add(t3, t0, t1);
-		fp4_sub(t5, t2, t3);
-
-		fp4_add(t6, a[1][0], a[1][1]);
-		fp4_sqr(t3, t6);
-		fp4_sqr(t2, a[1][0]);
-
-		fp4_mul_art(t6, t5);
-		fp4_add(t5, t6, a[1][0]);
-		fp4_dbl(t5, t5);
-		fp4_add(c[1][0], t5, t6);
-
-		fp4_mul_art(t4, t1);
-		fp4_add(t5, t0, t4);
-		fp4_sub(t6, t5, a[1][1]);
-
-		fp4_sqr(t1, a[1][1]);
-
-		fp4_dbl(t6, t6);
-		fp4_add(c[1][1], t6, t5);
-
-		fp4_mul_art(t4, t1);
-		fp4_add(t5, t2, t4);
-		fp4_sub(t6, t5, a[2][0]);
-		fp4_dbl(t6, t6);
-		fp4_add(c[2][0], t6, t5);
-
-		fp4_add(t0, t2, t1);
-		fp4_sub(t5, t3, t0);
-		fp4_add(t6, t5, a[2][1]);
-		fp4_dbl(t6, t6);
-		fp4_add(c[2][1], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-		fp4_free(t6);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp24_sqr_unr(dv24_t c, fp24_t a) {
-	dv8_t u0, u1, u2, u3, u4;
-	fp8_t t0, t1;
-
-	dv8_null(u0);
-	dv8_null(u1);
-	dv8_null(u2);
-	dv8_null(u3);
-	dv8_null(u4);
-	fp8_null(t0);
-	fp8_null(t1);
-
-	RLC_TRY {
-		dv8_new(u0);
-		dv8_new(u1);
-		dv8_new(u2);
-		dv8_new(u3);
-		dv8_new(u4);
-		fp8_new(t0);
-		fp8_new(t1);
-
-		/* u0 = a_0^2 */
-		fp8_sqr_unr(u0, a[0]);
-
-		/* u1 = 2 * a_1 * a_2 */
-		fp8_mul_unr(u1, a[1], a[2]);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_addc_low(u1[i][j], u1[i][j], u1[i][j]);
-			}
-		}
-
-		/* t2 = a_2^2. */
-		fp8_sqr_unr(u2, a[2]);
-
-		/* t0 = a_0 + a_2. */
-		fp8_add(t0, a[0], a[2]);
-
-		/* u3 = (a_0 + a_2 + a_1)^2. */
-		fp8_add(t1, t0, a[1]);
-		fp8_sqr_unr(u3, t1);
-
-		/* u4 = (a_0 + a_2 - a_1)^2. */
-		fp8_sub(t0, t0, a[1]);
-		fp8_sqr_unr(u4, t0);
-
-		/* u4 = (u4 + u3)/2. */
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_addc_low(u4[i][j], u4[i][j], u3[i][j]);
-				fp_hlvd_low(u4[i][j][0], u4[i][j][0]);
-				fp_hlvd_low(u4[i][j][1], u4[i][j][1]);
-			}
-		}
-
-		/* t3 = t3 - u4 - t1. */
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_subc_low(u3[i][j], u3[i][j], u4[i][j]);
-				fp2_subc_low(u3[i][j], u3[i][j], u1[i][j]);
-			}
-		}
-
-		/* c_2 = u4 - t0 - t2. */
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_subc_low(u4[i][j], u4[i][j], u0[i][j]);
-				fp2_subc_low(c[2][i][j], u4[i][j], u2[i][j]);
-			}
-		}
-
-		/* c_0 = t0 + t1 * E. */
-		fp2_nord_low(u4[0][0], u1[1][1]);
-		dv_copy(u4[0][1][0], u1[1][0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u4[0][1][1], u1[1][0][1], 2 * RLC_FP_DIGS);
-		for (int j = 0; j < 2; j++) {
-			fp2_addc_low(c[0][0][j], u4[0][j], u0[0][j]);
-			fp2_addc_low(c[0][1][j], u1[0][j], u0[1][j]);
-		}
-
-		/* c_1 = t3 + t2 * E. */
-		fp2_nord_low(u4[0][0], u2[1][1]);
-		dv_copy(u4[0][1][0], u2[1][0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u4[0][1][1], u2[1][0][1], 2 * RLC_FP_DIGS);
-		for (int j = 0; j < 2; j++) {
-			fp2_addc_low(c[1][0][j], u4[0][j], u3[0][j]);
-			fp2_addc_low(c[1][1][j], u2[0][j], u3[1][j]);
-		}
-
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv8_free(u0);
-		dv8_free(u1);
-		dv8_free(u2);
-		dv8_free(u3);
-		dv8_free(u4);
-		fp8_free(t0);
-		fp8_free(t1);
-	}
-}
-
-void fp24_sqr_lazyr(fp24_t c, fp24_t a) {
-	dv24_t t;
-
-	dv24_null(t);
-
-	RLC_TRY {
-		dv24_new(t);
-		fp24_sqr_unr(t, a);
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_rdcn_low(c[i][j][0], t[i][j][0]);
-				fp2_rdcn_low(c[i][j][1], t[i][j][1]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv24_free(t);
-	}
-}
-
-void fp24_sqr_cyc_lazyr(fp24_t c, fp24_t a) {
-	/* TODO: implement lazy reduction. */
-	fp24_sqr_cyc_basic(c, a);
-}
-
-void fp24_sqr_pck_lazyr(fp24_t c, fp24_t a) {
-	/* TODO: implement lazy reduction. */
-	fp24_sqr_pck_basic(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp2_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp2_mul.c
deleted file mode 100644
index dd4b9e472a70..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp2_mul.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a quadratic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_QDR == BASIC || !defined(STRIP)
-
-void fp2_mul_basic(fp2_t c, fp2_t a, fp2_t b) {
-	dv_t t0, t1, t2, t3, t4;
-
-	dv_null(t0);
-	dv_null(t1);
-	dv_null(t2);
-	dv_null(t3);
-	dv_null(t4);
-
-	RLC_TRY {
-		dv_new(t0);
-		dv_new(t1);
-		dv_new(t2);
-		dv_new(t3);
-		dv_new(t4);
-
-		/* Karatsuba algorithm. */
-
-		/* t2 = a_0 + a_1, t1 = b_0 + b_1. */
-		fp_add(t2, a[0], a[1]);
-		fp_add(t1, b[0], b[1]);
-
-		/* t3 = (a_0 + a_1) * (b_0 + b_1). */
-		fp_muln_low(t3, t2, t1);
-
-		/* t0 = a_0 * b_0, t4 = a_1 * b_1. */
-		fp_muln_low(t0, a[0], b[0]);
-		fp_muln_low(t4, a[1], b[1]);
-
-		/* t2 = (a_0 * b_0) + (a_1 * b_1). */
-		fp_addc_low(t2, t0, t4);
-
-		/* t1 = (a_0 * b_0) + i^2 * (a_1 * b_1). */
-		fp_subc_low(t1, t0, t4);
-
-		/* t1 = u^2 * (a_1 * b_1). */
-		for (int i = -1; i > fp_prime_get_qnr(); i--) {
-			fp_subc_low(t1, t1, t4);
-		}
-		for (int i = 1; i < fp_prime_get_qnr(); i++) {
-			fp_addc_low(t1, t1, t4);
-		}
-
-		/* c_0 = t1 mod p. */
-		fp_rdc(c[0], t1);
-
-		/* t4 = t3 - t2. */
-		fp_subc_low(t4, t3, t2);
-
-		/* c_1 = t4 mod p. */
-		fp_rdc(c[1], t4);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t0);
-		dv_free(t1);
-		dv_free(t2);
-		dv_free(t3);
-		dv_free(t4);
-	}
-}
-
-void fp2_mul_nor_basic(fp2_t c, fp2_t a) {
-	fp2_t t;
-	bn_t b;
-
-	fp2_null(t);
-	bn_null(b);
-
-	RLC_TRY {
-		fp2_new(t);
-		bn_new(b);
-
-#ifdef FP_QNRES
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		fp_neg(t[0], a[1]);
-		fp_add(c[1], a[0], a[1]);
-		fp_add(c[0], t[0], a[0]);
-#else
-		int qnr = fp2_field_get_qnr();
-
-		switch (fp_prime_get_mod8()) {
-			case 3:
-				/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-				fp_neg(t[0], a[1]);
-				fp_add(c[1], a[0], a[1]);
-				fp_add(c[0], t[0], a[0]);
-				break;
-			case 1:
-			case 5:
-				/* If p = 1,5 mod 8, (i) is a QNR/CNR. */
-				fp2_mul_art(c, a);
-				break;
-			case 7:
-				/* If p = 7 mod 8, we choose (2^k + i) as a QNR/CNR. */
-				fp2_mul_art(t, a);
-				fp2_copy(c, a);
-				while (qnr > 1) {
-					fp2_dbl(c, c);
-					qnr = qnr >> 1;
-				}
-				fp2_add(c, c, t);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-		bn_free(b);
-	}
-}
-
-#endif
-
-#if FPX_QDR == INTEG || !defined(STRIP)
-
-void fp2_mul_integ(fp2_t c, fp2_t a, fp2_t b) {
-	fp2_mulm_low(c, a, b);
-}
-
-void fp2_mul_nor_integ(fp2_t c, fp2_t a) {
-	fp2_norm_low(c, a);
-}
-
-#endif
-
-void fp2_mul_art(fp2_t c, fp2_t a) {
-	fp_t t;
-
-	fp_null(t);
-
-	RLC_TRY {
-		fp_new(t);
-
-#ifdef FP_QNRES
-		/* (a_0 + a_1 * i) * i = -a_1 + a_0 * i. */
-		fp_copy(t, a[0]);
-		fp_neg(c[0], a[1]);
-		fp_copy(c[1], t);
-#else
-		/* (a_0 + a_1 * i) * i = (a_1 * i^2) + a_0 * i. */
-		fp_copy(t, a[0]);
-		fp_neg(c[0], a[1]);
-		for (int i = -1; i > fp_prime_get_qnr(); i--) {
-			fp_sub(c[0], c[0], a[1]);
-		}
-		for (int i = 0; i <= fp_prime_get_qnr(); i++) {
-			fp_add(c[0], c[0], a[1]);
-		}
-		fp_copy(c[1], t);
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-}
-
-void fp2_mul_frb(fp2_t c, fp2_t a, int i, int j) {
-	ctx_t *ctx = core_get();
-
-#if ALLOC == AUTO
-	switch(i) {
-		case 1:
-			fp2_mul(c, a, ctx->fp2_p1[j - 1]);
-			break;
-		case 2:
-			fp2_mul(c, a, ctx->fp2_p2[j - 1]);
-			break;
-	}
-#else
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		switch(i) {
-			case 1:
-				fp_copy(t[0], ctx->fp2_p1[j - 1][0]);
-				fp_copy(t[1], ctx->fp2_p1[j - 1][1]);
-				break;
-			case 2:
-				fp_copy(t[0], ctx->fp2_p2[j - 1][0]);
-				fp_copy(t[1], ctx->fp2_p2[j - 1][1]);
-				break;
-		}
-
-		fp2_mul(c, a, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-#endif
-}
-
-void fp2_mul_dig(fp2_t c, const fp2_t a, dig_t b) {
-	fp_mul_dig(c[0], a[0], b);
-	fp_mul_dig(c[1], a[1], b);
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp2_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp2_sqr.c
deleted file mode 100644
index cc4c9f3f4a6b..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp2_sqr.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a quadratic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_QDR == BASIC || !defined(STRIP)
-
-void fp2_sqr_basic(fp2_t c, fp2_t a) {
-	fp_t t0, t1, t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		/* t0 = (a_0 + a_1). */
-		fp_add(t0, a[0], a[1]);
-
-		/* t1 = (a_0 - a_1). */
-		fp_sub(t1, a[0], a[1]);
-
-		/* t1 = a_0 + u^2 * a_1. */
-		for (int i = -1; i > fp_prime_get_qnr(); i--) {
-			fp_sub(t1, t1, a[1]);
-		}
-		for (int i = 1; i < fp_prime_get_qnr(); i++) {
-			fp_add(t1, t1, a[1]);
-		}
-
-
-		if (fp_prime_get_qnr() == -1) {
-			/* t2 = 2 * a_0. */
-			fp_dbl(t2, a[0]);
-			/* c_1 = 2 * a_0 * a_1. */
-			fp_mul(c[1], t2, a[1]);
-			/* c_0 = a_0^2 + a_1^2 * u^2. */
-			fp_mul(c[0], t0, t1);
-		} else {
-			/* c_1 = a_0 * a_1. */
-			fp_mul(c[1], a[0], a[1]);
-			/* c_0 = a_0^2 + a_1^2 * u^2. */
-			fp_mul(c[0], t0, t1);
-			for (int i = -1; i > fp_prime_get_qnr(); i--) {
-				fp_add(c[0], c[0], c[1]);
-			}
-			for (int i = 1; i < fp_prime_get_qnr(); i++) {
-				fp_add(c[0], c[0], c[1]);
-			}
-
-			/* c_1 = 2 * a_0 * a_1. */
-			fp_dbl(c[1], c[1]);
-		}
-		/* c = c_0 + c_1 * u. */
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-}
-
-#endif
-
-#if FPX_QDR == INTEG || !defined(STRIP)
-
-void fp2_sqr_integ(fp2_t c, fp2_t a) {
-	fp2_sqrm_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp3_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp3_mul.c
deleted file mode 100644
index 1571e85b6c68..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp3_mul.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a cubic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_CBC == BASIC || !defined(STRIP)
-
-void fp3_mul_basic(fp3_t c, fp3_t a, fp3_t b) {
-	dv_t t, t0, t1, t2, t3, t4, t5, t6;
-
-	dv_null(t);
-	dv_null(t0);
-	dv_null(t1);
-	dv_null(t2);
-	dv_null(t3);
-	dv_null(t4);
-	dv_null(t5);
-	dv_null(t6);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_new(t0);
-		dv_new(t1);
-		dv_new(t2);
-		dv_new(t3);
-		dv_new(t4);
-		dv_new(t5);
-		dv_new(t6);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0, t1 = a_1 * b_1, t2 = a_2 * b_2. */
-		fp_muln_low(t0, a[0], b[0]);
-		fp_muln_low(t1, a[1], b[1]);
-		fp_muln_low(t2, a[2], b[2]);
-
-		/* t3 = (a_1 + a_2) * (b_1 + b_2). */
-		fp_add(t3, a[1], a[2]);
-		fp_add(t4, b[1], b[2]);
-		fp_muln_low(t, t3, t4);
-#ifdef RLC_FP_ROOM
-		fp_addd_low(t6, t1, t2);
-#else
-		fp_addc_low(t6, t1, t2);
-#endif
-		fp_subc_low(t4, t, t6);
-		fp_addc_low(t3, t0, t4);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_addc_low(t3, t3, t4);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(t3, t3, t4);
-		}
-
-		fp_add(t4, a[0], a[1]);
-		fp_add(t5, b[0], b[1]);
-		fp_muln_low(t, t4, t5);
-#ifdef RLC_FP_ROOM
-		fp_addd_low(t4, t0, t1);
-#else
-		fp_addc_low(t4, t0, t1);
-#endif
-		fp_subc_low(t4, t, t4);
-		fp_addc_low(t4, t4, t2);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_addc_low(t4, t4, t2);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(t4, t4, t2);
-		}
-
-		fp_add(t5, a[0], a[2]);
-		fp_add(t6, b[0], b[2]);
-		fp_muln_low(t, t5, t6);
-#ifdef RLC_FP_ROOM
-		fp_addd_low(t6, t0, t2);
-#else
-		fp_addc_low(t6, t0, t2);
-#endif
-		fp_addc_low(t6, t0, t2);
-		fp_subc_low(t5, t, t6);
-		fp_addc_low(t5, t5, t1);
-
-		/* c_0 = t3 mod p. */
-		fp_rdc(c[0], t3);
-
-		/* c_1 = t4 mod p. */
-		fp_rdc(c[1], t4);
-
-		/* c_2 = t5 mod p. */
-		fp_rdc(c[2], t5);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t);
-		dv_free(t0);
-		dv_free(t1);
-		dv_free(t2);
-		dv_free(t3);
-		dv_free(t4);
-		dv_free(t5);
-		dv_free(t6);
-	}
-}
-
-#endif
-
-#if FPX_CBC == INTEG || !defined(STRIP)
-
-void fp3_mul_integ(fp3_t c, fp3_t a, fp3_t b) {
-	fp3_mulm_low(c, a, b);
-}
-
-#endif
-
-void fp3_mul_nor(fp3_t c, fp3_t a) {
-	fp_t t;
-
-	fp_null(t);
-
-	RLC_TRY {
-		fp_new(t);
-
-		/* (a_0 + a_1 * u + a_2 * u^2) * u = a_0 * u + a_1 * u^2 + a_2 * u^3. */
-		fp_copy(t, a[0]);
-		fp_copy(c[0], a[2]);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_add(c[0], c[0], a[2]);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_sub(c[0], c[0], a[2]);
-		}
-		fp_copy(c[2], a[1]);
-		fp_copy(c[1], t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t);
-	}
-}
-
-void fp3_mul_frb(fp3_t c, fp3_t a, int i, int j) {
-	ctx_t *ctx = core_get();
-	fp3_copy(c, a);
-	switch (i % 3) {
-		case 0:
-			if (j % 3 == 1) {
-				fp_mul(c[1], c[1], ctx->fp3_p0[0]);
-				fp_mul(c[2], c[2], ctx->fp3_p0[1]);
-			}
-			if (j % 3 == 2) {
-				fp_mul(c[1], c[1], ctx->fp3_p0[1]);
-				fp_mul(c[2], c[2], ctx->fp3_p0[0]);
-			}
-			break;
-		case 1:
-			fp_mul(c[0], c[0], ctx->fp3_p1[j - 1]);
-			fp_mul(c[1], c[1], ctx->fp3_p1[j - 1]);
-			fp_mul(c[2], c[2], ctx->fp3_p1[j - 1]);
-			for (int k = 0; k < (j * ctx->frb3[0]) % 3; k++) {
-				fp3_mul_nor(c, c);
-			}
-			break;
-		case 2:
-			fp_mul(c[0], c[0], ctx->fp3_p2[j - 1]);
-			fp_mul(c[1], c[1], ctx->fp3_p2[j - 1]);
-			fp_mul(c[2], c[2], ctx->fp3_p2[j - 1]);
-			for (int k = 0; k < ctx->frb3[j]; k++) {
-				fp3_mul_nor(c, c);
-			}
-			break;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp3_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp3_sqr.c
deleted file mode 100644
index f86167f394a6..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp3_sqr.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a cubic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_CBC == BASIC || !defined(STRIP)
-
-void fp3_sqr_basic(fp3_t c, fp3_t a) {
-	dv_t t0, t1, t2, t3, t4;
-
-	dv_null(t0);
-	dv_null(t1);
-	dv_null(t2);
-	dv_null(t3);
-	dv_null(t4);
-
-	RLC_TRY {
-		dv_new(t0);
-		dv_new(t1);
-		dv_new(t2);
-		dv_new(t3);
-		dv_new(t4);
-
-		/* t0 = a_0^2. */
-		fp_sqrn_low(t0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2. */
-		fp_dbl(t2, a[1]);
-		fp_muln_low(t1, t2, a[2]);
-
-		/* t3 = (a_0 + a_2 + a_1)^2, t4 = (a_0 + a_2 - a_1)^2. */
-		fp_add(t3, a[0], a[2]);
-		fp_add(t4, t3, a[1]);
-		fp_sub(t2, t3, a[1]);
-		fp_sqrn_low(t3, t4);
-		fp_sqrn_low(t4, t2);
-
-		/* t2 = a_2^2. */
-		fp_sqrn_low(t2, a[2]);
-
-		/* t4 = (t4 + t3)/2. */
-#ifdef RLC_FP_ROOM
-		fp_addd_low(t4, t4, t3);
-#else
-		fp_addc_low(t4, t4, t3);
-#endif
-		fp_hlvd_low(t4, t4);
-
-		/* t3 = t3 - t4 - t1. */
-		fp_subc_low(t3, t3, t4);
-		fp_subc_low(t3, t3, t1);
-
-		/* c_2 = t4 - t0 - t2. */
-		fp_subc_low(t4, t4, t0);
-		fp_subc_low(t4, t4, t2);
-		fp_rdc(c[2], t4);
-
-		/* c_0 = t0 + t1 * B. */
-		for (int i = 1; i <= fp_prime_get_cnr(); i++) {
-			fp_addc_low(t0, t0, t1);
-		}
-		for (int i = -1; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(t0, t0, t1);
-		}
-		fp_rdc(c[0], t0);
-
-		/* c_1 = t3 + t2 * B. */
-		for (int i = 1; i <= fp_prime_get_cnr(); i++) {
-			fp_addc_low(t3, t3, t2);
-		}
-		for (int i = -1; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(t3, t3, t2);
-		}
-		fp_rdc(c[1], t3);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv_free(t0);
-		dv_free(t1);
-		dv_free(t2);
-		dv_free(t3);
-		dv_free(t4);
-	}
-}
-
-#endif
-
-#if FPX_CBC == INTEG || !defined(STRIP)
-
-void fp3_sqr_integ(fp3_t c, fp3_t a) {
-	fp3_sqrm_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp48_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp48_mul.c
deleted file mode 100644
index d0994cce369e..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp48_mul.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a 48-degree extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp48_mul_basic(fp48_t c, fp48_t a, fp48_t b) {
-	fp24_t t0, t1, t2;
-
-	fp24_null(t0);
-	fp24_null(t1);
-	fp24_null(t2);
-
-	RLC_TRY {
-		fp24_new(t0);
-		fp24_new(t1);
-		fp24_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp24_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp24_mul(t1, a[1], b[1]);
-		/* t2 = b_0 + b_1. */
-		fp24_add(t2, b[0], b[1]);
-
-		/* c_1 = a_0 + a_1. */
-		fp24_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp24_mul(c[1], c[1], t2);
-		fp24_sub(c[1], c[1], t0);
-		fp24_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp24_mul_art(t1, t1);
-		fp24_add(c[0], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t0);
-		fp24_free(t1);
-		fp24_free(t2);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp48_mul_lazyr(fp48_t c, fp48_t a, fp48_t b) {
-	/* TODO: implement lazy reduction. */
-	fp48_mul_basic(c, a, b);
-}
-
-#endif
-
-void fp48_mul_dxs(fp48_t c, fp48_t a, fp48_t b) {
-	fp24_t t0, t1, t2;
-
-	fp24_null(t0);
-	fp24_null(t1);
-	fp24_null(t2);
-
-	RLC_TRY {
-		fp24_new(t0);
-		fp24_new(t1);
-		fp24_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp24_mul_dxs(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-#if EP_ADD == BASIC
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				for (int k = 0; k < 2; k++) {
-					fp_mul(t1[0][i][j][k], a[1][0][i][j][k], b[1][1][0][0][0]);
-					fp_mul(t1[1][i][j][k], a[1][1][i][j][k], b[1][1][0][0][0]);
-					fp_mul(t1[2][i][j][k], a[1][2][i][j][k], b[1][1][0][0][0]);
-				}
-			}
-		}
-#else
-		fp8_mul(t1[0], a[1][0], b[1][1]);
-		fp8_mul(t1[1], a[1][1], b[1][1]);
-		fp8_mul(t1[2], a[1][2], b[1][1]);
-#endif
-		fp24_mul_art(t1, t1);
-		/* t2 = b_0 + b_1. */
-		fp8_copy(t2[0], b[0][0]);
-#if EP_ADD == BASIC
-		fp8_copy(t2[1], b[0][1]);
-		fp_add(t2[1][0][0][0], t2[1][0][0][0], b[1][1][0][0][0]);
-#else
-		fp8_add(t2[1], b[0][1], b[1][1]);
-#endif
-		fp8_copy(t2[2], b[0][2]);
-
-		/* c_1 = a_0 + a_1. */
-		fp24_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp24_mul_dxs(c[1], c[1], t2);
-		fp24_sub(c[1], c[1], t0);
-		fp24_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp24_mul_art(t1, t1);
-		fp24_add(c[0], t0, t1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t0);
-		fp24_free(t1);
-		fp24_free(t2);
-	}
-}
-
-void fp48_mul_art(fp48_t c, fp48_t a) {
-	fp24_t t0;
-
-	fp24_null(t0);
-
-	RLC_TRY {
-		fp24_new(t0);
-
-		/* (a_0 + a_1 * v) * v = a_0 * v + a_1 * v^2 */
-		fp24_copy(t0, a[0]);
-		fp24_mul_art(c[0], a[1]);
-		fp24_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp48_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp48_sqr.c
deleted file mode 100644
index 45032b65e98d..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp48_sqr.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a dodecic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp48_sqr_basic(fp48_t c, fp48_t a) {
-	fp24_t t0, t1;
-
-	fp24_null(t0);
-	fp24_null(t1);
-
-	RLC_TRY {
-		fp24_new(t0);
-		fp24_new(t1);
-
-		fp24_add(t0, a[0], a[1]);
-		fp24_mul_art(t1, a[1]);
-		fp24_add(t1, a[0], t1);
-		fp24_mul(t0, t0, t1);
-		fp24_mul(c[1], a[0], a[1]);
-		fp24_sub(c[0], t0, c[1]);
-		fp24_mul_art(t1, c[1]);
-		fp24_sub(c[0], c[0], t1);
-		fp24_dbl(c[1], c[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t0);
-		fp24_free(t1);
-	}
-}
-
-void fp48_sqr_cyc_basic(fp48_t c, fp48_t a) {
-	fp8_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-	fp8_null(t5);
-	fp8_null(t6);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		fp8_new(t5);
-		fp8_new(t6);
-
-		fp8_sqr(t2, a[0][0]);
-		fp8_sqr(t3, a[1][1]);
-		fp8_add(t1, a[0][0], a[1][1]);
-
-		fp8_mul_art(t0, t3);
-		fp8_add(t0, t0, t2);
-
-		fp8_sqr(t1, t1);
-		fp8_sub(t1, t1, t2);
-		fp8_sub(t1, t1, t3);
-
-		fp8_sub(c[0][0], t0, a[0][0]);
-		fp8_add(c[0][0], c[0][0], c[0][0]);
-		fp8_add(c[0][0], t0, c[0][0]);
-
-		fp8_add(c[1][1], t1, a[1][1]);
-		fp8_add(c[1][1], c[1][1], c[1][1]);
-		fp8_add(c[1][1], t1, c[1][1]);
-
-		fp8_sqr(t0, a[0][1]);
-		fp8_sqr(t1, a[1][2]);
-		fp8_add(t5, a[0][1], a[1][2]);
-		fp8_sqr(t2, t5);
-
-		fp8_add(t3, t0, t1);
-		fp8_sub(t5, t2, t3);
-
-		fp8_add(t6, a[1][0], a[0][2]);
-		fp8_sqr(t3, t6);
-		fp8_sqr(t2, a[1][0]);
-
-		fp8_mul_art(t6, t5);
-		fp8_add(t5, t6, a[1][0]);
-		fp8_dbl(t5, t5);
-		fp8_add(c[1][0], t5, t6);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t0, t4);
-		fp8_sub(t6, t5, a[0][2]);
-
-		fp8_sqr(t1, a[0][2]);
-
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][2], t6, t5);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t2, t4);
-		fp8_sub(t6, t5, a[0][1]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][1], t6, t5);
-
-		fp8_add(t0, t2, t1);
-		fp8_sub(t5, t3, t0);
-		fp8_add(t6, t5, a[1][2]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[1][2], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		fp8_free(t5);
-		fp8_free(t6);
-	}
-}
-
-void fp48_sqr_pck_basic(fp48_t c, fp48_t a) {
-	fp8_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-	fp8_null(t5);
-	fp8_null(t6);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		fp8_new(t5);
-		fp8_new(t6);
-
-		fp8_sqr(t0, a[0][1]);
-		fp8_sqr(t1, a[1][2]);
-		fp8_add(t5, a[0][1], a[1][2]);
-		fp8_sqr(t2, t5);
-
-		fp8_add(t3, t0, t1);
-		fp8_sub(t5, t2, t3);
-
-		fp8_add(t6, a[1][0], a[0][2]);
-		fp8_sqr(t3, t6);
-		fp8_sqr(t2, a[1][0]);
-
-		fp8_mul_art(t6, t5);
-		fp8_add(t5, t6, a[1][0]);
-		fp8_dbl(t5, t5);
-		fp8_add(c[1][0], t5, t6);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t0, t4);
-		fp8_sub(t6, t5, a[0][2]);
-
-		fp8_sqr(t1, a[0][2]);
-
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][2], t6, t5);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t2, t4);
-		fp8_sub(t6, t5, a[0][1]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][1], t6, t5);
-
-		fp8_add(t0, t2, t1);
-		fp8_sub(t5, t3, t0);
-		fp8_add(t6, t5, a[1][2]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[1][2], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		fp8_free(t5);
-		fp8_free(t6);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp48_sqr_lazyr(fp48_t c, fp48_t a) {
-	/* TODO: implement lazy reduction. */
-	fp48_sqr_basic(c, a);
-}
-
-void fp48_sqr_cyc_lazyr(fp48_t c, fp48_t a) {
-	fp8_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-	fp8_null(t5);
-	fp8_null(t6);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		fp8_new(t5);
-		fp8_new(t6);
-
-		fp8_sqr(t2, a[0][0]);
-		fp8_sqr(t3, a[1][1]);
-		fp8_add(t1, a[0][0], a[1][1]);
-
-		fp8_mul_art(t0, t3);
-		fp8_add(t0, t0, t2);
-
-		fp8_sqr(t1, t1);
-		fp8_sub(t1, t1, t2);
-		fp8_sub(t1, t1, t3);
-
-		fp8_sub(c[0][0], t0, a[0][0]);
-		fp8_add(c[0][0], c[0][0], c[0][0]);
-		fp8_add(c[0][0], t0, c[0][0]);
-
-		fp8_add(c[1][1], t1, a[1][1]);
-		fp8_add(c[1][1], c[1][1], c[1][1]);
-		fp8_add(c[1][1], t1, c[1][1]);
-
-		fp8_sqr(t0, a[0][1]);
-		fp8_sqr(t1, a[1][2]);
-		fp8_add(t5, a[0][1], a[1][2]);
-		fp8_sqr(t2, t5);
-
-		fp8_add(t3, t0, t1);
-		fp8_sub(t5, t2, t3);
-
-		fp8_add(t6, a[1][0], a[0][2]);
-		fp8_sqr(t3, t6);
-		fp8_sqr(t2, a[1][0]);
-
-		fp8_mul_art(t6, t5);
-		fp8_add(t5, t6, a[1][0]);
-		fp8_dbl(t5, t5);
-		fp8_add(c[1][0], t5, t6);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t0, t4);
-		fp8_sub(t6, t5, a[0][2]);
-
-		fp8_sqr(t1, a[0][2]);
-
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][2], t6, t5);
-
-		fp8_mul_art(t4, t1);
-		fp8_add(t5, t2, t4);
-		fp8_sub(t6, t5, a[0][1]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[0][1], t6, t5);
-
-		fp8_add(t0, t2, t1);
-		fp8_sub(t5, t3, t0);
-		fp8_add(t6, t5, a[1][2]);
-		fp8_dbl(t6, t6);
-		fp8_add(c[1][2], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		fp8_free(t5);
-		fp8_free(t6);
-	}
-}
-
-void fp48_sqr_pck_lazyr(fp48_t c, fp48_t a) {
-	fp8_t t0, t1, t2;
-	dv8_t u0, u1, u2, u3;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	dv8_null(u0);
-	dv8_null(u1);
-	dv8_null(u2);
-	dv8_null(u3);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		dv8_new(u0);
-		dv8_new(u1);
-		dv8_new(u2);
-		dv8_new(u3);
-
-		fp8_sqr_unr(u0, a[0][1]);
-		fp8_sqr_unr(u1, a[1][2]);
-		fp8_add(t0, a[0][1], a[1][2]);
-		fp8_sqr_unr(u2, t0);
-
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_addc_low(u3[i][j], u0[i][j], u1[i][j]);
-				fp2_subc_low(u3[i][j], u2[i][j], u3[i][j]);
-				fp2_rdcn_low(t0[i][j], u3[i][j]);
-			}
-		}
-
-		fp8_add(t1, a[1][0], a[0][2]);
-		fp8_sqr(t2, t1);
-		fp8_sqr_unr(u2, a[1][0]);
-
-		fp8_mul_art(t1, t0);
-		fp8_add(t0, t1, a[1][0]);
-		fp8_dbl(t0, t0);
-		fp8_add(c[1][0], t0, t1);
-
-		fp2_nord_low(u3[0][0], u1[1][1]);
-		fp2_addc_low(u3[0][0], u0[0][0], u3[0][0]);
-		fp2_addc_low(u3[0][1], u0[0][1], u1[1][0]);
-		fp2_addc_low(u3[1][0], u0[1][0], u1[0][0]);
-		fp2_addc_low(u3[1][1], u0[1][1], u1[0][1]);
-		fp8_sqr_unr(u1, a[0][2]);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_rdcn_low(t0[i][j], u3[i][j]);
-			}
-		}
-		fp8_sub(t1, t0, a[0][2]);
-		fp8_dbl(t1, t1);
-		fp8_add(c[0][2], t1, t0);
-
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_addc_low(u0[i][j], u2[i][j], u1[i][j]);
-				fp2_rdcn_low(t0[i][j], u0[i][j]);
-			}
-		}
-		fp8_sub(t0, t2, t0);
-		fp8_add(t1, t0, a[1][2]);
-		fp8_dbl(t1, t1);
-		fp8_add(c[1][2], t0, t1);
-
-		fp2_nord_low(u3[0][0], u1[1][1]);
-		fp2_addc_low(u3[0][0], u2[0][0], u3[0][0]);
-		fp2_addc_low(u3[0][1], u2[0][1], u1[1][0]);
-		fp2_addc_low(u3[1][0], u2[1][0], u1[0][0]);
-		fp2_addc_low(u3[1][1], u2[1][1], u1[0][1]);
-		for (int i = 0; i < 2; i++) {
-			for (int j = 0; j < 2; j++) {
-				fp2_rdcn_low(t0[i][j], u3[i][j]);
-			}
-		}
-		fp8_sub(t1, t0, a[0][1]);
-		fp8_dbl(t1, t1);
-		fp8_add(c[0][1], t1, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		dv8_free(u0);
-		dv8_free(u1);
-		dv8_free(u2);
-		dv8_free(u3);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp4_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp4_mul.c
deleted file mode 100644
index 1ab92ea9e953..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp4_mul.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a quartic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp4_mul_basic(fp4_t c, fp4_t a, fp4_t b) {
-	fp2_t t0, t1, t2;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp2_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp2_mul(t1, a[1], b[1]);
-		/* t2 = b_0 + b_1. */
-		fp2_add(t2, b[0], b[1]);
-
-		/* c_1 = a_0 + a_1. */
-		fp2_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp2_mul(c[1], c[1], t2);
-		fp2_sub(c[1], c[1], t0);
-		fp2_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp2_mul_nor(t2, t1);
-		fp2_add(c[0], t0, t2);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp4_mul_unr(dv4_t c, fp4_t a, fp4_t b) {
-	fp2_t t0, t1;
-	dv2_t u0, u1;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		dv2_new(u0);
-		dv2_new(u1);
-
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u0, a[0], b[0]);
-		fp2_mulc_low(u1, a[1], b[1]);
-		fp2_addn_low(t0, b[0], b[1]);
-		fp2_addn_low(t1, a[0], a[1]);
-#else
-		fp2_muln_low(u0, a[0], b[0]);
-		fp2_muln_low(u1, a[1], b[1]);
-		fp2_addm_low(t0, b[0], b[1]);
-		fp2_addm_low(t1, a[0], a[1]);
-#endif
-		fp2_muln_low(c[1], t1, t0);
-		fp2_subc_low(c[1], c[1], u0);
-		fp2_subc_low(c[1], c[1], u1);
-#ifdef RLC_FP_ROOM
-		fp2_norh_low(c[0], u1);
-#else
-		fp2_nord_low(c[0], u1);
-#endif
-		fp2_addc_low(c[0], c[0], u0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		dv2_free(t1);
-		dv2_free(u0);
-		dv2_free(u1);
-	}
-}
-
-void fp4_mul_lazyr(fp4_t c, fp4_t a, fp4_t b) {
-	dv4_t t;
-
-	dv4_null(t);
-
-	RLC_TRY {
-		dv4_new(t);
-		fp4_mul_unr(t, a, b);
-		fp2_rdcn_low(c[0], t[0]);
-		fp2_rdcn_low(c[1], t[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv4_free(t);
-	}
-}
-
-#endif
-
-void fp4_mul_art(fp4_t c, fp4_t a) {
-	fp2_t t0;
-
-	fp2_null(t0);
-
-	RLC_TRY {
-		fp2_new(t0);
-
-		/* (a_0 + a_1 * v) * v = a_0 * v + a_1 * v^2 */
-		fp2_copy(t0, a[0]);
-		fp2_mul_nor(c[0], a[1]);
-		fp2_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-	}
-}
-
-void fp4_mul_frb(fp4_t c, fp4_t a, int i, int j) {
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		fp_copy(t[0], core_get()->fp4_p1[0]);
-		fp_copy(t[1], core_get()->fp4_p1[1]);
-	    if (i == 1) {
-			for (int k = 0; k < j; k++) {
-	        	fp2_mul(c[0], a[0], t);
-				fp2_mul(c[1], a[1], t);
-				fp4_mul_art(c, c);
-			}
-	    } else {
-			RLC_THROW(ERR_NO_VALID);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp4_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp4_sqr.c
deleted file mode 100644
index 354ccbc58f5d..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp4_sqr.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a quartic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp4_sqr_basic(fp4_t c, fp4_t a) {
-	fp2_t t0, t1;
-
-	fp2_null(t0);
-	fp2_null(t1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-
-		fp2_add(t0, a[0], a[1]);
-		fp2_mul_nor(t1, a[1]);
-		fp2_add(t1, a[0], t1);
-		fp2_mul(t0, t0, t1);
-		fp2_mul(c[1], a[0], a[1]);
-		fp2_sub(c[0], t0, c[1]);
-		fp2_mul_nor(t1, c[1]);
-		fp2_sub(c[0], c[0], t1);
-		fp2_dbl(c[1], c[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp4_sqr_unr(dv4_t c, fp4_t a) {
-	fp2_t t;
-	dv2_t u0, u1;
-
-	fp2_null(t);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t);
-		dv2_new(u0);
-		dv2_new(u1);
-
-		/* t0 = a^2. */
-		fp2_sqrn_low(u0, a[0]);
-		/* t1 = b^2. */
-		fp2_sqrn_low(u1, a[1]);
-
-		fp2_addm_low(t, a[0], a[1]);
-
-		/* c = a^2  + b^2 * E. */
-		fp2_norh_low(c[0], u1);
-		fp2_addc_low(c[0], c[0], u0);
-
-		/* d = (a + b)^2 - a^2 - b^2 = 2 * a * b. */
-		fp2_addc_low(u1, u1, u0);
-		fp2_sqrn_low(c[1], t);
-		fp2_subc_low(c[1], c[1], u1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t);
-		dv2_free(u0);
-		dv2_free(u1);
-	}
-}
-
-void fp4_sqr_lazyr(fp4_t c, fp4_t a) {
-	dv4_t t;
-
-	dv4_null(t);
-
-	RLC_TRY {
-		dv4_new(t);
-		fp4_sqr_unr(t, a);
-		fp2_rdcn_low(c[0], t[0]);
-		fp2_rdcn_low(c[1], t[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv4_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp54_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp54_mul.c
deleted file mode 100644
index fb45581e45f9..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp54_mul.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 4007-4019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 4.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 4.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a 54-degree extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp54_mul_basic(fp54_t c, fp54_t a, fp54_t b) {
-	fp18_t t0, t1, t2, t3, t4, t5;
-
-	fp18_null(t0);
-	fp18_null(t1);
-	fp18_null(t2);
-	fp18_null(t3);
-	fp18_null(t4);
-	fp18_null(t5);
-
-	RLC_TRY {
-		fp18_new(t0);
-		fp18_new(t1);
-		fp18_new(t2);
-		fp18_new(t3);
-		fp18_new(t4);
-		fp18_new(t5);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp18_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp18_mul(t1, a[1], b[1]);
-		/* t2 = a_2 * b_2. */
-		fp18_mul(t2, a[2], b[2]);
-
-		fp18_add(t3, a[1], a[2]);
-		fp18_add(t4, b[1], b[2]);
-		fp18_mul(t3, t3, t4);
-		fp18_sub(t3, t3, t1);
-		fp18_sub(t3, t3, t2);
-		fp18_mul_art(t3, t3);
-		fp18_add(t3, t3, t0);
-
-		fp18_add(t4, a[0], a[1]);
-		fp18_add(t5, b[0], b[1]);
-		fp18_mul(t4, t4, t5);
-		fp18_sub(t4, t4, t0);
-		fp18_sub(t4, t4, t1);
-		fp18_mul_art(t5, t2);
-		fp18_add(c[1], t4, t5);
-
-		fp18_add(t4, a[0], a[2]);
-		fp18_add(t5, b[0], b[2]);
-		fp18_mul(c[2], t4, t5);
-		fp18_sub(c[2], c[2], t0);
-		fp18_add(c[2], c[2], t1);
-		fp18_sub(c[2], c[2], t2);
-
-		fp18_copy(c[0], t3);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp18_free(t0);
-		fp18_free(t1);
-		fp18_free(t2);
-		fp18_free(t3);
-		fp18_free(t4);
-		fp18_free(t5);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp54_mul_lazyr(fp54_t c, fp54_t a, fp54_t b) {
-	/* TODO: implement lazy reduction. */
-	fp54_mul_basic(c, a, b);
-}
-
-#endif
-
-void fp54_mul_dxs(fp54_t c, fp54_t a, fp54_t b) {
-	fp18_t t0, t1, t2, t3, t4;
-
-	fp18_null(t0);
-	fp18_null(t1);
-	fp18_null(t2);
-	fp18_null(t3);
-	fp18_null(t4);
-
-	RLC_TRY {
-		fp18_new(t0);
-		fp18_new(t1);
-		fp18_new(t2);
-		fp18_new(t3);
-		fp18_new(t4);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-#if EP_ADD == BASIC
-		fp18_mul_dxs(t0, a[0], b[0]);
-#else
-		fp18_mul(t0, a[0], b[0]);
-#endif
-		/* t2 = a_2 * b_2. */
-		fp9_mul(t2[0], a[2][0], b[2][0]);
-		fp9_mul(t2[1], a[2][1], b[2][0]);
-
-		fp18_add(t3, a[1], a[2]);
-		fp9_mul(t3[0], t3[0], b[2][0]);
-		fp9_mul(t3[1], t3[1], b[2][0]);
-		fp18_sub(t3, t3, t2);
-		fp18_mul_art(t3, t3);
-		fp18_add(t3, t3, t0);
-
-		fp18_add(t4, a[0], a[1]);
-#if EP_ADD == BASIC
-		fp18_mul_dxs(t4, t4, b[0]);
-#else
-		fp18_mul(t4, t4, b[0]);
-#endif
-		fp18_sub(t4, t4, t0);
-		fp18_mul_art(t1, t2);
-		fp18_add(c[1], t4, t1);
-
-		fp18_add(t4, a[0], a[2]);
-		fp9_add(t1[0], b[0][0], b[2][0]);
-		fp9_copy(t1[1], b[0][1]);
-#if EP_ADD == BASIC
-		fp18_mul_dxs(c[2], t4, t1);
-#else
-		fp18_mul(c[2], t4, t1);
-#endif
-		fp18_sub(c[2], c[2], t0);
-		fp18_sub(c[2], c[2], t2);
-
-		fp18_copy(c[0], t3);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp18_free(t0);
-		fp18_free(t1);
-		fp18_free(t2);
-		fp18_free(t3);
-		fp18_free(t4);
-	}
-}
-
-void fp54_mul_art(fp54_t c, fp54_t a) {
-	fp18_t t0;
-
-	fp18_null(t0);
-
-	RLC_TRY {
-		fp18_new(t0);
-
-		/* (a_0 + a_1 * v + a_2 * v^2) * v = a_2 + a_0 * v + a_1 * v^2 */
-		fp18_copy(t0, a[0]);
-		fp18_mul_art(c[0], a[2]);
-		fp18_copy(c[2], a[1]);
-		fp18_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp18_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp54_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp54_sqr.c
deleted file mode 100644
index 37a75744b209..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp54_sqr.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a 54-degree extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp54_sqr_basic(fp54_t c, fp54_t a) {
-	fp18_t t0, t1, t2, t3, t4;
-
-	fp18_null(t0);
-	fp18_null(t1);
-	fp18_null(t2);
-	fp18_null(t3);
-	fp18_null(t4);
-
-	RLC_TRY {
-		fp18_new(t0);
-		fp18_new(t1);
-		fp18_new(t2);
-		fp18_new(t3);
-		fp18_new(t4);
-
-		/* t0 = a_0^2 */
-		fp18_sqr(t0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp18_mul(t1, a[1], a[2]);
-		fp18_dbl(t1, t1);
-
-		/* t2 = a_2^2. */
-		fp18_sqr(t2, a[2]);
-
-		/* c_2 = a_0 + a_2. */
-		fp18_add(c[2], a[0], a[2]);
-
-		/* t3 = (a_0 + a_2 + a_1)^2. */
-		fp18_add(t3, c[2], a[1]);
-		fp18_sqr(t3, t3);
-
-		/* c_2 = (a_0 + a_2 - a_1)^2. */
-		fp18_sub(c[2], c[2], a[1]);
-		fp18_sqr(c[2], c[2]);
-
-		/* c_2 = (c_2 + t3)/2. */
-		fp18_add(c[2], c[2], t3);
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 3; j++) {
-				fp_hlv(c[2][0][i][j], c[2][0][i][j]);
-				fp_hlv(c[2][1][i][j], c[2][1][i][j]);
-			}
-		}
-
-		/* t3 = t3 - c_2 - t1. */
-		fp18_sub(t3, t3, c[2]);
-		fp18_sub(t3, t3, t1);
-
-		/* c_2 = c_2 - t0 - t2. */
-		fp18_sub(c[2], c[2], t0);
-		fp18_sub(c[2], c[2], t2);
-
-		/* c_0 = t0 + t1 * E. */
-		fp18_mul_art(t4, t1);
-		fp18_add(c[0], t0, t4);
-
-		/* c_1 = t3 + t2 * E. */
-		fp18_mul_art(t4, t2);
-		fp18_add(c[1], t3, t4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp18_free(t0);
-		fp18_free(t1);
-		fp18_free(t2);
-		fp18_free(t3);
-		fp18_free(t4);
-	}
-}
-
-void fp54_sqr_cyc_basic(fp54_t c, fp54_t a) {
-	fp9_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-	fp9_null(t3);
-	fp9_null(t4);
-	fp9_null(t5);
-	fp9_null(t6);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-		fp9_new(t3);
-		fp9_new(t4);
-		fp9_new(t5);
-		fp9_new(t6);
-
-		fp9_sqr(t2, a[0][0]);
-		fp9_sqr(t3, a[0][1]);
-		fp9_add(t1, a[0][0], a[0][1]);
-
-		fp9_mul_art(t0, t3);
-		fp9_add(t0, t0, t2);
-
-		fp9_sqr(t1, t1);
-		fp9_sub(t1, t1, t2);
-		fp9_sub(t1, t1, t3);
-
-		fp9_sub(c[0][0], t0, a[0][0]);
-		fp9_add(c[0][0], c[0][0], c[0][0]);
-		fp9_add(c[0][0], t0, c[0][0]);
-
-		fp9_add(c[0][1], t1, a[0][1]);
-		fp9_add(c[0][1], c[0][1], c[0][1]);
-		fp9_add(c[0][1], t1, c[0][1]);
-
-		fp9_sqr(t0, a[2][0]);
-		fp9_sqr(t1, a[2][1]);
-		fp9_add(t5, a[2][0], a[2][1]);
-		fp9_sqr(t2, t5);
-
-		fp9_add(t3, t0, t1);
-		fp9_sub(t5, t2, t3);
-
-		fp9_add(t6, a[1][0], a[1][1]);
-		fp9_sqr(t3, t6);
-		fp9_sqr(t2, a[1][0]);
-
-		fp9_mul_art(t6, t5);
-		fp9_add(t5, t6, a[1][0]);
-		fp9_dbl(t5, t5);
-		fp9_add(c[1][0], t5, t6);
-
-		fp9_mul_art(t4, t1);
-		fp9_add(t5, t0, t4);
-		fp9_sub(t6, t5, a[1][1]);
-
-		fp9_sqr(t1, a[1][1]);
-
-		fp9_dbl(t6, t6);
-		fp9_add(c[1][1], t6, t5);
-
-		fp9_mul_art(t4, t1);
-		fp9_add(t5, t2, t4);
-		fp9_sub(t6, t5, a[2][0]);
-		fp9_dbl(t6, t6);
-		fp9_add(c[2][0], t6, t5);
-
-		fp9_add(t0, t2, t1);
-		fp9_sub(t5, t3, t0);
-		fp9_add(t6, t5, a[2][1]);
-		fp9_dbl(t6, t6);
-		fp9_add(c[2][1], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-		fp9_free(t3);
-		fp9_free(t4);
-		fp9_free(t5);
-		fp9_free(t6);
-	}
-}
-
-void fp54_sqr_pck_basic(fp54_t c, fp54_t a) {
-	fp9_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-	fp9_null(t3);
-	fp9_null(t4);
-	fp9_null(t5);
-	fp9_null(t6);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-		fp9_new(t3);
-		fp9_new(t4);
-		fp9_new(t5);
-		fp9_new(t6);
-
-		fp9_sqr(t0, a[2][0]);
-		fp9_sqr(t1, a[2][1]);
-		fp9_add(t5, a[2][0], a[2][1]);
-		fp9_sqr(t2, t5);
-
-		fp9_add(t3, t0, t1);
-		fp9_sub(t5, t2, t3);
-
-		fp9_add(t6, a[1][0], a[1][1]);
-		fp9_sqr(t3, t6);
-		fp9_sqr(t2, a[1][0]);
-
-		fp9_mul_art(t6, t5);
-		fp9_add(t5, t6, a[1][0]);
-		fp9_dbl(t5, t5);
-		fp9_add(c[1][0], t5, t6);
-
-		fp9_mul_art(t4, t1);
-		fp9_add(t5, t0, t4);
-		fp9_sub(t6, t5, a[1][1]);
-
-		fp9_sqr(t1, a[1][1]);
-
-		fp9_dbl(t6, t6);
-		fp9_add(c[1][1], t6, t5);
-
-		fp9_mul_art(t4, t1);
-		fp9_add(t5, t2, t4);
-		fp9_sub(t6, t5, a[2][0]);
-		fp9_dbl(t6, t6);
-		fp9_add(c[2][0], t6, t5);
-
-		fp9_add(t0, t2, t1);
-		fp9_sub(t5, t3, t0);
-		fp9_add(t6, t5, a[2][1]);
-		fp9_dbl(t6, t6);
-		fp9_add(c[2][1], t5, t6);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-		fp9_free(t3);
-		fp9_free(t4);
-		fp9_free(t5);
-		fp9_free(t6);
-	}
-}
-
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-
-void fp54_sqr_lazyr(fp54_t c, fp54_t a) {
-	/* TODO: implement lazy reduction. */
-	fp54_sqr_basic(c, a);
-}
-
-void fp54_sqr_cyc_lazyr(fp54_t c, fp54_t a) {
-	/* TODO: implement lazy reduction. */
-	fp54_sqr_cyc_basic(c, a);
-}
-
-void fp54_sqr_pck_lazyr(fp54_t c, fp54_t a) {
-	fp9_t t0, t1, t2;
-	dv9_t u0, u1, u2, u3;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-	dv9_null(u0);
-	dv9_null(u1);
-	dv9_null(u2);
-	dv9_null(u3);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-		dv9_new(u0);
-		dv9_new(u1);
-		dv9_new(u2);
-		dv9_new(u3);
-
-		fp9_sqr_unr(u0, a[2][0]);
-		fp9_sqr_unr(u1, a[2][1]);
-		fp9_add(t0, a[2][0], a[2][1]);
-		fp9_sqr_unr(u2, t0);
-
-		for (int i = 0; i < 3; i++) {
-			fp3_addc_low(u3[i], u0[i], u1[i]);
-			fp3_subc_low(u3[i], u2[i], u3[i]);
-			fp3_rdcn_low(t0[i], u3[i]);
-		}
-
-		fp9_add(t1, a[1][0], a[1][1]);
-		fp9_sqr(t2, t1);
-		fp9_sqr_unr(u2, a[1][0]);
-
-		fp9_mul_art(t1, t0);
-		fp9_add(t0, t1, a[1][0]);
-		fp9_dbl(t0, t0);
-		fp9_add(c[1][0], t0, t1);
-
-		fp3_nord_low(u3[0], u1[2]);
-		fp3_addc_low(u3[0], u0[0], u3[0]);
-		fp3_addc_low(u3[1], u0[1], u1[0]);
-		fp3_addc_low(u3[2], u0[2], u1[1]);
-		fp9_sqr_unr(u1, a[1][1]);
-		for (int i = 0; i < 3; i++) {
-			fp3_rdcn_low(t0[i], u3[i]);
-		}
-		fp9_sub(t1, t0, a[1][1]);
-		fp9_dbl(t1, t1);
-		fp9_add(c[1][1], t1, t0);
-
-		for (int i = 0; i < 3; i++) {
-			fp3_addc_low(u0[i], u2[i], u1[i]);
-			fp3_rdcn_low(t0[i], u0[i]);
-		}
-		fp9_sub(t0, t2, t0);
-		fp9_add(t1, t0, a[2][1]);
-		fp9_dbl(t1, t1);
-		fp9_add(c[2][1], t0, t1);
-
-		fp3_nord_low(u3[0], u1[2]);
-		fp3_addc_low(u3[0], u2[0], u3[0]);
-		fp3_addc_low(u3[1], u2[1], u1[0]);
-		fp3_addc_low(u3[2], u2[2], u1[1]);
-		for (int i = 0; i < 3; i++) {
-			fp3_rdcn_low(t0[i], u3[i]);
-		}
-		fp9_sub(t1, t0, a[2][0]);
-		fp9_dbl(t1, t1);
-		fp9_add(c[2][0], t1, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-		dv9_free(u0);
-		dv9_free(u1);
-		dv9_free(u2);
-		dv9_free(u3);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp6_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp6_mul.c
deleted file mode 100644
index dcb1e5db5ac7..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp6_mul.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a sextic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp6_mul_basic(fp6_t c, fp6_t a, fp6_t b) {
-	fp2_t v0, v1, v2, t0, t1, t2;
-
-	fp2_null(v0);
-	fp2_null(v1);
-	fp2_null(v2);
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(v0);
-		fp2_new(v1);
-		fp2_new(v2);
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* v0 = a_0b_0 */
-		fp2_mul(v0, a[0], b[0]);
-
-		/* v1 = a_1b_1 */
-		fp2_mul(v1, a[1], b[1]);
-
-		/* v2 = a_2b_2 */
-		fp2_mul(v2, a[2], b[2]);
-
-		/* t2 (c_0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp2_add(t0, a[1], a[2]);
-		fp2_add(t1, b[1], b[2]);
-		fp2_mul(t2, t0, t1);
-		fp2_sub(t2, t2, v1);
-		fp2_sub(t2, t2, v2);
-		fp2_mul_nor(t0, t2);
-		fp2_add(t2, t0, v0);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-		fp2_add(t0, a[0], a[1]);
-		fp2_add(t1, b[0], b[1]);
-		fp2_mul(c[1], t0, t1);
-		fp2_sub(c[1], c[1], v0);
-		fp2_sub(c[1], c[1], v1);
-		fp2_mul_nor(t0, v2);
-		fp2_add(c[1], c[1], t0);
-
-		/* c_2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-		fp2_add(t0, a[0], a[2]);
-		fp2_add(t1, b[0], b[2]);
-		fp2_mul(c[2], t0, t1);
-		fp2_sub(c[2], c[2], v0);
-		fp2_add(c[2], c[2], v1);
-		fp2_sub(c[2], c[2], v2);
-
-		/* c_0 = t2 */
-		fp2_copy(c[0], t2);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t2);
-		fp2_free(t1);
-		fp2_free(t0);
-		fp2_free(v2);
-		fp2_free(v1);
-		fp2_free(v0);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-/* MSVC needs this to be exported, so remove inline */
-void fp6_mul_unr(dv6_t c, fp6_t a, fp6_t b) {
-	dv2_t u0, u1, u2, u3;
-	fp2_t t0, t1;
-
-	dv2_null(u0);
-	dv2_null(u1);
-	dv2_null(u2);
-	dv2_null(u3);
-	fp2_null(t0);
-	fp2_null(t1);
-
-	RLC_TRY {
-		dv2_new(u0);
-		dv2_new(u1);
-		dv2_new(u2);
-		dv2_new(u3);
-		fp2_new(t0);
-		fp2_new(t1);
-
-		/* v0 = a_0b_0, v1 = a_1b_1, v2 = a_2b_2,
-		 * t0 = a_1 + a_2, t1 = b_1 + b_2,
-		 * u4 = u1 + u2, u5 = u0 + u1, u6 = u0 + u2 */
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u0, a[0], b[0]);
-		fp2_mulc_low(u1, a[1], b[1]);
-		fp2_mulc_low(u2, a[2], b[2]);
-		fp2_addn_low(t0, a[1], a[2]);
-		fp2_addn_low(t1, b[1], b[2]);
-		fp2_addd_low(c[0], u1, u2);
-#else
-		fp2_muln_low(u0, a[0], b[0]);
-		fp2_muln_low(u1, a[1], b[1]);
-		fp2_muln_low(u2, a[2], b[2]);
-		fp2_addm_low(t0, a[1], a[2]);
-		fp2_addm_low(t1, b[1], b[2]);
-		fp2_addc_low(c[0], u1, u2);
-#endif
-		/* t2 (c_0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp2_muln_low(u3, t0, t1);
-		fp2_subc_low(u3, u3, c[0]);
-#ifdef RLC_FP_ROOM
-		fp2_norh_low(c[0], u3);
-#else
-		fp2_nord_low(c[0], u3);
-#endif
-		fp2_addc_low(c[0], c[0], u0);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-#ifdef RLC_FP_ROOM
-		fp2_addn_low(t0, a[0], a[1]);
-		fp2_addn_low(t1, b[0], b[1]);
-		fp2_addd_low(c[1], u0, u1);
-#else
-		fp2_addm_low(t0, a[0], a[1]);
-		fp2_addm_low(t1, b[0], b[1]);
-		fp2_addc_low(c[1], u0, u1);
-#endif
-		fp2_muln_low(u3, t0, t1);
-		fp2_subc_low(u3, u3, c[1]);
-#ifdef RLC_FP_ROOM
-		fp2_norh_low(c[2], u2);
-#else
-		fp2_nord_low(c[2], u2);
-#endif
-		fp2_addc_low(c[1], u3, c[2]);
-
-		/* c_2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-#ifdef RLC_FP_ROOM
-		fp2_addn_low(t0, a[0], a[2]);
-		fp2_addn_low(t1, b[0], b[2]);
-		fp2_addd_low(c[2], u0, u2);
-#else
-		fp2_addm_low(t0, a[0], a[2]);
-		fp2_addm_low(t1, b[0], b[2]);
-		fp2_addc_low(c[2], u0, u2);
-#endif
-		fp2_muln_low(u3, t0, t1);
-		fp2_subc_low(u3, u3, c[2]);
-		fp2_addc_low(c[2], u3, u1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(u0);
-		dv2_free(u1);
-		dv2_free(u2);
-		dv2_free(u3);
-		fp2_free(t0);
-		fp2_free(t1);
-	}
-}
-
-void fp6_mul_lazyr(fp6_t c, fp6_t a, fp6_t b) {
-	dv6_t t;
-
-	dv6_null(t);
-
-	RLC_TRY {
-		dv6_new(t);
-		fp6_mul_unr(t, a, b);
-		fp2_rdcn_low(c[0], t[0]);
-		fp2_rdcn_low(c[1], t[1]);
-		fp2_rdcn_low(c[2], t[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv6_free(t);
-	}
-}
-
-#endif
-
-void fp6_mul_dxs(fp6_t c, fp6_t a, fp6_t b) {
-	fp2_t v0, v1, t0, t1, t2;
-
-	fp2_null(v0);
-	fp2_null(v1);
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(v0);
-		fp2_new(v1);
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* v0 = a_0b_0 */
-		fp2_mul(v0, a[0], b[0]);
-
-		/* v1 = a_1b_1 */
-		fp2_mul(v1, a[1], b[1]);
-
-		/* v2 = a_2b_2 = 0 */
-
-		/* t2 (c0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp2_add(t0, a[1], a[2]);
-		fp2_mul(t0, t0, b[1]);
-		fp2_sub(t0, t0, v1);
-		fp2_mul_nor(t2, t0);
-		fp2_add(t2, t2, v0);
-
-		/* c1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-		fp2_add(t0, a[0], a[1]);
-		fp2_add(t1, b[0], b[1]);
-		fp2_mul(c[1], t0, t1);
-		fp2_sub(c[1], c[1], v0);
-		fp2_sub(c[1], c[1], v1);
-
-		/* c2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-		fp2_add(t0, a[0], a[2]);
-		fp2_mul(c[2], t0, b[0]);
-		fp2_sub(c[2], c[2], v0);
-		fp2_add(c[2], c[2], v1);
-
-		/* c0 = t2 */
-		fp2_copy(c[0], t2);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(v0);
-		fp2_free(v1);
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-}
-
-void fp6_mul_art(fp6_t c, fp6_t a) {
-	fp2_t t0;
-
-	fp2_null(t0);
-
-	RLC_TRY {
-		fp2_new(t0);
-
-		/* (a_0 + a_1 * v + a_2 * v^2) * v = a_2 + a_0 * v + a_1 * v^2 */
-		fp2_copy(t0, a[0]);
-		fp2_mul_nor(c[0], a[2]);
-		fp2_copy(c[2], a[1]);
-		fp2_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp6_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp6_sqr.c
deleted file mode 100644
index 7136145229f5..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp6_sqr.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a sextic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp6_sqr_basic(fp6_t c, fp6_t a) {
-	fp2_t t0, t1, t2, t3, t4;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-
-		/* t0 = a_0^2 */
-		fp2_sqr(t0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp2_mul(t1, a[1], a[2]);
-		fp2_dbl(t1, t1);
-
-		/* t2 = a_2^2. */
-		fp2_sqr(t2, a[2]);
-
-		/* c2 = a_0 + a_2. */
-		fp2_add(c[2], a[0], a[2]);
-
-		/* t3 = (a_0 + a_2 + a_1)^2. */
-		fp2_add(t3, c[2], a[1]);
-		fp2_sqr(t3, t3);
-
-		/* c2 = (a_0 + a_2 - a_1)^2. */
-		fp2_sub(c[2], c[2], a[1]);
-		fp2_sqr(c[2], c[2]);
-
-		/* c2 = (c2 + t3)/2. */
-		fp2_add(c[2], c[2], t3);
-		fp_hlv(c[2][0], c[2][0]);
-		fp_hlv(c[2][1], c[2][1]);
-
-		/* t3 = t3 - c2 - t1. */
-		fp2_sub(t3, t3, c[2]);
-		fp2_sub(t3, t3, t1);
-
-		/* c2 = c2 - t0 - t2. */
-		fp2_sub(c[2], c[2], t0);
-		fp2_sub(c[2], c[2], t2);
-
-		/* c0 = t0 + t1 * E. */
-		fp2_mul_nor(t4, t1);
-		fp2_add(c[0], t0, t4);
-
-		/* c1 = t3 + t2 * E. */
-		fp2_mul_nor(t4, t2);
-		fp2_add(c[1], t3, t4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp6_sqr_unr(dv6_t c, fp6_t a) {
-	dv2_t u0, u1, u2, u3, u4, u5;
-	fp2_t t0, t1, t2, t3;
-
-	dv2_null(u0);
-	dv2_null(u1);
-	dv2_null(u2);
-	dv2_null(u3);
-	dv2_null(u4);
-	dv2_null(u5);
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-
-	RLC_TRY {
-		dv2_new(u0);
-		dv2_new(u1);
-		dv2_new(u2);
-		dv2_new(u3);
-		dv2_new(u4);
-		dv2_new(u5);
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-
-		/* u0 = a_0^2 */
-		fp2_sqrn_low(u0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp2_dblm_low(t0, a[1]);
-
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u1, t0, a[2]);
-#else
-		fp2_muln_low(u1, t0, a[2]);
-#endif
-
-		/* u2 = a_2^2. */
-		fp2_sqrn_low(u2, a[2]);
-
-		/* t4 = a_0 + a_2. */
-		fp2_addm_low(t3, a[0], a[2]);
-
-		/* u3 = (a_0 + a_2 + a_1)^2. */
-		fp2_addm_low(t2, t3, a[1]);
-		fp2_sqrn_low(u3, t2);
-
-		/* u4 = (a_0 + a_2 - a_1)^2. */
-		fp2_subm_low(t1, t3, a[1]);
-		fp2_sqrn_low(u4, t1);
-
-		/* u4 = (u4 + u3)/2. */
-#ifdef RLC_FP_ROOM
-		fp2_addd_low(u4, u4, u3);
-#else
-		fp2_addc_low(u4, u4, u3);
-#endif
-		fp_hlvd_low(u4[0], u4[0]);
-		fp_hlvd_low(u4[1], u4[1]);
-
-		/* u3 = u3 - u4 - u1. */
-#ifdef RLC_FP_ROOM
-		fp2_addd_low(u5, u1, u4);
-#else
-		fp2_addc_low(u5, u1, u4);
-#endif
-		fp2_subc_low(u3, u3, u5);
-
-		/* c2 = u4 - u0 - u2. */
-#ifdef RLC_FP_ROOM
-		fp2_addd_low(u5, u0, u2);
-#else
-		fp2_addc_low(u5, u0, u2);
-#endif
-		fp2_subc_low(c[2], u4, u5);
-
-		/* c0 = u0 + u1 * E. */
-		fp2_nord_low(u4, u1);
-		fp2_addc_low(c[0], u0, u4);
-
-		/* c1 = u3 + u2 * E. */
-		fp2_nord_low(u4, u2);
-		fp2_addc_low(c[1], u3, u4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(u0);
-		dv2_free(u1);
-		dv2_free(u2);
-		dv2_free(u3);
-		dv2_free(u4);
-		dv2_free(u5);
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-	}
-}
-
-void fp6_sqr_lazyr(fp6_t c, fp6_t a) {
-	dv6_t t;
-
-	dv6_null(t);
-
-	RLC_TRY {
-		dv6_new(t);
-		fp6_sqr_unr(t, a);
-		fp2_rdcn_low(c[0], t[0]);
-		fp2_rdcn_low(c[1], t[1]);
-		fp2_rdcn_low(c[2], t[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv6_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp8_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp8_mul.c
deleted file mode 100644
index c8c918963481..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp8_mul.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 4007-4019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 4.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 4.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in an octic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp8_mul_basic(fp8_t c, fp8_t a, fp8_t b) {
-	fp4_t t0, t1, t4;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t4);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t4);
-
-		/* Karatsuba algorithm. */
-
-		/* t0 = a_0 * b_0. */
-		fp4_mul(t0, a[0], b[0]);
-		/* t1 = a_1 * b_1. */
-		fp4_mul(t1, a[1], b[1]);
-		/* t4 = b_0 + b_1. */
-		fp4_add(t4, b[0], b[1]);
-
-		/* c_1 = a_0 + a_1. */
-		fp4_add(c[1], a[0], a[1]);
-
-		/* c_1 = (a_0 + a_1) * (b_0 + b_1) */
-		fp4_mul(c[1], c[1], t4);
-		fp4_sub(c[1], c[1], t0);
-		fp4_sub(c[1], c[1], t1);
-
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp4_mul_art(t4, t1);
-		fp4_add(c[0], t0, t4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t4);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-static void fp4_mul_dxs_unr(dv4_t c, fp4_t a, fp4_t b) {
-	fp2_t t0, t1;
-	dv2_t u0, u1;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		dv2_new(u0);
-		dv2_new(u1);
-
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u1, a[1], b[1]);
-		fp2_addn_low(t0, b[0], b[1]);
-		fp2_addn_low(t1, a[0], a[1]);
-#else
-		fp2_muln_low(u1, a[1], b[1]);
-		fp2_addm_low(t0, b[0], b[1]);
-		fp2_addm_low(t1, a[0], a[1]);
-#endif
-		fp2_muln_low(c[1], t1, t0);
-		fp2_subc_low(c[1], c[1], u1);
-		fp2_norh_low(c[0], u1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		dv2_free(t1);
-		dv2_free(u0);
-		dv2_free(u1);
-	}
-}
-
-void fp8_mul_dxs(fp8_t c, fp8_t a, fp8_t b) {
-	fp4_t t0, t1;
-	dv4_t u0, u1, u2, u3;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	dv4_null(u0);
-	dv4_null(u1);
-	dv4_null(u2);
-	dv4_null(u3);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		dv4_new(u0);
-		dv4_new(u1);
-		dv4_new(u2);
-		dv4_new(u3);
-
-		/* Karatsuba algorithm. */
-
-		/* u0 = a_0 * b_0. */
-		fp4_mul_unr(u0, a[0], b[0]);
-		/* u1 = a_1 * b_1. */
-		fp4_mul_dxs_unr(u1, a[1], b[1]);
-
-		/* t1 = a_0 + a_1. */
-		fp4_add(t0, a[0], a[1]);
-		/* t0 = b_0 + b_1. */
-		fp4_add(t1, b[0], b[1]);
-		/* u2 = (a_0 + a_1) * (b_0 + b_1) */
-		fp4_mul_unr(u2, t0, t1);
-		/* c_1 = u2 - a_0b_0 - a_1b_1. */
-		for (int i = 0; i < 2; i++) {
-			fp2_addc_low(u3[i], u0[i], u1[i]);
-			fp2_subc_low(u2[i], u2[i], u3[i]);
-			fp2_rdcn_low(c[1][i], u2[i]);
-		}
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp2_nord_low(u2[0], u1[1]);
-		dv_copy(u2[1][0], u1[0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u2[1][1], u1[0][1], 2 * RLC_FP_DIGS);
-		for (int i = 0; i < 2; i++) {
-			fp2_addc_low(u2[i], u0[i], u2[i]);
-			fp2_rdcn_low(c[0][i], u2[i]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		dv4_free(t1);
-		dv4_free(u0);
-		dv4_free(u1);
-		dv4_free(u2);
-		dv4_free(u3);
-	}
-}
-
-void fp8_mul_unr(dv8_t c, fp8_t a, fp8_t b) {
-	fp4_t t0, t1;
-	dv4_t u0, u1, u2, u3;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	dv4_null(u0);
-	dv4_null(u1);
-	dv4_null(u2);
-	dv4_null(u3);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		dv4_new(u0);
-		dv4_new(u1);
-		dv4_new(u2);
-		dv4_new(u3);
-
-		/* Karatsuba algorithm. */
-
-		/* u0 = a_0 * b_0. */
-		fp4_mul_unr(u0, a[0], b[0]);
-		/* u1 = a_1 * b_1. */
-		fp4_mul_unr(u1, a[1], b[1]);
-		/* t1 = a_0 + a_1. */
-		fp4_add(t0, a[0], a[1]);
-		/* t0 = b_0 + b_1. */
-		fp4_add(t1, b[0], b[1]);
-		/* u2 = (a_0 + a_1) * (b_0 + b_1) */
-		fp4_mul_unr(u2, t0, t1);
-		/* c_1 = u2 - a_0b_0 - a_1b_1. */
-		for (int i = 0; i < 2; i++) {
-			fp2_addc_low(u3[i], u0[i], u1[i]);
-			fp2_subc_low(c[1][i], u2[i], u3[i]);
-		}
-		/* c_0 = a_0b_0 + v * a_1b_1. */
-		fp2_nord_low(u2[0], u1[1]);
-		dv_copy(u2[1][0], u1[0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u2[1][1], u1[0][1], 2 * RLC_FP_DIGS);
-		for (int i = 0; i < 2; i++) {
-			fp2_addc_low(c[0][i], u0[i], u2[i]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		dv4_free(u0);
-		dv4_free(u1);
-		dv4_free(u2);
-		dv4_free(u3);
-	}
-}
-
-void fp8_mul_lazyr(fp8_t c, fp8_t a, fp8_t b) {
-	dv8_t t;
-
-	dv8_null(t);
-
-	RLC_TRY {
-		dv8_new(t);
-		fp8_mul_unr(t, a, b);
-		fp2_rdcn_low(c[0][0], t[0][0]);
-		fp2_rdcn_low(c[0][1], t[0][1]);
-		fp2_rdcn_low(c[1][0], t[1][0]);
-		fp2_rdcn_low(c[1][1], t[1][1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv8_free(t);
-	}
-}
-
-#endif
-
-void fp8_mul_art(fp8_t c, fp8_t a) {
-	fp4_t t0;
-
-	fp4_null(t0);
-
-	RLC_TRY {
-		fp4_new(t0);
-
-		/* (a_0 + a_1 * v) * v = a_0 * v + a_1 * v^4 */
-		fp4_copy(t0, a[0]);
-		fp4_mul_art(c[0], a[1]);
-		fp4_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp8_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp8_sqr.c
deleted file mode 100644
index c2b5f99d1dc5..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp8_sqr.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in an octic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp8_sqr_basic(fp8_t c, fp8_t a) {
-	fp4_t t0, t1;
-
-	fp4_null(t0);
-	fp4_null(t1);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-
-		fp4_add(t0, a[0], a[1]);
-		fp4_mul_art(t1, a[1]);
-		fp4_add(t1, a[0], t1);
-		fp4_mul(t0, t0, t1);
-		fp4_mul(c[1], a[0], a[1]);
-		fp4_sub(c[0], t0, c[1]);
-		fp4_mul_art(t1, c[1]);
-		fp4_sub(c[0], c[0], t1);
-		fp4_dbl(c[1], c[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp8_sqr_unr(dv8_t c, fp8_t a) {
-	fp4_t t;
-	dv4_t u0, u1, u2;
-
-	fp4_null(t);
-	dv4_null(u0);
-	dv4_null(u1);
-	dv4_null(u2);
-
-	RLC_TRY {
-		fp4_new(t);
-		dv4_new(u0);
-		dv4_new(u1);
-		dv4_new(u2);
-
-		/* t0 = a^2. */
-		fp4_sqr_unr(u0, a[0]);
-		/* t1 = b^2. */
-		fp4_sqr_unr(u1, a[1]);
-
-		fp4_add(t, a[0], a[1]);
-
-		/* c = a^2 + b^2 * E. */
-		dv_copy(u2[1][0], u1[0][0], 2 * RLC_FP_DIGS);
-		dv_copy(u2[1][1], u1[0][1], 2 * RLC_FP_DIGS);
-		fp2_nord_low(u2[0], u1[1]);
-		fp2_addc_low(c[0][0], u2[0], u0[0]);
-		fp2_addc_low(c[0][1], u2[1], u0[1]);
-
-		/* d = (a + b)^2 - a^2 - b^2 = 2 * a * b. */
-		fp2_addc_low(u1[0], u1[0], u0[0]);
-		fp2_addc_low(u1[1], u1[1], u0[1]);
-
-		fp4_sqr_unr(u0, t);
-		fp2_subc_low(c[1][0], u0[0], u1[0]);
-		fp2_subc_low(c[1][1], u0[1], u1[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t);
-		dv4_free(u0);
-		dv4_free(u1);
-		dv4_free(u2);
-	}
-}
-
-void fp8_sqr_lazyr(fp8_t c, fp8_t a) {
-	dv8_t t;
-
-	dv8_null(t);
-
-	RLC_TRY {
-		dv8_new(t);
-		fp8_sqr_unr(t, a);
-		fp2_rdcn_low(c[0][0], t[0][0]);
-		fp2_rdcn_low(c[0][1], t[0][1]);
-		fp2_rdcn_low(c[1][0], t[1][0]);
-		fp2_rdcn_low(c[1][1], t[1][1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv8_free(t);
-	}
-}
-
-#endif
-
-void fp8_sqr_cyc(fp8_t c, fp8_t a) {
-	fp4_t t0, t1, t2;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-
-		fp4_sqr(t0, a[1]);
-		fp4_add(t1, a[0], a[1]);
-		fp4_sqr(t2, t1);
-		fp4_sub(t2, t2, t0);
-		fp4_mul_art(c[0], t0);
-		fp4_sub(c[1], t2, c[0]);
-		fp4_dbl(c[0], c[0]);
-		fp_add_dig(c[0][0][0], c[0][0][0], 1);
-		fp_sub_dig(c[1][0][0], c[1][0][0], 1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp9_mul.c b/src/dashbls/depends/relic/src/fpx/relic_fp9_mul.c
deleted file mode 100644
index d796d77fd576..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp9_mul.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication in a nonic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp9_mul_basic(fp9_t c, fp9_t a, fp9_t b) {
-	fp3_t v0, v1, v2, t0, t1, t2;
-
-	fp3_null(v0);
-	fp3_null(v1);
-	fp3_null(v2);
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-
-	RLC_TRY {
-		fp3_new(v0);
-		fp3_new(v1);
-		fp3_new(v2);
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-
-		/* v0 = a_0b_0 */
-		fp3_mul(v0, a[0], b[0]);
-
-		/* v1 = a_1b_1 */
-		fp3_mul(v1, a[1], b[1]);
-
-		/* v2 = a_2b_2 */
-		fp3_mul(v2, a[2], b[2]);
-
-		/* t2 (c_0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp3_add(t0, a[1], a[2]);
-		fp3_add(t1, b[1], b[2]);
-		fp3_mul(t2, t0, t1);
-		fp3_sub(t2, t2, v1);
-		fp3_sub(t2, t2, v2);
-		fp3_mul_nor(t0, t2);
-		fp3_add(t2, t0, v0);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-		fp3_add(t0, a[0], a[1]);
-		fp3_add(t1, b[0], b[1]);
-		fp3_mul(c[1], t0, t1);
-		fp3_sub(c[1], c[1], v0);
-		fp3_sub(c[1], c[1], v1);
-		fp3_mul_nor(t0, v2);
-		fp3_add(c[1], c[1], t0);
-
-		/* c_2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-		fp3_add(t0, a[0], a[2]);
-		fp3_add(t1, b[0], b[2]);
-		fp3_mul(c[2], t0, t1);
-		fp3_sub(c[2], c[2], v0);
-		fp3_add(c[2], c[2], v1);
-		fp3_sub(c[2], c[2], v2);
-
-		/* c_0 = t2 */
-		fp3_copy(c[0], t2);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(t2);
-		fp3_free(t1);
-		fp3_free(t0);
-		fp3_free(v2);
-		fp3_free(v1);
-		fp3_free(v0);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp9_mul_unr(dv9_t c, fp9_t a, fp9_t b) {
-	dv3_t u0, u1, u2, u3;
-	fp3_t t0, t1;
-
-	dv3_null(u0);
-	dv3_null(u1);
-	dv3_null(u2);
-	dv3_null(u3);
-	fp3_null(t0);
-	fp3_null(t1);
-
-	RLC_TRY {
-		dv3_new(u0);
-		dv3_new(u1);
-		dv3_new(u2);
-		dv3_new(u3);
-		fp3_new(t0);
-		fp3_new(t1);
-
-		/* v0 = a_0b_0, v1 = a_1b_1, v2 = a_2b_2,
-		 * t0 = a_1 + a_2, t1 = b_1 + b_2,
-		 * u4 = u1 + u2, u5 = u0 + u1, u6 = u0 + u2 */
-#ifdef RLC_FP_ROOM
-		fp3_muln_low(u0, a[0], b[0]);
-		fp3_muln_low(u1, a[1], b[1]);
-		fp3_muln_low(u2, a[2], b[2]);
-		fp3_addm_low(t0, a[1], a[2]);
-		fp3_addm_low(t1, b[1], b[2]);
-		fp3_addc_low(c[0], u1, u2);
-#else
-		fp3_muln_low(u0, a[0], b[0]);
-		fp3_muln_low(u1, a[1], b[1]);
-		fp3_muln_low(u2, a[2], b[2]);
-		fp3_addm_low(t0, a[1], a[2]);
-		fp3_addm_low(t1, b[1], b[2]);
-		fp3_addc_low(c[0], u1, u2);
-#endif
-		/* t2 (c_0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp3_muln_low(u3, t0, t1);
-		fp3_subc_low(u3, u3, c[0]);
-		fp3_nord_low(c[0], u3);
-		fp3_addc_low(c[0], c[0], u0);
-
-		/* c_1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-		fp3_addm_low(t0, a[0], a[1]);
-		fp3_addm_low(t1, b[0], b[1]);
-		fp3_addc_low(c[1], u0, u1);
-
-		fp3_muln_low(u3, t0, t1);
-		fp3_subc_low(u3, u3, c[1]);
-		fp3_nord_low(c[2], u2);
-		fp3_addc_low(c[1], u3, c[2]);
-
-		/* c_2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-		fp3_addm_low(t0, a[0], a[2]);
-		fp3_addm_low(t1, b[0], b[2]);
-		fp3_addc_low(c[2], u0, u2);
-
-		fp3_muln_low(u3, t0, t1);
-		fp3_subc_low(u3, u3, c[2]);
-		fp3_addc_low(c[2], u3, u1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(u0);
-		dv3_free(u1);
-		dv3_free(u2);
-		dv3_free(u3);
-		fp3_free(t0);
-		fp3_free(t1);
-	}
-}
-
-void fp9_mul_lazyr(fp9_t c, fp9_t a, fp9_t b) {
-	dv9_t t;
-
-	dv9_null(t);
-
-	RLC_TRY {
-		dv9_new(t);
-		fp9_mul_unr(t, a, b);
-		fp3_rdcn_low(c[0], t[0]);
-		fp3_rdcn_low(c[1], t[1]);
-		fp3_rdcn_low(c[2], t[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv9_free(t);
-	}
-}
-
-#endif
-
-void fp9_mul_dxs(fp9_t c, fp9_t a, fp9_t b) {
-	fp3_t v0, v1, t0, t1, t2;
-
-	fp3_null(v0);
-	fp3_null(v1);
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-
-	RLC_TRY {
-		fp3_new(v0);
-		fp3_new(v1);
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-
-		/* v0 = a_0b_0 */
-		fp3_mul(v0, a[0], b[0]);
-
-		/* v1 = a_1b_1 */
-		fp3_mul(v1, a[1], b[1]);
-
-		/* v2 = a_2b_2 = 0 */
-
-		/* t2 (c0) = v0 + E((a_1 + a_2)(b_1 + b_2) - v1 - v2) */
-		fp3_add(t0, a[1], a[2]);
-		fp3_mul(t0, t0, b[1]);
-		fp3_sub(t0, t0, v1);
-		fp3_mul_nor(t2, t0);
-		fp3_add(t2, t2, v0);
-
-		/* c1 = (a_0 + a_1)(b_0 + b_1) - v0 - v1 + Ev2 */
-		fp3_add(t0, a[0], a[1]);
-		fp3_add(t1, b[0], b[1]);
-		fp3_mul(c[1], t0, t1);
-		fp3_sub(c[1], c[1], v0);
-		fp3_sub(c[1], c[1], v1);
-
-		/* c2 = (a_0 + a_2)(b_0 + b_2) - v0 + v1 - v2 */
-		fp3_add(t0, a[0], a[2]);
-		fp3_mul(c[2], t0, b[0]);
-		fp3_sub(c[2], c[2], v0);
-		fp3_add(c[2], c[2], v1);
-
-		/* c0 = t2 */
-		fp3_copy(c[0], t2);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(v0);
-		fp3_free(v1);
-		fp3_free(t0);
-		fp3_free(t1);
-		fp3_free(t2);
-	}
-}
-
-void fp9_mul_art(fp9_t c, fp9_t a) {
-	fp3_t t0;
-
-	fp3_null(t0);
-
-	RLC_TRY {
-		fp3_new(t0);
-
-		/* (a_0 + a_1 * v + a_2 * v^2) * v = a_2 + a_0 * v + a_1 * v^2 */
-		fp3_copy(t0, a[0]);
-		fp3_mul_nor(c[0], a[2]);
-		fp3_copy(c[2], a[1]);
-		fp3_copy(c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fp9_sqr.c b/src/dashbls/depends/relic/src/fpx/relic_fp9_sqr.c
deleted file mode 100644
index 572e627fda59..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fp9_sqr.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of squaring in a nonic extension of a prime field.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-
-void fp9_sqr_basic(fp9_t c, fp9_t a) {
-	fp3_t t0, t1, t2, t3, t4;
-
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-	fp3_null(t3);
-	fp3_null(t4);
-
-	RLC_TRY {
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-		fp3_new(t3);
-		fp3_new(t4);
-
-		/* t0 = a_0^2 */
-		fp3_sqr(t0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp3_mul(t1, a[1], a[2]);
-		fp3_dbl(t1, t1);
-
-		/* t2 = a_2^2. */
-		fp3_sqr(t2, a[2]);
-
-		/* c2 = a_0 + a_2. */
-		fp3_add(c[2], a[0], a[2]);
-
-		/* t3 = (a_0 + a_2 + a_1)^2. */
-		fp3_add(t3, c[2], a[1]);
-		fp3_sqr(t3, t3);
-
-		/* c2 = (a_0 + a_2 - a_1)^2. */
-		fp3_sub(c[2], c[2], a[1]);
-		fp3_sqr(c[2], c[2]);
-
-		/* c2 = (c2 + t3)/2. */
-		fp3_add(c[2], c[2], t3);
-		fp_hlv(c[2][0], c[2][0]);
-		fp_hlv(c[2][1], c[2][1]);
-		fp_hlv(c[2][2], c[2][2]);
-
-		/* t3 = t3 - c2 - t1. */
-		fp3_sub(t3, t3, c[2]);
-		fp3_sub(t3, t3, t1);
-
-		/* c2 = c2 - t0 - t2. */
-		fp3_sub(c[2], c[2], t0);
-		fp3_sub(c[2], c[2], t2);
-
-		/* c0 = t0 + t1 * E. */
-		fp3_mul_nor(t4, t1);
-		fp3_add(c[0], t0, t4);
-
-		/* c1 = t3 + t2 * E. */
-		fp3_mul_nor(t4, t2);
-		fp3_add(c[1], t3, t4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(t0);
-		fp3_free(t1);
-		fp3_free(t2);
-		fp3_free(t3);
-		fp3_free(t4);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void fp9_sqr_unr(dv9_t c, fp9_t a) {
-	dv3_t u0, u1, u2, u3, u4, u5;
-	fp3_t t0, t1, t2, t3;
-
-	dv3_null(u0);
-	dv3_null(u1);
-	dv3_null(u2);
-	dv3_null(u3);
-	dv3_null(u4);
-	dv3_null(u5);
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-	fp3_null(t3);
-
-	RLC_TRY {
-		dv3_new(u0);
-		dv3_new(u1);
-		dv3_new(u2);
-		dv3_new(u3);
-		dv3_new(u4);
-		dv3_new(u5);
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-		fp3_new(t3);
-
-		/* u0 = a_0^2 */
-		fp3_sqrn_low(u0, a[0]);
-
-		/* t1 = 2 * a_1 * a_2 */
-		fp3_dblm_low(t0, a[1]);
-		fp3_muln_low(u1, t0, a[2]);
-
-		/* u2 = a_2^2. */
-		fp3_sqrn_low(u2, a[2]);
-
-		/* t4 = a_0 + a_2. */
-		fp3_addm_low(t3, a[0], a[2]);
-
-		/* u3 = (a_0 + a_2 + a_1)^2. */
-		fp3_addm_low(t2, t3, a[1]);
-		fp3_sqrn_low(u3, t2);
-
-		/* u4 = (a_0 + a_2 - a_1)^2. */
-		fp3_subm_low(t1, t3, a[1]);
-		fp3_sqrn_low(u4, t1);
-
-		/* u4 = (u4 + u3)/2. */
-#ifdef RLC_FP_ROOM
-		fp3_addc_low(u4, u4, u3);
-#else
-		fp3_addc_low(u4, u4, u3);
-#endif
-		fp_hlvd_low(u4[0], u4[0]);
-		fp_hlvd_low(u4[1], u4[1]);
-		fp_hlvd_low(u4[2], u4[2]);
-
-		/* u3 = u3 - u4 - u1. */
-		fp3_addc_low(u5, u1, u4);
-		fp3_subc_low(u3, u3, u5);
-
-		/* c2 = u4 - u0 - u2. */
-		fp3_addc_low(u5, u0, u2);
-		fp3_subc_low(c[2], u4, u5);
-
-		/* c0 = u0 + u1 * E. */
-		fp3_nord_low(u4, u1);
-		fp3_addc_low(c[0], u0, u4);
-
-		/* c1 = u3 + u2 * E. */
-		fp3_nord_low(u4, u2);
-		fp3_addc_low(c[1], u3, u4);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(u0);
-		dv3_free(u1);
-		dv3_free(u2);
-		dv3_free(u3);
-		dv3_free(u4);
-		dv3_free(u5);
-		fp3_free(t0);
-		fp3_free(t1);
-		fp3_free(t2);
-		fp3_free(t3);
-	}
-}
-
-void fp9_sqr_lazyr(fp9_t c, fp9_t a) {
-	dv9_t t;
-
-	dv9_null(t);
-
-	RLC_TRY {
-		dv9_new(t);
-		fp9_sqr_unr(t, a);
-		fp3_rdcn_low(c[0], t[0]);
-		fp3_rdcn_low(c[1], t[1]);
-		fp3_rdcn_low(c[2], t[2]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv9_free(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_add.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_add.c
deleted file mode 100644
index ca1fbf8ce4d0..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_add.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of addition in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if FPX_QDR == BASIC || !defined(STRIP)
-
-void fp2_add_basic(fp2_t c, fp2_t a, fp2_t b) {
-  fp_add(c[0], a[0], b[0]);
-  fp_add(c[1], a[1], b[1]);
-}
-
-void fp2_sub_basic(fp2_t c, fp2_t a, fp2_t b) {
-  fp_sub(c[0], a[0], b[0]);
-  fp_sub(c[1], a[1], b[1]);
-}
-
-void fp2_dbl_basic(fp2_t c, fp2_t a) {
-  /* 2 * (a_0 + a_1 * u) = 2 * a_0 + 2 * a_1 * u. */
-  fp_dbl(c[0], a[0]);
-  fp_dbl(c[1], a[1]);
-}
-
-#endif
-
-#if FPX_QDR == INTEG || !defined(STRIP)
-
-void fp2_add_integ(fp2_t c, fp2_t a, fp2_t b) {
-	fp2_addm_low(c, a, b);
-}
-
-void fp2_sub_integ(fp2_t c, fp2_t a, fp2_t b) {
-	fp2_subm_low(c, a, b);
-}
-
-void fp2_dbl_integ(fp2_t c, fp2_t a) {
-	fp2_dblm_low(c, a);
-}
-
-#endif
-
-void fp2_add_dig(fp2_t c, const fp2_t a, dig_t dig) {
-	fp_add_dig(c[0], a[0], dig);
-	fp_copy(c[1], a[1]);
-}
-
-void fp2_sub_dig(fp2_t c, const fp2_t a, dig_t dig) {
-	fp_sub_dig(c[0], a[0], dig);
-	fp_copy(c[1], a[1]);
-}
-
-void fp2_neg(fp2_t c, fp2_t a) {
-	fp_neg(c[0], a[0]);
-	fp_neg(c[1], a[1]);
-}
-
-#if FPX_CBC == BASIC || !defined(STRIP)
-
-void fp3_add_basic(fp3_t c, fp3_t a, fp3_t b) {
-  fp_add(c[0], a[0], b[0]);
-  fp_add(c[1], a[1], b[1]);
-  fp_add(c[2], a[2], b[2]);
-}
-
-void fp3_sub_basic(fp3_t c, fp3_t a, fp3_t b) {
-  fp_sub(c[0], a[0], b[0]);
-  fp_sub(c[1], a[1], b[1]);
-  fp_sub(c[2], a[2], b[2]);
-}
-
-void fp3_dbl_basic(fp3_t c, fp3_t a) {
-  /* 2 * (a_0 + a_1 * u) = 2 * a_0 + 2 * a_1 * u. */
-  fp_dbl(c[0], a[0]);
-  fp_dbl(c[1], a[1]);
-  fp_dbl(c[2], a[2]);
-}
-
-#endif
-
-void fp3_neg(fp3_t c, fp3_t a) {
-	fp_neg(c[0], a[0]);
-	fp_neg(c[1], a[1]);
-	fp_neg(c[2], a[2]);
-}
-
-#if FPX_CBC == INTEG || !defined(STRIP)
-
-void fp3_add_integ(fp3_t c, fp3_t a, fp3_t b) {
-	fp3_addm_low(c, a, b);
-}
-
-void fp3_sub_integ(fp3_t c, fp3_t a, fp3_t b) {
-	fp3_subm_low(c, a, b);
-}
-
-void fp3_dbl_integ(fp3_t c, fp3_t a) {
-	fp3_dblm_low(c, a);
-}
-
-#endif
-
-void fp4_add(fp4_t c, fp4_t a, fp4_t b) {
-	fp2_add(c[0], a[0], b[0]);
-	fp2_add(c[1], a[1], b[1]);
-}
-
-void fp4_sub(fp4_t c, fp4_t a, fp4_t b) {
-	fp2_sub(c[0], a[0], b[0]);
-	fp2_sub(c[1], a[1], b[1]);
-}
-
-void fp4_dbl(fp4_t c, fp4_t a) {
-	/* 2 * (a_0 + a_1 * v + a_2 * v^2) = 2 * a_0 + 2 * a_1 * v + 2 * a_2 * v^2. */
-	fp2_dbl(c[0], a[0]);
-	fp2_dbl(c[1], a[1]);
-}
-
-void fp4_neg(fp4_t c, fp4_t a) {
-	fp2_neg(c[0], a[0]);
-	fp2_neg(c[1], a[1]);
-}
-
-void fp6_add(fp6_t c, fp6_t a, fp6_t b) {
-	fp2_add(c[0], a[0], b[0]);
-	fp2_add(c[1], a[1], b[1]);
-	fp2_add(c[2], a[2], b[2]);
-}
-
-void fp6_sub(fp6_t c, fp6_t a, fp6_t b) {
-	fp2_sub(c[0], a[0], b[0]);
-	fp2_sub(c[1], a[1], b[1]);
-	fp2_sub(c[2], a[2], b[2]);
-}
-
-void fp6_dbl(fp6_t c, fp6_t a) {
-	fp2_dbl(c[0], a[0]);
-	fp2_dbl(c[1], a[1]);
-	fp2_dbl(c[2], a[2]);
-}
-
-void fp6_neg(fp6_t c, fp6_t a) {
-	fp2_neg(c[0], a[0]);
-	fp2_neg(c[1], a[1]);
-	fp2_neg(c[2], a[2]);
-}
-
-void fp8_add(fp8_t c, fp8_t a, fp8_t b) {
-	fp4_add(c[0], a[0], b[0]);
-	fp4_add(c[1], a[1], b[1]);
-}
-
-void fp8_sub(fp8_t c, fp8_t a, fp8_t b) {
-	fp4_sub(c[0], a[0], b[0]);
-	fp4_sub(c[1], a[1], b[1]);
-}
-
-void fp8_dbl(fp8_t c, fp8_t a) {
-	fp4_dbl(c[0], a[0]);
-	fp4_dbl(c[1], a[1]);
-}
-
-void fp8_neg(fp8_t c, fp8_t a) {
-	fp4_neg(c[0], a[0]);
-	fp4_neg(c[1], a[1]);
-}
-
-void fp9_add(fp9_t c, fp9_t a, fp9_t b) {
-	fp3_add(c[0], a[0], b[0]);
-	fp3_add(c[1], a[1], b[1]);
-	fp3_add(c[2], a[2], b[2]);
-}
-
-void fp9_sub(fp9_t c, fp9_t a, fp9_t b) {
-	fp3_sub(c[0], a[0], b[0]);
-	fp3_sub(c[1], a[1], b[1]);
-	fp3_sub(c[2], a[2], b[2]);
-}
-
-void fp9_dbl(fp9_t c, fp9_t a) {
-	fp3_dbl(c[0], a[0]);
-	fp3_dbl(c[1], a[1]);
-	fp3_dbl(c[2], a[2]);
-}
-
-void fp9_neg(fp9_t c, fp9_t a) {
-	fp3_neg(c[0], a[0]);
-	fp3_neg(c[1], a[1]);
-	fp3_neg(c[2], a[2]);
-}
-
-void fp12_add(fp12_t c, fp12_t a, fp12_t b) {
-	fp6_add(c[0], a[0], b[0]);
-	fp6_add(c[1], a[1], b[1]);
-}
-
-void fp12_sub(fp12_t c, fp12_t a, fp12_t b) {
-	fp6_sub(c[0], a[0], b[0]);
-	fp6_sub(c[1], a[1], b[1]);
-}
-
-void fp12_neg(fp12_t c, fp12_t a) {
-	fp6_neg(c[0], a[0]);
-	fp6_neg(c[1], a[1]);
-}
-
-void fp12_dbl(fp12_t c, fp12_t a) {
-	fp6_dbl(c[0], a[0]);
-	fp6_dbl(c[1], a[1]);
-}
-
-void fp18_add(fp18_t c, fp18_t a, fp18_t b) {
-	fp9_add(c[0], a[0], b[0]);
-	fp9_add(c[1], a[1], b[1]);
-}
-
-void fp18_sub(fp18_t c, fp18_t a, fp18_t b) {
-	fp9_sub(c[0], a[0], b[0]);
-	fp9_sub(c[1], a[1], b[1]);
-}
-
-void fp18_dbl(fp18_t c, fp18_t a) {
-	fp9_dbl(c[0], a[0]);
-	fp9_dbl(c[1], a[1]);
-}
-
-void fp18_neg(fp18_t c, fp18_t a) {
-	fp9_neg(c[0], a[0]);
-	fp9_neg(c[1], a[1]);
-}
-
-void fp24_add(fp24_t c, fp24_t a, fp24_t b) {
-	fp8_add(c[0], a[0], b[0]);
-	fp8_add(c[1], a[1], b[1]);
-    fp8_add(c[2], a[2], b[2]);
-}
-
-void fp24_sub(fp24_t c, fp24_t a, fp24_t b) {
-	fp8_sub(c[0], a[0], b[0]);
-	fp8_sub(c[1], a[1], b[1]);
-    fp8_sub(c[2], a[2], b[2]);
-}
-
-void fp24_neg(fp24_t c, fp24_t a) {
-	fp8_neg(c[0], a[0]);
-	fp8_neg(c[1], a[1]);
-    fp8_neg(c[2], a[2]);
-}
-
-void fp24_dbl(fp24_t c, fp24_t a) {
-	fp8_dbl(c[0], a[0]);
-	fp8_dbl(c[1], a[1]);
-    fp8_dbl(c[2], a[2]);
-}
-
-void fp48_add(fp48_t c, fp48_t a, fp48_t b) {
-	fp24_add(c[0], a[0], b[0]);
-	fp24_add(c[1], a[1], b[1]);
-}
-
-void fp48_sub(fp48_t c, fp48_t a, fp48_t b) {
-	fp24_sub(c[0], a[0], b[0]);
-	fp24_sub(c[1], a[1], b[1]);
-}
-
-void fp48_neg(fp48_t c, fp48_t a) {
-	fp24_neg(c[0], a[0]);
-	fp24_neg(c[1], a[1]);
-}
-
-void fp48_dbl(fp48_t c, fp48_t a) {
-	fp24_dbl(c[0], a[0]);
-	fp24_dbl(c[1], a[1]);
-}
-
-void fp54_add(fp54_t c, fp54_t a, fp54_t b) {
-	fp18_add(c[0], a[0], b[0]);
-	fp18_add(c[1], a[1], b[1]);
-    fp18_add(c[2], a[2], b[2]);
-}
-
-void fp54_sub(fp54_t c, fp54_t a, fp54_t b) {
-	fp18_sub(c[0], a[0], b[0]);
-	fp18_sub(c[1], a[1], b[1]);
-    fp18_sub(c[2], a[2], b[2]);
-}
-
-void fp54_neg(fp54_t c, fp54_t a) {
-	fp18_neg(c[0], a[0]);
-	fp18_neg(c[1], a[1]);
-    fp18_neg(c[2], a[2]);
-}
-
-void fp54_dbl(fp54_t c, fp54_t a) {
-	fp18_dbl(c[0], a[0]);
-	fp18_dbl(c[1], a[1]);
-    fp18_dbl(c[2], a[2]);
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_cmp.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_cmp.c
deleted file mode 100644
index d10dd2d9655e..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_cmp.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of comparison in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp2_cmp(fp2_t a, fp2_t b) {
-	return (fp_cmp(a[0], b[0]) == RLC_EQ) && (fp_cmp(a[1], b[1]) == RLC_EQ) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp2_cmp_dig(fp2_t a, dig_t b) {
-	return (fp_cmp_dig(a[0], b) == RLC_EQ) && fp_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp3_cmp(fp3_t a, fp3_t b) {
-	return (fp_cmp(a[0], b[0]) == RLC_EQ) && (fp_cmp(a[1], b[1]) == RLC_EQ) &&
-			(fp_cmp(a[2], b[2]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp3_cmp_dig(fp3_t a, dig_t b) {
-	return (fp_cmp_dig(a[0], b) == RLC_EQ) && fp_is_zero(a[1]) &&
-			fp_is_zero(a[2]) ? RLC_EQ : RLC_NE;
-}
-
-int fp4_cmp(fp4_t a, fp4_t b) {
-	return (fp2_cmp(a[0], b[0]) == RLC_EQ) && (fp2_cmp(a[1], b[1]) == RLC_EQ) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp4_cmp_dig(fp4_t a, dig_t b) {
-	return (fp2_cmp_dig(a[0], b) == RLC_EQ) && fp2_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp6_cmp(fp6_t a, fp6_t b) {
-	return (fp2_cmp(a[0], b[0]) == RLC_EQ) && (fp2_cmp(a[1], b[1]) == RLC_EQ) &&
-			(fp2_cmp(a[2], b[2]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp6_cmp_dig(fp6_t a, dig_t b) {
-	return (fp2_cmp_dig(a[0], b) == RLC_EQ) && fp2_is_zero(a[1]) &&
-			fp2_is_zero(a[2]) ?	RLC_EQ : RLC_NE;
-}
-
-int fp9_cmp(fp9_t a, fp9_t b) {
-	return (fp3_cmp(a[0], b[0]) == RLC_EQ) && (fp3_cmp(a[1], b[1]) == RLC_EQ) &&
-			(fp3_cmp(a[2], b[2]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp9_cmp_dig(fp9_t a, dig_t b) {
-	return (fp3_cmp_dig(a[0], b) == RLC_EQ) && fp3_is_zero(a[1]) &&
-			fp3_is_zero(a[2]) ?	RLC_EQ : RLC_NE;
-}
-
-int fp8_cmp(fp8_t a, fp8_t b) {
-	return (fp4_cmp(a[0], b[0]) == RLC_EQ) && (fp4_cmp(a[1], b[1]) == RLC_EQ) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp8_cmp_dig(fp8_t a, dig_t b) {
-	return (fp4_cmp_dig(a[0], b) == RLC_EQ) && fp4_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp12_cmp(fp12_t a, fp12_t b) {
-	return (fp6_cmp(a[0], b[0]) == RLC_EQ) && (fp6_cmp(a[1], b[1]) == RLC_EQ) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp12_cmp_dig(fp12_t a, dig_t b) {
-	return (fp6_cmp_dig(a[0], b) == RLC_EQ) && fp6_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp18_cmp(fp18_t a, fp18_t b) {
-	return (fp9_cmp(a[0], b[0]) == RLC_EQ) && (fp9_cmp(a[1], b[1]) == RLC_EQ) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp18_cmp_dig(fp18_t a, dig_t b) {
-	return (fp9_cmp_dig(a[0], b) == RLC_EQ) && fp9_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp24_cmp(fp24_t a, fp24_t b) {
-	return (fp8_cmp(a[0], b[0]) == RLC_EQ) && (fp8_cmp(a[1], b[1]) == RLC_EQ) &&
-			(fp8_cmp(a[2], b[2]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp24_cmp_dig(fp24_t a, dig_t b) {
-	return (fp8_cmp_dig(a[0], b) == RLC_EQ) && fp8_is_zero(a[1]) &&
-			fp8_is_zero(a[2]) ? RLC_EQ : RLC_NE;
-}
-
-int fp48_cmp(fp48_t a, fp48_t b) {
-	return (fp24_cmp(a[0], b[0]) == RLC_EQ) &&
-		(fp24_cmp(a[1], b[1]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp48_cmp_dig(fp48_t a, dig_t b) {
-	return (fp24_cmp_dig(a[0], b) == RLC_EQ) && fp24_is_zero(a[1]) ?
-			RLC_EQ : RLC_NE;
-}
-
-int fp54_cmp(fp54_t a, fp54_t b) {
-	return (fp18_cmp(a[0], b[0]) == RLC_EQ) && (fp18_cmp(a[1], b[1]) == RLC_EQ)
-			&& (fp18_cmp(a[2], b[2]) == RLC_EQ) ? RLC_EQ : RLC_NE;
-}
-
-int fp54_cmp_dig(fp54_t a, dig_t b) {
-	return (fp18_cmp_dig(a[0], b) == RLC_EQ) && fp18_is_zero(a[1]) &&
-			fp18_is_zero(a[2]) ? RLC_EQ : RLC_NE;
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_cyc.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_cyc.c
deleted file mode 100644
index 5f8e0310f8f5..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_cyc.c
+++ /dev/null
@@ -1,2155 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of exponentiation in cyclotomic subgroups of extensions
- * defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_conv_cyc(fp2_t c, fp2_t a) {
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		/* t = a^{-1}. */
-		fp2_inv(t, a);
-		/* c = a^p. */
-		fp2_inv_cyc(c, a);
-		/* c = a^(p - 1). */
-		fp2_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-int fp2_test_cyc(fp2_t a) {
-	fp2_t t;
-	int result = 0;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-		fp2_frb(t, a, 1);
-		fp2_mul(t, t, a);
-		result = ((fp2_cmp_dig(t, 1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-
-	return result;
-}
-
-void fp2_exp_cyc(fp2_t c, fp2_t a, bn_t b) {
-	fp2_t r, s, t[1 << (FP_WIDTH - 2)];
-	int i, l;
-	int8_t naf[RLC_FP_BITS + 1], *k;
-
-	if (bn_is_zero(b)) {
-		return fp2_set_dig(c, 1);
-	}
-
-	fp2_null(r);
-	fp2_null(s);
-
-	RLC_TRY {
-		fp2_new(r);
-		fp2_new(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i ++) {
-			fp2_null(t[i]);
-			fp2_new(t[i]);
-		}
-
-#if FP_WIDTH > 2
-		fp2_sqr(t[0], a);
-		fp2_mul(t[1], t[0], a);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp2_mul(t[i], t[i - 1], t[0]);
-		}
-#endif
-		fp2_copy(t[0], a);
-
-		l = RLC_FP_BITS + 1;
-		fp2_set_dig(r, 1);
-		bn_rec_naf(naf, &l, b, FP_WIDTH);
-
-		k = naf + l - 1;
-
-		for (i = l - 1; i >= 0; i--, k--) {
-			fp2_sqr(r, r);
-
-			if (*k > 0) {
-				fp2_mul(r, r, t[*k / 2]);
-			}
-			if (*k < 0) {
-				fp2_inv_cyc(s, t[-*k / 2]);
-				fp2_mul(r, r, s);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp2_inv_cyc(c, r);
-		} else {
-			fp2_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(r);
-		fp2_free(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp2_free(t[i]);
-		}
-	}
-}
-
-void fp8_conv_cyc(fp8_t c, fp8_t a) {
-	fp8_t t;
-
-	fp8_null(t);
-
-	RLC_TRY {
-		fp8_new(t);
-
-		/* t = a^{-1}. */
-		fp8_inv(t, a);
-		/* c = a^(p^4). */
-		fp8_inv_cyc(c, a);
-		/* c = a^(p^4 - 1). */
-		fp8_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t);
-	}
-}
-
-int fp8_test_cyc(fp8_t a) {
-	fp8_t t;
-	int result = 0;
-
-	fp8_null(t);
-
-	RLC_TRY {
-		fp8_new(t);
-		fp8_inv_cyc(t, a);
-		fp8_mul(t, t, a);
-		result = ((fp8_cmp_dig(t, 1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t);
-	}
-
-	return result;
-}
-
-void fp8_exp_cyc(fp8_t c, fp8_t a, bn_t b) {
-	fp8_t r, s, t[1 << (FP_WIDTH - 2)];
-	int i, l;
-	int8_t naf[RLC_FP_BITS + 1], *k;
-
-	if (bn_is_zero(b)) {
-		return fp8_set_dig(c, 1);
-	}
-
-	fp8_null(r);
-	fp8_null(s);
-
-	RLC_TRY {
-		fp8_new(r);
-		fp8_new(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i ++) {
-			fp8_null(t[i]);
-			fp8_new(t[i]);
-		}
-
-#if FP_WIDTH > 2
-		fp8_sqr_cyc(t[0], a);
-		fp8_mul(t[1], t[0], a);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp8_mul(t[i], t[i - 1], t[0]);
-		}
-#endif
-		fp8_copy(t[0], a);
-
-		l = RLC_FP_BITS + 1;
-		fp8_set_dig(r, 1);
-		bn_rec_naf(naf, &l, b, FP_WIDTH);
-
-		k = naf + l - 1;
-
-		for (i = l - 1; i >= 0; i--, k--) {
-			fp8_sqr_cyc(r, r);
-
-			if (*k > 0) {
-				fp8_mul(r, r, t[*k / 2]);
-			}
-			if (*k < 0) {
-				fp8_inv_cyc(s, t[-*k / 2]);
-				fp8_mul(r, r, s);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp8_inv_cyc(c, r);
-		} else {
-			fp8_copy(c, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(r);
-		fp8_free(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp8_free(t[i]);
-		}
-	}
-}
-
-void fp12_conv_cyc(fp12_t c, fp12_t a) {
-	fp12_t t;
-
-	fp12_null(t);
-
-	RLC_TRY {
-		fp12_new(t);
-
-		/* First, compute c = a^(p^6 - 1). */
-		/* t = a^{-1}. */
-		fp12_inv(t, a);
-		/* c = a^(p^6). */
-		fp12_inv_cyc(c, a);
-		/* c = a^(p^6 - 1). */
-		fp12_mul(c, c, t);
-
-		/* Second, compute c^(p^2 + 1). */
-		/* t = c^(p^2). */
-		fp12_frb(t, c, 2);
-
-		/* c = c^(p^2 + 1). */
-		fp12_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(t);
-	}
-}
-
-int fp12_test_cyc(fp12_t a) {
-	fp12_t t0, t1;
-	int result = 0;
-
-	fp12_null(t0);
-	fp12_null(t1);
-
-	RLC_TRY {
-		fp12_new(t0);
-		fp12_new(t1);
-
-		/* Check if a^(p^4 - p^2 + 1) == 1. */
-		fp12_frb(t0, a, 4);
-		fp12_mul(t0, t0, a);
-		fp12_frb(t1, a, 2);
-
-		result = ((fp12_cmp(t0, t1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(t0);
-		fp12_free(t1);
-	}
-
-	return result;
-}
-
-void fp12_back_cyc(fp12_t c, fp12_t a) {
-	fp2_t t0, t1, t2;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		/* t0 = g4^2. */
-		fp2_sqr(t0, a[0][1]);
-		/* t1 = 3 * g4^2 - 2 * g3. */
-		fp2_sub(t1, t0, a[0][2]);
-		fp2_dbl(t1, t1);
-		fp2_add(t1, t1, t0);
-		/* t0 = E * g5^2 + t1. */
-		fp2_sqr(t2, a[1][2]);
-		fp2_mul_nor(t0, t2);
-		fp2_add(t0, t0, t1);
-		/* t1 = 1/(4 * g2). */
-		fp2_dbl(t1, a[1][0]);
-		fp2_dbl(t1, t1);
-		fp2_inv(t1, t1);
-		/* c_1 = g1. */
-		fp2_mul(c[1][1], t0, t1);
-
-		/* t1 = g3 * g4. */
-		fp2_mul(t1, a[0][2], a[0][1]);
-		/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-		fp2_sqr(t2, c[1][1]);
-		fp2_sub(t2, t2, t1);
-		fp2_dbl(t2, t2);
-		fp2_sub(t2, t2, t1);
-		/* t1 = g2 * g5. */
-		fp2_mul(t1, a[1][0], a[1][2]);
-		/* c_0 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-		fp2_add(t2, t2, t1);
-		fp2_mul_nor(c[0][0], t2);
-		fp_add_dig(c[0][0][0], c[0][0][0], 1);
-
-		fp2_copy(c[0][1], a[0][1]);
-		fp2_copy(c[0][2], a[0][2]);
-		fp2_copy(c[1][0], a[1][0]);
-		fp2_copy(c[1][2], a[1][2]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-}
-
-void fp12_back_cyc_sim(fp12_t c[], fp12_t a[], int n) {
-    fp2_t *t = RLC_ALLOCA(fp2_t, n * 3);
-    fp2_t
-        *t0 = t + 0 * n,
-        *t1 = t + 1 * n,
-        *t2 = t + 2 * n;
-
-	if (n == 0) {
-		RLC_FREE(t);
-		return;
-	}
-
-	RLC_TRY {
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fp2_null(t0[i]);
-			fp2_null(t1[i]);
-			fp2_null(t2[i]);
-			fp2_new(t0[i]);
-			fp2_new(t1[i]);
-			fp2_new(t2[i]);
-		}
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g4^2. */
-			fp2_sqr(t0[i], a[i][0][1]);
-			/* t1 = 3 * g4^2 - 2 * g3. */
-			fp2_sub(t1[i], t0[i], a[i][0][2]);
-			fp2_dbl(t1[i], t1[i]);
-			fp2_add(t1[i], t1[i], t0[i]);
-			/* t0 = E * g5^2 + t1. */
-			fp2_sqr(t2[i], a[i][1][2]);
-			fp2_mul_nor(t0[i], t2[i]);
-			fp2_add(t0[i], t0[i], t1[i]);
-			/* t1 = (4 * g2). */
-			fp2_dbl(t1[i], a[i][1][0]);
-			fp2_dbl(t1[i], t1[i]);
-		}
-
-		/* t1 = 1 / t1. */
-		fp2_inv_sim(t1, t1, n);
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g1. */
-			fp2_mul(c[i][1][1], t0[i], t1[i]);
-
-			/* t1 = g3 * g4. */
-			fp2_mul(t1[i], a[i][0][2], a[i][0][1]);
-			/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-			fp2_sqr(t2[i], c[i][1][1]);
-			fp2_sub(t2[i], t2[i], t1[i]);
-			fp2_dbl(t2[i], t2[i]);
-			fp2_sub(t2[i], t2[i], t1[i]);
-			/* t1 = g2 * g5. */
-			fp2_mul(t1[i], a[i][1][0], a[i][1][2]);
-			/* t2 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-			fp2_add(t2[i], t2[i], t1[i]);
-			fp2_mul_nor(c[i][0][0], t2[i]);
-			fp_add_dig(c[i][0][0][0], c[i][0][0][0], 1);
-
-			fp2_copy(c[i][0][1], a[i][0][1]);
-			fp2_copy(c[i][0][2], a[i][0][2]);
-			fp2_copy(c[i][1][0], a[i][1][0]);
-			fp2_copy(c[i][1][2], a[i][1][2]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fp2_free(t0[i]);
-			fp2_free(t1[i]);
-			fp2_free(t2[i]);
-		}
-		RLC_FREE(t);
-	}
-}
-
-void fp12_exp_cyc(fp12_t c, fp12_t a, bn_t b) {
-	int i, j, k, l, w = bn_ham(b);
-
-	if (bn_is_zero(b)) {
-		return fp12_set_dig(c, 1);
-	}
-
-	if ((bn_bits(b) > RLC_DIG) && ((w << 3) > bn_bits(b))) {
-		int _l[4];
-		int8_t naf[4][RLC_FP_BITS + 1];
-		fp12_t t[4];
-		bn_t _b[4], n, u;
-
-		bn_null(n);
-		bn_null(u);
-
-		RLC_TRY {
-			bn_new(n);
-			bn_new(u);
-			for (i = 0; i < 4; i++) {
-				bn_null(_b[i]);
-				bn_new(_b[i]);
-				fp12_null(t[i]);
-				fp12_new(t[i]);
-			}
-
-			ep_curve_get_ord(n);
-			fp_prime_get_par(u);
-			bn_rec_frb(_b, 4, b, u, n, ep_curve_is_pairf() == EP_B12 ||
-				ep_curve_is_pairf() == EP_B24 || ep_curve_is_pairf() == EP_B48);
-
-			if (ep_curve_is_pairf()) {
-				fp12_copy(t[0], a);
-				fp12_frb(t[1], t[0], 1);
-				fp12_frb(t[2], t[1], 1);
-				fp12_frb(t[3], t[2], 1);
-
-				l = 0;
-				for (i = 0; i < 4; i++) {
-					if (bn_sign(_b[i]) == RLC_NEG) {
-						fp12_inv_cyc(t[i], t[i]);
-					}
-					_l[i] = RLC_FP_BITS + 1;
-					bn_rec_naf(naf[i], &_l[i], _b[i], 2);
-					l = RLC_MAX(l, _l[i]);
-				}
-
-				fp12_set_dig(c, 1);
-				for (i = l - 1; i >= 0; i--) {
-					fp12_sqr_cyc(c, c);
-					for (j = 0; j < 4; j++) {
-						if (naf[j][i] > 0) {
-							fp12_mul(c, c, t[j]);
-						}
-						if (naf[j][i] < 0) {
-							fp12_inv_cyc(t[j], t[j]);
-							fp12_mul(c, c, t[j]);
-							fp12_inv_cyc(t[j], t[j]);
-						}
-					}
-				}
-			} else {
-				fp12_copy(t[0], a);
-
-				for (i = bn_bits(b) - 2; i >= 0; i--) {
-					fp12_sqr_cyc(t[0], t[0]);
-					if (bn_get_bit(b, i)) {
-						fp12_mul(t[0], t[0], a);
-					}
-				}
-
-				fp12_copy(c, t[0]);
-				if (bn_sign(b) == RLC_NEG) {
-					fp12_inv_cyc(c, c);
-				}
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			bn_free(n);
-			bn_free(u);
-			for (i = 0; i < 4; i++) {
-				bn_free(_b[i]);
-				fp12_free(t[i]);
-			}
-		}
-	} else {
-		fp12_t t, *u = RLC_ALLOCA(fp12_t, w);
-
-		fp12_null(t);
-
-		RLC_TRY {
-			if (u == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			for (i = 0; i < w; i++) {
-				fp12_null(u[i]);
-				fp12_new(u[i]);
-			}
-			fp12_new(t);
-
-			j = 0;
-			fp12_copy(t, a);
-			for (i = 1; i < bn_bits(b); i++) {
-				fp12_sqr_pck(t, t);
-				if (bn_get_bit(b, i)) {
-					fp12_copy(u[j++], t);
-				}
-			}
-
-			if (!bn_is_even(b)) {
-				j = 0;
-				k = w - 1;
-			} else {
-				j = 1;
-				k = w;
-			}
-
-			fp12_back_cyc_sim(u, u, k);
-
-			if (!bn_is_even(b)) {
-				fp12_copy(c, a);
-			} else {
-				fp12_copy(c, u[0]);
-			}
-
-			for (i = j; i < k; i++) {
-				fp12_mul(c, c, u[i]);
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp12_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			for (i = 0; i < w; i++) {
-				fp12_free(u[i]);
-			}
-			fp12_free(t);
-			RLC_FREE(u);
-		}
-	}
-}
-
-void fp2_exp_cyc_sim(fp2_t e, fp2_t a, bn_t b, fp2_t c, bn_t d) {
-	int i, l, n0, n1, l0, l1;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], *_k, *_m;
-	fp2_t r, t0[1 << (EP_WIDTH - 2)];
-	fp2_t s, t1[1 << (EP_WIDTH - 2)];
-
-	if (bn_is_zero(b)) {
-		return fp2_exp_cyc(e, c, d);
-	}
-
-	if (bn_is_zero(d)) {
-		return fp2_exp_cyc(e, a, b);
-	}
-
-	fp2_null(r);
-	fp2_null(s);
-
-	RLC_TRY {
-		fp2_new(r);
-		fp2_new(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i ++) {
-			fp2_null(t0[i]);
-			fp2_null(t1[i]);
-			fp2_new(t0[i]);
-			fp2_new(t1[i]);
-		}
-
-#if FP_WIDTH > 2
-		fp2_sqr(t0[0], a);
-		fp2_mul(t0[1], t0[0], a);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp2_mul(t0[i], t0[i - 1], t0[0]);
-		}
-
-		fp2_sqr(t1[0], c);
-		fp2_mul(t1[1], t1[0], c);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp2_mul(t1[i], t1[i - 1], t1[0]);
-		}
-#endif
-		fp2_copy(t0[0], a);
-		fp2_copy(t1[0], c);
-
-		l0 = l1 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, b, FP_WIDTH);
-		bn_rec_naf(naf1, &l1, d, FP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		if (bn_sign(b) == RLC_NEG) {
-			for (i = 0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(d) == RLC_NEG) {
-			for (i = 0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-
-		fp2_set_dig(r, 1);
-		for (i = l - 1; i >= 0; i--, _k--, _m--) {
-			fp2_sqr(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-
-			if (n0 > 0) {
-				fp2_mul(r, r, t0[n0 / 2]);
-			}
-			if (n0 < 0) {
-				fp2_inv_cyc(s, t0[-n0 / 2]);
-				fp2_mul(r, r, s);
-			}
-			if (n1 > 0) {
-				fp2_mul(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				fp2_inv_cyc(s, t1[-n1 / 2]);
-				fp2_mul(r, r, s);
-			}
-		}
-
-		fp2_copy(e, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(r);
-		fp2_free(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp2_free(t0[i]);
-			fp2_free(t1[i]);
-		}
-	}
-}
-
-
-void fp12_exp_cyc_sim(fp12_t e, fp12_t a, bn_t b, fp12_t c, bn_t d) {
-	int i, j, l;
-	bn_t _b[4], _d[4], n, x;
-	fp12_t t[4], u[4];
-
-	if (bn_is_zero(b)) {
-		return fp12_exp_cyc(e, c, d);
-	}
-
-	if (bn_is_zero(d)) {
-		return fp12_exp_cyc(e, a, b);
-	}
-
-	bn_null(n);
-	bn_null(x);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(x);
-		for (i = 0; i < 4; i++) {
-			bn_null(_b[i]);
-			bn_null(_d[i]);
-			fp12_null(t[i]);
-			fp12_null(u[i]);
-			bn_new(_b[i]);
-			bn_new(_d[i]);
-			fp12_new(t[i]);
-			fp12_new(u[i]);
-		}
-
-		ep_curve_get_ord(n);
-		fp_prime_get_par(x);
-		bn_rec_frb(_b, 4, b, x, n, ep_curve_is_pairf() == EP_B12);
-		bn_rec_frb(_d, 4, d, x, n, ep_curve_is_pairf() == EP_B12);
-
-		if (ep_curve_is_pairf()) {
-			for (i = 0; i < 4; i++) {
-				fp12_frb(t[i], a, i);
-				fp12_frb(u[i], c, i);
-				if (bn_sign(_b[i]) == RLC_NEG) {
-					fp12_inv_cyc(t[i], t[i]);
-				}
-				if (bn_sign(_d[i]) == RLC_NEG) {
-					fp12_inv_cyc(u[i], u[i]);
-				}
-			}
-
-			l = RLC_MAX(bn_bits(_b[0]), bn_bits(_b[1]));
-			l = RLC_MAX(l, RLC_MAX(bn_bits(_b[2]), bn_bits(_b[3])));
-			l = RLC_MAX(l, RLC_MAX(bn_bits(_d[0]), bn_bits(_d[1])));
-			l = RLC_MAX(l, RLC_MAX(bn_bits(_d[2]), bn_bits(_d[3])));
-
-			fp12_set_dig(e, 1);
-			for (i = l - 1; i >= 0; i--) {
-				fp12_sqr_cyc(e, e);
-				for (j = 0; j < 4; j++) {
-					if (bn_get_bit(_b[j], i)) {
-						fp12_mul(e, e, t[j]);
-					}
-					if (bn_get_bit(_d[j], i)) {
-						fp12_mul(e, e, u[j]);
-					}
-				}
-			}
-		} else {
-			if (bn_sign(b) == RLC_NEG) {
-				fp12_inv_cyc(t[0], a);
-			} else {
-				fp12_copy(t[0], a);
-			}
-			if (bn_sign(d) == RLC_NEG) {
-				fp12_inv_cyc(u[0], c);
-			} else {
-				fp12_copy(u[0], c);
-			}
-
-			fp12_set_dig(e, 1);
-			l = RLC_MAX(bn_bits(b), bn_bits(d));
-			for (i = l - 1; i >= 0; i--) {
-				fp12_sqr_cyc(e, e);
-				if (bn_get_bit(b, i)) {
-					fp12_mul(e, e, t[0]);
-				}
-				if (bn_get_bit(d, i)) {
-					fp12_mul(e, e, u[0]);
-				}
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(x);
-		for (i = 0; i < 4; i++) {
-			bn_free(_b[i]);
-			bn_free(_d[i]);
-			fp12_free(t[i]);
-			fp12_free(u[i]);
-		}
-	}
-}
-
-void fp12_exp_cyc_sps(fp12_t c, fp12_t a, const int *b, int len, int sign) {
-	int i, j, k, w = len;
-    fp12_t t, *u = RLC_ALLOCA(fp12_t, w);
-
-	if (len == 0) {
-		RLC_FREE(u);
-		fp12_set_dig(c, 1);
-		return;
-	}
-
-	fp12_null(t);
-
-	RLC_TRY {
-		if (u == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < w; i++) {
-			fp12_null(u[i]);
-			fp12_new(u[i]);
-		}
-		fp12_new(t);
-
-		fp12_copy(t, a);
-		if (b[0] == 0) {
-			for (j = 0, i = 1; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp12_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp12_inv_cyc(u[i - 1], t);
-				} else {
-					fp12_copy(u[i - 1], t);
-				}
-			}
-
-			fp12_back_cyc_sim(u, u, w - 1);
-
-			fp12_copy(c, a);
-			for (i = 0; i < w - 1; i++) {
-				fp12_mul(c, c, u[i]);
-			}
-		} else {
-			for (j = 0, i = 0; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp12_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp12_inv_cyc(u[i], t);
-				} else {
-					fp12_copy(u[i], t);
-				}
-			}
-
-			fp12_back_cyc_sim(u, u, w);
-
-			fp12_copy(c, u[0]);
-			for (i = 1; i < w; i++) {
-				fp12_mul(c, c, u[i]);
-			}
-		}
-
-		if (sign == RLC_NEG) {
-			fp12_inv_cyc(c, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < w; i++) {
-			fp12_free(u[i]);
-		}
-		fp12_free(t);
-		RLC_FREE(u);
-	}
-}
-
-void fp24_conv_cyc(fp24_t c, fp24_t a) {
-	fp24_t t;
-
-	fp24_null(t);
-
-	RLC_TRY {
-		fp24_new(t);
-
-		/* First, compute c = a^(p^12 - 1). */
-		/* t = a^{-1}. */
-		fp24_inv(t, a);
-		/* c = a^(p^12). */
-		fp24_inv_cyc(c, a);
-		/* c = a^(p^12 - 1). */
-		fp24_mul(c, c, t);
-
-		/* Second, compute c^(p^4 + 1). */
-		/* t = c^(p^4). */
-		fp24_frb(t, c, 4);
-
-		/* c = c^(p^4 + 1). */
-		fp24_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp24_free(t);
-	}
-}
-
-int fp24_test_cyc(fp24_t a) {
-	fp24_t t0, t1;
-	int result = 0;
-
-	fp24_null(t0);
-	fp24_null(t1);
-
-	RLC_TRY {
-		fp24_new(t0);
-		fp24_new(t1);
-
-		/* Check if a^(p^8 - p^4 + 1) == 1. */
-		fp24_frb(t0, a, 8);
-		fp24_mul(t0, t0, a);
-		fp24_frb(t1, a, 4);
-
-		result = ((fp24_cmp(t0, t1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp24_free(t0);
-		fp24_free(t1);
-	}
-
-	return result;
-}
-
-void fp24_back_cyc(fp24_t c, fp24_t a) {
-	fp4_t t0, t1, t2;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-
-		/* t0 = g4^2. */
-		fp4_sqr(t0, a[2][0]);
-		/* t1 = 3 * g4^2 - 2 * g3. */
-		fp4_sub(t1, t0, a[1][1]);
-		fp4_dbl(t1, t1);
-		fp4_add(t1, t1, t0);
-		/* t0 = E * g5^2 + t1. */
-		fp4_sqr(t2, a[2][1]);
-		fp4_mul_art(t0, t2);
-		fp4_add(t0, t0, t1);
-		/* t1 = 1/(4 * g2). */
-		fp4_dbl(t1, a[1][0]);
-		fp4_dbl(t1, t1);
-		fp4_inv(t1, t1);
-		/* c_1 = g1. */
-		fp4_mul(c[0][1], t0, t1);
-
-		/* t1 = g3 * g4. */
-		fp4_mul(t1, a[1][1], a[2][0]);
-		/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-		fp4_sqr(t2, c[0][1]);
-		fp4_sub(t2, t2, t1);
-		fp4_dbl(t2, t2);
-		fp4_sub(t2, t2, t1);
-		/* t1 = g2 * g5. */
-		fp4_mul(t1, a[1][0], a[2][1]);
-		/* c_0 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-		fp4_add(t2, t2, t1);
-		fp4_mul_art(c[0][0], t2);
-		fp_add_dig(c[0][0][0][0], c[0][0][0][0], 1);
-
-		fp4_copy(c[1][0], a[1][0]);
-		fp4_copy(c[1][1], a[1][1]);
-		fp4_copy(c[2][0], a[2][0]);
-		fp4_copy(c[2][1], a[2][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-	}
-}
-
-void fp24_back_cyc_sim(fp24_t c[], fp24_t a[], int n) {
-    fp4_t *t = RLC_ALLOCA(fp4_t, n * 3);
-    fp4_t
-        *t0 = t + 0 * n,
-        *t1 = t + 1 * n,
-        *t2 = t + 2 * n;
-
-	if (n == 0) {
-		RLC_FREE(t);
-		return;
-	}
-
-	RLC_TRY {
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fp4_null(t0[i]);
-			fp4_null(t1[i]);
-			fp4_null(t2[i]);
-			fp4_new(t0[i]);
-			fp4_new(t1[i]);
-			fp4_new(t2[i]);
-		}
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g4^2. */
-			fp4_sqr(t0[i], a[i][2][0]);
-			/* t1 = 3 * g4^2 - 2 * g3. */
-			fp4_sub(t1[i], t0[i], a[i][1][1]);
-			fp4_dbl(t1[i], t1[i]);
-			fp4_add(t1[i], t1[i], t0[i]);
-			/* t0 = E * g5^2 + t1. */
-			fp4_sqr(t2[i], a[i][2][1]);
-			fp4_mul_art(t0[i], t2[i]);
-			fp4_add(t0[i], t0[i], t1[i]);
-			/* t1 = (4 * g2). */
-			fp4_dbl(t1[i], a[i][1][0]);
-			fp4_dbl(t1[i], t1[i]);
-		}
-
-		/* t1 = 1 / t1. */
-		fp4_inv_sim(t1, t1, n);
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g1. */
-			fp4_mul(c[i][0][1], t0[i], t1[i]);
-
-			/* t1 = g3 * g4. */
-			fp4_mul(t1[i], a[i][1][1], a[i][2][0]);
-			/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-			fp4_sqr(t2[i], c[i][0][1]);
-			fp4_sub(t2[i], t2[i], t1[i]);
-			fp4_dbl(t2[i], t2[i]);
-			fp4_sub(t2[i], t2[i], t1[i]);
-			/* t1 = g2 * g5. */
-			fp4_mul(t1[i], a[i][1][0], a[i][2][1]);
-			/* t2 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-			fp4_add(t2[i], t2[i], t1[i]);
-			fp4_mul_art(c[i][0][0], t2[i]);
-			fp_add_dig(c[i][0][0][0][0], c[i][0][0][0][0], 1);
-
-			fp4_copy(c[i][1][0], a[i][1][0]);
-			fp4_copy(c[i][1][1], a[i][1][1]);
-			fp4_copy(c[i][2][0], a[i][2][0]);
-			fp4_copy(c[i][2][1], a[i][2][1]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fp4_free(t0[i]);
-			fp4_free(t1[i]);
-			fp4_free(t2[i]);
-		}
-		RLC_FREE(t);
-	}
-}
-
-void fp24_exp_cyc(fp24_t c, fp24_t a, bn_t b) {
-	int i, j, k, w = bn_ham(b);
-
-	if (bn_is_zero(b)) {
-		fp24_set_dig(c, 1);
-		return;
-	}
-
-	if ((bn_bits(b) > RLC_DIG) && ((w << 3) > bn_bits(b))) {
-		int l, _l[8];
-		int8_t naf[8][RLC_FP_BITS + 1];
-		fp24_t t[8];
-		bn_t _b[8], n, x;
-
-		bn_null(n);
-		bn_null(x);
-
-		RLC_TRY {
-			bn_new(n);
-			bn_new(x);
-			for (i = 0; i < 8; i++) {
-				bn_null(_b[i]);
-				bn_new(_b[i]);
-				fp24_null(t[i]);
-				fp24_new(t[i]);
-			}
-
-			ep_curve_get_ord(n);
-			fp_prime_get_par(x);
-			bn_rec_frb(_b, 8, b, x, n, ep_curve_is_pairf());
-
-			if (ep_curve_is_pairf()) {
-				l = 0;
-
-				fp24_copy(t[0], a);
-				for (i = 0; i < 8; i++) {
-					_l[i] = RLC_FP_BITS + 1;
-					bn_rec_naf(naf[i], &_l[i], _b[i], 2);
-					l = RLC_MAX(l, _l[i]);
-					if (i > 0) {
-						fp24_frb(t[i], t[i - 1], 1);
-					}
-				}
-
-				for (i = 0; i < 8; i++) {
-					if (bn_sign(_b[i]) == RLC_NEG) {
-						fp24_inv_cyc(t[i], t[i]);
-					}
-				}
-
-				fp24_set_dig(c, 1);
-				for (i = l - 1; i >= 0; i--) {
-					fp24_sqr_cyc(c, c);
-					for (j = 0; j < 8; j++) {
-						if (naf[j][i] > 0) {
-							fp24_mul(c, c, t[j]);
-						}
-						if (naf[j][i] < 0) {
-							fp24_inv_cyc(t[j], t[j]);
-							fp24_mul(c, c, t[j]);
-							fp24_inv_cyc(t[j], t[j]);
-						}
-					}
-				}
-			} else {
-				fp24_copy(t[0], a);
-
-				for (i = bn_bits(b) - 2; i >= 0; i--) {
-					fp24_sqr_cyc(t[0], t[0]);
-					if (bn_get_bit(b, i)) {
-						fp24_mul(t[0], t[0], a);
-					}
-				}
-
-				fp24_copy(c, t[0]);
-				if (bn_sign(b) == RLC_NEG) {
-					fp24_inv_cyc(c, c);
-				}
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			bn_free(n);
-			bn_free(x);
-			for (i = 0; i < 8; i++) {
-				bn_free(_b[i]);
-				fp24_free(t[i]);
-			}
-		}
-	} else {
-		fp24_t t, *u = RLC_ALLOCA(fp24_t, w);
-
-		fp24_null(t);
-
-		RLC_TRY {
-			if (u == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			for (i = 0; i < w; i++) {
-				fp24_null(u[i]);
-				fp24_new(u[i]);
-			}
-			fp24_new(t);
-
-			j = 0;
-			fp24_copy(t, a);
-			for (i = 1; i < bn_bits(b); i++) {
-				fp24_sqr_pck(t, t);
-				if (bn_get_bit(b, i)) {
-					fp24_copy(u[j++], t);
-				}
-			}
-
-			if (!bn_is_even(b)) {
-				j = 0;
-				k = w - 1;
-			} else {
-				j = 1;
-				k = w;
-			}
-
-			fp24_back_cyc_sim(u, u, k);
-
-			if (!bn_is_even(b)) {
-				fp24_copy(c, a);
-			} else {
-				fp24_copy(c, u[0]);
-			}
-
-			for (i = j; i < k; i++) {
-				fp24_mul(c, c, u[i]);
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp24_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			for (i = 0; i < w; i++) {
-				fp24_free(u[i]);
-			}
-			fp24_free(t);
-			RLC_FREE(u);
-		}
-	}
-}
-
-void fp24_exp_cyc_sim(fp24_t e, fp24_t a, bn_t b, fp24_t c, bn_t d) {
-	int i, l, n0, n1, l0, l1;
-	int8_t naf0[RLC_FP_BITS + 1], naf1[RLC_FP_BITS + 1], *_k, *_m;
-	fp24_t r, t0[1 << (EP_WIDTH - 2)];
-	fp24_t s, t1[1 << (EP_WIDTH - 2)];
-
-	if (bn_is_zero(b)) {
-		return fp24_exp_cyc(e, c, d);
-	}
-
-	if (bn_is_zero(d)) {
-		return fp24_exp_cyc(e, a, b);
-	}
-
-	fp24_null(r);
-	fp24_null(s);
-
-	RLC_TRY {
-		fp24_new(r);
-		fp24_new(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i ++) {
-			fp24_null(t0[i]);
-			fp24_null(t1[i]);
-			fp24_new(t0[i]);
-			fp24_new(t1[i]);
-		}
-
-#if FP_WIDTH > 2
-		fp24_sqr(t0[0], a);
-		fp24_mul(t0[1], t0[0], a);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp24_mul(t0[i], t0[i - 1], t0[0]);
-		}
-
-		fp24_sqr(t1[0], c);
-		fp24_mul(t1[1], t1[0], c);
-		for (int i = 2; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp24_mul(t1[i], t1[i - 1], t1[0]);
-		}
-#endif
-		fp24_copy(t0[0], a);
-		fp24_copy(t1[0], c);
-
-		l0 = l1 = RLC_FP_BITS + 1;
-		bn_rec_naf(naf0, &l0, b, FP_WIDTH);
-		bn_rec_naf(naf1, &l1, d, FP_WIDTH);
-
-		l = RLC_MAX(l0, l1);
-		if (bn_sign(b) == RLC_NEG) {
-			for (i = 0; i < l0; i++) {
-				naf0[i] = -naf0[i];
-			}
-		}
-		if (bn_sign(d) == RLC_NEG) {
-			for (i = 0; i < l1; i++) {
-				naf1[i] = -naf1[i];
-			}
-		}
-
-		_k = naf0 + l - 1;
-		_m = naf1 + l - 1;
-
-		fp24_set_dig(r, 1);
-		for (i = l - 1; i >= 0; i--, _k--, _m--) {
-			fp24_sqr(r, r);
-
-			n0 = *_k;
-			n1 = *_m;
-
-			if (n0 > 0) {
-				fp24_mul(r, r, t0[n0 / 2]);
-			}
-			if (n0 < 0) {
-				fp24_inv_cyc(s, t0[-n0 / 2]);
-				fp24_mul(r, r, s);
-			}
-			if (n1 > 0) {
-				fp24_mul(r, r, t1[n1 / 2]);
-			}
-			if (n1 < 0) {
-				fp24_inv_cyc(s, t1[-n1 / 2]);
-				fp24_mul(r, r, s);
-			}
-		}
-
-		fp24_copy(e, r);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp24_free(r);
-		fp24_free(s);
-		for (i = 0; i < (1 << (FP_WIDTH - 2)); i++) {
-			fp24_free(t0[i]);
-			fp24_free(t1[i]);
-		}
-	}
-}
-
-void fp24_exp_cyc_sps(fp24_t c, fp24_t a, const int *b, int len, int sign) {
-	int i, j, k, w = len;
-    fp24_t t, *u = RLC_ALLOCA(fp24_t, w);
-
-	if (len == 0) {
-		RLC_FREE(u);
-		fp24_set_dig(c, 1);
-		return;
-	}
-
-	fp24_null(t);
-
-	RLC_TRY {
-		if (u == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < w; i++) {
-			fp24_null(u[i]);
-			fp24_new(u[i]);
-		}
-		fp24_new(t);
-
-		fp24_copy(t, a);
-		if (b[0] == 0) {
-			for (j = 0, i = 1; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp24_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp24_inv_cyc(u[i - 1], t);
-				} else {
-					fp24_copy(u[i - 1], t);
-				}
-			}
-
-			fp24_back_cyc_sim(u, u, w - 1);
-
-			fp24_copy(c, a);
-			for (i = 0; i < w - 1; i++) {
-				fp24_mul(c, c, u[i]);
-			}
-		} else {
-			for (j = 0, i = 0; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp24_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp24_inv_cyc(u[i], t);
-				} else {
-					fp24_copy(u[i], t);
-				}
-			}
-
-			fp24_back_cyc_sim(u, u, w);
-
-			fp24_copy(c, u[0]);
-			for (i = 1; i < w; i++) {
-				fp24_mul(c, c, u[i]);
-			}
-		}
-
-		if (sign == RLC_NEG) {
-			fp24_inv_cyc(c, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < w; i++) {
-			fp24_free(u[i]);
-		}
-		fp24_free(t);
-		RLC_FREE(u);
-	}
-}
-
-void fp48_conv_cyc(fp48_t c, fp48_t a) {
-	fp48_t t;
-
-	fp48_null(t);
-
-	RLC_TRY {
-		fp48_new(t);
-
-		/* First, compute c = a^(p^24 - 1). */
-		/* t = a^{-1}. */
-		fp48_inv(t, a);
-		/* c = a^(p^24). */
-		fp48_inv_cyc(c, a);
-		/* c = a^(p^24 - 1). */
-		fp48_mul(c, c, t);
-
-		/* Second, compute c^(p^8 + 1). */
-		/* t = c^(p^8). */
-		fp48_frb(t, c, 8);
-
-		/* c = c^(p^8 + 1). */
-		fp48_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp48_free(t);
-	}
-}
-
-int fp48_test_cyc(fp48_t a) {
-	fp48_t t0, t1;
-	int result = 0;
-
-	fp48_null(t0);
-	fp48_null(t1);
-
-	RLC_TRY {
-		fp48_new(t0);
-		fp48_new(t1);
-
-		/* Check if a^(p^16 - p^8 + 1) == 1. */
-		fp48_frb(t0, a, 16);
-		fp48_mul(t0, t0, a);
-		fp48_frb(t1, a, 8);
-
-		result = ((fp48_cmp(t0, t1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp48_free(t0);
-		fp48_free(t1);
-	}
-
-	return result;
-}
-
-void fp48_back_cyc(fp48_t c, fp48_t a) {
-	fp8_t t0, t1, t2;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-
-		/* t0 = g4^2. */
-		fp8_sqr(t0, a[0][1]);
-		/* t1 = 3 * g4^2 - 2 * g3. */
-		fp8_sub(t1, t0, a[0][2]);
-		fp8_dbl(t1, t1);
-		fp8_add(t1, t1, t0);
-		/* t0 = E * g5^2 + t1. */
-		fp8_sqr(t2, a[1][2]);
-		fp8_mul_art(t0, t2);
-		fp8_add(t0, t0, t1);
-		/* t1 = 1/(4 * g2). */
-		fp8_dbl(t1, a[1][0]);
-		fp8_dbl(t1, t1);
-		fp8_inv(t1, t1);
-		/* c_1 = g1. */
-		fp8_mul(c[1][1], t0, t1);
-
-		/* t1 = g3 * g4. */
-		fp8_mul(t1, a[0][2], a[0][1]);
-		/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-		fp8_sqr(t2, c[1][1]);
-		fp8_sub(t2, t2, t1);
-		fp8_dbl(t2, t2);
-		fp8_sub(t2, t2, t1);
-		/* t1 = g2 * g5. */
-		fp8_mul(t1, a[1][0], a[1][2]);
-		/* c_0 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-		fp8_add(t2, t2, t1);
-		fp8_mul_art(c[0][0], t2);
-		fp_add_dig(c[0][0][0][0][0], c[0][0][0][0][0], 1);
-
-		fp8_copy(c[0][1], a[0][1]);
-		fp8_copy(c[0][2], a[0][2]);
-		fp8_copy(c[1][0], a[1][0]);
-		fp8_copy(c[1][2], a[1][2]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-	}
-}
-
-void fp48_back_cyc_sim(fp48_t c[], fp48_t a[], int n) {
-    fp8_t *t = RLC_ALLOCA(fp8_t, n * 3);
-    fp8_t
-        *t0 = t + 0 * n,
-        *t1 = t + 1 * n,
-        *t2 = t + 2 * n;
-
-	if (n == 0) {
-		RLC_FREE(t);
-		return;
-	}
-
-	RLC_TRY {
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fp8_null(t0[i]);
-			fp8_null(t1[i]);
-			fp8_null(t2[i]);
-			fp8_new(t0[i]);
-			fp8_new(t1[i]);
-			fp8_new(t2[i]);
-		}
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g4^2. */
-			fp8_sqr(t0[i], a[i][0][1]);
-			/* t1 = 3 * g4^2 - 2 * g3. */
-			fp8_sub(t1[i], t0[i], a[i][0][2]);
-			fp8_dbl(t1[i], t1[i]);
-			fp8_add(t1[i], t1[i], t0[i]);
-			/* t0 = E * g5^2 + t1. */
-			fp8_sqr(t2[i], a[i][1][2]);
-			fp8_mul_art(t0[i], t2[i]);
-			fp8_add(t0[i], t0[i], t1[i]);
-			/* t1 = (4 * g2). */
-			fp8_dbl(t1[i], a[i][1][0]);
-			fp8_dbl(t1[i], t1[i]);
-		}
-
-		/* t1 = 1 / t1. */
-		fp8_inv_sim(t1, t1, n);
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g1. */
-			fp8_mul(c[i][1][1], t0[i], t1[i]);
-
-			/* t1 = g3 * g4. */
-			fp8_mul(t1[i], a[i][0][2], a[i][0][1]);
-			/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-			fp8_sqr(t2[i], c[i][1][1]);
-			fp8_sub(t2[i], t2[i], t1[i]);
-			fp8_dbl(t2[i], t2[i]);
-			fp8_sub(t2[i], t2[i], t1[i]);
-			/* t1 = g2 * g5. */
-			fp8_mul(t1[i], a[i][1][0], a[i][1][2]);
-			/* t2 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-			fp8_add(t2[i], t2[i], t1[i]);
-			fp8_mul_art(c[i][0][0], t2[i]);
-			fp_add_dig(c[i][0][0][0][0][0], c[i][0][0][0][0][0], 1);
-
-			fp8_copy(c[i][0][1], a[i][0][1]);
-			fp8_copy(c[i][0][2], a[i][0][2]);
-			fp8_copy(c[i][1][0], a[i][1][0]);
-			fp8_copy(c[i][1][2], a[i][1][2]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fp8_free(t0[i]);
-			fp8_free(t1[i]);
-			fp8_free(t2[i]);
-		}
-		RLC_FREE(t);
-	}
-}
-
-void fp48_exp_cyc(fp48_t c, fp48_t a, bn_t b) {
-	int i, j, k, w = bn_ham(b);
-
-	if (bn_is_zero(b)) {
-		return fp48_set_dig(c, 1);
-	}
-
-	if ((bn_bits(b) > RLC_DIG) && ((w << 3) > bn_bits(b))) {
-		fp48_t t;
-
-		fp48_null(t)
-
-		RLC_TRY {
-			fp48_new(t);
-
-			fp48_copy(t, a);
-			for (i = bn_bits(b) - 2; i >= 0; i--) {
-				fp48_sqr_cyc(t, t);
-				if (bn_get_bit(b, i)) {
-					fp48_mul(t, t, a);
-				}
-			}
-
-			fp48_copy(c, t);
-			if (bn_sign(b) == RLC_NEG) {
-				fp48_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			fp48_free(t);
-		}
-	} else {
-		fp48_t t, *u = RLC_ALLOCA(fp48_t, w);
-
-		fp48_null(t);
-
-		RLC_TRY {
-			if (u == NULL) {
-				RLC_THROW(ERR_NO_MEMORY);
-			}
-			for (i = 0; i < w; i++) {
-				fp48_null(u[i]);
-				fp48_new(u[i]);
-			}
-			fp48_new(t);
-
-			j = 0;
-			fp48_copy(t, a);
-			for (i = 1; i < bn_bits(b); i++) {
-				fp48_sqr_pck(t, t);
-				if (bn_get_bit(b, i)) {
-					fp48_copy(u[j++], t);
-				}
-			}
-
-			if (!bn_is_even(b)) {
-				j = 0;
-				k = w - 1;
-			} else {
-				j = 1;
-				k = w;
-			}
-
-			fp48_back_cyc_sim(u, u, k);
-
-			if (!bn_is_even(b)) {
-				fp48_copy(c, a);
-			} else {
-				fp48_copy(c, u[0]);
-			}
-
-			for (i = j; i < k; i++) {
-				fp48_mul(c, c, u[i]);
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp48_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			for (i = 0; i < w; i++) {
-				fp48_free(u[i]);
-			}
-			fp48_free(t);
-			RLC_FREE(u);
-		}
-	}
-}
-
-void fp48_exp_cyc_sps(fp48_t c, fp48_t a, const int *b, int len, int sign) {
-	int i, j, k, w = len;
-    fp48_t t, *u = RLC_ALLOCA(fp48_t, w);
-
-	if (len == 0) {
-		RLC_FREE(u);
-		fp48_set_dig(c, 1);
-		return;
-	}
-
-	fp48_null(t);
-
-	RLC_TRY {
-		if (u == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < w; i++) {
-			fp48_null(u[i]);
-			fp48_new(u[i]);
-		}
-		fp48_new(t);
-
-		fp48_copy(t, a);
-		if (b[0] == 0) {
-			for (j = 0, i = 1; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp48_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp48_inv_cyc(u[i - 1], t);
-				} else {
-					fp48_copy(u[i - 1], t);
-				}
-			}
-
-			fp48_back_cyc_sim(u, u, w - 1);
-
-			fp48_copy(c, a);
-			for (i = 0; i < w - 1; i++) {
-				fp48_mul(c, c, u[i]);
-			}
-		} else {
-			for (j = 0, i = 0; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp48_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp48_inv_cyc(u[i], t);
-				} else {
-					fp48_copy(u[i], t);
-				}
-			}
-
-			fp48_back_cyc_sim(u, u, w);
-
-			fp48_copy(c, u[0]);
-			for (i = 1; i < w; i++) {
-				fp48_mul(c, c, u[i]);
-			}
-		}
-
-		if (sign == RLC_NEG) {
-			fp48_inv_cyc(c, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < w; i++) {
-			fp48_free(u[i]);
-		}
-		fp48_free(t);
-		RLC_FREE(u);
-	}
-}
-
-void fp54_conv_cyc(fp54_t c, fp54_t a) {
-	fp54_t t;
-
-	fp54_null(t);
-
-	RLC_TRY {
-		fp54_new(t);
-
-		/* First, compute c = a^(p^27 - 1). */
-		/* t = a^{-1}. */
-		fp54_inv(t, a);
-		/* c = a^(p^27). */
-		fp54_inv_cyc(c, a);
-		/* c = a^(p^27 - 1). */
-		fp54_mul(c, c, t);
-
-		/* Second, compute c^(p^9 + 1). */
-		/* t = c^(p^9). */
-		fp54_frb(t, c, 9);
-
-		/* c = c^(p^9 + 1). */
-		fp54_mul(c, c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp54_free(t);
-	}
-}
-
-int fp54_test_cyc(fp54_t a) {
-	fp54_t t0, t1;
-	int result = 0;
-
-	fp54_null(t0);
-	fp54_null(t1);
-
-	RLC_TRY {
-		fp54_new(t0);
-		fp54_new(t1);
-
-		/* Check if a^(p^18 - p^9 + 1) == 1. */
-		fp54_frb(t0, a, 18);
-		fp54_mul(t0, t0, a);
-		fp54_frb(t1, a, 9);
-		result = ((fp54_cmp(t0, t1) == RLC_EQ) ? 1 : 0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp54_free(t0);
-		fp54_free(t1);
-	}
-
-	return result;
-}
-
-void fp54_back_cyc(fp54_t c, fp54_t a) {
-	fp9_t t0, t1, t2;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-
-		/* t0 = g4^2. */
-		fp9_sqr(t0, a[2][0]);
-		/* t1 = 3 * g4^2 - 2 * g3. */
-		fp9_sub(t1, t0, a[1][1]);
-		fp9_dbl(t1, t1);
-		fp9_add(t1, t1, t0);
-		/* t0 = E * g5^2 + t1. */
-		fp9_sqr(t2, a[2][1]);
-		fp9_mul_art(t0, t2);
-		fp9_add(t0, t0, t1);
-		/* t1 = 1/(4 * g2). */
-		fp9_dbl(t1, a[1][0]);
-		fp9_dbl(t1, t1);
-		fp9_inv(t1, t1);
-		/* c_1 = g1. */
-		fp9_mul(c[0][1], t0, t1);
-
-		/* t1 = g3 * g4. */
-		fp9_mul(t1, a[1][1], a[2][0]);
-		/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-		fp9_sqr(t2, c[0][1]);
-		fp9_sub(t2, t2, t1);
-		fp9_dbl(t2, t2);
-		fp9_sub(t2, t2, t1);
-		/* t1 = g2 * g5. */
-		fp9_mul(t1, a[1][0], a[2][1]);
-		/* c_0 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-		fp9_add(t2, t2, t1);
-		fp9_mul_art(c[0][0], t2);
-		fp_add_dig(c[0][0][0][0], c[0][0][0][0], 1);
-
-		fp9_copy(c[1][0], a[1][0]);
-		fp9_copy(c[1][1], a[1][1]);
-		fp9_copy(c[2][0], a[2][0]);
-		fp9_copy(c[2][1], a[2][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-	}
-}
-
-void fp54_back_cyc_sim(fp54_t c[], fp54_t a[], int n) {
-    fp9_t *t = RLC_ALLOCA(fp9_t, n * 3);
-    fp9_t
-        *t0 = t + 0 * n,
-        *t1 = t + 1 * n,
-        *t2 = t + 2 * n;
-
-	if (n == 0) {
-		RLC_FREE(t);
-		return;
-	}
-
-	RLC_TRY {
-		if (t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (int i = 0; i < n; i++) {
-			fp9_null(t0[i]);
-			fp9_null(t1[i]);
-			fp9_null(t2[i]);
-			fp9_new(t0[i]);
-			fp9_new(t1[i]);
-			fp9_new(t2[i]);
-		}
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g4^2. */
-			fp9_sqr(t0[i], a[i][2][0]);
-			/* t1 = 3 * g4^2 - 2 * g3. */
-			fp9_sub(t1[i], t0[i], a[i][1][1]);
-			fp9_dbl(t1[i], t1[i]);
-			fp9_add(t1[i], t1[i], t0[i]);
-			/* t0 = E * g5^2 + t1. */
-			fp9_sqr(t2[i], a[i][2][1]);
-			fp9_mul_art(t0[i], t2[i]);
-			fp9_add(t0[i], t0[i], t1[i]);
-			/* t1 = (4 * g2). */
-			fp9_dbl(t1[i], a[i][1][0]);
-			fp9_dbl(t1[i], t1[i]);
-		}
-
-		/* t1 = 1 / t1. */
-		fp9_inv_sim(t1, t1, n);
-
-		for (int i = 0; i < n; i++) {
-			/* t0 = g1. */
-			fp9_mul(c[i][0][1], t0[i], t1[i]);
-
-			/* t1 = g3 * g4. */
-			fp9_mul(t1[i], a[i][1][1], a[i][2][0]);
-			/* t2 = 2 * g1^2 - 3 * g3 * g4. */
-			fp9_sqr(t2[i], c[i][0][1]);
-			fp9_sub(t2[i], t2[i], t1[i]);
-			fp9_dbl(t2[i], t2[i]);
-			fp9_sub(t2[i], t2[i], t1[i]);
-			/* t1 = g2 * g5. */
-			fp9_mul(t1[i], a[i][1][0], a[i][2][1]);
-			/* t2 = E * (2 * g1^2 + g2 * g5 - 3 * g3 * g4) + 1. */
-			fp9_add(t2[i], t2[i], t1[i]);
-			fp9_mul_art(c[i][0][0], t2[i]);
-			fp_add_dig(c[i][0][0][0][0], c[i][0][0][0][0], 1);
-
-			fp9_copy(c[i][1][0], a[i][1][0]);
-			fp9_copy(c[i][1][1], a[i][1][1]);
-			fp9_copy(c[i][2][0], a[i][2][0]);
-			fp9_copy(c[i][2][1], a[i][2][1]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		for (int i = 0; i < n; i++) {
-			fp9_free(t0[i]);
-			fp9_free(t1[i]);
-			fp9_free(t2[i]);
-		}
-		RLC_FREE(t);
-	}
-}
-
-void fp54_exp_cyc(fp54_t c, fp54_t a, bn_t b) {
-	int i, j, k, w = bn_ham(b);
-
-	if (bn_is_zero(b)) {
-		return fp54_set_dig(c, 1);
-	}
-
-	if ((bn_bits(b) > RLC_DIG) && ((w << 3) > bn_bits(b))) {
-		fp54_t t;
-
-		fp54_null(t)
-
-		RLC_TRY {
-			fp54_new(t);
-
-			fp54_copy(t, a);
-
-			for (i = bn_bits(b) - 2; i >= 0; i--) {
-				fp54_sqr_cyc(t, t);
-				if (bn_get_bit(b, i)) {
-					fp54_mul(t, t, a);
-				}
-			}
-
-			fp54_copy(c, t);
-			if (bn_sign(b) == RLC_NEG) {
-				fp54_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			fp54_free(t);
-		}
-	} else {
-		fp54_t t, *u = RLC_ALLOCA(fp54_t, w);
-
-		fp54_null(t);
-
-		RLC_TRY {
-			if (u == NULL) {
-				RLC_THROW(ERR_NO_MEMORY)
-			}
-			for (i = 0; i < w; i++) {
-				fp54_null(u[i]);
-				fp54_new(u[i]);
-			}
-			fp54_new(t);
-
-			j = 0;
-			fp54_copy(t, a);
-			for (i = 1; i < bn_bits(b); i++) {
-				fp54_sqr_pck(t, t);
-				if (bn_get_bit(b, i)) {
-					fp54_copy(u[j++], t);
-				}
-			}
-
-			if (!bn_is_even(b)) {
-				j = 0;
-				k = w - 1;
-			} else {
-				j = 1;
-				k = w;
-			}
-
-			fp54_back_cyc_sim(u, u, k);
-
-			if (!bn_is_even(b)) {
-				fp54_copy(c, a);
-			} else {
-				fp54_copy(c, u[0]);
-			}
-
-			for (i = j; i < k; i++) {
-				fp54_mul(c, c, u[i]);
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp54_inv_cyc(c, c);
-			}
-		}
-		RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		}
-		RLC_FINALLY {
-			for (i = 0; i < w; i++) {
-				fp54_free(u[i]);
-			}
-			fp54_free(t);
-			RLC_FREE(u);
-		}
-	}
-}
-
-void fp54_exp_cyc_sps(fp54_t c, fp54_t a, const int *b, int len, int sign) {
-	int i, j, k, w = len;
-    fp54_t t, *u = RLC_ALLOCA(fp54_t, w);
-
-	if (len == 0) {
-		RLC_FREE(u);
-		fp54_set_dig(c, 1);
-		return;
-	}
-
-	fp54_null(t);
-
-	RLC_TRY {
-		if (u == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < w; i++) {
-			fp54_null(u[i]);
-			fp54_new(u[i]);
-		}
-		fp54_new(t);
-
-		fp54_copy(t, a);
-		if (b[0] == 0) {
-			for (j = 0, i = 1; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp54_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp54_inv_cyc(u[i - 1], t);
-				} else {
-					fp54_copy(u[i - 1], t);
-				}
-			}
-
-			fp54_back_cyc_sim(u, u, w - 1);
-
-			fp54_copy(c, a);
-			for (i = 0; i < w - 1; i++) {
-				fp54_mul(c, c, u[i]);
-			}
-		} else {
-			for (j = 0, i = 0; i < len; i++) {
-				k = (b[i] < 0 ? -b[i] : b[i]);
-				for (; j < k; j++) {
-					fp54_sqr_pck(t, t);
-				}
-				if (b[i] < 0) {
-					fp54_inv_cyc(u[i], t);
-				} else {
-					fp54_copy(u[i], t);
-				}
-			}
-
-			fp54_back_cyc_sim(u, u, w);
-
-			fp54_copy(c, u[0]);
-			for (i = 1; i < w; i++) {
-				fp54_mul(c, c, u[i]);
-			}
-		}
-
-		if (sign == RLC_NEG) {
-			fp54_inv_cyc(c, c);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < w; i++) {
-			fp54_free(u[i]);
-		}
-		fp54_free(t);
-		RLC_FREE(u);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_exp.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_exp.c
deleted file mode 100644
index e559e7ffe510..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_exp.c
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of exponentiation in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_exp(fp2_t c, fp2_t a, bn_t b) {
-	fp2_t t;
-
-	if (bn_is_zero(b)) {
-		fp2_set_dig(c, 1);
-		return;
-	}
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		fp2_copy(t, a);
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp2_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp2_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp2_inv(c, t);
-		} else {
-			fp2_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-void fp2_exp_dig(fp2_t c, fp2_t a, dig_t b) {
-	fp2_t t;
-
-	if (b == 0) {
-		fp2_set_dig(c, 1);
-		return;
-	}
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		fp2_copy(t, a);
-		for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-			fp2_sqr(t, t);
-			if (b & ((dig_t)1 << i)) {
-				fp2_mul(t, t, a);
-			}
-		}
-
-		fp2_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-void fp3_exp(fp3_t c, fp3_t a, bn_t b) {
-	fp3_t t;
-
-	if (bn_is_zero(b)) {
-		fp3_set_dig(c, 1);
-		return;
-	}
-
-	fp3_null(t);
-
-	RLC_TRY {
-		fp3_new(t);
-
-		fp3_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp3_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp3_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp3_inv(c, t);
-		} else {
-			fp3_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp3_free(t);
-	}
-}
-
-void fp4_exp(fp4_t c, fp4_t a, bn_t b) {
-	fp4_t t;
-
-	if (bn_is_zero(b)) {
-		fp4_set_dig(c, 1);
-		return;
-	}
-
-	fp4_null(t);
-
-	RLC_TRY {
-		fp4_new(t);
-
-		fp4_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp4_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp4_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp4_inv(c, t);
-		} else {
-			fp4_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t);
-	}
-}
-
-void fp6_exp(fp6_t c, fp6_t a, bn_t b) {
-	fp6_t t;
-
-	if (bn_is_zero(b)) {
-		fp6_set_dig(c, 1);
-		return;
-	}
-
-	fp6_null(t);
-
-	RLC_TRY {
-		fp6_new(t);
-
-		fp6_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp6_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp6_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp6_inv(c, t);
-		} else {
-			fp6_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp6_free(t);
-	}
-}
-
-void fp8_exp(fp8_t c, fp8_t a, bn_t b) {
-	fp8_t t;
-
-	if (bn_is_zero(b)) {
-		fp8_set_dig(c, 1);
-		return;
-	}
-
-	fp8_null(t);
-
-	RLC_TRY {
-		fp8_new(t);
-
-		if (fp8_test_cyc(a)) {
-			fp8_exp_cyc(c, a, b);
-		} else {
-			fp8_copy(t, a);
-
-			for (int i = bn_bits(b) - 2; i >= 0; i--) {
-				fp8_sqr(t, t);
-				if (bn_get_bit(b, i)) {
-					fp8_mul(t, t, a);
-				}
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp8_inv(c, t);
-			} else {
-				fp8_copy(c, t);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t);
-	}
-}
-
-void fp9_exp(fp9_t c, fp9_t a, bn_t b) {
-	fp9_t t;
-
-	if (bn_is_zero(b)) {
-		fp9_set_dig(c, 1);
-		return;
-	}
-
-	fp9_null(t);
-
-	RLC_TRY {
-		fp9_new(t);
-
-		fp9_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp9_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp9_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp9_inv(c, t);
-		} else {
-			fp9_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(t);
-	}
-}
-
-void fp12_exp(fp12_t c, fp12_t a, bn_t b) {
-	fp12_t t;
-
-	if (bn_is_zero(b)) {
-		fp12_set_dig(c, 1);
-		return;
-	}
-
-	fp12_null(t);
-
-	RLC_TRY {
-		fp12_new(t);
-
-		if (fp12_test_cyc(a)) {
-			fp12_exp_cyc(c, a, b);
-		} else {
-			fp12_copy(t, a);
-
-			for (int i = bn_bits(b) - 2; i >= 0; i--) {
-				fp12_sqr(t, t);
-				if (bn_get_bit(b, i)) {
-					fp12_mul(t, t, a);
-				}
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp12_inv(c, t);
-			} else {
-				fp12_copy(c, t);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(t);
-	}
-}
-
-void fp12_exp_dig(fp12_t c, fp12_t a, dig_t b) {
-	bn_t _b;
-	fp12_t t, v;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	if (b == 0) {
-		fp12_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(_b);
-	fp12_null(t);
-	fp12_null(v);
-
-	RLC_TRY {
-		bn_new(_b);
-		fp12_new(t);
-		fp12_new(v);
-
-		fp12_copy(t, a);
-
-		if (fp12_test_cyc(a)) {
-			fp12_inv_cyc(v, a);
-			bn_set_dig(_b, b);
-
-			l = RLC_DIG + 1;
-			bn_rec_naf(naf, &l, _b, 2);
-
-			for (int i = bn_bits(_b) - 2; i >= 0; i--) {
-				fp12_sqr_cyc(t, t);
-
-				u = naf[i];
-				if (u > 0) {
-					fp12_mul(t, t, a);
-				} else if (u < 0) {
-					fp12_mul(t, t, v);
-				}
-			}
-		} else {
-			for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-				fp12_sqr(t, t);
-				if (b & ((dig_t)1 << i)) {
-					fp12_mul(t, t, a);
-				}
-			}
-		}
-
-		fp12_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(_b);
-		fp12_free(t);
-		fp12_free(v);
-	}
-}
-
-void fp18_exp(fp18_t c, fp18_t a, bn_t b) {
-	fp18_t t;
-
-	if (bn_is_zero(b)) {
-		fp18_set_dig(c, 1);
-		return;
-	}
-
-	fp18_null(t);
-
-	RLC_TRY {
-		fp18_new(t);
-
-		fp18_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp18_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp18_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp18_inv(c, t);
-		} else {
-			fp18_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp18_free(t);
-	}
-}
-
-void fp24_exp(fp24_t c, fp24_t a, bn_t b) {
-	fp24_t t;
-
-	if (bn_is_zero(b)) {
-		fp24_set_dig(c, 1);
-		return;
-	}
-
-	fp24_null(t);
-
-	RLC_TRY {
-		fp24_new(t);
-
-		fp24_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp24_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp24_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp24_inv(c, t);
-		} else {
-			fp24_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp24_free(t);
-	}
-}
-
-void fp24_exp_dig(fp24_t c, fp24_t a, dig_t b) {
-	bn_t _b;
-	fp24_t t, v;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	if (b == 0) {
-		fp24_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(_b);
-	fp24_null(t);
-	fp24_null(v);
-
-	RLC_TRY {
-		bn_new(_b);
-		fp24_new(t);
-		fp24_new(v);
-
-		fp24_copy(t, a);
-
-		if (fp24_test_cyc(a)) {
-			fp24_inv_cyc(v, a);
-			bn_set_dig(_b, b);
-
-			l = RLC_DIG + 1;
-			bn_rec_naf(naf, &l, _b, 2);
-
-			for (int i = bn_bits(_b) - 2; i >= 0; i--) {
-				fp24_sqr_cyc(t, t);
-
-				u = naf[i];
-				if (u > 0) {
-					fp24_mul(t, t, a);
-				} else if (u < 0) {
-					fp24_mul(t, t, v);
-				}
-			}
-		} else {
-			for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-				fp24_sqr(t, t);
-				if (b & ((dig_t)1 << i)) {
-					fp24_mul(t, t, a);
-				}
-			}
-		}
-
-		fp24_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(_b);
-		fp24_free(t);
-		fp24_free(v);
-	}
-}
-
-void fp48_exp(fp48_t c, fp48_t a, bn_t b) {
-	fp48_t t;
-
-	if (bn_is_zero(b)) {
-		fp48_set_dig(c, 1);
-		return;
-	}
-
-	fp48_null(t);
-
-	RLC_TRY {
-		fp48_new(t);
-
-		if (fp48_test_cyc(a)) {
-			fp48_exp_cyc(c, a, b);
-		} else {
-			fp48_copy(t, a);
-
-			for (int i = bn_bits(b) - 2; i >= 0; i--) {
-				fp48_sqr(t, t);
-				if (bn_get_bit(b, i)) {
-					fp48_mul(t, t, a);
-				}
-			}
-
-			if (bn_sign(b) == RLC_NEG) {
-				fp48_inv(c, t);
-			} else {
-				fp48_copy(c, t);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp48_free(t);
-	}
-}
-
-void fp48_exp_dig(fp48_t c, fp48_t a, dig_t b) {
-	bn_t _b;
-	fp48_t t, v;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	if (b == 0) {
-		fp48_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(_b);
-	fp48_null(t);
-	fp48_null(v);
-
-	RLC_TRY {
-		bn_new(_b);
-		fp48_new(t);
-		fp48_new(v);
-
-		fp48_copy(t, a);
-
-		if (fp48_test_cyc(a)) {
-			fp48_inv_cyc(v, a);
-			bn_set_dig(_b, b);
-
-			l = RLC_DIG + 1;
-			bn_rec_naf(naf, &l, _b, 2);
-
-			for (int i = bn_bits(_b) - 2; i >= 0; i--) {
-				fp48_sqr_cyc(t, t);
-
-				u = naf[i];
-				if (u > 0) {
-					fp48_mul(t, t, a);
-				} else if (u < 0) {
-					fp48_mul(t, t, v);
-				}
-			}
-		} else {
-			for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-				fp48_sqr(t, t);
-				if (b & ((dig_t)1 << i)) {
-					fp48_mul(t, t, a);
-				}
-			}
-		}
-
-		fp48_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(_b);
-		fp48_free(t);
-		fp48_free(v);
-	}
-}
-
-void fp54_exp(fp54_t c, fp54_t a, bn_t b) {
-	fp54_t t;
-
-	if (bn_is_zero(b)) {
-		fp54_set_dig(c, 1);
-		return;
-	}
-
-	fp54_null(t);
-
-	RLC_TRY {
-		fp54_new(t);
-
-		fp54_copy(t, a);
-
-		for (int i = bn_bits(b) - 2; i >= 0; i--) {
-			fp54_sqr(t, t);
-			if (bn_get_bit(b, i)) {
-				fp54_mul(t, t, a);
-			}
-		}
-
-		if (bn_sign(b) == RLC_NEG) {
-			fp54_inv(c, t);
-		} else {
-			fp54_copy(c, t);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp54_free(t);
-	}
-}
-
-void fp54_exp_dig(fp54_t c, fp54_t a, dig_t b) {
-	bn_t _b;
-	fp54_t t, v;
-	int8_t u, naf[RLC_DIG + 1];
-	int l;
-
-	if (b == 0) {
-		fp54_set_dig(c, 1);
-		return;
-	}
-
-	bn_null(_b);
-	fp54_null(t);
-	fp54_null(v);
-
-	RLC_TRY {
-		bn_new(_b);
-		fp54_new(t);
-		fp54_new(v);
-
-		fp54_copy(t, a);
-
-		if (fp54_test_cyc(a)) {
-			fp54_inv_cyc(v, a);
-			bn_set_dig(_b, b);
-
-			l = RLC_DIG + 1;
-			bn_rec_naf(naf, &l, _b, 2);
-
-			for (int i = bn_bits(_b) - 2; i >= 0; i--) {
-				fp54_sqr_cyc(t, t);
-
-				u = naf[i];
-				if (u > 0) {
-					fp54_mul(t, t, a);
-				} else if (u < 0) {
-					fp54_mul(t, t, v);
-				}
-			}
-		} else {
-			for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-				fp54_sqr(t, t);
-				if (b & ((dig_t)1 << i)) {
-					fp54_mul(t, t, a);
-				}
-			}
-		}
-
-		fp54_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(_b);
-		fp54_free(t);
-		fp54_free(v);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_field.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_field.c
deleted file mode 100644
index 92d9557e3779..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_field.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of configuration for prime field extensions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp2_field_get_qnr() {
-	/* Override some of the results when cubic non-residue is also needed. */
-#if FP_PRIME == 158 || FP_PRIME == 256
-	return 4;
-#elif FP_PRIME == 446
-	return 16;
-#else
-	return core_get()->qnr2;
-#endif
-}
-
-void fp2_field_init(void) {
-	bn_t e;
-	fp2_t t0, t1;
-	ctx_t *ctx = core_get();
-
-	bn_null(e);
-	fp2_null(t0);
-	fp2_null(t1);
-
-	RLC_TRY {
-		bn_new(e);
-		fp2_new(t0);
-		fp2_new(t1);
-
-		/* Start by finding a quadratic/cubic non-residue. */
-#ifdef FP_QNRES
-		ctx->qnr2 = 1;
-#else
-		/* First start with u as quadratic non-residue. */
-		ctx->qnr2 = 0;
-		fp_zero(t0[0]);
-		fp_set_dig(t0[1], 1);
-		/* If it does not work, attempt (u + 2), otherwise double. */
-		if (fp2_srt(t1, t0) == 1) {
-			ctx->qnr2 = 2;
-			fp_set_dig(t0[0], ctx->qnr2);
-			while (fp2_srt(t1, t0) == 1 && util_bits_dig(ctx->qnr2) < RLC_DIG - 1) {
-				/* Pick a power of 2 for efficiency. */
-				ctx->qnr2 *= 2;
-				fp_set_dig(t0[0], ctx->qnr2);
-			}
-		}
-#endif /* !FP_QNRES */
-
-		/* Compute QNR^(p - 1)/6 and consecutive powers. */
-		fp2_set_dig(t1, 1);
-		fp2_mul_nor(t0, t1);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_sub_dig(e, e, 1);
-		bn_div_dig(e, e, 6);
-		fp2_exp(t0, t0, e);
-		fp_copy(ctx->fp2_p1[0][0], t0[0]);
-		fp_copy(ctx->fp2_p1[0][1], t0[1]);
-		fp2_sqr(t1, t0);
-		fp_copy(ctx->fp2_p1[1][0], t1[0]);
-		fp_copy(ctx->fp2_p1[1][1], t1[1]);
-		fp2_mul(t1, t1, t0);
-		fp_copy(ctx->fp2_p1[2][0], t1[0]);
-		fp_copy(ctx->fp2_p1[2][1], t1[1]);
-		fp2_sqr(t1, t0);
-		fp2_sqr(t1, t1);
-		fp_copy(ctx->fp2_p1[3][0], t1[0]);
-		fp_copy(ctx->fp2_p1[3][1], t1[1]);
-		fp2_mul(t1, t1, t0);
-		fp_copy(ctx->fp2_p1[4][0], t1[0]);
-		fp_copy(ctx->fp2_p1[4][1], t1[1]);
-
-		/* Compute QNR^(p - (p mod 4))/4. */
-		fp2_set_dig(t1, 1);
-		fp2_mul_nor(t0, t1);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 4);
-		fp2_exp(t0, t0, e);
-		fp_copy(ctx->fp2_p2[0][0], t0[0]);
-		fp_copy(ctx->fp2_p2[0][1], t0[1]);
-
-		/* Compute QNR^(p - (p mod 12))/12. */
-		fp2_set_dig(t1, 1);
-		fp2_mul_nor(t0, t1);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 12);
-		fp2_exp(t0, t0, e);
-		fp_copy(ctx->fp2_p2[1][0], t0[0]);
-		fp_copy(ctx->fp2_p2[1][1], t0[1]);
-
-		/* Compute QNR^(p - (p mod 24))/24. */
-		fp2_set_dig(t1, 1);
-		fp2_mul_nor(t0, t1);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 24);
-		fp2_exp(t0, t0, e);
-		fp_copy(ctx->fp2_p2[2][0], t0[0]);
-		fp_copy(ctx->fp2_p2[2][1], t0[1]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(e);
-		fp2_free(t0);
-		fp2_free(t1);
-	}
-}
-
-void fp3_field_init(void) {
-	bn_t e;
-	fp3_t t0, t1, t2;
-	ctx_t *ctx = core_get();
-
-	bn_null(e);
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-
-	RLC_TRY {
-		bn_new(e);
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-
-		/* Compute t0 = u^((p - (p mod 3))/3). */
-		if (fp_prime_get_cnr() < 0) {
-			fp_set_dig(ctx->fp3_p0[0], -fp_prime_get_cnr());
-			fp_neg(ctx->fp3_p0[0], ctx->fp3_p0[0]);
-		} else {
-			fp_set_dig(ctx->fp3_p0[0], fp_prime_get_cnr());
-		}
-		bn_read_raw(e, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 3);
-		fp_exp(ctx->fp3_p0[0], ctx->fp3_p0[0], e);
-		fp_sqr(ctx->fp3_p0[1], ctx->fp3_p0[0]);
-
-		/* Compute t0 = u^((p - (p mod 6))/6). */
-		fp3_zero(t0);
-		fp_set_dig(t0[1], 1);
-		bn_read_raw(e, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 6);
-		fp3_exp(t0, t0, e);
-
-		/* Look for a non-trivial subfield element.. */
-		ctx->frb3[0] = 0;
-		while (ctx->frb3[0] < 3 && fp_is_zero(t0[ctx->frb3[0]++]));
-		/* Fill rest of table with powers of constant. */
-		fp_copy(ctx->fp3_p1[0], t0[--ctx->frb3[0] % 3]);
-		fp3_sqr(t1, t0);
-		fp_copy(ctx->fp3_p1[1], t1[(2 * ctx->frb3[0]) % 3]);
-		fp3_mul(t2, t1, t0);
-		fp_copy(ctx->fp3_p1[2], t2[(3 * ctx->frb3[0]) % 3]);
-		fp3_sqr(t2, t1);
-		fp_copy(ctx->fp3_p1[3], t2[(4 * ctx->frb3[0]) % 3]);
-		fp3_mul(t2, t2, t0);
-		fp_copy(ctx->fp3_p1[4], t2[(5 * ctx->frb3[0]) % 3]);
-
-		/* Compute t0 = u^((p - (p mod 9))/9). */
-		fp3_zero(t0);
-		fp_set_dig(t0[1], 1);
-		bn_read_raw(e, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 9);
-		fp3_exp(t0, t0, e);
-		/* Look for a non-trivial subfield element.. */
-		ctx->frb3[1] = 0;
-		while (ctx->frb3[1] < 3 && fp_is_zero(t0[ctx->frb3[1]++]));
-		fp_copy(ctx->fp3_p2[0], t0[--ctx->frb3[1]]);
-
-		/* Compute t0 = u^((p - (p mod 18))/18). */
-		fp3_zero(t0);
-		fp_set_dig(t0[1], 1);
-		bn_read_raw(e, fp_prime_get(), RLC_FP_DIGS);
-		bn_div_dig(e, e, 18);
-		fp3_exp(t0, t0, e);
-		/* Look for a non-trivial subfield element.. */
-		ctx->frb3[2] = 0;
-		while (ctx->frb3[2] < 3 && fp_is_zero(t0[ctx->frb3[2]++]));
-		fp_copy(ctx->fp3_p2[1], t0[--ctx->frb3[2]]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(e);
-		fp3_free(t0);
-		fp3_free(t1);
-		fp3_free(t2);
-	}
-}
-
-void fp4_field_init() {
-	bn_t e;
-	fp4_t t0;
-	ctx_t *ctx = core_get();
-
-	bn_null(e);
-	fp4_null(t0);
-
-	RLC_TRY {
-		bn_new(e);
-		fp4_new(t0);
-
-		fp4_set_dig(t0, 1);
-		fp4_mul_art(t0, t0);
-		e->used = RLC_FP_DIGS;
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		bn_sub_dig(e, e, 1);
-		bn_div_dig(e, e, 6);
-		fp4_exp(t0, t0, e);
-		fp_copy(ctx->fp4_p1[0], t0[1][0]);
-		fp_copy(ctx->fp4_p1[1], t0[1][1]);
-	} RLC_CATCH_ANY {
-	    RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(e);
-		fp4_free(t0);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_frb.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_frb.c
deleted file mode 100644
index 2f16e66576a9..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_frb.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of frobenius action in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_frb(fp2_t c, fp2_t a, int i) {
-	switch (i % 2) {
-		case 0:
-			fp2_copy(c, a);
-			break;
-		case 1:
-			/* (a_0 + a_1 * u)^p = a_0 - a_1 * u. */
-			fp_copy(c[0], a[0]);
-			fp_neg(c[1], a[1]);
-			break;
-	}
-}
-
-void fp3_frb(fp3_t c, fp3_t a, int i) {
-	fp3_copy(c, a);
-	switch (i % 3) {
-		case 1:
-			fp3_mul_frb(c, c, 0, 1);
-			break;
-		case 2:
-			fp3_mul_frb(c, c, 0, 2);
-			break;
-	}
-}
-
-void fp4_frb(fp4_t c, fp4_t a, int i) {
-	/* Cost of a single multiplication in Fp^2 per Frobenius. */
-	fp4_copy(c, a);
-	for (; i % 4 > 0; i--) {
-		fp2_frb(c[0], c[0], 1);
-		fp2_frb(c[1], c[1], 1);
-		fp2_mul_frb(c[1], c[1], 1, 3);
-	}
-}
-
-void fp6_frb(fp6_t c, fp6_t a, int i) {
-	/* Cost of two multiplication in Fp^2 per Frobenius. */
-	fp6_copy(c, a);
-	for (; i % 6 > 0; i--) {
-		fp2_frb(c[0], c[0], 1);
-		fp2_frb(c[1], c[1], 1);
-		fp2_frb(c[2], c[2], 1);
-		fp2_mul_frb(c[1], c[1], 1, 2);
-		fp2_mul_frb(c[2], c[2], 1, 4);
-	}
-}
-
-void fp8_frb(fp8_t c, fp8_t a, int i) {
-	/* Cost of four multiplication in Fp^2 per Frobenius. */
-	fp8_copy(c, a);
-	for (; i % 8 > 0; i--) {
-		fp4_frb(c[0], c[0], 1);
-		fp4_frb(c[1], c[1], 1);
-		fp2_mul_frb(c[1][0], c[1][0], 2, 1);
-		fp2_mul_frb(c[1][1], c[1][1], 2, 1);
-		if (fp_prime_get_mod8() != 1) {
-			fp4_mul_art(c[1], c[1]);
-		}
-	}
-}
-
-void fp9_frb(fp9_t c, fp9_t a, int i) {
-	/* Cost of two multiplication in Fp^3 per Frobenius. */
-	fp9_copy(c, a);
-	for (; i % 9 > 0; i--) {
-		fp3_frb(c[0], c[0], 1);
-		fp3_frb(c[1], c[1], 1);
-		fp3_frb(c[2], c[2], 1);
-		fp3_mul_frb(c[1], c[1], 1, 2);
-		fp3_mul_frb(c[2], c[2], 1, 4);
-	}
-}
-
-void fp12_frb(fp12_t c, fp12_t a, int i) {
-	/* Cost of five multiplication in Fp^2 per Frobenius. */
-	fp12_copy(c, a);
-	for (; i % 12 > 0; i--) {
-		fp6_frb(c[0], c[0], 1);
-		fp2_frb(c[1][0], c[1][0], 1);
-		fp2_frb(c[1][1], c[1][1], 1);
-		fp2_frb(c[1][2], c[1][2], 1);
-		fp2_mul_frb(c[1][0], c[1][0], 1, 1);
-		fp2_mul_frb(c[1][1], c[1][1], 1, 3);
-		fp2_mul_frb(c[1][2], c[1][2], 1, 5);
-	}
-}
-
-void fp18_frb(fp18_t c, fp18_t a, int i) {
-	/* Cost of five multiplication in Fp^2 per Frobenius. */
-	fp18_copy(c, a);
-	for (; i % 18 > 0; i--) {
-		fp9_frb(c[0], c[0], 1);
-		fp3_frb(c[1][0], c[1][0], 1);
-		fp3_frb(c[1][1], c[1][1], 1);
-		fp3_frb(c[1][2], c[1][2], 1);
-		fp3_mul_frb(c[1][0], c[1][0], 1, 1);
-		fp3_mul_frb(c[1][1], c[1][1], 1, 3);
-		fp3_mul_frb(c[1][2], c[1][2], 1, 5);
-	}
-}
-
-void fp24_frb(fp24_t c, fp24_t a, int i) {
-	/* Cost of 20 multiplication in Fp^2 per Frobenius. */
-	fp24_copy(c, a);
-	for (; i % 24 > 0; i--) {
-		fp8_frb(c[0], c[0], 1);
-		fp8_frb(c[1], c[1], 1);
-		fp8_frb(c[2], c[2], 1);
-		for (int j = 0; j < 2; j++) {
-			for (int l = 0; l < 2; l++) {
-				fp2_mul_frb(c[1][j][l], c[1][j][l], 2, 2);
-				fp2_mul_frb(c[2][j][l], c[2][j][l], 1, 1);
-			}
-			if ((fp_prime_get_mod8() % 4) == 3) {
-				fp4_mul_art(c[1][j], c[1][j]);
-			}
-		}
-	}
-}
-
-void fp48_frb(fp48_t c, fp48_t a, int i) {
-	/* Cost of 52 multiplication in Fp^2 per Frobenius. */
-	fp48_copy(c, a);
-	for (; i % 48 > 0; i--) {
-		fp24_frb(c[0], c[0], 1);
-		fp24_frb(c[1], c[1], 1);
-		for (int j = 0; j < 3; j++) {
-			for (int k = 0; k < 2; k++) {
-				for (int l = 0; l < 2; l++) {
-					fp2_mul_frb(c[1][j][k][l], c[1][j][k][l], 2, 3);
-				}
-				if (fp_prime_get_mod8() == 3) {
-					fp4_mul_art(c[1][j][k], c[1][j][k]);
-				}
-			}
-			if ((fp_prime_get_mod8() % 4) == 3) {
-				fp8_mul_art(c[1][j], c[1][j]);
-			}
-		}
-	}
-}
-
-void fp54_frb(fp54_t c, fp54_t a, int i) {
-	/* Cost of 20 multiplication in Fp^2 per Frobenius. */
-	fp54_copy(c, a);
-	for (; i % 54 > 0; i--) {
-		fp18_frb(c[0], c[0], 1);
-		fp18_frb(c[1], c[1], 1);
-		fp18_frb(c[2], c[2], 1);
-		for (int j = 0; j < 2; j++) {
-			for (int l = 0; l < 3; l++) {
-				fp3_mul_frb(c[1][j][l], c[1][j][l], 2, 2);
-				fp3_mul_frb(c[2][j][l], c[2][j][l], 2, 1);
-			}
-			/* This is not genreal enough, so hard code parameters needing the
-			tweak. */
-#if FP_PRIME == 256
-			fp9_mul_art(c[1][j], c[1][j]);
-			fp9_mul_art(c[1][j], c[1][j]);
-			fp9_mul_art(c[2][j], c[2][j]);
-#endif
-#if FP_PRIME == 446
-			fp9_mul_art(c[1][j], c[1][j]);
-			fp9_mul_art(c[2][j], c[2][j]);
-			fp9_mul_art(c[2][j], c[2][j]);
-#endif
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_inv.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_inv.c
deleted file mode 100644
index b279f879cb69..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_inv.c
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of inversion in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_inv(fp2_t c, fp2_t a) {
-	fp_t t0, t1;
-
-	fp_null(t0);
-	fp_null(t1);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-
-		/* t0 = a_0^2, t1 = a_1^2. */
-		fp_sqr(t0, a[0]);
-		fp_sqr(t1, a[1]);
-
-		/* t1 = 1/(a_0^2 + a_1^2). */
-#ifndef FP_QNRES
-		if (fp_prime_get_qnr() != -1) {
-			if (fp_prime_get_qnr() == -2) {
-				fp_dbl(t1, t1);
-				fp_add(t0, t0, t1);
-			} else {
-				if (fp_prime_get_qnr() < 0) {
-					fp_mul_dig(t1, t1, -fp_prime_get_qnr());
-					fp_add(t0, t0, t1);
-				} else {
-					fp_mul_dig(t1, t1, fp_prime_get_qnr());
-					fp_sub(t0, t0, t1);
-				}
-			}
-		} else {
-			fp_add(t0, t0, t1);
-		}
-#else
-		fp_add(t0, t0, t1);
-#endif
-
-		fp_inv(t1, t0);
-
-		/* c_0 = a_0/(a_0^2 + a_1^2). */
-		fp_mul(c[0], a[0], t1);
-		/* c_1 = - a_1/(a_0^2 + a_1^2). */
-		fp_mul(c[1], a[1], t1);
-		fp_neg(c[1], c[1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-	}
-}
-
-void fp2_inv_cyc(fp2_t c, fp2_t a) {
-	fp_copy(c[0], a[0]);
-	fp_neg(c[1], a[1]);
-}
-
-void fp2_inv_sim(fp2_t *c, fp2_t *a, int n) {
-	int i;
-	fp2_t u, *t = RLC_ALLOCA(fp2_t, n);
-
-	for (i = 0; i < n; i++) {
-		fp2_null(t[i]);
-	}
-	fp2_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fp2_new(t[i]);
-		}
-		fp2_new(u);
-
-		fp2_copy(c[0], a[0]);
-		fp2_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp2_copy(t[i], a[i]);
-			fp2_mul(c[i], c[i - 1], t[i]);
-		}
-
-		fp2_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp2_mul(c[i], c[i - 1], u);
-			fp2_mul(u, u, t[i]);
-		}
-		fp2_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp2_free(t[i]);
-		}
-		fp2_free(u);
-		RLC_FREE(t);
-	}
-}
-
-void fp3_inv(fp3_t c, fp3_t a) {
-	fp_t v0;
-	fp_t v1;
-	fp_t v2;
-	fp_t t0;
-
-	fp_null(v0);
-	fp_null(v1);
-	fp_null(v2);
-	fp_null(t0);
-
-	RLC_TRY {
-		fp_new(v0);
-		fp_new(v1);
-		fp_new(v2);
-		fp_new(t0);
-
-		/* v0 = a_0^2 - B * a_1 * a_2. */
-		fp_sqr(t0, a[0]);
-		fp_mul(v0, a[1], a[2]);
-		fp_copy(v2, v0);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_add(v2, v2, v0);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_sub(v2, v2, v0);
-		}
-		fp_sub(v0, t0, v2);
-
-		/* v1 = B * a_2^2 - a_0 * a_1. */
-		fp_sqr(t0, a[2]);
-		fp_copy(v2, t0);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_add(v2, v2, t0);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_sub(v2, v2, t0);
-		}
-		fp_mul(v1, a[0], a[1]);
-		fp_sub(v1, v2, v1);
-
-		/* v2 = a_1^2 - a_0 * a_2. */
-		fp_sqr(t0, a[1]);
-		fp_mul(v2, a[0], a[2]);
-		fp_sub(v2, t0, v2);
-
-		fp_mul(t0, a[1], v2);
-		fp_copy(c[1], t0);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_add(c[1], c[1], t0);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_sub(c[1], c[1], t0);
-		}
-
-		fp_mul(c[0], a[0], v0);
-
-		fp_mul(t0, a[2], v1);
-		fp_copy(c[2], t0);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_add(c[2], c[2], t0);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_sub(c[2], c[2], t0);
-		}
-
-		fp_add(t0, c[0], c[1]);
-		fp_add(t0, t0, c[2]);
-		fp_inv(t0, t0);
-
-		fp_mul(c[0], v0, t0);
-		fp_mul(c[1], v1, t0);
-		fp_mul(c[2], v2, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(v0);
-		fp_free(v1);
-		fp_free(v2);
-		fp_free(t0);
-	}
-}
-
-void fp3_inv_sim(fp3_t * c, fp3_t * a, int n) {
-	int i;
-	fp3_t u, *t = RLC_ALLOCA(fp3_t, n);
-
-	for (i = 0; i < n; i++) {
-		fp3_null(t[i]);
-	}
-	fp3_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fp3_new(t[i]);
-		}
-		fp3_new(u);
-
-		fp3_copy(c[0], a[0]);
-		fp3_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp3_copy(t[i], a[i]);
-			fp3_mul(c[i], c[i - 1], t[i]);
-		}
-
-		fp3_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp3_mul(c[i], c[i - 1], u);
-			fp3_mul(u, u, t[i]);
-		}
-		fp3_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp3_free(t[i]);
-		}
-		fp3_free(u);
-		RLC_FREE(t);
-	}
-}
-
-void fp4_inv_cyc(fp4_t c, fp4_t a) {
-	fp2_copy(c[0], a[0]);
-	fp2_neg(c[1], a[1]);
-}
-
-void fp4_inv(fp4_t c, fp4_t a) {
-	fp2_t t0;
-	fp2_t t1;
-
-	fp2_null(t0);
-	fp2_null(t1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-
-		fp2_sqr(t0, a[0]);
-		fp2_sqr(t1, a[1]);
-		fp2_mul_nor(t1, t1);
-		fp2_sub(t0, t0, t1);
-		fp2_inv(t0, t0);
-
-		fp2_mul(c[0], a[0], t0);
-		fp2_neg(c[1], a[1]);
-		fp2_mul(c[1], c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-	}
-}
-
-void fp4_inv_sim(fp4_t * c, fp4_t * a, int n) {
-	int i;
-	fp4_t u, *t = RLC_ALLOCA(fp4_t, n);
-
-	for (i = 0; i < n; i++) {
-		fp4_null(t[i]);
-	}
-	fp4_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fp4_new(t[i]);
-		}
-		fp4_new(u);
-
-		fp4_copy(c[0], a[0]);
-		fp4_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp4_copy(t[i], a[i]);
-			fp4_mul(c[i], c[i - 1], t[i]);
-		}
-
-		fp4_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp4_mul(c[i], c[i - 1], u);
-			fp4_mul(u, u, t[i]);
-		}
-		fp4_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp4_free(t[i]);
-		}
-		fp4_free(u);
-		RLC_FREE(t);
-	}
-}
-
-void fp6_inv(fp6_t c, fp6_t a) {
-	fp2_t v0;
-	fp2_t v1;
-	fp2_t v2;
-	fp2_t t0;
-
-	fp2_null(v0);
-	fp2_null(v1);
-	fp2_null(v2);
-	fp2_null(t0);
-
-	RLC_TRY {
-		fp2_new(v0);
-		fp2_new(v1);
-		fp2_new(v2);
-		fp2_new(t0);
-
-		/* v0 = a_0^2 - E * a_1 * a_2. */
-		fp2_sqr(t0, a[0]);
-		fp2_mul(v0, a[1], a[2]);
-		fp2_mul_nor(v2, v0);
-		fp2_sub(v0, t0, v2);
-
-		/* v1 = E * a_2^2 - a_0 * a_1. */
-		fp2_sqr(t0, a[2]);
-		fp2_mul_nor(v2, t0);
-		fp2_mul(v1, a[0], a[1]);
-		fp2_sub(v1, v2, v1);
-
-		/* v2 = a_1^2 - a_0 * a_2. */
-		fp2_sqr(t0, a[1]);
-		fp2_mul(v2, a[0], a[2]);
-		fp2_sub(v2, t0, v2);
-
-		fp2_mul(t0, a[1], v2);
-		fp2_mul_nor(c[1], t0);
-
-		fp2_mul(c[0], a[0], v0);
-
-		fp2_mul(t0, a[2], v1);
-		fp2_mul_nor(c[2], t0);
-
-		fp2_add(t0, c[0], c[1]);
-		fp2_add(t0, t0, c[2]);
-		fp2_inv(t0, t0);
-
-		fp2_mul(c[0], v0, t0);
-		fp2_mul(c[1], v1, t0);
-		fp2_mul(c[2], v2, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(v0);
-		fp2_free(v1);
-		fp2_free(v2);
-		fp2_free(t0);
-	}
-}
-
-void fp8_inv_cyc(fp8_t c, fp8_t a) {
-	fp4_copy(c[0], a[0]);
-	fp4_neg(c[1], a[1]);
-}
-
-void fp8_inv(fp8_t c, fp8_t a) {
-	fp4_t t0;
-	fp4_t t1;
-
-	fp4_null(t0);
-	fp4_null(t1);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-
-		fp4_sqr(t0, a[0]);
-		fp4_sqr(t1, a[1]);
-		fp4_mul_art(t1, t1);
-		fp4_sub(t0, t0, t1);
-		fp4_inv(t0, t0);
-
-		fp4_mul(c[0], a[0], t0);
-		fp4_neg(c[1], a[1]);
-		fp4_mul(c[1], c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-	}
-}
-
-void fp8_inv_sim(fp8_t *c, fp8_t *a, int n) {
-	int i;
-	fp8_t u, *t = RLC_ALLOCA(fp8_t, n);
-
-	for (i = 0; i < n; i++) {
-		fp8_null(t[i]);
-	}
-	fp8_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fp8_new(t[i]);
-		}
-		fp8_new(u);
-
-		fp8_copy(c[0], a[0]);
-		fp8_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp8_copy(t[i], a[i]);
-			fp8_mul(c[i], c[i - 1], t[i]);
-		}
-
-		fp8_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp8_mul(c[i], c[i - 1], u);
-			fp8_mul(u, u, t[i]);
-		}
-		fp8_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp8_free(t[i]);
-		}
-		fp8_free(u);
-		RLC_FREE(t);
-	}
-}
-
-void fp9_inv(fp9_t c, fp9_t a) {
-	fp3_t v0;
-	fp3_t v1;
-	fp3_t v2;
-	fp3_t t0;
-
-	fp3_null(v0);
-	fp3_null(v1);
-	fp3_null(v2);
-	fp3_null(t0);
-
-	RLC_TRY {
-		fp3_new(v0);
-		fp3_new(v1);
-		fp3_new(v2);
-		fp3_new(t0);
-
-		/* v0 = a_0^2 - E * a_1 * a_2. */
-		fp3_sqr(t0, a[0]);
-		fp3_mul(v0, a[1], a[2]);
-		fp3_mul_nor(v2, v0);
-		fp3_sub(v0, t0, v2);
-
-		/* v1 = E * a_2^2 - a_0 * a_1. */
-		fp3_sqr(t0, a[2]);
-		fp3_mul_nor(v2, t0);
-		fp3_mul(v1, a[0], a[1]);
-		fp3_sub(v1, v2, v1);
-
-		/* v2 = a_1^2 - a_0 * a_2. */
-		fp3_sqr(t0, a[1]);
-		fp3_mul(v2, a[0], a[2]);
-		fp3_sub(v2, t0, v2);
-
-		fp3_mul(t0, a[1], v2);
-		fp3_mul_nor(c[1], t0);
-
-		fp3_mul(c[0], a[0], v0);
-
-		fp3_mul(t0, a[2], v1);
-		fp3_mul_nor(c[2], t0);
-
-		fp3_add(t0, c[0], c[1]);
-		fp3_add(t0, t0, c[2]);
-		fp3_inv(t0, t0);
-
-		fp3_mul(c[0], v0, t0);
-		fp3_mul(c[1], v1, t0);
-		fp3_mul(c[2], v2, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(v0);
-		fp3_free(v1);
-		fp3_free(v2);
-		fp3_free(t0);
-	}
-}
-
-void fp9_inv_sim(fp9_t * c, fp9_t * a, int n) {
-	int i;
-	fp9_t u, *t = RLC_ALLOCA(fp9_t, n);
-
-	for (i = 0; i < n; i++) {
-		fp9_null(t[i]);
-	}
-	fp9_null(u);
-
-	RLC_TRY {
-		for (i = 0; i < n; i++) {
-			fp9_new(t[i]);
-		}
-		fp9_new(u);
-
-		fp9_copy(c[0], a[0]);
-		fp9_copy(t[0], a[0]);
-
-		for (i = 1; i < n; i++) {
-			fp9_copy(t[i], a[i]);
-			fp9_mul(c[i], c[i - 1], t[i]);
-		}
-
-		fp9_inv(u, c[n - 1]);
-
-		for (i = n - 1; i > 0; i--) {
-			fp9_mul(c[i], c[i - 1], u);
-			fp9_mul(u, u, t[i]);
-		}
-		fp9_copy(c[0], u);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		for (i = 0; i < n; i++) {
-			fp9_free(t[i]);
-		}
-		fp9_free(u);
-		RLC_FREE(t);
-	}
-}
-
-void fp12_inv(fp12_t c, fp12_t a) {
-	fp6_t t0;
-	fp6_t t1;
-
-	fp6_null(t0);
-	fp6_null(t1);
-
-	RLC_TRY {
-		fp6_new(t0);
-		fp6_new(t1);
-
-		fp6_sqr(t0, a[0]);
-		fp6_sqr(t1, a[1]);
-		fp6_mul_art(t1, t1);
-		fp6_sub(t0, t0, t1);
-		fp6_inv(t0, t0);
-
-		fp6_mul(c[0], a[0], t0);
-		fp6_neg(c[1], a[1]);
-		fp6_mul(c[1], c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp6_free(t0);
-		fp6_free(t1);
-	}
-}
-
-void fp12_inv_cyc(fp12_t c, fp12_t a) {
-	fp6_copy(c[0], a[0]);
-	fp6_neg(c[1], a[1]);
-}
-
-void fp18_inv(fp18_t c, fp18_t a) {
-	fp9_t t0;
-	fp9_t t1;
-
-	fp9_null(t0);
-	fp9_null(t1);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-
-		fp9_sqr(t0, a[0]);
-		fp9_sqr(t1, a[1]);
-		fp9_mul_art(t1, t1);
-		fp9_sub(t0, t0, t1);
-		fp9_inv(t0, t0);
-
-		fp9_mul(c[0], a[0], t0);
-		fp9_neg(c[1], a[1]);
-		fp9_mul(c[1], c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-	}
-}
-
-void fp18_inv_cyc(fp18_t c, fp18_t a) {
-	fp9_copy(c[0], a[0]);
-	fp9_neg(c[1], a[1]);
-}
-
-void fp24_inv(fp24_t c, fp24_t a) {
-	fp8_t v0;
-	fp8_t v1;
-	fp8_t v2;
-	fp8_t t0;
-
-	fp8_null(v0);
-	fp8_null(v1);
-	fp8_null(v2);
-	fp8_null(t0);
-
-	RLC_TRY {
-		fp8_new(v0);
-		fp8_new(v1);
-		fp8_new(v2);
-		fp8_new(t0);
-
-		/* v0 = a_0^2 - E * a_1 * a_2. */
-		fp8_sqr(t0, a[0]);
-		fp8_mul(v0, a[1], a[2]);
-		fp8_mul_art(v2, v0);
-		fp8_sub(v0, t0, v2);
-
-		/* v1 = E * a_2^2 - a_0 * a_1. */
-		fp8_sqr(t0, a[2]);
-		fp8_mul_art(v2, t0);
-		fp8_mul(v1, a[0], a[1]);
-		fp8_sub(v1, v2, v1);
-
-		/* v2 = a_1^2 - a_0 * a_2. */
-		fp8_sqr(t0, a[1]);
-		fp8_mul(v2, a[0], a[2]);
-		fp8_sub(v2, t0, v2);
-
-		fp8_mul(t0, a[1], v2);
-		fp8_mul_art(c[1], t0);
-
-		fp8_mul(c[0], a[0], v0);
-
-		fp8_mul(t0, a[2], v1);
-		fp8_mul_art(c[2], t0);
-
-		fp8_add(t0, c[0], c[1]);
-		fp8_add(t0, t0, c[2]);
-		fp8_inv(t0, t0);
-
-		fp8_mul(c[0], v0, t0);
-		fp8_mul(c[1], v1, t0);
-		fp8_mul(c[2], v2, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(v0);
-		fp8_free(v1);
-		fp8_free(v2);
-		fp8_free(t0);
-	}
-}
-
-void fp24_inv_cyc(fp24_t c, fp24_t a) {
-	fp8_inv_cyc(c[0], a[0]);
-	fp8_inv_cyc(c[1], a[1]);
-	fp8_neg(c[1], c[1]);
-	fp8_inv_cyc(c[2], a[2]);
-}
-
-void fp48_inv(fp48_t c, fp48_t a) {
-	fp24_t t0;
-	fp24_t t1;
-
-	fp24_null(t0);
-	fp24_null(t1);
-
-	RLC_TRY {
-		fp24_new(t0);
-		fp24_new(t1);
-
-		fp24_sqr(t0, a[0]);
-		fp24_sqr(t1, a[1]);
-		fp24_mul_art(t1, t1);
-		fp24_sub(t0, t0, t1);
-		fp24_inv(t0, t0);
-
-		fp24_mul(c[0], a[0], t0);
-		fp24_neg(c[1], a[1]);
-		fp24_mul(c[1], c[1], t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t0);
-		fp24_free(t1);
-	}
-}
-
-void fp48_inv_cyc(fp48_t c, fp48_t a) {
-	fp24_copy(c[0], a[0]);
-	fp24_neg(c[1], a[1]);
-}
-
-void fp54_inv(fp54_t c, fp54_t a) {
-	fp18_t v0;
-	fp18_t v1;
-	fp18_t v2;
-	fp18_t t0;
-
-	fp18_null(v0);
-	fp18_null(v1);
-	fp18_null(v2);
-	fp18_null(t0);
-
-	RLC_TRY {
-		fp18_new(v0);
-		fp18_new(v1);
-		fp18_new(v2);
-		fp18_new(t0);
-
-		/* v0 = a_0^2 - E * a_1 * a_2. */
-		fp18_sqr(t0, a[0]);
-		fp18_mul(v0, a[1], a[2]);
-		fp18_mul_art(v2, v0);
-		fp18_sub(v0, t0, v2);
-
-		/* v1 = E * a_2^2 - a_0 * a_1. */
-		fp18_sqr(t0, a[2]);
-		fp18_mul_art(v2, t0);
-		fp18_mul(v1, a[0], a[1]);
-		fp18_sub(v1, v2, v1);
-
-		/* v2 = a_1^2 - a_0 * a_2. */
-		fp18_sqr(t0, a[1]);
-		fp18_mul(v2, a[0], a[2]);
-		fp18_sub(v2, t0, v2);
-
-		fp18_mul(t0, a[1], v2);
-		fp18_mul_art(c[1], t0);
-
-		fp18_mul(c[0], a[0], v0);
-
-		fp18_mul(t0, a[2], v1);
-		fp18_mul_art(c[2], t0);
-
-		fp18_add(t0, c[0], c[1]);
-		fp18_add(t0, t0, c[2]);
-		fp18_inv(t0, t0);
-
-		fp18_mul(c[0], v0, t0);
-		fp18_mul(c[1], v1, t0);
-		fp18_mul(c[2], v2, t0);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp18_free(v0);
-		fp18_free(v1);
-		fp18_free(v2);
-		fp18_free(t0);
-	}
-}
-
-void fp54_inv_cyc(fp54_t c, fp54_t a) {
-	fp18_inv_cyc(c[0], a[0]);
-	fp18_inv_cyc(c[1], a[1]);
-	fp18_neg(c[1], c[1]);
-	fp18_inv_cyc(c[2], a[2]);
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_pck.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_pck.c
deleted file mode 100644
index 1f9b6b9f9d0c..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_pck.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of finite field compression in extension fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_pck(fp2_t c, fp2_t a) {
-	int b = fp_get_bit(a[1], 0);
-	fp2_copy(c, a);
-	if (fp2_test_cyc(a)) {
-		fp_copy(c[0], a[0]);
-		fp_zero(c[1]);
-		fp_set_bit(c[1], 0, b);
-	}
-}
-
-int fp2_upk(fp2_t c, fp2_t a) {
-	if (fp_bits(a[1]) <= 1) {
-		int result, b = fp_get_bit(a[1], 0);
-		fp_t t;
-
-		fp_null(t);
-
-		RLC_TRY {
-			fp_new(t);
-
-			/* a_0^2 + a_1^2 = 1, thus a_1^2 = 1 - a_0^2. */
-			fp_sqr(t, a[0]);
-			fp_sub_dig(t, t, 1);
-			fp_neg(t, t);
-
-			/* a1 = sqrt(a_0^2). */
-			result = fp_srt(t, t);
-
-			if (result) {
-				/* Verify if least significant bit of the result matches the
-				 * compressed second coordinate. */
-				if (fp_get_bit(t, 0) != b) {
-					fp_neg(t, t);
-				}
-				fp_copy(c[0], a[0]);
-				fp_copy(c[1], t);
-			}
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			fp_free(t);
-		}
-		return result;
-	} else {
-		fp2_copy(c, a);
-		return 1;
-	}
-}
-
-void fp12_pck(fp12_t c, fp12_t a) {
-	fp12_copy(c, a);
-	if (fp12_test_cyc(c)) {
-		fp2_zero(c[0][0]);
-		fp2_zero(c[1][1]);
-	}
-}
-
-int fp12_upk(fp12_t c, fp12_t a) {
-	if (fp2_is_zero(a[0][0]) && fp2_is_zero(a[1][1])) {
-		fp12_back_cyc(c, a);
-		if (fp12_test_cyc(c)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		fp12_copy(c, a);
-		return 1;
-	}
-}
-
-void fp12_pck_max(fp12_t c, fp12_t a) {
-	 fp12_copy(c, a);
-	if (fp12_test_cyc(c)) {
-		/* Use torus-based compression from Section 4.1 in
-		 * "On Compressible Pairings and Their Computation" by Naehrig et al.
-		 */
-		fp2_add_dig(c[0][0], a[0][0], 1);
-		fp6_inv(c[1], a[1]);
-		fp6_mul(c[0], c[0], c[1]);
-		fp6_zero(c[1]);
-	}
-}
-
-int fp12_upk_max(fp12_t c, fp12_t a) {
-	if (fp6_is_zero(a[1])) {
-		fp12_t t;
-
-		fp12_null(t);
-
-		RLC_TRY {
-			fp12_new(t);
-			/* Formula for decompression for the odd q case from Section 2 in
-			 * "Compression in finite fields and torus-based cryptography" by
-			 * Rubin-Silverberg.
-			 */
-			fp6_copy(t[0], a[0]);
-			fp6_zero(t[1]);
-			fp_set_dig(t[1][0][0], 1);
-			fp_neg(t[1][0][0], t[1][0][0]);
-			fp12_inv(t, t);
-			fp6_copy(c[0], a[0]);
-			fp6_set_dig(c[1], 1);
-			fp12_mul(c, c, t);
-		} RLC_CATCH_ANY {
-			RLC_THROW(ERR_CAUGHT);
-		} RLC_FINALLY {
-			fp12_free(t);
-		}
-		if (fp12_test_cyc(c)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		fp12_copy(c, a);
-		return 1;
-	}
-}
-
-void fp24_pck(fp24_t c, fp24_t a) {
-	fp24_copy(c, a);
-	if (fp24_test_cyc(c)) {
-		fp4_zero(c[0][0]);
-		fp4_zero(c[0][1]);
-	}
-}
-
-int fp24_upk(fp24_t c, fp24_t a) {
-	if (fp4_is_zero(a[0][0]) && fp4_is_zero(a[0][1])) {
-		fp24_back_cyc(c, a);
-		if (fp24_test_cyc(c)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		fp24_copy(c, a);
-		return 1;
-	}
-}
-
-void fp48_pck(fp48_t c, fp48_t a) {
-	fp48_copy(c, a);
-	if (fp48_test_cyc(c)) {
-		fp8_zero(c[0][0]);
-		fp8_zero(c[1][1]);
-	}
-}
-
-int fp48_upk(fp48_t c, fp48_t a) {
-	if (fp8_is_zero(a[0][0]) && fp8_is_zero(a[1][1])) {
-		fp48_back_cyc(c, a);
-		if (fp48_test_cyc(c)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		fp48_copy(c, a);
-		return 1;
-	}
-}
-
-void fp54_pck(fp54_t c, fp54_t a) {
-	fp54_copy(c, a);
-	if (fp54_test_cyc(c)) {
-		fp9_zero(c[0][0]);
-		fp9_zero(c[0][1]);
-	}
-}
-
-int fp54_upk(fp54_t c, fp54_t a) {
-	if (fp9_is_zero(a[0][0]) && fp9_is_zero(a[0][1])) {
-		fp54_back_cyc(c, a);
-		if (fp54_test_cyc(c)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		fp54_copy(c, a);
-		return 1;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_rdc.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_rdc.c
deleted file mode 100644
index 903128bfa641..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_rdc.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of modular reduction in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if PP_QDR == BASIC || !defined(STRIP)
-
-void fp2_rdc_basic(fp2_t c, dv2_t a) {
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-}
-
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-
-void fp2_rdc_integ(fp2_t c, dv2_t a) {
-	fp2_rdcn_low(c, a);
-}
-
-#endif
-
-#if PP_CBC == BASIC || !defined(STRIP)
-
-void fp3_rdc_basic(fp3_t c, dv3_t a) {
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-}
-
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-
-void fp3_rdc_integ(fp3_t c, dv3_t a) {
-	fp3_rdcn_low(c, a);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_srt.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_srt.c
deleted file mode 100644
index 2da52b750c1a..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_srt.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of square root in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-int fp2_srt(fp2_t c, fp2_t a) {
-	int r = 0;
-	fp_t t0;
-	fp_t t1;
-	fp_t t2;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-
-	if (fp2_is_zero(a)) {
-		fp2_zero(c);
-		return 1;
-	}
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-
-		if (fp_is_zero(a[1])) {
-			/* special case: either a[0] is square and sqrt is purely 'real'
-			 * or a[0] is non-square and sqrt is purely 'imaginary' */
-			r = 1;
-			if (fp_srt(t0, a[0])) {
-				fp_copy(c[0], t0);
-				fp_zero(c[1]);
-			} else {
-				/* Compute a[0]/i^2. */
-#ifdef FP_QNRES
-				fp_copy(t0, a[0]);
-#else
-				if (fp_prime_get_qnr() == -2) {
-					fp_hlv(t0, a[0]);
-				} else {
-					fp_set_dig(t0, -fp_prime_get_qnr());
-					fp_inv(t0, t0);
-					fp_mul(t0, t0, a[0]);
-				}
-#endif
-				fp_neg(t0, t0);
-				fp_zero(c[0]);
-				if (!fp_srt(c[1], t0)) {
-					/* should never happen! */
-					RLC_THROW(ERR_NO_VALID);
-				}
-			}
-		} else {
-			/* t0 = a[0]^2 - i^2 * a[1]^2 */
-			fp_sqr(t0, a[0]);
-			fp_sqr(t1, a[1]);
-			for (int i = -1; i > fp_prime_get_qnr(); i--) {
-				fp_add(t0, t0, t1);
-			}
-			fp_add(t0, t0, t1);
-
-			if (fp_srt(t1, t0)) {
-				/* t0 = (a_0 + sqrt(t0)) / 2 */
-				fp_add(t0, a[0], t1);
-				fp_hlv(t0, t0);
-
-				if (!fp_srt(t2, t0)) {
-					/* t0 = (a_0 - sqrt(t0)) / 2 */
-					fp_sub(t0, a[0], t1);
-					fp_hlv(t0, t0);
-					if (!fp_srt(t2, t0)) {
-						/* should never happen! */
-						RLC_THROW(ERR_NO_VALID);
-					}
-				}
-				/* c_0 = sqrt(t0) */
-				fp_copy(c[0], t2);
-				/* c_1 = a_1 / (2 * sqrt(t0)) */
-				fp_dbl(t2, t2);
-				fp_inv(t2, t2);
-				fp_mul(c[1], a[1], t2);
-				r = 1;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-	}
-	return r;
-}
-
-int fp3_srt(fp3_t c, fp3_t a) {
-	int r = 0;
-	fp3_t t0, t1, t2, t3;
-	bn_t e;
-
-	fp3_null(t0);
-	fp3_null(t1);
-	fp3_null(t2);
-	fp3_null(t3);
-	bn_null(e);
-
-	if (fp3_is_zero(a)) {
-		fp3_zero(c);
-		return 1;
-	}
-
-	RLC_TRY {
-		fp3_new(t0);
-		fp3_new(t1);
-		fp3_new(t2);
-		fp3_new(t3);
-		bn_new(e);
-
-		switch (fp_prime_get_mod8()) {
-			case 5:
-				fp3_dbl(t3, a);
-				fp3_frb(t0, t3, 1);
-
-				fp3_sqr(t1, t0);
-				fp3_mul(t2, t1, t0);
-				fp3_mul(t1, t1, t2);
-
-				fp3_frb(t0, t0, 1);
-				fp3_mul(t3, t3, t1);
-				fp3_mul(t0, t0, t3);
-
-				e->used = RLC_FP_DIGS;
-				dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-				bn_div_dig(e, e, 8);
-				fp3_exp(t0, t0, e);
-
-				fp3_mul(t0, t0, t2);
-				fp3_sqr(t1, t0);
-				fp3_mul(t1, t1, a);
-				fp3_dbl(t1, t1);
-
-				fp3_mul(t0, t0, a);
-				fp_sub_dig(t1[0], t1[0], 1);
-				fp3_mul(c, t0, t1);
-				break;
-			case 3:
-			case 7:
-				fp3_frb(t0, a, 1);
-				fp3_sqr(t1, t0);
-				fp3_mul(t2, t1, t0);
-				fp3_frb(t0, t0, 1);
-				fp3_mul(t3, t2, a);
-				fp3_mul(t0, t0, t3);
-
-				e->used = RLC_FP_DIGS;
-				dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-				bn_div_dig(e, e, 4);
-				fp3_exp(t0, t0, e);
-
-				fp3_mul(t0, t0, a);
-				fp3_mul(c, t0, t1);
-				break;
-			default:
-				fp3_zero(c);
-				break;
-		}
-
-		fp3_sqr(t0, c);
-		if (fp3_cmp(t0, a) == RLC_EQ) {
-			r = 1;
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp3_free(t0);
-		fp3_free(t1);
-		fp3_free(t2);
-		fp3_free(t3);
-		bn_free(e);
-	}
-
-	return r;
-}
-
-int fp4_srt(fp4_t c, fp4_t a) {
-	int r = 0;
-	fp2_t t0, t1, t2;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-
-	if (fp4_is_zero(a)) {
-		fp4_zero(c);
-		return 1;
-	}
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-
-		if (fp2_is_zero(a[1])) {
-			/* special case: either a[0] is square and sqrt is purely 'real'
-			 * or a[0] is non-square and sqrt is purely 'imaginary' */
-			r = 1;
-			if (fp2_srt(t0, a[0])) {
-				fp2_copy(c[0], t0);
-				fp2_zero(c[1]);
-			} else {
-				/* Compute a[0]/s^2. */
-				fp2_set_dig(t0, 1);
-				fp2_mul_nor(t0, t0);
-				fp2_inv(t0, t0);
-				fp2_mul(t0, a[0], t0);
-				fp2_neg(t0, t0);
-				fp2_zero(c[0]);
-				if (!fp2_srt(c[1], t0)) {
-					/* should never happen! */
-					RLC_THROW(ERR_NO_VALID);
-				}
-				fp2_mul_art(c[1], c[1]);
-			}
-		} else {
-			/* t0 = a[0]^2 - s^2 * a[1]^2 */
-			fp2_sqr(t0, a[0]);
-			fp2_sqr(t1, a[1]);
-			fp2_mul_nor(t2, t1);
-			fp2_sub(t0, t0, t2);
-
-			if (fp2_srt(t1, t0)) {
-				/* t0 = (a_0 + sqrt(t0)) / 2 */
-				fp2_add(t0, a[0], t1);
-				fp_hlv(t0[0], t0[0]);
-				fp_hlv(t0[1], t0[1]);
-
-				if (!fp2_srt(t2, t0)) {
-					/* t0 = (a_0 - sqrt(t0)) / 2 */
-					fp2_sub(t0, a[0], t1);
-					fp_hlv(t0[0], t0[0]);
-					fp_hlv(t0[1], t0[1]);
-					if (!fp2_srt(t2, t0)) {
-						/* should never happen! */
-						RLC_THROW(ERR_NO_VALID);
-					}
-				}
-				/* c_0 = sqrt(t0) */
-				fp2_copy(c[0], t2);
-
-				/* c_1 = a_1 / (2 * sqrt(t0)) */
-				fp2_dbl(t2, t2);
-				fp2_inv(t2, t2);
-				fp2_mul(c[1], a[1], t2);
-				r = 1;
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-	}
-	return r;
-}
diff --git a/src/dashbls/depends/relic/src/fpx/relic_fpx_util.c b/src/dashbls/depends/relic/src/fpx/relic_fpx_util.c
deleted file mode 100644
index 1de8cc6fc384..000000000000
--- a/src/dashbls/depends/relic/src/fpx/relic_fpx_util.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of utilities in extensions defined over prime fields.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_copy(fp2_t c, fp2_t a) {
-	fp_copy(c[0], a[0]);
-	fp_copy(c[1], a[1]);
-}
-
-void fp2_zero(fp2_t a) {
-	fp_zero(a[0]);
-	fp_zero(a[1]);
-}
-
-int fp2_is_zero(fp2_t a) {
-	return fp_is_zero(a[0]) && fp_is_zero(a[1]);
-}
-
-void fp2_rand(fp2_t a) {
-	fp_rand(a[0]);
-	fp_rand(a[1]);
-}
-
-void fp2_print(fp2_t a) {
-	fp_print(a[0]);
-	fp_print(a[1]);
-}
-
-int fp2_size_bin(fp2_t a, int pack) {
-	if (pack) {
-		if (fp2_test_cyc(a)) {
-			return RLC_FP_BYTES + 1;
-		} else {
-			return 2 * RLC_FP_BYTES;
-		}
-	} else {
-		return 2 * RLC_FP_BYTES;
-	}
-}
-
-void fp2_read_bin(fp2_t a, const uint8_t *bin, int len) {
-	if (len != RLC_FP_BYTES + 1 && len != 2 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	if (len == RLC_FP_BYTES + 1) {
-		fp_read_bin(a[0], bin, RLC_FP_BYTES);
-		fp_zero(a[1]);
-		fp_set_bit(a[1], 0, bin[RLC_FP_BYTES]);
-		fp2_upk(a, a);
-	}
-	if (len == 2 * RLC_FP_BYTES) {
-		fp_read_bin(a[0], bin, RLC_FP_BYTES);
-		fp_read_bin(a[1], bin + RLC_FP_BYTES, RLC_FP_BYTES);
-	}
-}
-
-void fp2_write_bin(uint8_t *bin, int len, fp2_t a, int pack) {
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		if (pack && fp2_test_cyc(a)) {
-			if (len < RLC_FP_BYTES + 1) {
-				RLC_THROW(ERR_NO_BUFFER);
-				return;
-			} else {
-				fp2_pck(t, a);
-				fp_write_bin(bin, RLC_FP_BYTES, t[0]);
-				bin[RLC_FP_BYTES] = fp_get_bit(t[1], 0);
-			}
-		} else {
-			if (len < 2 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-				return;
-			} else {
-				fp_write_bin(bin, RLC_FP_BYTES, a[0]);
-				fp_write_bin(bin + RLC_FP_BYTES, RLC_FP_BYTES, a[1]);
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-void fp2_set_dig(fp2_t a, dig_t b) {
-	fp_set_dig(a[0], b);
-	fp_zero(a[1]);
-}
-
-void fp3_copy(fp3_t c, fp3_t a) {
-	fp_copy(c[0], a[0]);
-	fp_copy(c[1], a[1]);
-	fp_copy(c[2], a[2]);
-}
-
-void fp3_zero(fp3_t a) {
-	fp_zero(a[0]);
-	fp_zero(a[1]);
-	fp_zero(a[2]);
-}
-
-int fp3_is_zero(fp3_t a) {
-	return fp_is_zero(a[0]) && fp_is_zero(a[1]) && fp_is_zero(a[2]);
-}
-
-void fp3_rand(fp3_t a) {
-	fp_rand(a[0]);
-	fp_rand(a[1]);
-	fp_rand(a[2]);
-}
-
-void fp3_print(fp3_t a) {
-	fp_print(a[0]);
-	fp_print(a[1]);
-	fp_print(a[2]);
-}
-
-int fp3_size_bin(fp3_t a) {
-	return 3 * RLC_FP_BYTES;
-}
-
-void fp3_read_bin(fp3_t a, const uint8_t *bin, int len) {
-	if (len != 3 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp_read_bin(a[0], bin, RLC_FP_BYTES);
-	fp_read_bin(a[1], bin + RLC_FP_BYTES, RLC_FP_BYTES);
-	fp_read_bin(a[2], bin + 2 * RLC_FP_BYTES, RLC_FP_BYTES);
-}
-
-void fp3_write_bin(uint8_t *bin, int len, fp3_t a) {
-	if (len != 3 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp_write_bin(bin, RLC_FP_BYTES, a[0]);
-	fp_write_bin(bin + RLC_FP_BYTES, RLC_FP_BYTES, a[1]);
-	fp_write_bin(bin + 2 * RLC_FP_BYTES, RLC_FP_BYTES, a[2]);
-}
-
-void fp3_set_dig(fp3_t a, dig_t b) {
-	fp_set_dig(a[0], b);
-	fp_zero(a[1]);
-	fp_zero(a[2]);
-}
-
-void fp4_copy(fp4_t c, fp4_t a) {
-	fp2_copy(c[0], a[0]);
-	fp2_copy(c[1], a[1]);
-}
-
-void fp4_zero(fp4_t a) {
-	fp2_zero(a[0]);
-	fp2_zero(a[1]);
-}
-
-int fp4_is_zero(fp4_t a) {
-	return fp2_is_zero(a[0]) && fp2_is_zero(a[1]);
-}
-
-void fp4_rand(fp4_t a) {
-	fp2_rand(a[0]);
-	fp2_rand(a[1]);
-}
-
-void fp4_print(fp4_t a) {
-	fp2_print(a[0]);
-	fp2_print(a[1]);
-}
-
-int fp4_size_bin(fp4_t a) {
-	return 4 * RLC_FP_BYTES;
-}
-
-void fp4_read_bin(fp4_t a, const uint8_t *bin, int len) {
-	if (len != 4 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp2_read_bin(a[0], bin, 2 * RLC_FP_BYTES);
-	fp2_read_bin(a[1], bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-}
-
-void fp4_write_bin(uint8_t *bin, int len, fp4_t a) {
-	if (len != 4 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp2_write_bin(bin, 2 * RLC_FP_BYTES, a[0], 0);
-	fp2_write_bin(bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[1], 0);
-}
-
-void fp4_set_dig(fp4_t a, dig_t b) {
-	fp2_set_dig(a[0], b);
-	fp2_zero(a[1]);
-}
-
-void fp6_copy(fp6_t c, fp6_t a) {
-	fp2_copy(c[0], a[0]);
-	fp2_copy(c[1], a[1]);
-	fp2_copy(c[2], a[2]);
-}
-
-void fp6_zero(fp6_t a) {
-	fp2_zero(a[0]);
-	fp2_zero(a[1]);
-	fp2_zero(a[2]);
-}
-
-int fp6_is_zero(fp6_t a) {
-	return fp2_is_zero(a[0]) && fp2_is_zero(a[1]) && fp2_is_zero(a[2]);
-}
-
-void fp6_rand(fp6_t a) {
-	fp2_rand(a[0]);
-	fp2_rand(a[1]);
-	fp2_rand(a[2]);
-}
-
-void fp6_print(fp6_t a) {
-	fp2_print(a[0]);
-	fp2_print(a[1]);
-	fp2_print(a[2]);
-}
-
-int fp6_size_bin(fp6_t a) {
-	return 6 * RLC_FP_BYTES;
-}
-
-void fp6_read_bin(fp6_t a, const uint8_t *bin, int len) {
-	if (len != 6 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp2_read_bin(a[0], bin, 2 * RLC_FP_BYTES);
-	fp2_read_bin(a[1], bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-	fp2_read_bin(a[2], bin + 4 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-}
-
-void fp6_write_bin(uint8_t *bin, int len, fp6_t a) {
-	if (len != 6 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp2_write_bin(bin, 2 * RLC_FP_BYTES, a[0], 0);
-	fp2_write_bin(bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[1], 0);
-	fp2_write_bin(bin + 4 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[2], 0);
-}
-
-void fp6_set_dig(fp6_t a, dig_t b) {
-	fp2_set_dig(a[0], b);
-	fp2_zero(a[1]);
-	fp2_zero(a[2]);
-}
-
-void fp8_copy(fp8_t c, fp8_t a) {
-	fp4_copy(c[0], a[0]);
-	fp4_copy(c[1], a[1]);
-}
-
-void fp8_zero(fp8_t a) {
-	fp4_zero(a[0]);
-	fp4_zero(a[1]);
-}
-
-int fp8_is_zero(fp8_t a) {
-	return fp4_is_zero(a[0]) && fp4_is_zero(a[1]);
-}
-
-void fp8_rand(fp8_t a) {
-	fp4_rand(a[0]);
-	fp4_rand(a[1]);
-}
-
-void fp8_print(fp8_t a) {
-	fp4_print(a[0]);
-	fp4_print(a[1]);
-}
-
-int fp8_size_bin(fp8_t a, int pack) {
-	if (pack) {
-		if (fp8_test_cyc(a)) {
-			return 4 * RLC_FP_BYTES;
-		} else {
-			return 8 * RLC_FP_BYTES;
-		}
-	} else {
-		return 8 * RLC_FP_BYTES;
-	}
-}
-
-void fp8_read_bin(fp8_t a, const uint8_t *bin, int len) {
-	if (len != 8 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp4_read_bin(a[0], bin, 4 * RLC_FP_BYTES);
-	fp4_read_bin(a[1], bin + 4 * RLC_FP_BYTES, 4 * RLC_FP_BYTES);
-}
-
-void fp8_write_bin(uint8_t *bin, int len, fp8_t a) {
-	if (len != 8 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp4_write_bin(bin, 4 * RLC_FP_BYTES, a[0]);
-	fp4_write_bin(bin + 4 * RLC_FP_BYTES, 4 * RLC_FP_BYTES, a[1]);
-}
-
-void fp8_set_dig(fp8_t a, dig_t b) {
-	fp4_set_dig(a[0], b);
-	fp4_zero(a[1]);
-}
-
-void fp9_copy(fp9_t c, fp9_t a) {
-	fp3_copy(c[0], a[0]);
-	fp3_copy(c[1], a[1]);
-	fp3_copy(c[2], a[2]);
-}
-
-void fp9_zero(fp9_t a) {
-	fp3_zero(a[0]);
-	fp3_zero(a[1]);
-	fp3_zero(a[2]);
-}
-
-int fp9_is_zero(fp9_t a) {
-	return fp3_is_zero(a[0]) && fp3_is_zero(a[1]) && fp3_is_zero(a[2]);
-}
-
-void fp9_rand(fp9_t a) {
-	fp3_rand(a[0]);
-	fp3_rand(a[1]);
-	fp3_rand(a[2]);
-}
-
-void fp9_print(fp9_t a) {
-	fp3_print(a[0]);
-	fp3_print(a[1]);
-	fp3_print(a[2]);
-}
-
-int fp9_size_bin(fp9_t a) {
-	return 9 * RLC_FP_BYTES;
-}
-
-void fp9_read_bin(fp9_t a, const uint8_t *bin, int len) {
-	if (len != 9 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp3_read_bin(a[0], bin, 3 * RLC_FP_BYTES);
-	fp3_read_bin(a[1], bin + 3 * RLC_FP_BYTES, 3 * RLC_FP_BYTES);
-	fp3_read_bin(a[2], bin + 6 * RLC_FP_BYTES, 3 * RLC_FP_BYTES);
-}
-
-void fp9_write_bin(uint8_t *bin, int len, fp9_t a) {
-	if (len != 9 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp3_write_bin(bin, 3 * RLC_FP_BYTES, a[0]);
-	fp3_write_bin(bin + 3 * RLC_FP_BYTES, 3 * RLC_FP_BYTES, a[1]);
-	fp3_write_bin(bin + 6 * RLC_FP_BYTES, 3 * RLC_FP_BYTES, a[2]);
-}
-
-void fp9_set_dig(fp9_t a, dig_t b) {
-	fp3_set_dig(a[0], b);
-	fp3_zero(a[1]);
-	fp3_zero(a[2]);
-}
-
-void fp12_copy(fp12_t c, fp12_t a) {
-	fp6_copy(c[0], a[0]);
-	fp6_copy(c[1], a[1]);
-}
-
-void fp12_zero(fp12_t a) {
-	fp6_zero(a[0]);
-	fp6_zero(a[1]);
-}
-
-int fp12_is_zero(fp12_t a) {
-	return (fp6_is_zero(a[0]) && fp6_is_zero(a[1]));
-}
-
-void fp12_rand(fp12_t a) {
-	fp6_rand(a[0]);
-	fp6_rand(a[1]);
-}
-
-void fp12_print(fp12_t a) {
-	fp6_print(a[0]);
-	fp6_print(a[1]);
-}
-
-int fp12_size_bin(fp12_t a, int pack) {
-	if (pack) {
-		if (fp12_test_cyc(a)) {
-			return 8 * RLC_FP_BYTES;
-		} else {
-			return 12 * RLC_FP_BYTES;
-		}
-	} else {
-		return 12 * RLC_FP_BYTES;
-	}
-}
-
-void fp12_read_bin(fp12_t a, const uint8_t *bin, int len) {
-	if (len != 8 * RLC_FP_BYTES && len != 12 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	if (len == 8 * RLC_FP_BYTES) {
-		fp2_zero(a[0][0]);
-		fp2_read_bin(a[0][1], bin, 2 * RLC_FP_BYTES);
-		fp2_read_bin(a[0][2], bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-		fp2_read_bin(a[1][0], bin + 4 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-		fp2_zero(a[1][1]);
-		fp2_read_bin(a[1][2], bin + 6 * RLC_FP_BYTES, 2 * RLC_FP_BYTES);
-		fp12_back_cyc(a, a);
-	}
-	if (len == 12 * RLC_FP_BYTES) {
-		fp6_read_bin(a[0], bin, 6 * RLC_FP_BYTES);
-		fp6_read_bin(a[1], bin + 6 * RLC_FP_BYTES, 6 * RLC_FP_BYTES);
-	}
-}
-
-void fp12_write_bin(uint8_t *bin, int len, fp12_t a, int pack) {
-	fp12_t t;
-
-	fp12_null(t);
-
-	RLC_TRY {
-		fp12_new(t);
-
-		if (pack) {
-			if (len != 8 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp12_pck(t, a);
-			fp2_write_bin(bin, 2 * RLC_FP_BYTES, a[0][1], 0);
-			fp2_write_bin(bin + 2 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[0][2], 0);
-			fp2_write_bin(bin + 4 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[1][0], 0);
-			fp2_write_bin(bin + 6 * RLC_FP_BYTES, 2 * RLC_FP_BYTES, a[1][2], 0);
-		} else {
-			if (len != 12 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp6_write_bin(bin, 6 * RLC_FP_BYTES, a[0]);
-			fp6_write_bin(bin + 6 * RLC_FP_BYTES, 6 * RLC_FP_BYTES, a[1]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp12_free(t);
-	}
-}
-
-void fp12_set_dig(fp12_t a, dig_t b) {
-	fp6_set_dig(a[0], b);
-	fp6_zero(a[1]);
-}
-
-void fp18_copy(fp18_t c, fp18_t a) {
-	fp9_copy(c[0], a[0]);
-	fp9_copy(c[1], a[1]);
-}
-
-void fp18_zero(fp18_t a) {
-	fp9_zero(a[0]);
-	fp9_zero(a[1]);
-}
-
-int fp18_is_zero(fp18_t a) {
-	return (fp9_is_zero(a[0]) && fp9_is_zero(a[1]));
-}
-
-void fp18_rand(fp18_t a) {
-	fp9_rand(a[0]);
-	fp9_rand(a[1]);
-}
-
-void fp18_print(fp18_t a) {
-	fp9_print(a[0]);
-	fp9_print(a[1]);
-}
-
-int fp18_size_bin(fp18_t a) {
-	return 18 * RLC_FP_BYTES;
-}
-
-void fp18_read_bin(fp18_t a, const uint8_t *bin, int len) {
-	if (len != 18 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp9_read_bin(a[0], bin, 9 * RLC_FP_BYTES);
-	fp9_read_bin(a[1], bin + 9 * RLC_FP_BYTES, 9 * RLC_FP_BYTES);
-}
-
-void fp18_write_bin(uint8_t *bin, int len, fp18_t a) {
-	if (len != 18 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	fp9_write_bin(bin, 9 * RLC_FP_BYTES, a[0]);
-	fp9_write_bin(bin + 9 * RLC_FP_BYTES, 9 * RLC_FP_BYTES, a[1]);
-}
-
-void fp18_set_dig(fp18_t a, dig_t b) {
-	fp9_set_dig(a[0], b);
-	fp9_zero(a[1]);
-}
-
-void fp24_copy(fp24_t c, fp24_t a) {
-	fp8_copy(c[0], a[0]);
-	fp8_copy(c[1], a[1]);
-	fp8_copy(c[2], a[2]);
-}
-
-void fp24_zero(fp24_t a) {
-	fp8_zero(a[0]);
-	fp8_zero(a[1]);
-	fp8_zero(a[2]);
-}
-
-int fp24_is_zero(fp24_t a) {
-	return fp8_is_zero(a[0]) && fp8_is_zero(a[1]) && fp8_is_zero(a[2]);
-}
-
-void fp24_rand(fp24_t a) {
-	fp8_rand(a[0]);
-	fp8_rand(a[1]);
-	fp8_rand(a[2]);
-}
-
-void fp24_print(fp24_t a) {
-	fp8_print(a[0]);
-	fp8_print(a[1]);
-	fp8_print(a[2]);
-}
-
-int fp24_size_bin(fp24_t a, int pack) {
-	if (pack) {
-		if (fp24_test_cyc(a)) {
-			return 16 * RLC_FP_BYTES;
-		} else {
-			return 24 * RLC_FP_BYTES;
-		}
-	} else {
-		return 24 * RLC_FP_BYTES;
-	}
-}
-
-void fp24_read_bin(fp24_t a, const uint8_t *bin, int len) {
-	if (len != 16 * RLC_FP_BYTES && len != 24 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	if (len == 16 * RLC_FP_BYTES) {
-		fp4_zero(a[0][0]);
-		fp4_zero(a[0][1]);
-		fp4_read_bin(a[1][0], bin, 4 * RLC_FP_BYTES);
-		fp4_read_bin(a[1][1], bin + 4 * RLC_FP_BYTES, 4 * RLC_FP_BYTES);
-		fp4_read_bin(a[2][0], bin + 8 * RLC_FP_BYTES, 4 * RLC_FP_BYTES);
-		fp4_read_bin(a[2][1], bin + 12 * RLC_FP_BYTES, 4 * RLC_FP_BYTES);
-		fp24_back_cyc(a, a);
-	}
-	if (len == 24 * RLC_FP_BYTES) {
-		fp8_read_bin(a[0], bin, 8 * RLC_FP_BYTES);
-		fp8_read_bin(a[1], bin + 8 * RLC_FP_BYTES, 8 * RLC_FP_BYTES);
-		fp8_read_bin(a[2], bin + 16 * RLC_FP_BYTES, 8 * RLC_FP_BYTES);
-	}
-}
-
-void fp24_write_bin(uint8_t *bin, int len, fp24_t a, int pack) {
-	fp24_t t;
-
-	fp24_null(t);
-
-	RLC_TRY {
-		fp24_new(t);
-
-		if (pack) {
-			if (len != 16 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp24_pck(t, a);
-			fp4_write_bin(bin, 4 * RLC_FP_BYTES, a[1][0]);
-			fp4_write_bin(bin + 4 * RLC_FP_BYTES, 4 * RLC_FP_BYTES, a[1][1]);
-			fp4_write_bin(bin + 8 * RLC_FP_BYTES, 4 * RLC_FP_BYTES, a[2][0]);
-			fp4_write_bin(bin + 12 * RLC_FP_BYTES, 4 * RLC_FP_BYTES, a[2][1]);
-		} else {
-			if (len != 24 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp8_write_bin(bin, 8 * RLC_FP_BYTES, a[0]);
-			fp8_write_bin(bin + 8 * RLC_FP_BYTES, 8 * RLC_FP_BYTES, a[1]);
-			fp8_write_bin(bin + 16 * RLC_FP_BYTES, 8 * RLC_FP_BYTES, a[2]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp24_free(t);
-	}
-}
-
-void fp24_set_dig(fp24_t a, dig_t b) {
-	fp8_set_dig(a[0], b);
-	fp8_zero(a[1]);
-	fp8_zero(a[2]);
-}
-
-void fp48_copy(fp48_t c, fp48_t a) {
-	fp24_copy(c[0], a[0]);
-	fp24_copy(c[1], a[1]);
-}
-
-void fp48_zero(fp48_t a) {
-	fp24_zero(a[0]);
-	fp24_zero(a[1]);
-}
-
-int fp48_is_zero(fp48_t a) {
-	return (fp24_is_zero(a[0]) && fp24_is_zero(a[1]));
-}
-
-void fp48_rand(fp48_t a) {
-	fp24_rand(a[0]);
-	fp24_rand(a[1]);
-}
-
-void fp48_print(fp48_t a) {
-	fp24_print(a[0]);
-	fp24_print(a[1]);
-}
-
-int fp48_size_bin(fp48_t a, int pack) {
-	if (pack) {
-		if (fp48_test_cyc(a)) {
-			return 32 * RLC_FP_BYTES;
-		} else {
-			return 48 * RLC_FP_BYTES;
-		}
-	} else {
-		return 48 * RLC_FP_BYTES;
-	}
-}
-
-void fp48_read_bin(fp48_t a, const uint8_t *bin, int len) {
-	if (len != 32 * RLC_FP_BYTES && len != 48 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	if (len == 32 * RLC_FP_BYTES) {
-		fp8_zero(a[0][0]);
-		fp8_read_bin(a[0][1], bin, 8 * RLC_FP_BYTES);
-		fp8_read_bin(a[0][2], bin + 8 * RLC_FP_BYTES, 8 * RLC_FP_BYTES);
-		fp8_read_bin(a[1][0], bin + 16 * RLC_FP_BYTES, 8 * RLC_FP_BYTES);
-		fp8_zero(a[1][1]);
-		fp8_read_bin(a[1][2], bin + 24 * RLC_FP_BYTES, 8 * RLC_FP_BYTES);
-		fp48_back_cyc(a, a);
-	}
-	if (len == 48 * RLC_FP_BYTES) {
-		fp24_read_bin(a[0], bin, 24 * RLC_FP_BYTES);
-		fp24_read_bin(a[1], bin + 24 * RLC_FP_BYTES, 24 * RLC_FP_BYTES);
-	}
-}
-
-void fp48_write_bin(uint8_t *bin, int len, fp48_t a, int pack) {
-	fp48_t t;
-
-	fp48_null(t);
-
-	RLC_TRY {
-		fp48_new(t);
-
-		if (pack) {
-			if (len != 32 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp48_pck(t, a);
-			fp8_write_bin(bin, 8 * RLC_FP_BYTES, a[0][1]);
-			fp8_write_bin(bin + 8 * RLC_FP_BYTES, 8 * RLC_FP_BYTES, a[0][2]);
-			fp8_write_bin(bin + 16 * RLC_FP_BYTES, 8 * RLC_FP_BYTES, a[1][0]);
-			fp8_write_bin(bin + 24 * RLC_FP_BYTES, 8 * RLC_FP_BYTES, a[1][2]);
-		} else {
-			if (len != 48 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp24_write_bin(bin, 24 * RLC_FP_BYTES, a[0], 0);
-			fp24_write_bin(bin + 24 * RLC_FP_BYTES, 24 * RLC_FP_BYTES, a[1], 0);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp48_free(t);
-	}
-}
-
-void fp48_set_dig(fp48_t a, dig_t b) {
-	fp24_set_dig(a[0], b);
-	fp24_zero(a[1]);
-}
-
-void fp54_copy(fp54_t c, fp54_t a) {
-	fp18_copy(c[0], a[0]);
-	fp18_copy(c[1], a[1]);
-	fp18_copy(c[2], a[2]);
-}
-
-void fp54_zero(fp54_t a) {
-	fp18_zero(a[0]);
-	fp18_zero(a[1]);
-	fp18_zero(a[2]);
-}
-
-int fp54_is_zero(fp54_t a) {
-	return (fp18_is_zero(a[0]) && fp18_is_zero(a[1]) && fp18_is_zero(a[2]));
-}
-
-void fp54_rand(fp54_t a) {
-	fp18_rand(a[0]);
-	fp18_rand(a[1]);
-	fp18_rand(a[2]);
-}
-
-void fp54_print(fp54_t a) {
-	fp18_print(a[0]);
-	fp18_print(a[1]);
-	fp18_print(a[2]);
-}
-
-int fp54_size_bin(fp54_t a, int pack) {
-	if (pack) {
-		if (fp54_test_cyc(a)) {
-			return 36 * RLC_FP_BYTES;
-		} else {
-			return 54 * RLC_FP_BYTES;
-		}
-	} else {
-		return 54 * RLC_FP_BYTES;
-	}
-}
-
-void fp54_read_bin(fp54_t a, const uint8_t *bin, int len) {
-	if (len != 36 * RLC_FP_BYTES && len != 54 * RLC_FP_BYTES) {
-		RLC_THROW(ERR_NO_BUFFER);
-		return;
-	}
-	if (len == 36 * RLC_FP_BYTES) {
-		fp9_zero(a[0][0]);
-		fp9_zero(a[0][1]);
-		fp9_read_bin(a[1][0], bin, 9 * RLC_FP_BYTES);
-		fp9_read_bin(a[1][1], bin + 9 * RLC_FP_BYTES, 9 * RLC_FP_BYTES);
-		fp9_read_bin(a[2][0], bin + 18 * RLC_FP_BYTES, 9 * RLC_FP_BYTES);
-		fp9_read_bin(a[2][1], bin + 27 * RLC_FP_BYTES, 9 * RLC_FP_BYTES);
-		fp54_back_cyc(a, a);
-	}
-	if (len == 54 * RLC_FP_BYTES) {
-		fp18_read_bin(a[0], bin, 18 * RLC_FP_BYTES);
-		fp18_read_bin(a[1], bin + 18 * RLC_FP_BYTES, 18 * RLC_FP_BYTES);
-		fp18_read_bin(a[2], bin + 36 * RLC_FP_BYTES, 18 * RLC_FP_BYTES);
-	}
-}
-
-void fp54_write_bin(uint8_t *bin, int len, fp54_t a, int pack) {
-	fp54_t t;
-
-	fp54_null(t);
-
-	RLC_TRY {
-		fp54_new(t);
-
-		if (pack) {
-			if (len != 36 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp54_pck(t, a);
-			fp9_write_bin(bin, 9 * RLC_FP_BYTES, a[1][0]);
-			fp9_write_bin(bin + 9 * RLC_FP_BYTES, 9 * RLC_FP_BYTES, a[1][1]);
-			fp9_write_bin(bin + 18 * RLC_FP_BYTES, 9 * RLC_FP_BYTES, a[2][0]);
-			fp9_write_bin(bin + 27 * RLC_FP_BYTES, 9 * RLC_FP_BYTES, a[2][1]);
-		} else {
-			if (len != 54 * RLC_FP_BYTES) {
-				RLC_THROW(ERR_NO_BUFFER);
-			}
-			fp18_write_bin(bin, 18 * RLC_FP_BYTES, a[0]);
-			fp18_write_bin(bin + 18 * RLC_FP_BYTES, 18 * RLC_FP_BYTES, a[1]);
-			fp18_write_bin(bin + 36 * RLC_FP_BYTES, 18 * RLC_FP_BYTES, a[2]);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp54_free(t);
-	}
-}
-
-void fp54_set_dig(fp54_t a, dig_t b) {
-	fp18_set_dig(a[0], b);
-	fp18_zero(a[1]);
-	fp18_zero(a[2]);
-}
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.c
deleted file mode 100644
index c2d8a50e853a..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < RLC_FP_DIGS && carry; i++, a++, c++) {
-		r0 = (*a) + carry;
-		carry = (r0 < carry);
-		(*c) = r0;
-	}
-	for (; i < RLC_FP_DIGS; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_addd_low(c, a, b);
-
-	if (carry || (dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < RLC_FP_DIGS; i++, c++, a++) {
-		r0 = (*a) - carry;
-		carry = (r0 > (*a));
-		(*c) = r0;
-	}
-	return carry;
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_subd_low(c, a, b);
-
-	if (carry) {
-		fp_addn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	fp_subn_low(c, fp_prime_get(), a);
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		(*c) = r1;
-	}
-	return carry;
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-
-	fp_add1_low(c + RLC_FP_DIGS, a + RLC_FP_DIGS, carry);
-
-	carry = fp_rsh1_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS);
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.s
deleted file mode 100644
index da4691df8b09..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_add_low.s
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-#define RLC_LT	-1
-#define RLC_EQ	0
-#define RLC_GT	1
-
-.syntax unified
-.arch armv7-a
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_addn_low
-.global fp_subn_low
-.global fp_addm_low
-.global fp_addd_low
-.global fp_subd_low
-.global fp_subm_low
-
-/********************************************************** FP_ADDN_LOW ***********************************************************************/
-
-fp_addn_low:
-	STMDB sp!, {r4}
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	ADDS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #0]	/* (*c) = r3*/
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #4]	/* (*c) = r3*/
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #8]	/* (*c) = r3*/
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #12]	/* (*c) = r3*/
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #16]	/* (*c) = r3*/
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #20]	/* (*c) = r3*/
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #24]	/* (*c) = r3*/
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #28]	/* (*c) = r3*/
-
-	MOV r0, #0		/* r0 = carry = 0 */
-	ADC r0, r0, r0 	/* Armazenando o resultado do carry no r0*/
-
-	LDMIA sp!, {r4}
-	MOV pc, lr		/* return carry*/
-
-/********************************************************** FP_SUBN_LOW ***********************************************************************/
-fp_subn_low:
-	STMDB sp!, {r4}
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	SUBS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #0]	/* (*c) = r3*/
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #4]	/* (*c) = r3*/
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #8]	/* (*c) = r3*/
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #12]	/* (*c) = r3*/
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #16]	/* (*c) = r3*/
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #20]	/* (*c) = r3*/
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #24]	/* (*c) = r3*/
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) - (*b) */
-	STR r3, [r0, #28]	/* (*c) = r3*/
-
-	MOV r0, #0		/* r0 = carry = 0 */
-	SBC r0, r0, r0 	/* Armazenando o resultado do carry no r0*/
-
-	LDMIA sp!, {r4}
-	MOV pc, lr		/* return carry*/
-
-/********************************************************** FP_ADDM_LOW ***********************************************************************/
-
-fp_addd_low:
-	STMDB sp!, {r4}
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	ADDS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #0]	/* (*c) = r3*/
-
-	.irp i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-	LDR r3, [r1, #4*\i]	/* r3 = *a */
-	LDR r4, [r2, #4*\i]	/* r4 = *b */
-	ADCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #4*\i]	/* (*c) = r3*/
-	.endr
-
-	MOV r0, #0		/* r0 = carry = 0 */
-	ADC r0, r0, r0 	/* Armazenando o resultado do carry no r0*/
-
-	LDMIA sp!, {r4}
-	MOV pc, lr		/* return carry*/
-
-fp_subd_low:
-	STMDB sp!, {r4}
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	SUBS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #0]	/* (*c) = r3*/
-
-	.irp i, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-	LDR r3, [r1, #4*\i]	/* r3 = *a */
-	LDR r4, [r2, #4*\i]	/* r4 = *b */
-	SBCS r3, r3, r4		/* r3 = (*a) + (*b) */
-	STR r3, [r0, #4*\i]	/* (*c) = r3*/
-	.endr
-
-	MOV r0, #0		/* r0 = carry = 0 */
-	SBCS r0, r0, r0 	/* Armazenando o resultado do carry no r0*/
-
-	LDMIA sp!, {r4}
-	MOV pc, lr		/* return carry*/
-
-fp_addm_low2:
-	STMDB sp!, {r4-r12}
-
-/* ADD_STEP: */
-
-/* Manter os resultados em registradores {r5-r12} */
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	ADDS r5, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	ADCS r6, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	ADCS r7, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	ADCS r8, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	ADCS r9, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	ADCS r10, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	ADCS r11, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	ADC r12, r3, r4		/* r3 = (*a) + (*b) */
-
-/* SUB_STEP: */
-	/**** Primeira iteracao ****/
-	SUBS r5, r5, #0x13
-
-	/**** Segunda iteracao ****/
-	SBCS r6, r6, #0xA7000000
-
-	/**** Terceira iteracao ****/
-	SBCS r7, r7, #0x13
-
-	/**** Quarta iteracao ****/
-	MOVW r3, #0x6121
-	SBCS r8, r8, r3, LSL#16
-
-	/**** Quinta iteracao ****/
-	SBCS r9, r9, #0x8
-
-	/**** Sexta iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	SBCS r10, r10, r3
-
-	/**** Setima iteracao ****/
-	SBCS r11, r11, #0x40000001
-
-	/**** Oitava iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	SBCS r12, r12, r3
-
-	MOV r3, #0		/* r3 = carry = 0 */
-	SBCS r3, r3, r3 /* Armazenando o resultado do carry no r3*/
-
-/* Se houver carry, entao o resultado ficou menor, deve-se adicionar o primo 'p' novamente */
-	/**** Primeira iteracao ****/
-	AND  r4, r3, #0x13
-	ADDS r5, r5, r4
-
-	/**** Segunda iteracao ****/
-	AND  r4, r3, #0xA7000000
-	ADCS r6, r6, r4
-
-	/**** Terceira iteracao ****/
-	AND  r4, r3, #0x13
-	ADCS r7, r7, r4
-
-	/**** Quarta iteracao ****/
-	MOVW r4, #0x6121
-	AND  r4, r4, r3
-	ADCS r8, r8, r4, LSL#16
-
-	/**** Quinta iteracao ****/
-	AND  r4, r3, #0x8
-	ADCS r9, r9, r4
-
-	/**** Sexta iteracao ****/
-	MOVW r4, #0x4D80
-	MOVT r4, #0xBA34
-	AND  r4, r4, r3
-	ADCS r10, r10, r4
-
-	/**** Setima iteracao ****/
-	AND  r4, r3, #0x40000001
-	ADCS r11, r11, r4
-
-	/**** Oitava iteracao ****/
-	MOVW r4, #0x6482
-	MOVT r4, #0x2523
-	AND  r4, r4, r3
-	ADCS r12, r12, r4
-
-/* Senao, escreve o  resultado em memoria */
-	STR r5, [r0, #0]	/* (*c) = r5*/
-	STR r6, [r0, #4]	/* (*c) = r6*/
-	STR r7, [r0, #8]	/* (*c) = r7*/
-	STR r8, [r0, #12]	/* (*c) = r8*/
-	STR r9, [r0, #16]	/* (*c) = r9*/
-	STR r10, [r0, #20]	/* (*c) = r10*/
-	STR r11, [r0, #24]	/* (*c) = r11*/
-	STR r12, [r0, #28]	/* (*c) = r12*/
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr		/* return r*/
-
-fp_addm_low:
-	STMDB sp!, {r4-r12}
-
-/* ADD_STEP: */
-
-/* Manter os resultados em registradores {r5-r12} */
-
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	ADDS r5, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	ADCS r6, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	ADCS r7, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	ADCS r8, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	ADCS r9, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	ADCS r10, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	ADCS r11, r3, r4		/* r3 = (*a) + (*b) */
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	ADC r12, r3, r4		/* r3 = (*a) + (*b) */
-
-/* CMP_STEP: */
-
-	/**** Primeira iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	CMP r12, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Segunda iteracao ****/
-	CMP r11, #0x40000001
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Terceira iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	CMP r10, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Quarta iteracao ****/
-	CMP r9, #0x8
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Quinta iteracao ****/
-	MOVW r3, #0x6121
-	CMP r8, r3, LSL#16
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Sexta iteracao ****/
-	CMP r7, #0x13
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Setima iteracao ****/
-	CMP r6, #0xA7000000
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Oitava iteracao ****/
-	CMP r5, #0x13
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-GREATER_THAN_OR_EQUAL:
-
-/*Se for maior ou igual subtrair 'p' e escrever em memoria */
-
-/* SUB_STEP: */
-	/**** Primeira iteracao ****/
-	SUBS r5, r5, #0x13
-	STR r5, [r0, #0]
-
-	/**** Segunda iteracao ****/
-	SBCS r6, r6, #0xA7000000
-	STR r6, [r0, #4]
-
-	/**** Terceira iteracao ****/
-	SBCS r7, r7, #0x13
-	STR r7, [r0, #8]
-
-	/**** Quarta iteracao ****/
-	MOVW r3, #0x6121
-	SBCS r8, r8, r3, LSL#16
-	STR r8, [r0, #12]
-
-	/**** Quinta iteracao ****/
-	SBCS r9, r9, #0x8
-	STR r9, [r0, #16]
-
-	/**** Sexta iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	SBCS r10, r10, r3
-	STR r10, [r0, #20]
-
-	/**** Setima iteracao ****/
-	SBCS r11, r11, #0x40000001
-	STR r11, [r0, #24]
-
-	/**** Oitava iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	SBCS r12, r12, r3
-	STR r12, [r0, #28]
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr
-
-LESS_THAN:
-
-/* Se for menor escrever em memória */
-
-	STR r5, [r0, #0]	/* (*c) = r5*/
-	STR r6, [r0, #4]	/* (*c) = r6*/
-	STR r7, [r0, #8]	/* (*c) = r7*/
-	STR r8, [r0, #12]	/* (*c) = r8*/
-	STR r9, [r0, #16]	/* (*c) = r9*/
-	STR r10, [r0, #20]	/* (*c) = r10*/
-	STR r11, [r0, #24]	/* (*c) = r11*/
-	STR r12, [r0, #28]	/* (*c) = r12*/
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr		/* return r*/
-
-/********************************************************** FP_SUBM_LOW ***********************************************************************/
-/*
-void fp_subm_low(dig_t *c, dig_t *a, dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, b++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		c[i] = r0;
-	}
-	if (carry) {
-		fp_addn_low(c, c, fp_prime_get());
-	}
-}
-*/
-
-fp_subm_low2:
-	STMDB sp!, {r4-r12}
-
-/* SUB_STEP: */
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	SUBS r5, r3, r4
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	SBCS r6, r3, r4
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	SBCS r7, r3, r4
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	SBCS r8, r3, r4
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	SBCS r9, r3, r4
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	SBCS r10, r3, r4
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	SBCS r11, r3, r4
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	SBCS r12, r3, r4
-
-	MOV r3, #0		/* r3 = carry = 0 */
-	SBCS r3, r3, r3 	/* Armazenando o resultado do carry no r3*/
-
-	CMP r3, #0   		/* Verifica se o carry = 0 */
-
-/* Se houver carry adicionar o primo 'p' e escrever em memória */
-
-	/**** Primeira iteracao ****/
-	ADDNES r5, r5, #0x13
-
-	/**** Segunda iteracao ****/
-	ADCNES r6, r6, #0xA7000000
-
-	/**** Terceira iteracao ****/
-	ADCNES r7, r7, #0x13
-
-	/**** Quarta iteracao ****/
-	MOVW r3, #0x6121
-	ADCNES r8, r8, r3, LSL#16
-
-	/**** Quinta iteracao ****/
-	ADCNES r9, r9, #0x8
-
-	/**** Sexta iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	ADCNES r10, r10, r3
-
-	/**** Setima iteracao ****/
-	ADCNES r11, r11, #0x40000001
-
-	/**** Oitava iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	ADCNES r12, r12, r3
-
-/* Se nao houver carry escrever em memória */
-
-	STR r5, [r0, #0]	/* (*c) = r5*/
-	STR r6, [r0, #4]	/* (*c) = r6*/
-	STR r7, [r0, #8]	/* (*c) = r7*/
-	STR r8, [r0, #12]	/* (*c) = r8*/
-	STR r9, [r0, #16]	/* (*c) = r9*/
-	STR r10, [r0, #20]	/* (*c) = r10*/
-	STR r11, [r0, #24]	/* (*c) = r11*/
-	STR r12, [r0, #28]	/* (*c) = r12*/
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr
-
-fp_subm_low:
-	STMDB sp!, {r4-r12}
-
-/* SUB_STEP: */
-	/**** Primeira iteracao ****/
-	LDR r3, [r1, #0]	/* r3 = *a */
-	LDR r4, [r2, #0]	/* r4 = *b */
-	SUBS r5, r3, r4
-
-	/**** Segunda iteracao ****/
-	LDR r3, [r1, #4]	/* r3 = *a */
-	LDR r4, [r2, #4]	/* r4 = *b */
-	SBCS r6, r3, r4
-
-	/**** Terceira iteracao ****/
-	LDR r3, [r1, #8]	/* r3 = *a */
-	LDR r4, [r2, #8]	/* r4 = *b */
-	SBCS r7, r3, r4
-
-	/**** Quarta iteracao ****/
-	LDR r3, [r1, #12]	/* r3 = *a */
-	LDR r4, [r2, #12]	/* r4 = *b */
-	SBCS r8, r3, r4
-
-	/**** Quinta iteracao ****/
-	LDR r3, [r1, #16]	/* r3 = *a */
-	LDR r4, [r2, #16]	/* r4 = *b */
-	SBCS r9, r3, r4
-
-	/**** Sexta iteracao ****/
-	LDR r3, [r1, #20]	/* r3 = *a */
-	LDR r4, [r2, #20]	/* r4 = *b */
-	SBCS r10, r3, r4
-
-	/**** Setima iteracao ****/
-	LDR r3, [r1, #24]	/* r3 = *a */
-	LDR r4, [r2, #24]	/* r4 = *b */
-	SBCS r11, r3, r4
-
-	/**** Oitava iteracao ****/
-	LDR r3, [r1, #28]	/* r3 = *a */
-	LDR r4, [r2, #28]	/* r4 = *b */
-	SBCS r12, r3, r4
-
-	MOV r3, #0		/* r3 = carry = 0 */
-	SBCS r3, r3, r3 	/* Armazenando o resultado do carry no r3*/
-
-	CMP r3, #0   		/* Verifica se o carry = 0 */
-
-	BNE IS_ONE
-
-IS_ZERO:
-
-/* Se nao houver carry escrever em memória */
-
-	STR r5, [r0, #0]	/* (*c) = r5*/
-	STR r6, [r0, #4]	/* (*c) = r6*/
-	STR r7, [r0, #8]	/* (*c) = r7*/
-	STR r8, [r0, #12]	/* (*c) = r8*/
-	STR r9, [r0, #16]	/* (*c) = r9*/
-	STR r10, [r0, #20]	/* (*c) = r10*/
-	STR r11, [r0, #24]	/* (*c) = r11*/
-	STR r12, [r0, #28]	/* (*c) = r12*/
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr
-
-IS_ONE:
-
-/* Se houver carry adicionar o primo 'p' e escrever em memória */
-
-	/**** Primeira iteracao ****/
-	ADDS r5, r5, #0x13
-	STR r5, [r0, #0]
-
-	/**** Segunda iteracao ****/
-	ADCS r6, r6, #0xA7000000
-	STR r6, [r0, #4]
-
-	/**** Terceira iteracao ****/
-	ADCS r7, r7, #0x13
-	STR r7, [r0, #8]
-
-	/**** Quarta iteracao ****/
-	MOVW r3, #0x6121
-	ADCS r8, r8, r3, LSL#16
-	STR r8, [r0, #12]
-
-	/**** Quinta iteracao ****/
-	ADCS r9, r9, #0x8
-	STR r9, [r0, #16]
-
-	/**** Sexta iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	ADCS r10, r10, r3
-	STR r10, [r0, #20]
-
-	/**** Setima iteracao ****/
-	ADCS r11, r11, #0x40000001
-	STR r11, [r0, #24]
-
-	/**** Oitava iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	ADCS r12, r12, r3
-	STR r12, [r0, #28]
-
-	LDMIA sp!, {r4-r12}
-	MOV pc, lr
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.c
deleted file mode 100644
index a563e3b157bf..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Accumulates a double precision digit in a triple register variable.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- * @param[in] B				- the second digit to multiply.
- */
-#define COMBA_STEP_MUL(R2, R1, R0, A, B)								\
-	dbl_t r = (dbl_t)(A) * (dbl_t)(B);										\
-	dig_t _r = (R1);														\
-	(R0) += (dig_t)(r);														\
-	(R1) += (R0) < (dig_t)(r);												\
-	(R2) += (R1) < _r;														\
-	(R1) += (dig_t)((r) >> (dbl_t)RLC_DIG);								\
-	(R2) += (R1) < (dig_t)((r) >> (dbl_t)RLC_DIG);							\
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*c) + (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-
-	fp_muln_low(t, a, b);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.s
deleted file mode 100644
index 0f40ce73f2ec..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_mul_low.s
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-.syntax unified
-.arch armv7-a
-
-.global fp_muln_low
-
-/*============================================================================*/
-/* Uso dos registradores                                                      */
-/* r0 = C                                                                      */
-/* r1 = A                                                                        */
-/* r2 = B                                                                        */
-/* r3 = ACC_2                                                                    */
-/* r4 = ACC_1                                                                    */
-/* r5 = ACC_0                                                                    */
-/* r6 = Ra[0]                                                                    */
-/* r7 = Ra[1]                                                                    */
-/* r8 = Ra[2]                                                                    */
-/* r9 = Rb[0]                                                                    */
-/* r10 = Rb[1]                                                                    */
-/* r11 = Rb[2]                                                                    */
-/* r12 = aux                                                                    */
-/* r13 = sp                                                                        */
-/* r14 = lr                                                                        */
-/* r15 = pc                                                                        */
-/*============================================================================*/
-
-fp_muln_low:
-    STMDB sp!, {r4-r12, r14}
-
-    PLD    [r1, #32]
-    PLD    [r2, #32]
-
-/********************************************************** B_init ***********************************************************************/
-
-    LDR r6,  [r1, #(4*6)]
-    LDR r9,  [r2, #(4*0)]
-        MOV r5, #0
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMULL r5, r4, r6, r9
-        MOV r3, #0
-        LDR r10, [r2, #(4*1)]
-    /* COMBA_MFIN_1 6 */
-    STR r5, [r0, #(4*6)]
-    MOV r5, #0
-
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r5, r6, r10
-        LDR r7,  [r1, #(4*7)]
-        MOV r12, #0
-    ADDS r3, r3, r5
-    ADC r5, r12, #0
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r14, #0
-        LDR r6,  [r1, #(4*3)]
-        LDR r9,  [r2, #(4*0)]
-    ADDS r3, r3, r12
-/* ADC r5, r5, #0 */
-    /* COMBA_MFIN_2 7 */
-
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r14, r7, r10
-        STR r4, [r0, #(4*7)]
-        MOV r4, #0
-        MOV r12, #0
-    ADCS r5, r5, r14
-/* ADC r4, r4, #0 */
-    /* COMBA_MFIN_3 8 */
-
-    STR r5, [r0, #(4*9)]
-    MOV r5, #0
-/********************************************************** r0 - Part 1 ***********************************************************************/
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMULL r5, r12, r6, r9
-        STR r3, [r0, #(4*8)]
-        MOV r3, #0
-        LDR r7,  [r1, #(4*4)]
-        LDR r10, [r2, #(4*1)]
-        MOV r14, #0
-    ADCS r4, r4, r12
-/* ADC r3, r3, #0 */
-    /* COMBA_MFIN_1 3 */
-
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r14, r7, r9
-        STR r5, [r0, #(4*3)]
-        MOV r5, #0
-        MOV r12, #0
-    ADCS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r12, r6, r10
-        MOV r14, #0
-        LDR r8,  [r1, #(4*5)]
-        LDR r11, [r2, #(4*2)]
-    ADDS r3, r3, r12
-/* ADC r5, r5, #0 */
-    /* COMBA_MFIN_2 4 */
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r14, r8, r9
-        STR r4, [r0, #(4*4)]
-        MOV r4, #0
-        MOV r12, #0
-    ADCS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r12, r7, r10
-        MOV r14, #0
-    ADDS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r14, r6, r11
-        MOV r12, #0
-    ADDS r5, r5, r14
-/* ADC r4, r4, #0 */
-    /* COMBA_MFIN_3 5 */
-
-/********************************************************** r0 - Part 2 ***********************************************************************/
-
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r12, r8, r10
-        STR r3, [r0, #(4*5)]
-        MOV r3, #0
-        MOV r14, #0
-    ADCS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r14, r7, r11
-        LDR r9,  [r2, #(4*3)]
-        MOV r12, #0
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r12, r6, r9
-        MOV r14, #0
-        LDR  r10, [r0, #(4*6)]
-/*
-ADDS r4, r4, r12
-ADC r3, r3, #0
-*/
-    /* COMBA_ADD_1 6 */
-    ADDS r5, r5, r10
-    ADCS r4, r4, r12
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 6 */
-    STR r5, [r0, #(4*6)]
-
-    /* COMBA_STEP_2 r8 r11 */
-    UMLAL r4, r14, r8, r11
-        MOV r5, #0
-        LDR r10,  [r2, #(4*4)]
-        MOV r12, #0
-    ADCS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r14, #0
-    ADDS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r14, r6, r10
-        MOV r12, #0
-        LDR  r6, [r0, #(4*7)]
-/*
-    ADDS r3, r3, r14
-    ADC r5, r5, #0
-*/
-    /* COMBA_ADD_2 7 */
-    ADDS r4, r4, r6
-    ADCS r3, r3, r14
-/* ADC  r5, r5, #0 */
-    /* COMBA_MFIN_2 7 */
-    STR r4, [r0, #(4*7)]
-
-/********************************************************** r0 - Part 3 ***********************************************************************/
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r12, r8, r9
-        MOV r4, #0
-        LDR r6,  [r1, #(4*6)]
-        MOV r14, #0
-    ADCS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r14, r6, r11
-        MOV r12, #0
-    ADDS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r12, r7, r10
-        MOV r14, #0
-        LDR  r7, [r0, #(4*8)]
-/*
-    ADDS r5, r5, r12
-    ADC r4, r4, #0
-*/
-    /* COMBA_ADD_3 8 */
-    ADDS r3, r3, r7
-    ADCS r5, r5, r12
-/* ADC  r4, r4, #0 */
-
-    /* COMBA_MFIN_3 8 */
-    STR r3, [r0, #(4*8)]
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r14, r6, r9
-        MOV r3, #0
-        LDR r7,  [r1, #(4*7)]
-        MOV r12, #0
-    ADCS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r12, r7, r11
-        MOV r14, #0
-    ADDS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r14, r8, r10
-        MOV r12, #0
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_ADD_1 9 */
-    LDR  r14, [r0, #(4*9)]
-    ADDS r5, r5, r14
-    ADCS r4, r4, #0
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 9 */
-    STR r5, [r0, #(4*9)]
-
-/********************************************************** r0 - Part 4 ***********************************************************************/
-
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r5, #0
-        MOV r14, #0
-    ADCS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r14, r6, r10
-        MOV r12, #0
-    ADDS r3, r3, r14
-/* ADC r5, r5, #0 */
-    /* COMBA_MFIN_2 10 */
-    STR r4, [r0, #(4*10)]
-
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r12, r7, r10
-        MOV r4, #0
-        MOV r14, #0
-        LDR r6,  [r1, #(4*0)]
-        LDR r9,  [r2, #(4*0)]
-    ADCS r5, r5, r12
-/* ADC r4, r4, #0 */
-    /* COMBA_MFIN_3 11 */
-    STR r5, [r0, #(4*12)]
-    MOV r5, #0
-
-/********************************************************** r1 - Part 1 ***********************************************************************/
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMULL r5, r14, r6, r9
-        STR r3, [r0, #(4*11)]
-        MOV r3, #0
-        LDR r7,  [r1, #(4*1)]
-        MOV r12, #0
-    ADCS r4, r4, r14
-/* ADC r3, r3, #0 */
-    /* COMBA_MFIN_1 0 */
-    STR r5, [r0, #(4*0)]
-
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r5, #0
-        LDR r10, [r2, #(4*1)]
-        MOV r14, #0
-    ADCS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r14, r6, r10
-        MOV r12, #0
-        LDR r8,  [r1, #(4*2)]
-        LDR r11, [r2, #(4*2)]
-    ADDS r3, r3, r14
-/* ADC r5, r5, #0 */
-
-    /* COMBA_MFIN_2 1 */
-    STR r4, [r0, #(4*1)]
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r12, r8, r9
-        MOV r4, #0
-        MOV r14, #0
-    ADCS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r14, r7, r10
-        MOV r12, #0
-    ADDS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r12, r6, r11
-        MOV r14, #0
-    ADDS r5, r5, r12
-/* ADC r4, r4, #0 */
-    /* COMBA_MFIN_3 2 */
-    STR r3, [r0, #(4*2)]
-
-/********************************************************** r1 - Part 2 ***********************************************************************/
-
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r14, r8, r10
-        MOV r3, #0
-        LDR r9,  [r2, #(4*3)]
-        MOV r12, #0
-    ADCS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r12, r7, r11
-        MOV r14, #0
-    ADDS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r14, r6, r9
-        MOV r12, #0
-        LDR  r10, [r0, #(4*3)]
-/*
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-*/
-    /* COMBA_ADD_1 3 */
-    ADDS r5, r5, r10
-    ADCS r4, r4, r14
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 3 */
-    STR r5, [r0, #(4*3)]
-
-    /* COMBA_STEP_2 r8 r11 */
-    UMLAL r4, r12, r8, r11
-        MOV r5, #0
-        LDR r10,  [r2, #(4*4)]
-        MOV r14, #0
-    ADCS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r14, r7, r9
-        MOV r12, #0
-    ADDS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r12, r6, r10
-        MOV r14, #0
-        LDR  r11, [r0, #(4*4)]
-/*
-    ADDS r3, r3, r12
-    ADC r5, r5, #0
-*/
-    /* COMBA_ADD_2 4 */
-    ADDS r4, r4, r11
-    ADCS r3, r3, r12
-/* ADC  r5, r5, #0 */
-    /* COMBA_MFIN_2 4 */
-    STR r4, [r0, #(4*4)]
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r14, r8, r9
-        MOV r4, #0
-        LDR r11,  [r2, #(4*5)]
-        MOV r12, #0
-    ADCS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r12, r7, r10
-        MOV r14, #0
-    ADDS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r14, r6, r11
-        MOV r12, #0
-        LDR  r9, [r0, #(4*5)]
-/*
-    ADDS r5, r5, r14
-    ADC r4, r4, #0
-*/
-    /* COMBA_ADD_3 5 */
-    ADDS r3, r3, r9
-    ADCS r5, r5, r14
-/* ADC  r4, r4, #0 */
-    /* COMBA_MFIN_3 5 */
-    STR r3, [r0, #(4*5)]
-
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r12, r8, r10
-        MOV r3, #0
-        LDR r9,  [r2, #(4*6)]
-        MOV r14, #0
-    ADCS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r14, r7, r11
-        MOV r12, #0
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r12, r6, r9
-        MOV r14, #0
-        LDR  r10, [r0, #(4*6)]
-/*
-    ADDS r4, r4, r12
-    ADC r3, r3, #0
-*/
-    /* COMBA_ADD_1 6 */
-    ADDS r5, r5, r10
-    ADCS r4, r4, r12
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 6 */
-    STR r5, [r0, #(4*6)]
-
-    /* COMBA_STEP_2 r8 r11 */
-    UMLAL r4, r14, r8, r11
-        MOV r5, #0
-        LDR r10,  [r2, #(4*7)]
-        MOV r12, #0
-    ADCS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r14, #0
-    ADDS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r14, r6, r10
-        MOV r12, #0
-        LDR  r6, [r0, #(4*7)]
-/*
-    ADDS r3, r3, r14
-    ADC r5, r5, #0
-*/
-    /* COMBA_ADD_2 7 */
-    ADDS r4, r4, r6
-    ADCS r3, r3, r14
-/* ADC  r5, r5, #0 */
-    /* COMBA_MFIN_2 7 */
-    STR r4, [r0, #(4*7)]
-
-/********************************************************** r1 - Part 3 ***********************************************************************/
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r12, r8, r9
-        MOV r4, #0
-        LDR r6,  [r1, #(4*3)]
-        MOV r14, #0
-    ADCS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r14, r6, r11
-        MOV r12, #0
-    ADDS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r12, r7, r10
-        MOV r14, #0
-        LDR  r7, [r0, #(4*8)]
-/*
-    ADDS r5, r5, r12
-    ADC r4, r4, #0
-*/
-    /* COMBA_ADD_3 8 */
-    ADDS r3, r3, r7
-    ADCS r5, r5, r12
-/* ADC  r4, r4, #0 */
-    /* COMBA_MFIN_3 8 */
-    STR r3, [r0, #(4*8)]
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r14, r6, r9
-        MOV r3, #0
-        LDR r7,  [r1, #(4*4)]
-        MOV r12, #0
-    ADCS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r12, r7, r11
-        MOV r14, #0
-    ADDS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r14, r8, r10
-        MOV r12, #0
-        LDR  r8, [r0, #(4*9)]
-/*
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-*/
-    /* COMBA_ADD_1 9 */
-    ADDS r5, r5, r8
-    ADCS r4, r4, r14
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 9 */
-    STR r5, [r0, #(4*9)]
-
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r12, r7, r9
-        MOV r5, #0
-        LDR r8,  [r1, #(4*5)]
-        MOV r14, #0
-    ADCS r3, r3, r12
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r8 r11 */
-    UMLAL r4, r14, r8, r11
-        MOV r12, #0
-    ADDS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r12, r6, r10
-        MOV r14, #0
-        LDR  r6, [r0, #(4*10)]
-/*
-    ADDS r3, r3, r12
-    ADC r5, r5, #0
-*/
-    /* COMBA_ADD_2 10 */
-    ADDS r4, r4, r6
-    ADCS r3, r3, r12
-/* ADC  r5, r5, #0 */
-    /* COMBA_MFIN_2 10 */
-    STR r4, [r0, #(4*10)]
-
-    /* COMBA_STEP_3 r8 r9 */
-    UMLAL r3, r14, r8, r9
-        MOV r4, #0
-        LDR r6,  [r1, #(4*6)]
-        MOV r12, #0
-    ADCS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r6 r11 */
-    UMLAL r3, r12, r6, r11
-        MOV r14, #0
-    ADDS r5, r5, r12
-    ADC r4, r4, #0
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r14, r7, r10
-        MOV r12, #0
-        LDR  r7, [r0, #(4*11)]
-/*
-    ADDS r5, r5, r14
-    ADC r4, r4, #0
-*/
-    /* COMBA_ADD_3 11 */
-    ADDS r3, r3, r7
-    ADCS r5, r5, r14
-/* ADC  r4, r4, #0 */
-    /* COMBA_MFIN_3 11 */
-    STR r3, [r0, #(4*11)]
-
-    /* COMBA_STEP_1 r6 r9 */
-    UMLAL r5, r12, r6, r9
-        MOV r3, #0
-        LDR r7,  [r1, #(4*7)]
-        MOV r14, #0
-    ADCS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r7 r11 */
-    UMLAL r5, r14, r7, r11
-        MOV r12, #0
-    ADDS r4, r4, r14
-    ADC r3, r3, #0
-    /* COMBA_STEP_1 r8 r10 */
-    UMLAL r5, r12, r8, r10
-        MOV r14, #0
-    ADDS r4, r4, r12
-    ADC r3, r3, #0
-    /* COMBA_ADD_1 12 */
-    LDR  r12, [r0, #(4*12)]
-    ADDS r5, r5, r12
-    ADCS r4, r4, #0
-/* ADC  r3, r3, #0 */
-    /* COMBA_MFIN_1 12 */
-    STR r5, [r0, #(4*12)]
-
-/********************************************************** r1 - Part 4 ***********************************************************************/
-
-    /* COMBA_STEP_2 r7 r9 */
-    UMLAL r4, r14, r7, r9
-        MOV r5, #0
-        MOV r12, #0
-    ADCS r3, r3, r14
-    ADC r5, r5, #0
-    /* COMBA_STEP_2 r6 r10 */
-    UMLAL r4, r12, r6, r10
-        MOV r14, #0
-    ADDS r3, r3, r12
-/* ADC r5, r5, #0 */
-    /* COMBA_MFIN_2 13 */
-    STR r4, [r0, #(4*13)]
-
-    /* COMBA_STEP_3 r7 r10 */
-    UMLAL r3, r14, r7, r10
-        MOV r4, #0
-    ADCS r5, r5, r14
-    ADC r4, r4, #0
-    /* COMBA_MFIN_3 14 */
-    STR r3, [r0, #(4*14)]
-
-    STR r5, [r0, #(4*15)]
-
-    LDMIA sp!, {r4-r12, r14}
-    MOV pc, lr
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.c
deleted file mode 100644
index aafd6c1205b5..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t _r[2 * RLC_FP_DIGS], r[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS];
-	int *sform, len;
-	int first, i, j, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, RLC_FP_BITS);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 1; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			if (sform[i] > 0) {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		if (sform[0] > 0) {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-
-		dv_copy(_r, _q, first);
-		if (b0 > 0) {
-			_r[first - 1] &= RLC_MASK(b0);
-		}
-		fp_add(r, r, _r);
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.s
deleted file mode 100644
index 608353f88409..000000000000
--- a/src/dashbls/depends/relic/src/low/arm-asm-254/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-.syntax unified
-.arch armv7-a
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_rdcn_low
-
-/********************************************************** FP_RDCN_LOW ***********************************************************************/
-
-#define P71 0x2523
-#define P70 0x6482
-#define P6 0x40000001
-#define P51 0xBA34
-#define P50 0x4D80
-#define P4 0x00000008
-#define P31 0x6121
-#define P30 0x0000
-#define P2 0x00000013
-#define P1 0xA7000000
-#define P0 0x00000013
-
-#define CONST1 0xD794
-#define CONST0 0x35E5
-
-
-fp_rdcn_low:
-	STMDB sp!, {r4-r12, r14}
-
-	PLD    [r1, #32]
-
-	MOV r3, #0
-	MOV r4, #0
-	MOV r5, #0
-
-	/* COMBA_MFIN_LO_1 0 */
-	LDR  r6, [r1, #(4*0)]
-		MOV r8, #P0
-		MOVW r9, #CONST0
-		MOVT r9, #CONST1
-	ADDS r5, r5, r6
-/*
-	ADCS r4, r4, #0
-	ADC  r3, r3, #0
-*/
-	UMULL r6, r10, r5, r9
-   		MOV r12, #0
-   		MOV r14, #0
-   	STR r6, [r0, #(4*0)]
-
-
-	UMLAL r5, r12, r6, r8
-		LDR r6, [r0, #(4*0)]
-    	MOV r7, #P1
-	ADCS r4, r4, r12
-	ADC r3, r3, #0
-
-	/* COMBA_STEP_LO_2 0 P1 */
-	UMLAL r4, r14, r6, r7
-		LDR  r6, [r1, #(4*1)]
-		MOV r12, #0
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_MFIN_LO_2 1 */
-	ADDS r4, r4, r6
-/*
-	ADCS r3, r3, #0
-	ADC  r5, r5, #0
-*/
-	UMULL r6, r10, r4, r9
-		MOV r14, #0
-    STR r6, [r0, #(4*1)]
-
-	UMLAL r4, r12, r6, r8
-		LDR r6, [r0, #(4*0)]
-    	MOV r7, #P2
-	ADCS r3, r3, r12
-	ADC r5, r5, #0
-
-	/* COMBA_STEP_LO_3 0 P2 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*1)]
-		MOV r7, #P1
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* COMBA_STEP_LO_3 1 P1 */
-
-	UMLAL r3, r12, r6, r7
-		LDR  r6, [r1, #(4*2)]
-		MOV r14, #0
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_MFIN_LO_3 2 */
-	ADDS r3, r3, r6
-/*
-	ADCS r5, r5, #0
-	ADC  r4, r4, #0
-*/
-	UMULL r6, r10, r3, r9
-    STR r6, [r0, #(4*2)]
-
-	UMLAL r3, r14, r6, r8
-		MOV r12, #0
-		LDR r6, [r0, #(4*0)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADCS r5, r5, r14
-	ADC r4, r4, #0
-
-	/* _COMBA_STEP_LO_1 0 P31 P30 */
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*1)]
-   		MOV r7, #P2
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_STEP_LO_1 1 P2 */
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*2)]
-    	MOV r7, #P1
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* COMBA_STEP_LO_1 2 P1 */
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*3)]
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_MFIN_LO_1 3 */
-	ADDS r5, r5, r6
-/*
-	ADCS r4, r4, #0
-	ADC  r3, r3, #0
-*/
-	UMULL r6, r10, r5, r9
-   	STR r6, [r0, #(4*3)]
-
-	UMLAL r5, r14, r6, r8
-		MOV r12, #0
-		LDR r6, [r0, #(4*0)]
-   	 	MOV r7, #P4
-	ADCS r4, r4, r14
-	ADC r3, r3, #0
-
-	/* COMBA_STEP_LO_2 0 P4 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*1)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* _COMBA_STEP_LO_2 1 P31 P30 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*2)]
-    	MOV r7, #P2
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 2 P2 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*3)]
-    	MOV r7, #P1
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 3 P1 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR  r6, [r1, #(4*4)]
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_MFIN_LO_2 4 */
-
-	ADDS r4, r4, r6
-/*
-	ADCS r3, r3, #0
-	ADC  r5, r5, #0
-*/
-	UMULL r6, r10, r4, r9
-    STR r6, [r0, #(4*4)]
-
-	UMLAL r4, r12, r6, r8
-		MOV r14, #0
-		LDR r6, [r0, #(4*0)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADCS r3, r3, r12
-	ADC r5, r5, #0
-
-	/* _COMBA_STEP_LO_3 0 P51 P50 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*1)]
-    	MOV r7, #P4
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* COMBA_STEP_LO_3 1 P4 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*2)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* _COMBA_STEP_LO_3 2 P31 P30 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*3)]
-    	MOV r7, #P2
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* COMBA_STEP_LO_3 3 P2 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*4)]
-    	MOV r7, #P1
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_LO_3 4 P1 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR  r6, [r1, #(4*5)]
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* COMBA_MFIN_LO_3 5 */
-	ADDS r3, r3, r6
-/*
-	ADCS r5, r5, #0
-	ADC  r4, r4, #0
-*/
-	UMULL r6, r10, r3, r9
-    STR r6, [r0, #(4*5)]
-
-	UMLAL r3, r12, r6, r8
-		MOV r14, #0
-		LDR r6, [r0, #(4*0)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADCS r5, r5, r12
-	ADC r4, r4, #0
-
-	/* COMBA_STEP_LO_1 0 P6 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*1)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/*_COMBA_STEP_LO_1 1 P51 P50 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*2)]
-    	MOV r7, #P4
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_STEP_LO_1 2 P4 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*3)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* _COMBA_STEP_LO_1 3 P31 P30 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*4)]
-    	MOV r7, #P2
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_STEP_LO_1 4 P2 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*5)]
-    	MOV r7, #P1
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* COMBA_STEP_LO_1 5 P1 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*6)]
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_MFIN_LO_1 6 */
-	ADDS r5, r5, r6
-/*
-	ADCS r4, r4, #0
-	ADC  r3, r3, #0
-*/
-	UMULL r6, r10, r5, r9
-   	STR r6, [r0, #(4*6)]
-
-	UMLAL r5, r14, r6, r8
-		MOV r12, #0
-		LDR r6, [r0, #(4*0)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-	ADCS r4, r4, r14
-	ADC r3, r3, #0
-
-	/* _COMBA_STEP_LO_2 0 P71 P70 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*1)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 1 P6 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*2)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* _COMBA_STEP_LO_2 2 P51 P50 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*3)]
-    	MOV r7, #P4
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 3 P4 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*4)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* _COMBA_STEP_LO_2 4 P31 P30 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*5)]
-    	MOV r7, #P2
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 5 P2 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*6)]
-    	MOV r7, #P1
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_STEP_LO_2 6 P1 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*7)]
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* COMBA_MFIN_LO_2 7 */
-	ADDS r4, r4, r6
-/*
-	ADCS r3, r3, #0
-	ADC  r5, r5, #0
-*/
-	UMULL r6, r10, r4, r9
-    STR r6, [r0, #(4*7)]
-
-	UMLAL r4, r14, r6, r8
-		MOV r12, #0
-		LDR r6, [r0, #(4*1)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-	ADCS r3, r3, r14
-	ADC r5, r5, #0
-
-	/* _COMBA_STEP_HI_3 1 P71 P70 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*2)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 2 P6 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*3)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* _COMBA_STEP_HI_3 3 P51 P50 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*4)]
-    	MOV r7, #P4
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 4 P4 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*5)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* _COMBA_STEP_HI_3 5 P31 P30 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*6)]
-    	MOV r7, #P2
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 6 P2 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*7)]
-    	MOV r7, #P1
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 7 P1 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*8)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-/*
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-*/
-	/* COMBA_MFIN_HI_3 8 */
-	ADDS r3, r3, r6
-	ADCS r5, r5, r12
-	ADC  r4, r4, #0
-	LDR r6, [r0, #(4*2)]
-	STR r3, [r0, #(4*(8-8))]
-	MOV r3, #0
-
-	/* _COMBA_STEP_HI_1 2 P71 P70 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*3)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* COMBA_STEP_HI_1 3 P6 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*4)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* _COMBA_STEP_HI_1 4 P51 P50 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*5)]
-    	MOV r7, #P4
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* COMBA_STEP_HI_1 5 P4 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*6)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* _COMBA_STEP_HI_1 6 P31 P30 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*7)]
-    	MOV r7, #P2
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* COMBA_STEP_HI_1 7 P2 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*9)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-/*
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-*/
-	/* COMBA_MFIN_HI_1 9 */
-	ADDS r5, r5, r6
-	ADCS r4, r4, r12
-	ADC  r3, r3, #0
-	LDR r6, [r0, #(4*3)]
-	STR r5, [r0, #(4*(9-8))]
-	MOV r5, #0
-
-	/* _COMBA_STEP_HI_2 3 P71 P70 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*4)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_STEP_HI_2 4 P6 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*5)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* _COMBA_STEP_HI_2 5 P51 P50 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*6)]
-    	MOV r7, #P4
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_STEP_HI_2 6 P4 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*7)]
-		MOVW r7, #P30
-    	MOVT r7, #P31
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-	/* _COMBA_STEP_HI_2 7 P31 P30 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR  r6, [r1, #(4*10)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-/*
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-*/
-	/* COMBA_MFIN_HI_2 10 */
-	ADDS r4, r4, r6
-	ADCS r3, r3, r14
-	ADC  r5, r5, #0
-	LDR r6, [r0, #(4*4)]
-	STR r4, [r0, #(4*(10-8))]
-	MOV r4, #0
-
-	/* _COMBA_STEP_HI_3 4 P71 P70 */
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*5)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 5 P6 */
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*6)]
-		MOVW r7, #P50
-  	  MOVT r7, #P51
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-	/* _COMBA_STEP_HI_3 6 P51 P50 */
-
-	UMLAL r3, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*7)]
-    	MOV r7, #P4
-	ADDS r5, r5, r12
-	ADC r4, r4, #0
-	/* COMBA_STEP_HI_3 7 P4 */
-
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR  r6, [r1, #(4*11)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-/*
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-*/
-	/* COMBA_MFIN_HI_3 11 */
-	ADDS r3, r3, r6
-	ADCS r5, r5, r14
-	ADC  r4, r4, #0
-	LDR r6, [r0, #(4*5)]
-	STR r3, [r0, #(4*(11-8))]
-	MOV r3, #0
-
-	/* _COMBA_STEP_HI_1 5 P71 P70 */
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR r6, [r0, #(4*6)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-	/* COMBA_STEP_HI_1 6 P6 */
-
-	UMLAL r5, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*7)]
-		MOVW r7, #P50
-    	MOVT r7, #P51
-	ADDS r4, r4, r14
-	ADC r3, r3, #0
-	/* _COMBA_STEP_HI_1 7 P51 P50 */
-
-	UMLAL r5, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*12)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
-/*
-	ADDS r4, r4, r12
-	ADC r3, r3, #0
-*/
-	/* COMBA_MFIN_HI_1 12 */
-	ADDS r5, r5, r6
-	ADCS r4, r4, r12
-	ADC  r3, r3, #0
-	LDR r6, [r0, #(4*6)]
-	STR r5, [r0, #(4*(12-8))]
-	MOV r5, #0
-	/* _COMBA_STEP_HI_2 6 P71 P70 */
-
-	UMLAL r4, r14, r6, r7
-		MOV r12, #0
-		LDR r6, [r0, #(4*7)]
-    	MOVW r7, #0x0001
-    	MOVT r7, #0x4000
-	ADDS r3, r3, r14
-	ADC r5, r5, #0
-	/* COMBA_STEP_HI_2 7 P6 */
-
-	UMLAL r4, r12, r6, r7
-		MOV r14, #0
-		LDR  r6, [r1, #(4*13)]
-		MOVW r7, #P70
-    	MOVT r7, #P71
- /*
-	ADDS r3, r3, r12
-	ADC r5, r5, #0
-*/
-	/* COMBA_MFIN_HI_2 13 */
-	ADDS r4, r4, r6
-	ADCS r3, r3, r12
-	ADC  r5, r5, #0
-	LDR r6, [r0, #(4*7)]
-	STR r4, [r0, #(4*(13-8))]
-	MOV r4, #0
-
-	/* _COMBA_STEP_HI_3 7 P71 P70 */
-	UMLAL r3, r14, r6, r7
-		MOV r12, #0
-		LDR  r6, [r1, #(4*14)]
-/*
-	ADDS r5, r5, r14
-	ADC r4, r4, #0
-*/
-	/* COMBA_MFIN_HI_3 14 */
-	ADDS r3, r3, r6
-	ADCS r5, r5, r14
-	ADC  r4, r4, #0
-	LDR  r6, [r1, #(4*15)]
-	STR r3, [r0, #(4*(14-8))]
-	MOV r3, #0
-
-	/* COMBA_ADD_1 15 */
-	ADD r5, r5, r6
-/*
-	ADCS r4, r4, #0
-	ADC  r3, r3, #0
-*/
-	STR r5, [r0, #(4*7)]
-	/* STR r4, [r0, #(4*8)]  Necessario? */
-
-/* CMP_STEP: */
-	LDR r5, [r0, #0]
-	LDR r6, [r0, #4]
-	LDR r7, [r0, #8]
-	LDR r8, [r0, #12]
-	LDR r9, [r0, #16]
-	LDR r10, [r0, #20]
-	LDR r11, [r0, #24]
-	LDR r12, [r0, #28]
-
-	/**** Primeira iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	CMP r12, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Segunda iteracao ****/
-    	MOVW r3, #0x0001
-    	MOVT r3, #0x4000
-	CMP r11, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Terceira iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	CMP r10, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Quarta iteracao ****/
-	MOV r3, #P4
-	CMP r9, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Quinta iteracao ****/
-	MOVW r3, #0x0000
-	MOVT r3, #0x6121
-	CMP r8, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Sexta iteracao ****/
-	MOV r3, #P2
-	CMP r7, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Setima iteracao ****/
-	MOV r3, #P1
-	CMP r6, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-	/**** Oitava iteracao ****/
-	MOV r3, #P0
-	CMP r5, r3
-	BHI GREATER_THAN_OR_EQUAL
-	BLO LESS_THAN
-
-GREATER_THAN_OR_EQUAL:
-
-/*Se for maior ou igual subtrair 'p' e escrever em memoria */
-
-/* SUB_STEP: */
-	/**** Primeira iteracao ****/
-	MOV r3, #P0
-	SUBS r5, r5, r3
-	STR r5, [r0, #0]
-
-	/**** Segunda iteracao ****/
-	MOV r3, #P1
-	SBCS r6, r6, r3
-	STR r6, [r0, #4]
-
-	/**** Terceira iteracao ****/
-	MOV r3, #P2
-	SBCS r7, r7, r3
-	STR r7, [r0, #8]
-
-	/**** Quarta iteracao ****/
-	MOVW r3, #0x0000
-	MOVT r3, #0x6121
-	SBCS r8, r8, r3
-	STR r8, [r0, #12]
-
-	/**** Quinta iteracao ****/
-	MOV r3, #P4
-	SBCS r9, r9, r3
-	STR r9, [r0, #16]
-
-	/**** Sexta iteracao ****/
-	MOVW r3, #0x4D80
-	MOVT r3, #0xBA34
-	SBCS r10, r10, r3
-	STR r10, [r0, #20]
-
-	/**** Setima iteracao ****/
-    	MOVW r3, #0x0001
-    	MOVT r3, #0x4000
-	SBCS r11, r11, r3
-	STR r11, [r0, #24]
-
-	/**** Oitava iteracao ****/
-	MOVW r3, #0x6482
-	MOVT r3, #0x2523
-	SBCS r12, r12, r3
-	STR r12, [r0, #28]
-
-LESS_THAN:
-
-	LDMIA sp!, {r4-r12, r14}
-	MOV pc, lr
-
-.end
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_add_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_add_low.s
deleted file mode 100755
index 81e550da6c0e..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_add_low.s
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global bn_add1_low
-.global bn_addn_low
-.global bn_sub1_low
-.global bn_subn_low
-
-bn_add1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r23, x+
-	adc		r23, r20
-	st		z+, r23
-	dec		r18
-	breq	bn_add1_end
-
-bn_add1_loop:
-	ld		r23, x+
-	adc		r23, r1
-	st		z+, r23
-	dec		r18
-	brne	bn_add1_loop
-bn_add1_end:
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_addn_low:
-	push	r28
-	push	r29
-
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to y
-
-	; size is in r18
-
-	clc
-	tst		r18
-	breq	bn_add1_end
-
-bn_addn_loop:
-	ld		r23, x+
-	ld		r24, y+
-	adc		r23, r24
-	st		z+, r23
-	dec		r18
-	brne	bn_addn_loop
-bn_addn_end:
-	clr		r24
-	adc		r24, r1
-
-	pop		r29
-	pop		r28
-	ret
-
-bn_sub1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r23, x+
-	sbc		r23, r20
-	st		z+, r23
-	dec		r18
-	breq	bn_add1_end
-
-bn_sub1_loop:
-	ld		r23, x+
-	sbc		r23, r1
-	st		z+, r23
-	dec		r18
-	brne	bn_sub1_loop
-bn_sub1_end:
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_subn_low:
-	push	r28
-	push	r29
-
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to y
-
-	; size is in r18
-
-	clc
-	tst		r18
-	breq	bn_add1_end
-
-bn_subn_loop:
-	ld		r23, x+
-	ld		r24, y+
-	sbc		r23, r24
-	st		z+, r23
-	dec		r18
-	brne	bn_subn_loop
-bn_subn_end:
-	clr		r24
-	adc		r24, r1
-
-	pop		r29
-	pop		r28
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.c
deleted file mode 100755
index 52d70ad789e4..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift;
-
-	if (bits == 1)
-		return bn_lsh1_low(c, a, size);
-
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & RLC_MASK(bits);
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift;
-
-	if (bits == 1)
-		return bn_rsh1_low(c, a, size);
-
-	c += size - 1;
-	a += size - 1;
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = size - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & RLC_MASK(bits);
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.s
deleted file mode 100755
index 45359eb63cad..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_bn_shift_low.s
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global bn_rsh1_low
-.global bn_lsh1_low
-.global bn_lsh2_low
-.global bn_lsh4_low
-
-bn_rsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-	add     r30, r20
-	adc     r31, r1
-	add		r26, r20
-	adc		r27, r1
-
-	clc
-bn_rsh1_loop:
-	ld		r18, -x
-	ror		r18
-	st		-z, r18
-	dec		r20
-	brne	bn_rsh1_loop
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_lsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-
-	clc
-bn_lsh1_loop:
-	ld		r18, x+
-	rol		r18
-	st		z+, r18
-	dec		r20
-	brne	bn_lsh1_loop
-
-	clr		r24
-	adc		r24, r1
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.c
deleted file mode 100644
index f39e49fa43dc..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fp_addn_low(c, a, b);
-	if (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_addd_low(c, a, b);
-
-	if (carry || (dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < 2 * RLC_FP_DIGS; i++, a++, b++) {
-		r0 = (*a) + (*b);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	return carry;
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry;
-
-	carry = fp_subn_low(c, a, b);
-	if (carry) {
-		fp_addn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < 2 * RLC_FP_DIGS; i++, a++, b++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		c[i] = r0;
-	}
-	if (carry) {
-		fp_addn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < 2 * RLC_FP_DIGS; i++, a++, b++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		c[i] = r0;
-	}
-	return carry;
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	fp_subn_low(c, fp_prime_get(), a);
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		(*c) = r1;
-	}
-	return carry;
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		fp_copy(c, a);
-	}
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		fp_copy(c, a);
-	}
-
-	fp_add1_low(c + RLC_FP_DIGS, a + RLC_FP_DIGS, carry);
-
-	carry = fp_rsh1_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS);
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.s
deleted file mode 100755
index 44a8903abd67..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_add_low.s
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_add1_low
-.global fp_sub1_low
-.global fp_addn_low
-.global fp_subn_low
-
-.macro ADD1_STEP i, j
-	ld		r18, x+
-	adc		r18, r1
-	st		z+, r18
-	.if \i < \j
-		ADD1_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_add1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r18, x+
-	adc		r18, r20
-	st		z+, r18
-
-	ADD1_STEP 1, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-.macro ADDN_STEP i, j
-	ld		r18, x+
-	ld		r19, y+
-	adc		r18, r19
-	st		z+, r18
-	.if \i < \j
-		ADDN_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_addn_low:
-	push	r28
-	push	r29
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r18, x+
-	ld		r19, y+
-	adc		r18, r19
-	st		z+, r18
-
-	ADDN_STEP 1, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	pop		r29
-	pop		r28
-	ret
-
-.macro SUB1_STEP i, j
-	ld		r18, x+
-	sbc		r18, r1
-	st		z+, r18
-	.if \i < \j
-		SUB1_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_sub1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r18, x+
-	sbc		r18, r20
-	st		z+, r18
-
-	SUB1_STEP 1, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-.macro SUBN_STEP i, j
-	ld		r18, x+
-	ld		r19, y+
-	sbc		r18, r19
-	st		z+, r18
-	.if \i < \j
-		SUBN_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_subn_low:
-	push	r28
-	push	r29
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r18, x+
-	ld		r19, y+
-	sbc		r18, r19
-	st		z+, r18
-
-	SUBN_STEP 1, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	pop		r29
-	pop		r28
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.c
deleted file mode 100644
index 5b5950ebef09..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Accumulates a double precision digit in a triple register variable.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- * @param[in] B				- the second digit to multiply.
- */
-#define COMBA_STEP(R2, R1, R0, A, B)										\
-	dbl_t r = (dbl_t)(A) * (dbl_t)(B);										\
-	dig_t _r = (R1);														\
-	(R0) += (dig_t)(r);														\
-	(R1) += (R0) < (dig_t)(r);												\
-	(R2) += (R1) < _r;														\
-	(R1) += (dig_t)((r) >> (dbl_t)RLC_DIG);								\
-	(R2) += (R1) < (dig_t)((r) >> (dbl_t)RLC_DIG);							\
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*c) + (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t rlc_align t[2 * RLC_FP_DIGS];
-
-	fp_muln_low(t, a, b);
-	fp_rdc(c, t);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.s
deleted file mode 100755
index 7587fe671afe..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_mul_low.s
+++ /dev/null
@@ -1,2076 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_muln_low
-
-.macro PROLOGUE
-	.irp i, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 28, 29, 30, 31
-		push 	\i
-	.endr
-.endm
-
-.macro EPILOGUE
-	.irp i, 31, 30, 29, 28, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0
-		pop 	\i
-	.endr
-	ret
-.endm
-
-.macro COMB i, j, a, b, c
-	ldd	r0, Z+\j
-	mul	r0, 3+\i
-	add	\a, r0
-	adc	\b, r1
-	adc	\c, r2
-	.if \i > 0
-		COMB \i-1, \j+1, \a, \b, \c
-	.endif
-.endm
-
-fp_muln_low:
-	PROLOGUE
-
-	movw r28,r22
-	movw r26,r24
-	movw r30,r20
-
-	clr r2
-	clr r3
-	clr r7
-	clr r22
-	movw r8,r2
-	movw r10,r2
-	movw r12,r2
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Z+0
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+0+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+0+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+0+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	st X+,r8 ;0
-	st X+,r9 ;1
-	st X+,r10 ;2
-	st X+,r11 ;3
-
-	movw r8,r12
-	movw r10,r14
-	clr r2
-	clr r3
-	movw r12,r2
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Z+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Z+0
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+0+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+0+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+0+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;4
-	st X+,r9 ;5
-	st X+,r10 ;6
-	st X+,r11 ;7
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Z+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Z+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Z+0
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+0+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+0+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+0+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;8
-	st X+,r9 ;9
-	st X+,r10 ;10
-	st X+,r11 ;11
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Z+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Z+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Z+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Z+0
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+0+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+0+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+0+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;12
-	st X+,r9 ;13
-	st X+,r10 ;14
-	st X+,r11 ;15
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Z+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Z+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Z+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Z+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	ldd r6,Z+0
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+0+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+0+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+0+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;16
-	st X+,r9 ;17
-	st X+,r10 ;18
-	st X+,r11 ;19
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Z+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Z+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Z+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	ldd r6,Z+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;20
-	st X+,r9 ;21
-	st X+,r10 ;22
-	st X+,r11 ;23
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Z+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Z+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	ldd r6,Z+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;24
-	st X+,r9 ;25
-	st X+,r10 ;26
-	st X+,r11 ;27
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Z+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	mov r22,r7
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	ldd r6,Z+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r7
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r7
-	st X+,r8 ;28
-	st X+,r9 ;29
-	st X+,r10 ;30
-	st X+,r11 ;31
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	clr r2
-	clr r3
-	movw r14,r2
-	movw r16,r2
-	movw r18,r2
-	movw r20,r2
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	ldd r6,Z+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r7
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	ldd r6,Z+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r7
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	ldd r6,Z+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r7
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	ldd r6,Z+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r7
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r7
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r7
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-
-	st X+,r8 ;32
-	st X+,r9 ;33
-	st X+,r10 ;34
-	st X+,r11 ;35
-	st X+,r12 ;36
-	st X+,r13 ;37
-	st X+,r14 ;38
-	st X,r15 ;39
-
-	clr r1
-	EPILOGUE
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.c
deleted file mode 100644
index ee31798b6034..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcn_low(dig_t *c, dig_t *a) {
-	dig_t r1, *m, *tmpc;
-
-	m = fp_prime_get();
-	tmpc = c;
-
-	r1 = fp_rdci_low(c, a);
-
-	if (r1 || fp_cmp(c, m) != RLC_LT) {
-		fp_subn_low(c, c, m);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.s
deleted file mode 100755
index 43ffd29e4103..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,1749 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_rdci_low
-
-.macro PROLOGUE
-	.irp i, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 28, 29, 30, 31
-		push 	\i
-	.endr
-.endm
-
-.macro EPILOGUE
-	.irp i, 31, 30, 29, 28, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0
-		pop 	\i
-	.endr
-	ret
-.endm
-
-fp_rdci_low:
-	PROLOGUE
-
-	movw r30,r24
-	movw r28,r22
-
-	ldi	r26, 9
-	ldi	r27, 0xC7
-	clr	r2
-	clr	r23
-	clr	r24
-	clr	r25
-
-	ldd	r23, Y+0
-	mul	r23, r26
-	mov	r3, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x35
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+1
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r4, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0xA0
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r4, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+2
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r5, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0x0C
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r4, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r5, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+3
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r6, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x80
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r4, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r5, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r6, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+4
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r7, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0xEC
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r4, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r5, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r6, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r7, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+5
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r8, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0x9F
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r4, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r5, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r6, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r7, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r8, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+6
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r9, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x41
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r4, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r5, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r6, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r7, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r8, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r9, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+7
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r10, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0x41
-	mul r4, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r5, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r6, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r7, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r8, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r9, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r10, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+8
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r11, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0xC0
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r5, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r6, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r7, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r8, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r9, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r10, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r11, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+9
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r12, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0xE9
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r4, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r6, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r7, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r8, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r9, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r10, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r11, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r12, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+10
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r13, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0x7F
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r4, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r5, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r7, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r8, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r9, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r10, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r11, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r12, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r13, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+11
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r14, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0x7F
-	mul r4, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r5, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r6, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r8, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r9, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r10, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r11, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r12, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r13, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r14, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+12
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r15, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x7F
-	mul r5, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r6, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r7, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r9, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r10, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r11, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r12, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r13, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r14, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r15, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+13
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r16, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0xD0
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r6, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r7, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r8, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r10, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r11, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r12, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r13, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r14, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r15, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r16, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+14
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r17, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0x6E
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r4, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r7, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r8, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r9, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r11, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r12, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r13, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r14, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r15, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r16, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r17, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+15
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r18, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x6E
-	mul r4, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r5, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x7F
-	mul r8, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r9, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r10, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r12, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r13, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r14, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r15, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r16, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r17, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r18, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+16
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r19, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0x6E
-	mul r5, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r6, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r9, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r10, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r11, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r13, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r14, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r15, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r16, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r17, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r18, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r19, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+17
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	mul	r25, r26
-	mov	r20, r0
-	mul	r0, r27
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	clr	r25
-
-	ldi	r22, 0x6E
-	mul r6, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r7, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r10, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r11, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r12, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r14, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r15, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r16, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r17, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r18, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r19, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x35
-	mul r20, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+18
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	mul	r23, r26
-	mov	r21, r0
-	mul	r0, r27
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r7, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r8, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x7F
-	mul r11, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r12, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r13, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r15, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r16, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r17, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r18, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r19, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xA0
-	mul r20, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x35
-	mul r21, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+19
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	mul	r24, r26
-	mov	r3, r0
-	mul	r0, r27
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r4, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x6E
-	mul r8, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r9, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r12, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r13, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r14, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r16, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r17, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r18, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r19, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x0C
-	mul r20, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xA0
-	mul r21, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x35
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+20
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+0,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r5, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x6E
-	mul r9, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r10, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r13, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r14, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r15, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r17, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r18, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r19, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x80
-	mul r20, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x0C
-	mul r21, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xA0
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+21
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+1,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r6, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r10, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r11, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x7F
-	mul r14, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r15, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r16, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r18, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r19, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xEC
-	mul r20, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x80
-	mul r21, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x0C
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+22
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+2,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r7, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x6E
-	mul r11, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r12, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r15, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r16, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r17, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r19, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x9F
-	mul r20, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xEC
-	mul r21, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x80
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+23
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+3,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r8, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x6E
-	mul r12, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r13, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r16, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r17, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r18, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x41
-	mul r20, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x9F
-	mul r21, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xEC
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+24
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+4,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r9, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r13, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r14, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x7F
-	mul r17, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r18, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r19, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x41
-	mul r21, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x9F
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+25
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+5,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r10, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x6E
-	mul r14, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r15, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r18, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r19, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xC0
-	mul r20, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x41
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+26
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+6,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r11, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x6E
-	mul r15, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r16, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r19, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xE9
-	mul r20, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xC0
-	mul r21, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+27
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+7,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r12, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r16, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r17, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x7F
-	mul r20, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xE9
-	mul r21, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xC0
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+28
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+8,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r13, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x6E
-	mul r17, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r18, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x7F
-	mul r21, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xE9
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+29
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+9,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r14, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x6E
-	mul r18, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r19, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x7F
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+30
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+10,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r15, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r19, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0xD0
-	mul r20, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+31
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+11,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r16, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0x6E
-	mul r20, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldi	r22, 0xD0
-	mul r21, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+32
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+12,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r17, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0x6E
-	mul r21, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldi	r22, 0xD0
-	mul r3, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+33
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+13,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r18, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldi	r22, 0x6E
-	mul r3, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+34
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+14,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r19, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+35
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+15,r25
-	clr	r25
-
-	ldi	r22, 0x24
-	mul r20, r22
-	add	r23, r0
-	adc	r24, r1
-	adc	r25, r2
-	ldd	r22, Y+36
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+16,r23
-	clr	r23
-
-	ldi	r22, 0x24
-	mul r21, r22
-	add	r24, r0
-	adc	r25, r1
-	adc	r23, r2
-	ldd	r22, Y+37
-	add	r24, r22
-	adc	r25, r2
-	adc	r23, r2
-	std Z+17,r24
-	clr	r24
-
-	ldi	r22, 0x24
-	mul r3, r22
-	add	r25, r0
-	adc	r23, r1
-	adc	r24, r2
-	ldd	r22, Y+38
-	add	r25, r22
-	adc	r23, r2
-	adc	r24, r2
-	std Z+18,r25
-	clr	r25
-
-	ldd	r22, Y+39
-	add	r23, r22
-	adc	r24, r2
-	adc	r25, r2
-	std Z+19,r23
-	clr	r23
-
-	clr r1
-	EPILOGUE
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.c
deleted file mode 100755
index 17bf95535ce7..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	/* Prepare the bit mask. */
-	mask = ((dig_t)1 << (dig_t)bits) - 1;
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	c += RLC_FP_DIGS - 1;
-	a += RLC_FP_DIGS - 1;
-	/* Prepare the bit mask. */
-	mask = ((dig_t)1 << (dig_t)bits) - 1;
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = RLC_FP_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.s
deleted file mode 100755
index a0492dcf02f0..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_shift_low.s
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_rsh1_low
-.global fp_lsh1_low
-
-.macro RSH1_STEP i, j
-	ld		r18, -x
-	ror		r18
-	st		-z, r18
-	.if \i < \j
-		RSH1_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_rsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-	ldi		r20, RLC_FP_DIGS
-	add     r30, r20
-	adc     r31, r1
-	add		r26, r20
-	adc		r27, r1
-
-	clc
-	RSH1_STEP 0, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-.macro LSH1_STEP i, j
-	ld		r18, x+
-	rol		r18
-	st		z+, r18
-	.if \i < \j
-		LSH1_STEP \i + 1, \j
-	.endif
-.endm
-
-fp_lsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-
-	clc
-	LSH1_STEP 0, RLC_FP_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.c
deleted file mode 100644
index 22f61f467be9..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Computes the step of a Comba squaring.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- * @param[in] B				- the second digit to multiply.
- */
-#define COMBA_STEP(R2, R1, R0, A, B)										\
-	dbl_t r = (dbl_t)(A) * (dbl_t)(B);										\
-	dbl_t s = r + r;														\
-	dig_t _r = (R1);														\
-	(R0) += (dig_t)s;														\
-	(R1) += (R0) < (dig_t)s;												\
-	(R2) += (R1) < _r;														\
-	(R1) += (dig_t)(s >> (dbl_t)RLC_DIG);									\
-	(R2) += (R1) < (dig_t)(s >> (dbl_t)RLC_DIG);							\
-	(R2) += (s < r);														\
-
-/**
- * Computes the step of a Comba squaring when the loop length is odd.
- *
- * @param[in,out] R2		- most significant word of the triple register.
- * @param[in,out] R1		- middle word of the triple register.
- * @param[in,out] R0		- lowest significant word of the triple register.
- * @param[in] A				- the first digit to multiply.
- */
-#define COMBA_FINAL(R2, R1, R0, A)											\
-	dbl_t r = (dbl_t)(*tmpa) * (dbl_t)(*tmpa);								\
-	dig_t _r = (R1);														\
-	(R0) += (dig_t)(r);														\
-	(R1) += (R0) < (dig_t)r;												\
-	(R2) += (R1) < _r;														\
-	(R1) += (dig_t)(r >> (dbl_t)RLC_DIG);									\
-	(R2) += (R1) < (dig_t)(r >> (dbl_t)RLC_DIG);							\
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	dig_t rlc_align t[2 * RLC_FP_DIGS];
-
-	fp_sqrn_low(t, a);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.s b/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.s
deleted file mode 100755
index badf1c6dc31c..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-158/relic_fp_sqr_low.s
+++ /dev/null
@@ -1,1769 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp_low.h"
-
-//.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fp_sqrn_low
-
-.macro PROLOGUE
-	.irp i, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 28, 29, 30, 31
-		push 	\i
-	.endr
-.endm
-
-.macro EPILOGUE
-	.irp i, 31, 30, 29, 28, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0
-		pop 	\i
-	.endr
-	ret
-.endm
-
-fp_sqrn_low:
-	PROLOGUE
-
-	movw r28,r22
-	movw r26,r24
-
-	clr r24
-	clr r25
-	clr r22
-	movw r8,r24
-	movw r10,r24
-	movw r12,r24
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	mul r2,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r2,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r2,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r2,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r3,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r5,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;0
-	st X+,r9 ;1
-	st X+,r10 ;2
-	st X+,r11 ;3
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Y+4
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+4+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+4+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+4+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;4
-	st X+,r9 ;5
-	st X+,r10 ;6
-	st X+,r11 ;7
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Y+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	mul r2,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r2,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r2,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r2,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r3,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r5,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;8
-	st X+,r9 ;9
-	st X+,r10 ;10
-	st X+,r11 ;11
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Y+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Y+8
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+8+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+8+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+8+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;12
-	st X+,r9 ;13
-	st X+,r10 ;14
-	st X+,r11 ;15
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+0
-	ldd r3,Y+0+1
-	ldd r4,Y+0+2
-	ldd r5,Y+0+3
-	ldd r6,Y+16
-	mul r6,r2
-	add r8,r0
-    adc r9,r1
-    adc r16,r25
-    add r8,r0
-    adc r9,r1
-    adc r16,r25
-    mul r6,r3
-    add r9,r0
-    adc r10,r1
-    adc r17,r25
-    add r9,r0
-    adc r10,r1
-    adc r17,r25
-    mul r6,r4
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    mul r6,r5
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    ldd r6,Y+16+1
-    mul r6,r2
-    add r9,r0
-    adc r10,r1
-    adc r17,r25
-    add r9,r0
-    adc r10,r1
-    adc r17,r25
-    mul r6,r3
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    mul r6,r4
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    mul r6,r5
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    ldd r6,Y+16+2
-    mul r6,r2
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    add r10,r0
-    adc r11,r1
-    adc r18,r25
-    mul r6,r3
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    mul r6,r4
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    mul r6,r5
-    add r13,r0
-    adc r14,r1
-    adc r21,r25
-    add r13,r0
-    adc r14,r1
-    adc r21,r25
-    ldd r6,Y+16+3
-    mul r6,r2
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    add r11,r0
-    adc r12,r1
-    adc r19,r25
-    mul r6,r3
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    add r12,r0
-    adc r13,r1
-    adc r20,r25
-    mul r6,r4
-    add r13,r0
-    adc r14,r1
-    adc r21,r25
-    add r13,r0
-    adc r14,r1
-    adc r21,r25
-    mul r6,r5
-    add r14,r0
-    adc r15,r1
-    adc r22,r25
-    add r14,r0
-    adc r15,r1
-    adc r22,r25
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Y+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	mul r2,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r2,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r2,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r2,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r3,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r5,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;16
-	st X+,r9 ;17
-	st X+,r10 ;18
-	st X+,r11 ;19
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+4
-	ldd r3,Y+4+1
-	ldd r4,Y+4+2
-	ldd r5,Y+4+3
-	ldd r6,Y+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Y+12
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+12+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+12+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+12+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;20
-	st X+,r9 ;21
-	st X+,r10 ;22
-	st X+,r11 ;23
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+8
-	ldd r3,Y+8+1
-	ldd r4,Y+8+2
-	ldd r5,Y+8+3
-	ldd r6,Y+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	mul r2,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r2,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r2,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r2,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r3,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r5,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;24
-	st X+,r9 ;25
-	st X+,r10 ;26
-	st X+,r11 ;27
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+12
-	ldd r3,Y+12+1
-	ldd r4,Y+12+2
-	ldd r5,Y+12+3
-	ldd r6,Y+16
-	mul r6,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r6,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	ldd r6,Y+16+1
-	mul r6,r2
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r6,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	ldd r6,Y+16+2
-	mul r6,r2
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r6,r3
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	ldd r6,Y+16+3
-	mul r6,r2
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r6,r3
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r6,r4
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r6,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;28
-	st X+,r9 ;29
-	st X+,r10 ;30
-	st X+,r11 ;31
-
-	movw r8,r12
-	movw r10,r14
-	mov r12,r22
-	clr r13
-	movw r14,r24
-	movw r16,r24
-	movw r18,r24
-	movw r20,r24
-	clr r22
-	ldd r2,Y+16
-	ldd r3,Y+16+1
-	ldd r4,Y+16+2
-	ldd r5,Y+16+3
-	mul r2,r2
-	add r8,r0
-	adc r9,r1
-	adc r16,r25
-	mul r2,r3
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	add r9,r0
-	adc r10,r1
-	adc r17,r25
-	mul r2,r4
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r2,r5
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r3
-	add r10,r0
-	adc r11,r1
-	adc r18,r25
-	mul r3,r4
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	add r11,r0
-	adc r12,r1
-	adc r19,r25
-	mul r3,r5
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r4
-	add r12,r0
-	adc r13,r1
-	adc r20,r25
-	mul r4,r5
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	add r13,r0
-	adc r14,r1
-	adc r21,r25
-	mul r5,r5
-	add r14,r0
-	adc r15,r1
-	adc r22,r25
-	add r10,r16
-	adc r11,r17
-	adc r12,r18
-	adc r13,r19
-	adc r14,r20
-	adc r15,r21
-	adc r22,r25
-	st X+,r8 ;32
-	st X+,r9 ;33
-	st X+,r10 ;34
-	st X+,r11 ;35
-	st X+,r12  ;36
-	st X+,r13  ;37
-	st X+,r14  ;38
-	st X+,r15  ;39
-
-	clr r1
-	EPILOGUE
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_add_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_add_low.s
deleted file mode 100755
index 39faf8dc48a8..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_add_low.s
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision addition functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn_low.h"
-
-.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global bn_add1_low
-.global bn_addn_low
-.global bn_sub1_low
-.global bn_subn_low
-
-bn_add1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r23, x+
-	adc		r23, r20
-	st		z+, r23
-	dec		r18
-	breq	bn_add1_end
-
-bn_add1_loop:
-	ld		r23, x+
-	adc		r23, r1
-	st		z+, r23
-	dec		r18
-	brne	bn_add1_loop
-bn_add1_end:
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_addn_low:
-	push	r28
-	push	r29
-
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to y
-
-	; size is in r18
-
-	clc
-	tst		r18
-	breq	bn_addn_end
-
-bn_addn_loop:
-	ld		r23, x+
-	ld		r24, y+
-	adc		r23, r24
-	st		z+, r23
-	dec		r18
-	brne	bn_addn_loop
-bn_addn_end:
-	clr		r24
-	adc		r24, r1
-
-	pop		r29
-	pop		r28
-	ret
-
-bn_sub1_low:
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-
-	;  b is in r20
-	; size is in r18
-
-	clc
-	ld		r23, x+
-	sbc		r23, r20
-	st		z+, r23
-	dec		r18
-	breq	bn_sub1_end
-
-bn_sub1_loop:
-	ld		r23, x+
-	sbc		r23, r1
-	st		z+, r23
-	dec		r18
-	brne	bn_sub1_loop
-bn_sub1_end:
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_subn_low:
-	push	r28
-	push	r29
-
-	movw	r30, r24	; copy c to z
-	movw	r26, r22	; copy a to x
-	movw	r28, r20	; copy b to y
-
-	; size is in r18
-
-	clc
-	tst		r18
-	breq	bn_subn_end
-
-bn_subn_loop:
-	ld		r23, x+
-	ld		r24, y+
-	sbc		r23, r24
-	st		z+, r23
-	dec		r18
-	brne	bn_subn_loop
-bn_subn_end:
-	clr		r24
-	adc		r24, r1
-
-	pop		r29
-	pop		r28
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.c
deleted file mode 100755
index c480af7da69a..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	c += size - 1;
-	a += size - 1;
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = size - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.s
deleted file mode 100755
index 7ef222cb332e..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_bn_shift_low.s
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn_low.h"
-
-.arch atmega128
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global bn_rsh1_low
-.global bn_lsh1_low
-
-bn_rsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-	add     r30, r20
-	adc     r31, r1
-	add		r26, r20
-	adc		r27, r1
-
-	clc
-bn_rsh1_loop:
-	ld		r18, -x
-	ror		r18
-	st		-z, r18
-	dec		r20
-	brne	bn_rsh1_loop
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-bn_lsh1_low:
-	movw 	r30, r24
-	movw 	r26, r22
-
-	clc
-bn_lsh1_loop:
-	ld		r18, x+
-	rol		r18
-	st		z+, r18
-	dec		r20
-	brne	bn_lsh1_loop
-
-	clr		r24
-	adc		r24, r1
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.c b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.c
deleted file mode 100755
index 49e3fb458c37..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.s
deleted file mode 100755
index 793d45eb5588..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_add_low.s
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-.arch atmega128
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-.macro ADD1_STEP i, j
-	ld		r18, x+
-	st		z+, r18
-	.if \i < \j
-		ADD1_STEP \i + 1, \j
-	.endif
-.endm
-
-/*
- * Shifts the vector pointed by x by 1 and stores the result in z.
- */
-.macro ADDN_STEP i, j
-	ld		r18, x+
-	ld		r19, y+
-	eor		r18, r19
-	st		z+, r18
-	.if \i < \j
-		ADDN_STEP \i + 1, \j
-	.endif
-.endm
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fb_add1_low
-.global fb_addn_low
-.global fb_addd_low
-
-fb_add1_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r18,x+
-	eor		r18,r20
-	st		z+, r18
-
-	ADD1_STEP 1, RLC_FB_DIGS - 1
-
-	ret
-
-fb_addn_low:
-	push	r28
-	push	r29
-	movw	r30, r24
-	movw	r28, r22
-	movw	r26, r20
-
-	ADDN_STEP 0, RLC_FB_DIGS - 1
-
-	pop		r29
-	pop		r28
-	ret
-
-fb_addd_low:
-	push	r28
-	push	r29
-	movw 	r30, r24
-	movw 	r28, r22
-	movw	r26, r20
-
-fb_addd_loop:
-	ld		r20, x+
-	ld		r21, y+
-	eor		r21, r20
-	st		z+, r21
-	dec		r18
-	brne	fb_addd_loop
-
-	pop		r29
-	pop		r28
-	ret
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.c b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.c
deleted file mode 100755
index 6d7820bc6dc1..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_bn_low.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	dig_t carry;
-
-	fb_zero(c);
-	fb_zero(c + RLC_FB_DIGS);
-	for (int i = RLC_DIG - 1; i >= 0; i--) {
-		if (digit & ((dig_t)1 << i)) {
-			fb_addn_low(c, c, a);
-		}
-		if (i != 0) {
-			carry = fb_lsh1_low(c, c);
-			c[RLC_FB_DIGS] = (c[RLC_FB_DIGS] << 1) | carry;
-		}
-	}
-}
-
-void fb_muli_low(dig_t *c, dig_t *t, const dig_t *a, const dig_t *b);
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dv_t t;
-
-	dv_new(t);
-	fb_muli_low(c, t, a, b);
-	dv_free(t);
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.s
deleted file mode 100755
index 52ea94911212..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_mul_low.s
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-.arch atmega128
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR		X
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR		Z
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR		Z
-
-/*
- * Temporary register.
- */
-#define RT			r23
-
-/*
- * Carry register for shifting.
- */
-#define RC			r22
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4		(FB_POLYN + 4)
-
-/*
- * Size in bytes of a precomputation table line.
- */
-#if (POLY_M4 % WSIZE) > 0
-#define T_LINE	(POLY_M4/WSIZE + 1)
-#else
-#define T_LINE	(POLY_M4/WSIZE)
-#endif
-
-/*
- * Size of the multiplication precomputation table in bytes.
- */
-#define T_DIGS	(16 * T_LINE)
-
-/*
- * Size of the precomputation table in blocks of 256 bytes.
- */
-#if (T_DIGS % 256) > 0
-#define T_BLOCKS	(T_DIGS/256 + 1)
-#else
-#define T_BLOCKS	(T_DIGS/256)
-#endif
-
-/*
- * Precomputation table stored on a custom section (address must be terminated
- * in 0x00).
- */
-.data
-.byte
-/*
- * This table will be loaded on address 0x100.
- */
-fb_muln_table0: .space 256, 0
-fb_muln_table1: .space 256, 0
-fb_sqrt_table:
-.byte 0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15, 0x40, 0x41, 0x44, 0x45, 0x50, 0x51, 0x54, 0x55
-fb_sqrm_table0:
-.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07
-fb_sqrm_table1:
-.byte 0x00, 0x19, 0x64, 0x7d, 0x92, 0x8b, 0xf6, 0xef, 0x48, 0x51, 0x2c, 0x35, 0xda, 0xc3, 0xbe, 0xa7
-fb_sqrm_table2:
-.byte 0x00, 0x20, 0x80, 0xa0, 0x00, 0x20, 0x80, 0xa0, 0x00, 0x20, 0x80, 0xa0, 0x00, 0x20, 0x80, 0xa0
-
-.global fb_sqrt_table
-.global fb_sqrm_table0
-.global fb_sqrm_table1
-.global fb_sqrm_table2
-.global fb_rdcn_table0
-.global fb_rdcn_table1
-
-/*
- * Loads the pointer Y with the 16-bit address composed by i and j.
- */
-.macro LOAD_T_PTR i j
-	ldi		r28, \i
-	ldi		r29, \j
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-	ldd		\r1, B_PTR + 0	; r18 = r1 = b[0]
-	mov		\r2, \r1
-	lsl		\r2				; r19 = r2 = r1 << 1
-	mov		\r4, \r2
-	lsl		\r4				; r20 = r4 = r1 << 2
-	mov 	\r8, \r4
-	lsl		\r8				; r21 = r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-	mov		RT, \r1
-
-	ldd		\r1, B_PTR+\i	; r1 = b[i]
-	mov		\r2, \r1
-	lsl		RT
-	rol		\r2
-	mov		\r4, \r2
-	lsl 	RT
-	rol		\r4
-	mov		\r8, \r4
-	lsl		RT
-	rol		\r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST i, r1, r2, r4, r8
-	swap	\r1
-	andi	\r1, 0x0f
-	lsr		\r1			; t = b[i] >> 5
-
-	mov		\r8, \r1
-	lsr		\r1
-	mov		\r4, \r1
-	lsr		\r1
-	mov		\r2, \r1
-	clr		\r1
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN offset, r1, r2, r4, r8
-	std		y + 00, \r1		; tab[1][i] = r1
-	std		y + 16, \r2		; tab[2][i] = r2;
-	mov		RT, \r1
-	eor		RT, \r2
-	std		y + 32, RT		; tab[3][i] = r1^r2
-	std		y + 48, \r4		; tab[4][i] = r4
-	add		r28, RC			; &tab[5][i]
-	eor		RT, \r4
-	std		y + 32, RT		; tab[7][i] = r1^r2^r4
-	eor		RT, \r1
-	std		y + 16, RT		; tab[6][i] = r2^r4
-	mov		RT, \r1
-	eor		RT, \r4
-	std		y + 00, RT		; tab[5][i] = r1^r4;
-	std		y + 48, \r8		; tab[8][i] = r8
-	add		r28, RC			; &tab[9][i]
-	mov		RT, \r1
-	eor		RT, \r8			;
-	std		y + 00, RT		; tab[9][i] = r1^r8
-	eor		RT, \r2
-	std		y + 32, RT		; tab[11][i] = r1^r2^r8
-	eor		RT, \r1
-	std		y + 16, RT		; tab[10][i] = r2^r8
-	eor		\r4, \r8
-	std		y + 48, \r4		; tab[12][i] = r4^r8
-	add		r28, RC			; &tab[13][i]
-	eor		\r4, \r1
-	std		y + 00, \r4		; tab[13][i] = r1^r4^r8
-	eor		\r4, \r2
-	std		y + 32, \r4		; tab[15][i] = r1^r2^r4^r8
-	eor		\r4, \r1
-	std		y + 16, \r4		; tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST offset r1, r2, r4, r8
-	;std		y + 00, \r1		; tab[1][i] = r1
-	std		y + 16, \r2		; tab[2][i] = r2
-	std		y + 32, \r2		; tab[3][i] = r2
-	std		y + 48, \r4		; tab[4][i] = r4
-	add		r28, RC			; &tab[5][i]
-	std		y + 00,	\r4		; tab[5][i] = r1^r4
-	mov		RT, \r2
-	eor		RT, \r4			; r6 = r2^r4
-	std		y + 16, RT		; tab[6][i] = r6
-	std		y + 32, RT		; tab[7][i] = r1^r6;
-	std		y + 48, \r8		; tab[8][i] = r8
-	add		r28, RC			; &tab[9][i]
-	std		y + 00,\r8		; tab[9][i] = r9
-	eor		\r2, \r8
-	std		y + 16,\r2		; tab[10][i] = r2^r8
-	std		y + 32,\r2		; tab[11][i] = r2^r9
-	eor		\r4, \r8
-	std		y + 48,\r4		; tab[12][i] = r4^r8
-	add		r28, RC			; &tab[13][i];
-	std		y + 0, \r4		; tab[13][i] = r4^r9
-	eor		RT, \r8
-	std		y + 16, RT		; tab[14][i] = r6^r8
-	std		y + 32, RT		; tab[15][i] = r6^r9
-.endm
-
-.macro RLC_FILL_TABLE i, j
-	/*
-	 * We do not need to initialize the first row with zeroes, as the .data
-	 * section is already initialized with null bytes.
-	 */
-	.if \i == 0
-		ldi		r28, 16
-		PREP_FIRST	r18, r19, r20, r21
-		FILL_COLUMN	16, r18, r19, r20, r21
-	.else
-		.if \i >= 16
-			ldi		r28, \i
-			PREP_COLUMN	\i, r18, r19, r20, r21
-			FILL_COLUMN	\i, r18, r19, r20, r21
-		.else
-			ldi		r28, \i + 16
-			PREP_COLUMN	\i, r18, r19, r20, r21
-			FILL_COLUMN	\i + 16, r18, r19, r20, r21
-		.endif
-	.endif
-	.if \i < \j
-		RLC_FILL_TABLE \i + 1, \j
-	.endif
-.endm
-
-.macro SHIFT i, offset
-	swap	\i
-	mov		RT, \i
-	andi	RT, 0x0F
-	eor		\i, RT
-	eor		\i + 1, RT
-	std		C_PTR + (\i + \offset + 1), \i + 1
-.endm
-
-.macro MUL0_STEP i
-	.if \i == 16
-		inc		r29
-	.endif
-	.if \i > 15
-		ldd		\i, y + (\i - 16)
-	.else
-		ldd		\i, y + \i
-	.endif
-	.if \i < T_LINE - 1
-		MUL0_STEP \i + 1
-	.endif
-.endm
-
-.macro MUL_STEP i, j
-	.if \j == 16
-		inc		r29
-	.endif
-	.if \j == (T_LINE - 1)
-		.if \j > 15
-			ldd		\i, y + (\j - 16)
-		.else
-			ldd		\i, y + \j
-		.endif
-	.else
-		.if \j > 15
-			ldd		RT, y + (\j - 16)
-		.else
-			ldd		RT, y + \j
-		.endif
-		eor		\i, RT
-	.endif
-	.if \j < (T_LINE - 1)
-		.if \i == (T_LINE - 1)
-			MUL_STEP 0, \j + 1
-		.else
-			MUL_STEP \i + 1, \j + 1
-		.endif
-	.endif
-.endm
-
-.macro MULH i
-	ld 		r28, A_PTR+
-	andi	r28, 0xF0
-	ldi		r29, hi8(fb_muln_table0)
-
-	.if \i == 0
-		MUL0_STEP 0
-
-		swap	r0
-		mov		RT, r0
-		andi	RT, 0x0F
-		mov		RC, RT
-		eor		r0, RT
-
-		std		C_PTR + 0, r0
-	.else
-		MUL_STEP \i, 0
-
-		swap	\i
-		mov		RT, \i
-		andi	RT, 0x0F
-		eor		\i, RT
-		eor		\i, RC
-		mov		RC, RT
-
-		std		C_PTR + \i, \i
-	.endif
-.endm
-
-.macro MULL i
-	ld 		r28, A_PTR+
-	andi	r28, 0x0F
-	swap	r28
-	ldi		r29, hi8(fb_muln_table0)
-
-	.if \i == 0
-		MUL0_STEP 0
-	.else
-		MUL_STEP \i, 0
-	.endif
-
-	ldd		RT, C_PTR + \i
-	eor		\i, RT
-	std		C_PTR + \i, \i
-.endm
-
-.macro PROLOGUE
-	.irp i, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 28, 29
-		push 	\i
-	.endr
-.endm
-
-.macro EPILOGUE
-	clr		r1
-	.irp i, 29, 28, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0
-		pop 	\i
-	.endr
-	ret
-.endm
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global	fb_muln_low
-.global fb_muli_low
-
-#if FB_POLYN == 163
-
-.macro RLC_MULN_TABLE
-	ldi		RC, 0x40
-	ldi		r29, hi8(fb_muln_table0)
-	RLC_FILL_TABLE 0, 15
-	ldi		r29, hi8(fb_muln_table1)
-	RLC_FILL_TABLE 16, 20
-.endm
-
-.macro MULN_DO
-	.irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-		MULH \i
-	.endr
-
-	swap	r18
-	mov		RT, r18
-	andi	RT, 0x0F
-	eor		r18, RT
-	std		C_PTR + (18 + T_LINE + 1), RT
-
-	.irp i, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-		SHIFT \i, T_LINE
-	.endr
-
-	swap	r20
-	mov		RT,r20
-	andi	RT,0x0F
-	eor		r20, RT
-	eor		r0, RT
-	std		C_PTR + 21, r0
-
-	eor		r20, RC
-	std		C_PTR + 20, r20
-
-	sbiw	r26, 20		; x = &a
-
-	.irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20
-		MULL \i
-	.endr
-.endm
-
-#if FB_MUL == LODAH || !defined(STRIP)
-
-fb_muln_low:
-	PROLOGUE
-
-	; C is stored on r25:r24
-	movw	r26, r22		; copy a to x
-	movw	r30, r20		; copy b to z
-
-	RLC_MULN_TABLE
-	movw	r30, r24		; z = &c
-	MULN_DO
-
-	.irp i, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
-		ldd		RT, C_PTR + \i
-		eor		RT, \i % T_LINE
-		std		C_PTR + \i, RT
-	.endr
-
-	EPILOGUE
-#endif
-
-.macro R0 r0, r1, r2
-	mov		RT, r19
-	mov		\r1, RT
-	lsl		RT
-	lsl		RT
-	lsl		RT
-	eor		\r1, RT
-	mov		RT, r19
-	lsr		RT
-	lsr		RT
-	lsr		RT
-	eor		\r1, RT
-
-	swap	r19
-	mov		RT, r19
-	andi	RT, 0x0F
-	mov		\r0, RT
-	lsr		RT
-	eor		\r0, RT
-
-	andi	r19, 0xF0
-	eor		\r1, r19
-
-	lsl		r19
-	mov		\r2, r19
-.endm
-
-.macro R r0, r1, r2
-	mov		RT, r26
-	eor		\r1, RT
-	lsl		RT
-	lsl		RT
-	lsl		RT
-	eor		\r1, RT
-	mov		RT, r26
-	lsr		RT
-	lsr		RT
-	lsr		RT
-	eor		\r1, RT
-
-	swap	r26
-	mov		RT, r26
-	andi	RT, 0x0F
-	eor		\r0, RT
-	lsr		RT
-	eor		\r0, RT
-
-	andi	r26, 0xF0
-	eor		\r1, r26
-
-	lsl		r26
-	mov		\r2, r26
-.endm
-
-.macro STEP i, d1, d2
-	mov		r26, \d1 - T_LINE
-	.if \i == 1
-		R r21, r22, r20
-		ldd		RT, y + \d2
-		eor		RT, r21
-	.endif
-	.if \i == 2
-		R r22, r20, r21
-		ldd		RT, y + \d2
-		eor		RT, r22
-	.endif
-	.if \i == 3
-		R r20, r21, r22
-		ldd		RT, y + \d2
-		eor		RT, r20
-	.endif
-	std		z + \d2, RT
-.endm
-
-#if FB_MUL == INTEG || !defined(STRIP)
-
-fb_muli_low:
-	PROLOGUE
-
-	movw	r14, r22		; copy t to r15:r14
-	movw	r26, r20		; copy a to x
-	movw	r30, r18		; copy b to z
-
-	RLC_MULN_TABLE
-	movw	r30, r14		; z = &t
-	MULN_DO
-
-	.irp i, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
-		ldd		RT, C_PTR + \i
-		eor		\i % T_LINE, RT
-	.endr
-
-	movw	r28, r30			; y now points to t
-	movw	r30, r24			; z now points to c
-
-	R0		r21, r22, r20
-	mov		RT, r0
-	eor		RT, r21
-	mov		r25, RT				; We cannot write to c[21].
-
-	mov		r26, r18
-	R		r22, r20, r21
-	ldd		r18, y + 20
-	eor		r18, r22
-
-	STEP 3, 38, 19
-	STEP 1, 37, 18
-	STEP 2, 36, 17
-	STEP 3, 35, 16
-	STEP 1, 34, 15
-	STEP 2, 33, 14
-	STEP 3, 32, 13
-	STEP 1, 31, 12
-	STEP 2, 30, 11
-	STEP 3, 29, 10
-	STEP 1, 28, 9
-	STEP 2, 27, 8
-	STEP 3, 26, 7
-	STEP 1, 25, 6
-	STEP 2, 24, 5
-	STEP 3, 23, 4
-	STEP 1, 22, 3
-
-	mov		r26, r25
-	R		r22, r20, r21
-	ldd		RT, y + 2
-	eor		RT, r22
-	std		z + 2, RT
-
-	ldd 	r24, y + 1
-	eor 	r24, r20		; r24 = m[1]
-
-	ldd		r25, y + 0
-	eor		r25, r21		; r25 = m[0]
-
-	mov		r20, r18
-	lsr		r20
-	swap	r20
-	andi	r20, 0xC0	; r20 = (t>>3)<<6
-
-	mov		r19, r20
-	lsl		r19			; r19 = (t>>3)<<7
-
-	mov		r21, r18
-	andi	r21, 0xF8		; r21 = (t>>3)<<3
-
-	mov		r22, r18
-	lsr		r22
-	lsr		r22
-	lsr		r22			; r22 = (t >> 3)
-
-	eor		r22, r19
-	eor		r22, r20
-	eor		r22, r21
-
-	eor		r25, r22
-	std		z + 0, r25
-
-	mov		r25, r18
-	swap	r25
-	andi	r25, 0x0F
-	mov		RT, r25
-	lsr		RT
-	eor		RT, r25
-
-	eor		r24, RT
-	std		z + 1, r24
-
-	andi	r18, 0x07
-	std		z + 20, r18
-
-	EPILOGUE
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.c b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.c
deleted file mode 100755
index f26c94bf8c39..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_util.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/*@{ */
-/**
- * Dedicated functions to shift left by every possible shift amount.
- *
- * @param c		- the result.
- * @param a		- the digit vector to shift and add.
- * @param size		- the size of the digit vector.
- * @return the carry of the last shift.
- */
-dig_t fb_lsha1_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha2_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha3_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha4_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha5_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha6_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lsha7_low(dig_t *c, const dig_t *a, int size);
-/*@} */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, shift;
-
-	if (bits == 1)
-		return fb_lsh1_low(c, a);
-
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & RLC_MASK(bits);
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	if (bits == 1)
-		return fb_rsh1_low(c, a);
-
-	c += RLC_FB_DIGS - 1;
-	a += RLC_FB_DIGS - 1;
-	/* Prepare the bit mask. */
-	mask = ((dig_t)1 << (dig_t)bits) - 1;
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = RLC_FB_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-#if FB_INV == EXGCD || !defined(STRIP)
-
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size) {
-	if (bits == 1)
-		return fb_lsha1_low(c, a, size);
-	if (bits == 2)
-		return fb_lsha2_low(c, a, size);
-	if (bits == 3)
-		return fb_lsha3_low(c, a, size);
-	if (bits == 4)
-		return fb_lsha4_low(c, a, size);
-	if (bits == 5)
-		return fb_lsha5_low(c, a, size);
-	if (bits == 6)
-		return fb_lsha6_low(c, a, size);
-	if (bits == 7)
-		return fb_lsha7_low(c, a, size);
-
-	for (int i = 0; i < RLC_FB_DIGS; i++, c++, a++)
-		(*c) ^= (*a);
-	return 0;
-}
-
-#else
-
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size) {
-	int i, j;
-	dig_t b1, b2;
-
-	j = RLC_DIG - bits;
-	b1 = a[0];
-	c[0] ^= (b1 << bits);
-	if (size == RLC_FB_DIGS) {
-		for (i = 1; i < RLC_FB_DIGS; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	} else {
-		for (i = 1; i < size; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	}
-	return (b1 >> j);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.s
deleted file mode 100755
index 8306f4444961..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_shift_low.s
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-.arch atmega128
-
-/*============================================================================*/
-/* Private definitions                                                         */
-/*============================================================================*/
-
-.macro RSH1_STEP i, j
-	ld		r18, -x
-	ror		r18
-	st		-z, r18
-	.if \i < \j
-		RSH1_STEP \i + 1, \j
-	.endif
-.endm
-
-.macro LSH1_STEP i, j
-	ld		r18, x+
-	rol		r18
-	st		z+, r18
-	.if \i < \j
-		LSH1_STEP \i + 1, \j
-	.endif
-.endm
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.text
-
-.global fb_rsh1_low
-.global fb_lsh1_low
-
-fb_rsh1_low:
-	movw	r30, r24
-	movw	r26, r22
-	adiw	r30, RLC_FB_DIGS
-	adiw	r26, RLC_FB_DIGS
-
-	clc
-	RSH1_STEP 0, RLC_FB_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-fb_lsh1_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	clc
-	LSH1_STEP 0, RLC_FB_DIGS - 1
-
-	clr		r24
-	adc		r24, r1
-	ret
-
-#if FB_INV == EXGCD || !defined(STRIP)
-
-.global fb_lsha1_low
-.global fb_lsha2_low
-.global fb_lsha3_low
-.global fb_lsha4_low
-.global fb_lsha5_low
-.global fb_lsha6_low
-.global fb_lsha7_low
-
-fb_lsha1_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	clc
-fb_lsha1_loop:
-	ld		r25, z
-	ld		r21, x+
-	rol		r21
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha1_loop
-
-	clr		r24
-	rol		r24
-	ret
-
-fb_lsha2_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r21, x+
-	clr		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha2_end
-fb_lsha2_loop:
-	ld		r25, z
-	ld		r21, x+
-	eor		r25, r24
-	clr		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha2_loop
-
-fb_lsha2_end:
-	ret
-
-fb_lsha3_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r21, x+
-	clr		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha3_end
-fb_lsha3_loop:
-	ld		r25, z
-	ld		r21, x+
-	eor		r25, r24
-	clr		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha3_loop
-
-fb_lsha3_end:
-	ret
-
-fb_lsha4_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r21, x+
-	swap	r21
-	mov		r24, r21
-	andi	r21, 0xF0
-	andi	r24, 0x0F
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha4_end
-fb_lsha4_loop:
-	ld		r25, z
-	ld		r21, x+
-	eor		r25, r24
-	swap	r21
-	mov		r24, r21
-	andi	r21, 0xF0
-	andi	r24, 0x0F
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha4_loop
-
-fb_lsha4_end:
-	ret
-
-fb_lsha5_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r21, x+
-	swap	r21
-	mov		r24, r21
-	andi	r21, 0xF0
-	andi	r24, 0x0F
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha5_end
-fb_lsha5_loop:
-	ld		r25, z
-	ld		r21, x+
-	eor		r25, r24
-	swap	r21
-	mov		r24, r21
-	andi	r21, 0xF0
-	andi	r24, 0x0F
-	lsl		r21
-	rol		r24
-	eor		r25, r21
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha5_loop
-
-fb_lsha5_end:
-	ret
-
-fb_lsha6_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r24, x+
-	clr		r23
-	bst		r24, 0
-	bld		r23, 6
-	bst		r24, 1
-	bld		r23, 7
-	lsr		r24
-	lsr		r24
-	eor		r25, r23
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha6_end
-fb_lsha6_loop:
-	ld		r25, z
-	eor		r25, r24
-	ld		r24, x+
-	bst		r24, 0
-	bld		r23, 6
-	bst		r24, 1
-	bld		r23, 7
-	eor		r25, r23
-	lsr		r24
-	lsr		r24
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha6_loop
-
-fb_lsha6_end:
-	ret
-
-fb_lsha7_low:
-	movw	r30, r24
-	movw	r26, r22
-
-	ld		r25, z
-	ld		r24, x+
-	clr		r23
-	bst		r24, 0
-	bld		r23, 7
-	lsr		r24
-	eor		r25, r23
-	st		z+, r25
-	dec		r20
-	breq	fb_lsha7_end
-fb_lsha7_loop:
-	ld		r25, z
-	eor		r25, r24
-	ld		r24, x+
-	bst		r24, 0
-	bld		r23, 7
-	eor		r25, r23
-	lsr		r24
-	st		z+, r25
-	dec		r20
-	brne	fb_lsha7_loop
-
-fb_lsha7_end:
-	ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.c b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.c
deleted file mode 100755
index 18eb3b8975e8..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field squaring functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_sqri_low(dig_t *c, dig_t *t, const dig_t *a);
-
-void fb_sqrm_low(dig_t *c, const dig_t *a) {
-	dv_t t;
-
-	dv_new(t);
-	fb_sqri_low(c, t, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.s b/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.s
deleted file mode 100755
index 40ba8d3e3d50..000000000000
--- a/src/dashbls/depends/relic/src/low/avr-asm-163/relic_fb_sqr_low.s
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fb_low.h"
-
-#define RT		r24
-
-#define RT2		r25
-
-#define R0		r21
-
-#define R1		r22
-
-#define R2		r23
-
-.arch atmega128
-
-.data
-
-.text
-
-#if FB_SQR == INTEG || !defined(STRIP)
-
-#if FB_POLYN == 163
-
-.global fb_sqri_low
-
-.macro ACC0 r0, r1, r2
-	ld		\r0, y
-	ldd		\r1, y + 16
-	ldd		\r2, y + 32
-.endm
-
-.macro ACC r0, r1, r2
-	ld		RT2, y
-	eor		\r0, RT2
-	ldd		RT2, y + 16
-	eor		\r1, RT2
-	ldd		\r2, y + 32
-.endm
-
-.macro SQRM_HALF i
-	ldd		RT, z + \i
-	mov		r28, RT
-	andi	r28, 0x0f
-	ld		\i + \i,y
-.endm
-
-.macro SQRM_STEP i, j
-	ldd		RT, z + \i
-	mov		r28, RT
-	andi	r28, 0x0f
-	ld		\i + \i, y
-	swap	RT
-	mov		r28, RT
-	andi	r28, 0x0f
-	ld		\i + \i + 1, y
-	.if \i < \j
-		SQRM_STEP \i+1, \j
-	.endif
-.endm
-
-fb_sqri_low:
-	.irp i, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 28, 29
-		push	\i
-	.endr
-
-	movw	r30, r20				; Copy a to z
-	; Ignore t.
-	movw	r26, r24				; Copy c to x
-
-	ldi		r28,lo8(fb_sqrt_table)
-	ldi		r29,hi8(fb_sqrt_table)
-
-	SQRM_STEP 0, 9
-	SQRM_HALF 10
-
-	ldd		RT, z + 20
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC0 	R1, R2, R0
-
-	push	R1				; Store backup of c[21] on stack.
-
-	ldd		RT, z + 19
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R2, R0, R1
-	eor		r20, R2
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC 	R0, R1, R2
-	eor		r19, R0
-
-	ldd		RT, z + 18
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC		R1, R2, R0
-	eor		r18, R1
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC 	R2, R0, R1
-	eor		r17, R2
-
-	ldd		RT, z + 17
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC		R0, R1, R2
-	eor		r16, R0
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC 	R1, R2, R0
-	eor		r15, R1
-
-	ldd		RT, z + 16
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R2, R0, R1
-	eor		r14, R2
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC 	R0, R1, R2
-	eor		r13, R0
-
-	ldd		RT, z + 15
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R1, R2, R0
-	eor		r12, R1
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC		R2, R0, R1
-	eor		r11, R2
-
-	ldd		RT, z + 14
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC		R0, R1, R2
-	eor		r10, R0
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC 	R1, R2, R0
-	eor		r9, R1
-
-	ldd		RT, z + 13
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R2, R0, R1
-	eor		r8, R2
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC		R0, R1, R2
-	eor		r7, R0
-
-	ldd		RT, z + 12
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R1, R2, R0
-	eor		r6, R1
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC		R2, R0, R1
-	eor		r5, R2
-
-	ldd		RT, z + 11
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R0, R1, R2
-	eor		r4, R0
-	andi	RT, 0x0F
-	ldi		r28, lo8(fb_sqrm_table0)
-	add		r28, RT
-	ACC		R1, R2, R0
-	eor		r3, R1
-
-	ldd		RT, z + 10
-	mov		RT2, RT
-	ldi		r28, lo8(fb_sqrm_table0)
-	swap	RT2
-	andi	RT2, 0x0F
-	add		r28, RT2
-	ACC 	R2, R0, R1
-	eor		r2, R2
-	eor		r1, R0
-	eor		r0, R1
-
-	movw	r28, r26	; y = c[0]
-
-	.irp i, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-		std	y + \i, \i
-	.endr
-
-	pop		RT			; Read c[21].
-
-	eor		r1, RT
-	mov		RT2, RT
-	lsl		RT2
-	lsl		RT2
-	lsl		RT2
-	eor		r1, RT2
-	lsl		RT2
-	eor		r1, RT2
-	swap	RT
-	andi	RT, 0x0F
-	lsr		RT
-	eor		r1, RT
-	lsl		RT2
-	eor		r0, RT2
-
-	mov		RT, r20
-	lsr		RT
-	lsr		RT
-	lsr		RT
-	mov		RT2, RT
-	lsl		RT2
-	lsl		RT2
-	lsl		RT2
-	eor		r0, RT
-	eor		r0, RT2
-	mov		RT2, RT
-	swap	RT2
-	andi	RT2, 0xF0
-	lsl		RT2
-	lsl		RT2
-	eor		r0, RT2
-	lsl		RT2
-	eor		r0, RT2
-	std		y + 0, r0
-
-	mov		RT2, RT
-	lsr		RT2
-	eor		RT, RT2
-	lsr		RT
-	eor		r1, RT
-	std		y + 1, r1
-
-	andi	r20, 0x07
-	std		y + 20, r20
-
-	.irp i, 29, 28, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0
-		pop		\i
-	.endr
-
-	clr		r1
-
-	ret
-
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/CMakeLists.txt b/src/dashbls/depends/relic/src/low/curve2251-sse/CMakeLists.txt
deleted file mode 100644
index 41f1910618ad..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(${RELIC_SOURCE_DIR}/cmake/gmp.cmake)
-if(GMP_FOUND)
-  include_directories(${GMP_INCLUDE_DIR})
-  set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/macros.h b/src/dashbls/depends/relic/src/low/curve2251-sse/macros.h
deleted file mode 100755
index ededf49ebdef..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/macros.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Useful macros for binary field arithmetic.
- *
- * @version $Id$
- * @ingroup fb
- */
-
-#define PSHUFB(A, B)		_mm_shuffle_epi8(A, B);
-#define SHL64(A, B)			_mm_slli_epi64(A, B)
-#define SHR64(A, B)			_mm_srli_epi64(A, B)
-#define XOR(A, B)			_mm_xor_si128(A, B)
-#define SHL8(A, B)			_mm_slli_si128(A, B)
-#define SHR8(A, B)			_mm_srli_si128(A, B)
-#define AND(A, B)			_mm_and_si128(A, B)
-
-#define MUL(ma, mb) \
-	t0 = _mm_clmulepi64_si128(ma, mb, 0x00);\
-	t1 = _mm_clmulepi64_si128(ma, mb, 0x11);\
-	t2 = XOR(SHR8(ma, 8), ma);\
-	t3 = XOR(SHR8(mb, 8), mb);\
-	t2 = _mm_clmulepi64_si128(t2, t3, 0x00);\
-	t2 = XOR(t2, t0);\
-	t2 = XOR(t2, t1);\
-	t3 = SHR8(t2, 8);\
-	t2 = SHL8(t2, 8);\
-	t0 = XOR(t0, t2);\
-	t1 = XOR(t1, t3);\
-
-#define MULDXS(ma, mb)	\
-	t0 = _mm_clmulepi64_si128(ma, mb, 0x00);\
-	t2 = _mm_clmulepi64_si128(ma, mb, 0x01);\
-	t1 = SHR8(t2, 8);\
-	t2 = SHL8(t2, 8);\
-	t0 = XOR(t0, t2);\
-
-#define MULSXD(ma, mb)	\
-	MULDXS(mb, ma)
-
-#define RED251(t,m1,m0)\
-	t0 = _mm_slli_si128(t,8);\
-	t1 = _mm_srli_si128(t,8);\
-	m1 = _mm_xor_si128(m1,_mm_srli_epi64(t1,59));\
-	m1 = _mm_xor_si128(m1,_mm_srli_epi64(t1,57));\
-	m1 = _mm_xor_si128(m1,_mm_srli_epi64(t1,55));\
-	m1 = _mm_xor_si128(m1,_mm_srli_epi64(t1,52));\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(t0,59));\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(t0,57));\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(t0,55));\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(t0,52));\
-	t0 = _mm_srli_si128(t0,8);\
-	t1 = _mm_slli_si128(t1,8);\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t0,5));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t0,7));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t0,9));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t0,12));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t1,5));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t1,7));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t1,9));\
-	m0 = _mm_xor_si128(m0,_mm_slli_epi64(t1,12));
-
-#define REDUCE()														\
-	RED251(m3,m2,m1);													\
-	RED251(m2,m1,m0);													\
-	m8 = _mm_srli_si128(m1,8);											\
-	m9 = _mm_srli_epi64(m8,59);											\
-	m9 = _mm_slli_epi64(m9,59);											\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,59));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,57));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,55));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,52));						\
-
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_add_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_add_low.c
deleted file mode 100755
index 02e999effa2e..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_add_low.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-#ifdef __PCLMUL__
-#include <wmmintrin.h>
-#endif
-
-#include <tmmintrin.h>
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-#include "macros.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-
-	(*c) = (*a) ^ digit;
-	c++;
-	a++;
-	for (i = 0; i < RLC_FB_DIGS - 1; i++, a++, c++)
-		(*c) = (*a);
-}
-
-void fb_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	*(__m128i *)c = XOR(*(__m128i*)(a), *(__m128i*)(b));
-	*(__m128i *)(c + 2) = XOR(*(__m128i*)(a + 2), *(__m128i*)(b + 2));
-}
-
-void fb_addd_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	if (size == 2 * RLC_FB_DIGS) {
-		*(__m128i *)c = XOR(*(__m128i*)(a), *(__m128i*)(b));
-		*(__m128i *)(c + 2) = XOR(*(__m128i*)(a + 2), *(__m128i*)(b + 2));
-		*(__m128i *)(c + 4) = XOR(*(__m128i*)(a + 4), *(__m128i*)(b + 4));
-		*(__m128i *)(c + 6) = XOR(*(__m128i*)(a + 6), *(__m128i*)(b + 6));
-	} else {
-		for (int i = 0; i < size; i++, a++, b++, c++) {
-			(*c) = (*a) ^ (*b);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_inv_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_inv_low.c
deleted file mode 100755
index 579c3a9cbf0b..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_inv_low.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @ingroup fb
- */
-
-#include <stdio.h>
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_invn_low(dig_t *c, const dig_t *a) {
-	int i, j, x, y, len;
-	const int *chain = fb_poly_get_chain(&len);
-
-	int u[len + 1];
-	fb_t table[len + 1];
-	for (i = 0; i <= len; i++) {
-		fb_null(table[i]);
-	}
-
-	for (i = 0; i <= len; i++) {
-		fb_new(table[i]);
-	}
-
-	u[0] = 1;
-	u[1] = 2;
-	fb_copy(table[0], a);
-	fb_sqr(table[1], table[0]);
-	fb_mul(table[1], table[1], table[0]);
-
-	u[2] = u[1] + u[0];
-	fb_sqr(table[2], table[1]);
-	fb_mul(table[2], table[2], table[0]);
-
-	u[3] = u[2] + u[1];
-	fb_sqr(table[3], table[2]);
-	for (j = 1; j < u[1]; j++) {
-		fb_sqr(table[3], table[3]);
-	}
-	fb_mul(table[3], table[3], table[1]);
-
-	u[4] = 2 * u[3];
-	fb_sqr(table[4], table[3]);
-	for (j = 1; j < u[3]; j++) {
-		fb_sqr(table[4], table[4]);
-	}
-	fb_mul(table[4], table[4], table[3]);
-
-	u[5] = u[4] + u[3];
-	fb_sqr(table[5], table[4]);
-	for (j = 1; j < u[3]; j++) {
-		fb_sqr(table[5], table[5]);
-	}
-	fb_mul(table[5], table[5], table[3]);
-
-	for (i = 6; i <= len; i++) {
-		x = chain[i - 1] >> 8;
-		y = chain[i - 1] - (x << 8);
-		if (x == y) {
-			u[i] = 2 * u[i - 1];
-		} else {
-			u[i] = u[x] + u[y];
-		}
-		dig_t *tab = (dig_t *)fb_poly_tab_sqr(y);
-		fb_itr(table[i], table[x], u[y], (void *)tab);
-		fb_mul(table[i], table[i], table[y]);
-	}
-	fb_sqr(c, table[len]);
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_itr_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_itr_low.c
deleted file mode 100644
index 3341a205d38e..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_itr_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level iterated squaring/square-root.
- *
- * @ingroup fb
- */
-
-#include <tmmintrin.h>
-#include <xmmintrin.h>
-
-#include "relic_fb.h"
-#include "relic_dv.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_itrn_low(dig_t *c, const dig_t *a, dig_t *t) {
-	int i, j;
-	dig_t u, *p;
-	const dig_t *tmp;
-
-	__m128i r0, r1;
-	r0 = r1 = _mm_setzero_si128();
-	for (i = RLC_DIG - 4; i >= 0; i -= 4) {
-		tmp = a;
-		for (j = 0; j < RLC_FB_DIGS - 1; j++, tmp++) {
-			u = (*tmp >> i) & 0x0F;
-			p = (t + ((j * RLC_DIG + i) * 4 + u) * RLC_FB_DIGS);
-			r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-			r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-		}
-	}
-	for (i = RLC_DIG - 8; i >= 0; i -= 4) {
-		tmp = a + RLC_FB_DIGS - 1;
-		u = (*tmp >> i) & 0x0F;
-		p = (t + ((j * RLC_DIG + i) * 4 + u) * RLC_FB_DIGS);
-		r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-		r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-	}
-
-	_mm_store_si128((__m128i *)c, r0);
-	_mm_store_si128((__m128i *)(c + 2), r1);
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low.c
deleted file mode 100755
index 071895ccdfa0..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit multiplication functions.
- *
- * @ingroup fb
- */
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_muld_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	rlc_align dig_t t[16][size + 1];
-	dig_t u, r0, r1, r2, r4, r8, *tmpc;
-	const dig_t *tmpa;
-	int i, j;
-
-	dv_zero(c, 2 * size);
-
-	for (i = 0; i < 16; i++) {
-		dv_zero(t[i], size + 1);
-	}
-
-	u = 0;
-	for (i = 0; i < size; i++) {
-		r1 = r0 = b[i];
-		r2 = (r0 << 1) | (u >> (RLC_DIG - 1));
-		r4 = (r0 << 2) | (u >> (RLC_DIG - 2));
-		r8 = (r0 << 3) | (u >> (RLC_DIG - 3));
-		t[0][i] = 0;
-		t[1][i] = r1;
-		t[2][i] = r2;
-		t[3][i] = r1 ^ r2;
-		t[4][i] = r4;
-		t[5][i] = r1 ^ r4;
-		t[6][i] = r2 ^ r4;
-		t[7][i] = r1 ^ r2 ^ r4;
-		t[8][i] = r8;
-		t[9][i] = r1 ^ r8;
-		t[10][i] = r2 ^ r8;
-		t[11][i] = r1 ^ r2 ^ r8;
-		t[12][i] = r4 ^ r8;
-		t[13][i] = r1 ^ r4 ^ r8;
-		t[14][i] = r2 ^ r4 ^ r8;
-		t[15][i] = r1 ^ r2 ^ r4 ^ r8;
-		u = r1;
-	}
-
-	if (u > 0) {
-		r2 = u >> (RLC_DIG - 1);
-		r4 = u >> (RLC_DIG - 2);
-		r8 = u >> (RLC_DIG - 3);
-		t[0][size] = t[1][size] = 0;
-		t[2][size] = t[3][size] = r2;
-		t[4][size] = t[5][size] = r4;
-		t[6][size] = t[7][size] = r2 ^ r4;
-		t[8][size] = t[9][size] = r8;
-		t[10][size] = t[11][size] = r2 ^ r8;
-		t[12][size] = t[13][size] = r4 ^ r8;
-		t[14][size] = t[15][size] = r2 ^ r4 ^ r8;
-	}
-
-	for (i = RLC_DIG - 4; i > 0; i -= 4) {
-		tmpa = a;
-		tmpc = c;
-		for (j = 0; j < size; j++, tmpa++, tmpc++) {
-			u = (*tmpa >> i) & 0x0F;
-			fb_addd_low(tmpc, tmpc, t[u], size + 1);
-		}
-		bn_lshb_low(c, c, 2 * size, 4);
-	}
-
-	for (j = 0; j < size; j++, a++, c++) {
-		u = *a & 0x0F;
-		fb_addd_low(c, c, t[u], size + 1);
-	}
-}
-
-#if defined(__PCLMUL__) || defined(__INTEL_COMPILER)
-#include "relic_fb_mul_low_cl.c"
-#else
-#ifndef SHUFFLE
-#include "relic_fb_mul_low_ld.c"
-#else
-#include "relic_fb_mul_low_sf.c"
-#endif
-#endif
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_cl.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_cl.c
deleted file mode 100755
index fbbda31d936d..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_cl.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit multiplication functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-#include <wmmintrin.h>
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i ma0, ma1, mb0, mb1, m0, m1, m2, m3, m4, m5, t0, t1, t2, t3;
-
-	ma0 = _mm_load_si128((__m128i *)a);
-	mb0 = _mm_load_si128((__m128i *)b);
-
-	MUL(ma0, mb0);
-	m0 = t0;
-	m1 = t1;
-
-	ma1 = _mm_load_si128((__m128i *)a + 1);
-	mb1 = _mm_load_si128((__m128i *)b + 1);
-	MUL(ma1, mb1);
-	m2 = t0;
-	m3 = t1;
-
-	ma0 = XOR(ma0, ma1);
-	mb0 = XOR(mb0, mb1);
-
-	MUL(ma0, mb0);
-	m4 = t0;
-	m5 = t1;
-
-	m4 = _mm_xor_si128(m4, m0);
-	m5 = _mm_xor_si128(m5, m1);
-	m4 = _mm_xor_si128(m4, m2);
-	m5 = _mm_xor_si128(m5, m3);
-
-	m1 = XOR(m1, m4);
-	m2 = XOR(m2, m5);
-
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) c + 1, m1);
-	_mm_store_si128((__m128i *) c + 2, m2);
-	_mm_store_si128((__m128i *) c + 3, m3);
-
-}
-
-#if !defined(__INTEL_COMPILER)
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i ma0, ma1, mb0, mb1, m0, m1, m2, m3, m4, m5, t0, t1, t2, t3;
-	rlc_align dig_t t[2*RLC_FB_DIGS];
-
-	ma0 = _mm_load_si128((__m128i *)a);
-	mb0 = _mm_load_si128((__m128i *)b);
-
-	MUL(ma0, mb0);
-	m0 = t0;
-	m1 = t1;
-
-	ma1 = _mm_load_si128((__m128i *)a + 1);
-	mb1 = _mm_load_si128((__m128i *)b + 1);
-	MUL(ma1, mb1);
-	m2 = t0;
-	m3 = t1;
-
-	ma0 = XOR(ma0, ma1);
-	mb0 = XOR(mb0, mb1);
-
-	MUL(ma0, mb0);
-	m4 = t0;
-	m5 = t1;
-
-	m4 = _mm_xor_si128(m4, m0);
-	m5 = _mm_xor_si128(m5, m1);
-	m4 = _mm_xor_si128(m4, m2);
-	m5 = _mm_xor_si128(m5, m3);
-
-	m1 = XOR(m1, m4);
-	m2 = XOR(m2, m5);
-
-	_mm_store_si128((__m128i *) t + 0, m0);
-	_mm_store_si128((__m128i *) t + 1, m1);
-	_mm_store_si128((__m128i *) t + 2, m2);
-	_mm_store_si128((__m128i *) t + 3, m3);
-
-	const int ra = 52;
-	const int rb = 55;
-	const int rc = 57;
-	const int rh = 59;
-	const int lh = 5;
-	const int la = 12;
-	const int lb = 9;
-	const int lc = 7;
-
-	dig_t d = t[7], a0 = t[0], a1 = t[1], a2 = t[2], a3 = t[3], a4 = t[4];
-
-	a4 ^= (d >> rh);
-	a4 ^= (d >> ra);
-	a4 ^= (d >> rb);
-	a4 ^= (d >> rc);
-
-	a3 ^= (d << lh);
-	a3 ^= (d << la);
-	a3 ^= (d << lb);
-	a3 ^= (d << lc);
-
-	d = t[6];
-	a3 ^= (d >> rh);
-	a3 ^= (d >> ra);
-	a3 ^= (d >> rb);
-	a3 ^= (d >> rc);
-
-	a2 ^= (d << lh);
-	a2 ^= (d << la);
-	a2 ^= (d << lb);
-	a2 ^= (d << lc);
-
-	d = t[5];
-	a2 ^= (d >> rh);
-	a2 ^= (d >> ra);
-	a2 ^= (d >> rb);
-	a2 ^= (d >> rc);
-
-	a1 ^= (d << lh);
-	a1 ^= (d << la);
-	a1 ^= (d << lb);
-	a1 ^= (d << lc);
-
-	d = a4;
-	a1 ^= (d >> rh);
-	a1 ^= (d >> ra);
-	a1 ^= (d >> rb);
-	a1 ^= (d >> rc);
-
-	a0 ^= (d << lh);
-	a0 ^= (d << la);
-	a0 ^= (d << lb);
-	a0 ^= (d << lc);
-
-	d = a3 >> rh;
-	a0 ^= d;
-	d <<= rh;
-
-	a0 ^= (d >> ra);
-	a0 ^= (d >> rb);
-	a0 ^= (d >> rc);
-	a3 ^= d;
-
-	c[3] = a3;
-	c[2] = a2;
-	c[1] = a1;
-	c[0] = a0;
-
-	return;
-}
-
-#else
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i ma0, ma1, mb0, mb1, m0, m1, m2, m3, m4, m5, m8, m9, t0, t1, t2, t3;
-
-	ma0 = _mm_load_si128((__m128i *)a);
-	mb0 = _mm_load_si128((__m128i *)b);
-
-	MUL(ma0, mb0);
-	m0 = t0;
-	m1 = t1;
-
-	ma1 = _mm_load_si128((__m128i *)a + 1);
-	mb1 = _mm_load_si128((__m128i *)b + 1);
-	MUL(ma1, mb1);
-	m2 = t0;
-	m3 = t1;
-
-	ma0 = XOR(ma0, ma1);
-	mb0 = XOR(mb0, mb1);
-
-	MUL(ma0, mb0);
-	m4 = t0;
-	m5 = t1;
-
-	m4 = _mm_xor_si128(m4, m0);
-	m5 = _mm_xor_si128(m5, m1);
-	m4 = _mm_xor_si128(m4, m2);
-	m5 = _mm_xor_si128(m5, m3);
-
-	m1 = XOR(m1, m4);
-	m2 = XOR(m2, m5);
-
-	rlc_align dig_t _x[2];
-
-	REDUCE();
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) _x, m1);
-	c[2] = _x[0];
-	c[3] = _x[1] & 0x07FFFFFFFFFFFFFF;
-	return;
-}
-
-#endif
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	__m128i ma, mb, m0, m1, m2, t0, t1, t2;
-
-	ma = _mm_load_si128((__m128i *)a);
-	mb = _mm_set_epi32(0, 0, digit >> 32, digit & 0xFFFFFFFF);
-
-	MULDXS(ma, mb);
-	m0 = t0;
-	m1 = t1;
-
-	ma = _mm_load_si128((__m128i *)a + 1);
-	MULDXS(ma, mb);
-	m1 = XOR(m1, t0);
-	m2 = t1;
-
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) c + 1, m1);
-	_mm_store_si128((__m128i *) c + 2, m2);
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_ld.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_ld.c
deleted file mode 100755
index 5f4f42e982db..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_ld.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit multiplication functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int j, k;
-	dig_t b1, b2;
-
-	if (digit == 0) {
-		dv_zero(c, RLC_FB_DIGS + 1);
-		return;
-	}
-	if (digit == 1) {
-		fb_copy(c, a);
-		return;
-	}
-	c[RLC_FB_DIGS] = fb_lshb_low(c, a, util_bits_dig(digit) - 1);
-	for (int i = util_bits_dig(digit) - 2; i > 0; i--) {
-		if (digit & ((dig_t)1 << i)) {
-			j = RLC_DIG - i;
-			b1 = a[0];
-			c[0] ^= (b1 << i);
-			for (k = 1; k < RLC_FB_DIGS; k++) {
-				b2 = a[k];
-				c[k] ^= ((b2 << i) | (b1 >> j));
-				b1 = b2;
-			}
-			c[RLC_FB_DIGS] ^= (b1 >> j);
-		}
-	}
-	if (digit & (dig_t)1) {
-		fb_add(c, c, a);
-	}
-}
-
-void fb_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i tab[16][8], tab1[16][8];
-	__m128i s0, m0, m1, m2, m3, m4, m8, m9;
-	char ta, tb;
-	int i, j, k;
-
-#define LOOKUP(i, T)\
-	T[0][i] = _mm_setzero_si128();\
-	T[1][i] = m0;\
-    T[2][i] = m1;\
-    T[3][i] = m9=_mm_xor_si128(m0,m1);\
-    T[4][i] = m2;\
-    T[5][i] = _mm_xor_si128(m2,m0);\
-    T[6][i] = _mm_xor_si128(m2,m1);\
-    T[7][i] = _mm_xor_si128(m2,m9);\
-    T[8][i] =  m3;\
-    T[9][i] =  _mm_xor_si128(m3,m0);\
-    T[10][i] = _mm_xor_si128(m3,m1);\
-    T[11][i] = _mm_xor_si128(m3,m9);\
-    T[12][i] = m2=_mm_xor_si128(m3,m2);\
-    T[13][i] = _mm_xor_si128(m2,m0);\
-    T[14][i] = _mm_xor_si128(m2,m1);\
-    T[15][i] = _mm_xor_si128(m2,m9);
-
-	s0 = _mm_setzero_si128();
-	for (i = 0; i < 2; i++) {
-		m0 = _mm_load_si128((__m128i *) (b + 2 * i));
-		m9 = _mm_srli_epi64(m0, 57);
-		m8 = _mm_slli_si128(m9, 8);
-		m8 = _mm_xor_si128(m8, s0);
-		s0 = _mm_srli_si128(m9, 8);
-		m1 = _mm_slli_epi64(m0, 1);
-		m2 = _mm_slli_epi64(m0, 2);
-		m3 = _mm_slli_epi64(m0, 3);
-		m3 = _mm_xor_si128(m3, _mm_srli_epi64(m8, 4));
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 5));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 6));
-		LOOKUP(i, tab);
-		m4 = m0;
-		m0 = _mm_slli_epi64(m4, 4);
-		m1 = _mm_slli_epi64(m4, 5);
-		m2 = _mm_slli_epi64(m4, 6);
-		m3 = _mm_slli_epi64(m4, 7);
-		m3 = _mm_xor_si128(m3, m8);
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 1));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 2));
-		m0 = _mm_xor_si128(m0, _mm_srli_epi64(m8, 3));
-		LOOKUP(i, tab1);
-	}
-	m3 = s0;
-	m2 = _mm_srli_epi64(s0, 1);
-	tab1[0][i] = tab1[1][i] = tab1[2][i] = tab1[3][i] = _mm_setzero_si128();
-    tab1[4][i] = tab1[5][i] = tab1[6][i] = tab1[7][i] = m2;
-    tab1[8][i] = tab1[9][i] = tab1[10][i] = tab1[11][i] = m3;
-    m2 =_mm_xor_si128(m3,m2);
-    tab1[12][i] = tab1[13][i] = tab1[14][i] = tab1[15][i] = m2;
-#undef LOOKUP
-
-#define LSHIFT8(m3,m2,m1,m0)\
-	m3=_mm_alignr_epi8(m3,m2,15);\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define M(m2,m1,m0,ta,tb)\
-	m0=_mm_xor_si128(m0, tab[ta&0xf][0]);\
-	m1=_mm_xor_si128(m1, tab[ta&0xf][1]);\
-	m0=_mm_xor_si128(m0,tab1[tb&0xf][0]);\
-	m1=_mm_xor_si128(m1,tab1[tb&0xf][1]);\
-	m2=_mm_xor_si128(m2,tab1[tb&0xf][2]);\
-
-	// Main computation
-	m0 = m1 = m2 = m3 = _mm_setzero_si128();
-
-	for (j = 56; j >= 0; j -= 8) {
-		k = j + 4;
-		ta = (a[1] >> j);
-		tb = (a[1] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[3] >> j);
-		tb = (a[3] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	for (j = 56; j >= 8; j -= 8) {
-		k = j + 4;
-		ta = (a[0] >> j);
-		tb = (a[0] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[2] >> j);
-		tb = (a[2] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	ta = a[0];
-	tb = (a[0] >> 4);
-	M(m2, m1, m0, ta, tb);
-	ta = a[2];
-	tb = (a[2] >> 4);
-	M(m3, m2, m1, ta, tb);
-
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) c + 1, m1);
-	_mm_store_si128((__m128i *) c + 2, m2);
-	_mm_store_si128((__m128i *) c + 3, m3);
-#undef M
-}
-
-#if !defined(__INTEL_COMPILER)
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i tab[16][8], tab1[16][8];
-	__m128i s0, m0, m1, m2, m3, m4, m8, m9;
-	rlc_align dig_t t[2*RLC_FB_DIGS];
-	char ta, tb;
-	int i, j, k;
-
-#define LOOKUP(i, T)\
-	T[0][i] = _mm_setzero_si128();\
-	T[1][i] = m0;\
-    T[2][i] = m1;\
-    T[3][i] = m9=_mm_xor_si128(m0,m1);\
-    T[4][i] = m2;\
-    T[5][i] = _mm_xor_si128(m2,m0);\
-    T[6][i] = _mm_xor_si128(m2,m1);\
-    T[7][i] = _mm_xor_si128(m2,m9);\
-    T[8][i] =  m3;\
-    T[9][i] =  _mm_xor_si128(m3,m0);\
-    T[10][i] = _mm_xor_si128(m3,m1);\
-    T[11][i] = _mm_xor_si128(m3,m9);\
-    T[12][i] = m2=_mm_xor_si128(m3,m2);\
-    T[13][i] = _mm_xor_si128(m2,m0);\
-    T[14][i] = _mm_xor_si128(m2,m1);\
-    T[15][i] = _mm_xor_si128(m2,m9);
-
-	s0 = _mm_setzero_si128();
-	for (i = 0; i < 2; i++) {
-		m0 = _mm_load_si128((__m128i *) (b + 2 * i));
-		m9 = _mm_srli_epi64(m0, 57);
-		m8 = _mm_slli_si128(m9, 8);
-		m8 = _mm_xor_si128(m8, s0);
-		s0 = _mm_srli_si128(m9, 8);
-		m1 = _mm_slli_epi64(m0, 1);
-		m2 = _mm_slli_epi64(m0, 2);
-		m3 = _mm_slli_epi64(m0, 3);
-		m3 = _mm_xor_si128(m3, _mm_srli_epi64(m8, 4));
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 5));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 6));
-		LOOKUP(i, tab);
-		m4 = m0;
-		m0 = _mm_slli_epi64(m4, 4);
-		m1 = _mm_slli_epi64(m4, 5);
-		m2 = _mm_slli_epi64(m4, 6);
-		m3 = _mm_slli_epi64(m4, 7);
-		m3 = _mm_xor_si128(m3, m8);
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 1));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 2));
-		m0 = _mm_xor_si128(m0, _mm_srli_epi64(m8, 3));
-		LOOKUP(i, tab1);
-	}
-	m3 = s0;
-	m2 = _mm_srli_epi64(s0, 1);
-	m1 = _mm_setzero_si128();//_mm_srli_epi64(m8, 2);
-	m0 = _mm_setzero_si128();//_mm_srli_epi64(m8, 3);
-	tab1[0][i] = tab1[1][i] = tab1[2][i] = tab1[3][i] = m9 = _mm_setzero_si128();
-    tab1[4][i] = tab1[5][i] = tab1[6][i] = tab1[7][i] = m2;
-    tab1[8][i] = tab1[9][i] = tab1[10][i] = tab1[11][i] = m3;
-    m2 =_mm_xor_si128(m3,m2);
-    tab1[12][i] = tab1[13][i] = tab1[14][i] = tab1[15][i] = m2;
-#undef LOOKUP
-
-#define LSHIFT8(m3,m2,m1,m0)\
-	m3=_mm_alignr_epi8(m3,m2,15);\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define M(m2,m1,m0,ta,tb)\
-	m0=_mm_xor_si128(m0, tab[ta&0xf][0]);\
-	m1=_mm_xor_si128(m1, tab[ta&0xf][1]);\
-	m0=_mm_xor_si128(m0,tab1[tb&0xf][0]);\
-	m1=_mm_xor_si128(m1,tab1[tb&0xf][1]);\
-	m2=_mm_xor_si128(m2,tab1[tb&0xf][2]);\
-
-	// Main computation
-	m0 = m1 = m2 = m3 = _mm_setzero_si128();
-
-	for (j = 56; j >= 0; j -= 8) {
-		k = j + 4;
-		ta = (a[1] >> j);
-		tb = (a[1] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[3] >> j);
-		tb = (a[3] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	for (j = 56; j >= 8; j -= 8) {
-		k = j + 4;
-		ta = (a[0] >> j);
-		tb = (a[0] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[2] >> j);
-		tb = (a[2] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	ta = a[0];
-	tb = (a[0] >> 4);
-	M(m2, m1, m0, ta, tb);
-	ta = a[2];
-	tb = (a[2] >> 4);
-	M(m3, m2, m1, ta, tb);
-
-	_mm_store_si128((__m128i *) t + 0, m0);
-	_mm_store_si128((__m128i *) t + 1, m1);
-	_mm_store_si128((__m128i *) t + 2, m2);
-	_mm_store_si128((__m128i *) t + 3, m3);
-
-	const int ra = 52;
-	const int rb = 55;
-	const int rc = 57;
-	const int rh = 59;
-	const int lh = 5;
-	const int la = 12;
-	const int lb = 9;
-	const int lc = 7;
-
-	dig_t d = t[7], a0 = t[0], a1 = t[1], a2 = t[2], a3 = t[3], a4 = t[4];
-
-	a4 ^= (d >> rh);
-	a4 ^= (d >> ra);
-	a4 ^= (d >> rb);
-	a4 ^= (d >> rc);
-
-	a3 ^= (d << lh);
-	a3 ^= (d << la);
-	a3 ^= (d << lb);
-	a3 ^= (d << lc);
-
-	d = t[6];
-	a3 ^= (d >> rh);
-	a3 ^= (d >> ra);
-	a3 ^= (d >> rb);
-	a3 ^= (d >> rc);
-
-	a2 ^= (d << lh);
-	a2 ^= (d << la);
-	a2 ^= (d << lb);
-	a2 ^= (d << lc);
-
-	d = t[5];
-	a2 ^= (d >> rh);
-	a2 ^= (d >> ra);
-	a2 ^= (d >> rb);
-	a2 ^= (d >> rc);
-
-	a1 ^= (d << lh);
-	a1 ^= (d << la);
-	a1 ^= (d << lb);
-	a1 ^= (d << lc);
-
-	d = a4;
-	a1 ^= (d >> rh);
-	a1 ^= (d >> ra);
-	a1 ^= (d >> rb);
-	a1 ^= (d >> rc);
-
-	a0 ^= (d << lh);
-	a0 ^= (d << la);
-	a0 ^= (d << lb);
-	a0 ^= (d << lc);
-
-	d = a3 >> rh;
-	a0 ^= d;
-	d <<= rh;
-
-	a0 ^= (d >> ra);
-	a0 ^= (d >> rb);
-	a0 ^= (d >> rc);
-	a3 ^= d;
-
-	c[3] = a3;
-	c[2] = a2;
-	c[1] = a1;
-	c[0] = a0;
-
-	return;
-}
-
-#else
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align __m128i tab[16][8], tab1[16][8];
-	__m128i s0, m0, m1, m2, m3, m4, m8, m9, t0, t1, t2, *t;
-	rlc_align dig_t x[2];
-	char ta, tb;
-	int i, j, k;
-
-#define LOOKUP(i, T)\
-	T[0][i] = _mm_setzero_si128();\
-	T[1][i] = m0;\
-    T[2][i] = m1;\
-    T[3][i] = m9=_mm_xor_si128(m0,m1);\
-    T[4][i] = m2;\
-    T[5][i] = _mm_xor_si128(m2,m0);\
-    T[6][i] = _mm_xor_si128(m2,m1);\
-    T[7][i] = _mm_xor_si128(m2,m9);\
-    T[8][i] =  m3;\
-    T[9][i] =  _mm_xor_si128(m3,m0);\
-    T[10][i] = _mm_xor_si128(m3,m1);\
-    T[11][i] = _mm_xor_si128(m3,m9);\
-    T[12][i] = m2=_mm_xor_si128(m3,m2);\
-    T[13][i] = _mm_xor_si128(m2,m0);\
-    T[14][i] = _mm_xor_si128(m2,m1);\
-    T[15][i] = _mm_xor_si128(m2,m9);
-
-	s0 = _mm_setzero_si128();
-	for (i = 0; i < 2; i++) {
-		m0 = _mm_load_si128((__m128i *) (b + 2 * i));
-		m9 = _mm_srli_epi64(m0, 57);
-		m8 = _mm_slli_si128(m9, 8);
-		m8 = _mm_xor_si128(m8, s0);
-		s0 = _mm_srli_si128(m9, 8);
-		m1 = _mm_slli_epi64(m0, 1);
-		m2 = _mm_slli_epi64(m0, 2);
-		m3 = _mm_slli_epi64(m0, 3);
-		m3 = _mm_xor_si128(m3, _mm_srli_epi64(m8, 4));
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 5));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 6));
-		LOOKUP(i, tab);
-		m4 = m0;
-		m0 = _mm_slli_epi64(m4, 4);
-		m1 = _mm_slli_epi64(m4, 5);
-		m2 = _mm_slli_epi64(m4, 6);
-		m3 = _mm_slli_epi64(m4, 7);
-		m3 = _mm_xor_si128(m3, m8);
-		m2 = _mm_xor_si128(m2, _mm_srli_epi64(m8, 1));
-		m1 = _mm_xor_si128(m1, _mm_srli_epi64(m8, 2));
-		m0 = _mm_xor_si128(m0, _mm_srli_epi64(m8, 3));
-		LOOKUP(i, tab1);
-	}
-	m3 = s0;
-	m2 = _mm_srli_epi64(s0, 1);
-	m1 = _mm_setzero_si128();
-	m0 = _mm_setzero_si128();
-	tab1[0][i] = tab1[1][i] = tab1[2][i] = tab1[3][i] = m9 = _mm_setzero_si128();
-    tab1[4][i] = tab1[5][i] = tab1[6][i] = tab1[7][i] = m2;
-    tab1[8][i] = tab1[9][i] = tab1[10][i] = tab1[11][i] = m3;
-    m2 =_mm_xor_si128(m3,m2);
-    tab1[12][i] = tab1[13][i] = tab1[14][i] = tab1[15][i] = m2;
-#undef LOOKUP
-
-#define LSHIFT8(m3,m2,m1,m0)\
-	m3=_mm_alignr_epi8(m3,m2,15);\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define M(m2,m1,m0,ta,tb)\
-	ta &= 0x0f; tb &= 0x0f;\
-	m0=_mm_xor_si128(m0, tab[ta][0]);\
-	m1=_mm_xor_si128(m1, tab[ta][1]);\
-	m0=_mm_xor_si128(m0,tab1[tb][0]);\
-	m1=_mm_xor_si128(m1,tab1[tb][1]);\
-	m2=_mm_xor_si128(m2,tab1[tb][2]);\
-
-	// Main computation
-	m0 = m1 = m2 = m3 = _mm_setzero_si128();
-
-	for (j = 56; j >= 0; j -= 8) {
-		k = j + 4;
-		ta = (a[1] >> j);
-		tb = (a[1] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[3] >> j);
-		tb = (a[3] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	for (j = 56; j >= 8; j -= 8) {
-		k = j + 4;
-		ta = (a[0] >> j);
-		tb = (a[0] >> k);
-		M(m2, m1, m0, ta, tb);
-		ta = (a[2] >> j);
-		tb = (a[2] >> k);
-		M(m3, m2, m1, ta, tb);
-		LSHIFT8(m3, m2, m1, m0);
-	}
-	ta = a[0];
-	tb = (a[0] >> 4);
-	M(m2, m1, m0, ta, tb);
-	ta = a[2];
-	tb = (a[2] >> 4);
-	M(m3, m2, m1, ta, tb);
-
-#undef M
-
-	REDUCE();
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) x, m1);
-	c[2] = x[0];
-	c[3] = x[1] & 0x07FFFFFFFFFFFFFF;
-#undef M
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_sf.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_sf.c
deleted file mode 100755
index a15b0c5b509c..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_mul_low_sf.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit multiplication functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-#include "macros.h"
-
-#define INV(A,B,C,D)	D,C,B,A
-
-const rlc_align uint32_t tm[] = {
-	INV(0x00000000, 0x00000000, 0x00000000, 0x00000000),
-	INV(0x0F0E0D0C, 0x0B0A0908, 0x07060504, 0x03020100),
-	INV(0x1E1C1A18, 0x16141210, 0x0E0C0A08, 0x06040200),
-	INV(0x11121714, 0x1D1E1B18, 0x090A0F0C, 0x05060300),
-	INV(0x3C383430, 0x2C282420, 0x1C181410, 0x0C080400),
-	INV(0x3336393C, 0x27222D28, 0x1B1E1114, 0x0F0A0500),
-	INV(0x22242E28, 0x3A3C3630, 0x12141E18, 0x0A0C0600),
-	INV(0x2D2A2324, 0x31363F38, 0x15121B1C, 0x090E0700),
-	INV(0x78706860, 0x58504840, 0x38302820, 0x18100800),
-	INV(0x777E656C, 0x535A4148, 0x3F362D24, 0x1B120900),
-	INV(0x666C7278, 0x4E445A50, 0x363C2228, 0x1E140A00),
-	INV(0x69627F74, 0x454E5358, 0x313A272C, 0x1D160B00),
-	INV(0x44485C50, 0x74786C60, 0x24283C30, 0x14180C00),
-	INV(0x4B46515C, 0x7F726568, 0x232E3934, 0x171A0D00),
-	INV(0x5A544648, 0x626C7E70, 0x2A243638, 0x121C0E00),
-	INV(0x555A4B44, 0x69667778, 0x2D22333C, 0x111E0F00),
-};
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int j, k;
-	dig_t b1, b2;
-
-	if (digit == 0) {
-		dv_zero(c, RLC_FB_DIGS + 1);
-		return;
-	}
-	if (digit == 1) {
-		fb_copy(c, a);
-		return;
-	}
-	c[RLC_FB_DIGS] = fb_lshb_low(c, a, util_bits_dig(digit) - 1);
-	for (int i = util_bits_dig(digit) - 2; i > 0; i--) {
-		if (digit & ((dig_t)1 << i)) {
-			j = RLC_DIG - i;
-			b1 = a[0];
-			c[0] ^= (b1 << i);
-			for (k = 1; k < RLC_FB_DIGS; k++) {
-				b2 = a[k];
-				c[k] ^= ((b2 << i) | (b1 >> j));
-				b1 = b2;
-			}
-			c[RLC_FB_DIGS] ^= (b1 >> j);
-		}
-	}
-	if (digit & (dig_t)1) {
-		fb_add(c, c, a);
-	}
-}
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	__m128i rl[RLC_FB_DIGS], rh[RLC_FB_DIGS], l0, l1, h0, h1;
-	__m128i t0, t1, mask, m[RLC_FB_DIGS], m0, m1, m2, m3, m8, m9;
-	dig_t r0, r1, r2, r3;
-	int i, j, k, ta;
-	dig_t x[2];
-
-	mask = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	/* computes BL, BH and BM */
-	h0 = _mm_load_si128((__m128i *) & b[0]);
-	h1 = _mm_load_si128((__m128i *) & b[2]);
-
-#define LSHIFT4(m)\
-  m1=m[3];\
-  t1=_mm_srli_epi64(m1,60);\
-  for(j=3;j>0;j--){\
-    m1=_mm_slli_epi64(m1,4);\
-    t0=_mm_xor_si128(m1,_mm_slli_si128(t1,8));\
-    m1=m[j-1];\
-    t1=_mm_srli_epi64(m1,60);\
-    m[j]=_mm_xor_si128(t0,_mm_srli_si128(t1,8));\
-   }\
-   m[0]=_mm_slli_epi64(m1,4);\
-   m[0]=_mm_xor_si128(m[0],_mm_slli_si128(t1,8));
-
-#define LSHIFT8(m4,m3,m2,m1,m0)\
-	m3=_mm_alignr_epi8(m3,m2,15);\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define LSHIFT8V(m)\
-	m[3]=_mm_alignr_epi8(m[3],m[2],15);\
-	m[2]=_mm_alignr_epi8(m[2],m[1],15);\
-	m[1]=_mm_alignr_epi8(m[1],m[0],15);\
-	m[0]=_mm_slli_si128(m[0],1);
-
-#define M(m1,m0,ta,b0,b1)\
-	t0 = _mm_load_si128((__m128i *)tm + ta);\
-	m0 =  _mm_xor_si128(m0, _mm_shuffle_epi8(t0, b0));\
-	m1 =  _mm_xor_si128(m1, _mm_shuffle_epi8(t0, b1));\
-
-#define MultK(al,b0,b1)\
-	m0=m1=m2=m3=_mm_setzero_si128();\
-	for(k=56;k>=0; k-=8){\
-		ta=(r1>>k)&0x0f;\
-		M(m1,m0,ta,b0,b1);\
-		ta=(r3>>k)&0x0f;\
-		M(m2,m1,ta,b0,b1);\
-		LSHIFT8(m4,m3,m2,m1,m0);\
-	}\
-	for(k=56;k>=8; k-=8){\
-		ta=(r0>>k)&0x0f;\
-		M(m1,m0,ta,b0,b1);\
-		ta=(r2>>k)&0x0f;\
-		M(m2,m1,ta,b0,b1);\
-		LSHIFT8(m4,m3,m2,m1,m0);\
-	}\
-	ta=(r0)&0xf; M(m1,m0,ta,b0,b1);\
-	ta=(r2)&0xf; M(m2,m1,ta,b0,b1);\
-
-	l0 = _mm_and_si128(h0, mask);
-	l1 = _mm_and_si128(h1, mask);
-
-	r0 = a[0];
-	r1 = a[1];
-	r2 = a[2];
-	r3 = a[3];
-
-	/* AL * BL */
-	MultK(a, l0, l1);
-
-	rl[0] = m0;
-	rl[1] = m1;
-	rl[2] = m2;
-	rl[3] = m3;
-
-	h0 = _mm_and_si128(_mm_srli_epi64(h0, 4), mask);
-	h1 = _mm_and_si128(_mm_srli_epi64(h1, 4), mask);
-
-	r0 >>= 4;
-	r1 >>= 4;
-	r2 >>= 4;
-	r3 >>= 4;
-
-	/* AH * BH */
-	MultK(ah, h0, h1);
-
-	rh[0] = m0;
-	rh[1] = m1;
-	rh[2] = m2;
-	rh[3] = m3;
-
-	h0 = _mm_xor_si128(h0, l0);
-	h1 = _mm_xor_si128(h1, l1);
-
-	r0 ^= a[0];
-	r1 ^= a[1];
-	r2 ^= a[2];
-	r3 ^= a[3];
-
-	/* AM * BM */
-	MultK(am, h0, h1);
-
-	m[0] = m0;
-	m[1] = m1;
-	m[2] = m2;
-	m[3] = m3;
-
-	/* m = m + rh + rl */
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		m[i] = _mm_xor_si128(m[i], rh[i]);
-		m[i] = _mm_xor_si128(m[i], rl[i]);
-	}
-
-	/* m= m + x^8 rh + x^4 m + rl */
-
-	LSHIFT4(m);
-	LSHIFT8V(rh);
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		m[i] = _mm_xor_si128(m[i], rh[i]);
-		m[i] = _mm_xor_si128(m[i], rl[i]);
-	}
-
-	m0 = m[0];
-	m1 = m[1];
-	m2 = m[2];
-	m3 = m[3];
-
-	REDUCE();
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) x, m1);
-	c[2] = x[0];
-	c[3] = x[1] & 0x07FFFFFFFFFFFFFF;
-}
-
-void fb_muln_low(dig_t *c, const dig_t * a, const dig_t * b) {
-	__m128i rl[RLC_FB_DIGS], rh[RLC_FB_DIGS], l0, l1, h0, h1;
-	__m128i t0, t1, mask, m[RLC_FB_DIGS], m0, m1, m2, m3;
-	dig_t r0, r1, r2, r3;
-	int i, j, k, ta;
-
-	mask = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	/* computes BL, BH and BM */
-	h0 = _mm_load_si128((__m128i *) & b[0]);
-	h1 = _mm_load_si128((__m128i *) & b[2]);
-
-#define LSHIFT4(m)\
-  m1=m[3];\
-  t1=_mm_srli_epi64(m1,60);\
-  for(j=3;j>0;j--){\
-    m1=_mm_slli_epi64(m1,4);\
-    t0=_mm_xor_si128(m1,_mm_slli_si128(t1,8));\
-    m1=m[j-1];\
-    t1=_mm_srli_epi64(m1,60);\
-    m[j]=_mm_xor_si128(t0,_mm_srli_si128(t1,8));\
-   }\
-   m[0]=_mm_slli_epi64(m1,4);\
-   m[0]=_mm_xor_si128(m[0],_mm_slli_si128(t1,8));
-
-#define LSHIFT8(m4,m3,m2,m1,m0)\
-	m3=_mm_alignr_epi8(m3,m2,15);\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define LSHIFT8V(m)\
-	m[3]=_mm_alignr_epi8(m[3],m[2],15);\
-	m[2]=_mm_alignr_epi8(m[2],m[1],15);\
-	m[1]=_mm_alignr_epi8(m[1],m[0],15);\
-	m[0]=_mm_slli_si128(m[0],1);
-
-#define M(m1,m0,ta,b0,b1)\
-	t0 = _mm_load_si128((__m128i *)tm + ta);\
-	m0 =  _mm_xor_si128(m0, _mm_shuffle_epi8(t0, b0));\
-	m1 =  _mm_xor_si128(m1, _mm_shuffle_epi8(t0, b1));\
-
-#define MultK(al,b0,b1)\
-	m0=m1=m2=m3=_mm_setzero_si128();\
-	for(k=56;k>=0; k-=8){\
-		ta=(r1>>k)&0x0f;\
-		M(m1,m0,ta,b0,b1);\
-		ta=(r3>>k)&0x0f;\
-		M(m2,m1,ta,b0,b1);\
-		LSHIFT8(m4,m3,m2,m1,m0);\
-	}\
-	for(k=56;k>=8; k-=8){\
-		ta=(r0>>k)&0x0f;\
-		M(m1,m0,ta,b0,b1);\
-		ta=(r2>>k)&0x0f;\
-		M(m2,m1,ta,b0,b1);\
-		LSHIFT8(m4,m3,m2,m1,m0);\
-	}\
-	ta=(r0)&0xf; M(m1,m0,ta,b0,b1);\
-	ta=(r2)&0xf; M(m2,m1,ta,b0,b1);\
-
-	l0 = _mm_and_si128(h0, mask);
-	l1 = _mm_and_si128(h1, mask);
-
-	r0 = a[0];
-	r1 = a[1];
-	r2 = a[2];
-	r3 = a[3];
-
-	/* AL * BL */
-	MultK(a, l0, l1);
-
-	rl[0] = m0;
-	rl[1] = m1;
-	rl[2] = m2;
-	rl[3] = m3;
-
-	h0 = _mm_and_si128(_mm_srli_epi64(h0, 4), mask);
-	h1 = _mm_and_si128(_mm_srli_epi64(h1, 4), mask);
-
-	r0 >>= 4;
-	r1 >>= 4;
-	r2 >>= 4;
-	r3 >>= 4;
-
-	/* AH * BH */
-	MultK(ah, h0, h1);
-
-	rh[0] = m0;
-	rh[1] = m1;
-	rh[2] = m2;
-	rh[3] = m3;
-
-	h0 = _mm_xor_si128(h0, l0);
-	h1 = _mm_xor_si128(h1, l1);
-
-	r0 ^= a[0];
-	r1 ^= a[1];
-	r2 ^= a[2];
-	r3 ^= a[3];
-
-	/* AM * BM */
-	MultK(am, h0, h1);
-
-	m[0] = m0;
-	m[1] = m1;
-	m[2] = m2;
-	m[3] = m3;
-
-	/* m = m + rh + rl */
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		m[i] = _mm_xor_si128(m[i], rh[i]);
-		m[i] = _mm_xor_si128(m[i], rl[i]);
-	}
-
-	/* m= m + x^8 rh + x^4 m + rl */
-
-	LSHIFT4(m);
-	LSHIFT8V(rh);
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		m[i] = _mm_xor_si128(m[i], rh[i]);
-		m[i] = _mm_xor_si128(m[i], rl[i]);
-	}
-
-	_mm_store_si128((__m128i *) c + 0, m[0]);
-	_mm_store_si128((__m128i *) c + 1, m[1]);
-	_mm_store_si128((__m128i *) c + 2, m[2]);
-	_mm_store_si128((__m128i *) c + 3, m[3]);
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_rdc_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_rdc_low.c
deleted file mode 100755
index e348257827ab..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_rdc_low.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level modular reduction functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_rdcn_low(dig_t *c, dig_t *a) {
-	dig_t d, a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3], a4 = a[4];
-	const int ra = 52;
-	const int rb = 55;
-	const int rc = 57;
-	const int rh = 59;
-	const int lh = 5;
-	const int la = 12;
-	const int lb = 9;
-	const int lc = 7;
-
-	d = a[7];
-	a4 ^= (d >> rh);
-	a4 ^= (d >> ra);
-	a4 ^= (d >> rb);
-	a4 ^= (d >> rc);
-
-	a3 ^= (d << lh);
-	a3 ^= (d << la);
-	a3 ^= (d << lb);
-	a3 ^= (d << lc);
-
-	d = a[6];
-	a3 ^= (d >> rh);
-	a3 ^= (d >> ra);
-	a3 ^= (d >> rb);
-	a3 ^= (d >> rc);
-
-	a2 ^= (d << lh);
-	a2 ^= (d << la);
-	a2 ^= (d << lb);
-	a2 ^= (d << lc);
-
-	d = a[5];
-	a2 ^= (d >> rh);
-	a2 ^= (d >> ra);
-	a2 ^= (d >> rb);
-	a2 ^= (d >> rc);
-
-	a1 ^= (d << lh);
-	a1 ^= (d << la);
-	a1 ^= (d << lb);
-	a1 ^= (d << lc);
-
-	d = a4;
-	a1 ^= (d >> rh);
-	a1 ^= (d >> ra);
-	a1 ^= (d >> rb);
-	a1 ^= (d >> rc);
-
-	a0 ^= (d << lh);
-	a0 ^= (d << la);
-	a0 ^= (d << lb);
-	a0 ^= (d << lc);
-
-	d = a3 >> rh;
-	a0 ^= d;
-	d <<= rh;
-
-	a0 ^= (d >> ra);
-	a0 ^= (d >> rb);
-	a0 ^= (d >> rc);
-	a3 ^= d;
-
-	c[3] = a3;
-	c[2] = a2;
-	c[1] = a1;
-	c[0] = a0;
-}
-
-void fb_rdc1_low(dig_t *c, dig_t *a) {
-	dig_t d;
-	const int fa = 7;
-	const int fb = 4;
-	const int fc = 2;
-
-	const int rh = RLC_FB_BITS % RLC_DIG;
-	const int sh = RLC_FB_BITS / RLC_DIG + 1;
-	const int lh = RLC_DIG - rh;;
-	const int ra = (RLC_FB_BITS - fa) % RLC_DIG;
-	const int sa = (RLC_FB_BITS - fa) / RLC_DIG + 1;
-	const int la = RLC_DIG - ra;
-	const int rb = (RLC_FB_BITS - fb) % RLC_DIG;
-	const int sb = (RLC_FB_BITS - fb) / RLC_DIG + 1;
-	const int lb = RLC_DIG - rb;
-	const int rc = (RLC_FB_BITS - fc) % RLC_DIG;
-	const int sc = (RLC_FB_BITS - fc) / RLC_DIG + 1;
-	const int lc = RLC_DIG - rc;
-
-	d = a[RLC_FB_DIGS];
-
-	a[RLC_FB_DIGS - sh] ^= (d << lh);
-	a[RLC_FB_DIGS - sa + 1] ^= (d >> ra);
-	a[RLC_FB_DIGS - sa] ^= (d << la);
-
-	a[RLC_FB_DIGS - sb + 1] ^= (d >> rb);
-	a[RLC_FB_DIGS - sb] ^= (d << lb);
-	a[RLC_FB_DIGS - sc + 1] ^= (d >> rc);
-	a[RLC_FB_DIGS - sc] ^= (d << lc);
-
-	d = a[sh - 1] >> rh;
-
-	dig_t a0 = a[0];
-	a0 ^= d;
-	d <<= rh;
-
-	a0 ^= (d >> ra);
-	a0 ^= (d >> rb);
-	a0 ^= (d >> rc);
-	a[3] ^= d;
-
-	c[0] = a0;
-	c[1] = a[1];
-	c[2] = a[2];
-	c[3] = a[3];
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_slv_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_slv_low.c
deleted file mode 100755
index 9d87d3ad6601..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_slv_low.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field half-trace.
- *
- * @ingroup fb
- */
-
-#include <tmmintrin.h>
-#ifdef __PCLMUL__
-#include <smmintrin.h>
-#include <wmmintrin.h>
-#endif
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-void fb_slvn_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t *p, u0, u1, u2, u3;
-	const void *tab = fb_poly_get_slv();
-	__m128i m0, m1, m2, m3, m4, sqrt0, sqrt1, mask0, mask1, mask2, r0, r1, t0, t1, perm;
-
-	perm = _mm_set_epi32(0x0F0D0B09, 0x07050301, 0x0E0C0A08, 0x06040200);
-	mask2 = _mm_set_epi32(0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000);
-	mask1 = _mm_set_epi32(0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0);
-	mask0 = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-	sqrt0 = _mm_set_epi32(0x03020302, 0x01000100, 0x03020302, 0x01000100);
-	sqrt1 = _mm_set_epi32(0x0c080c08, 0x04000400, 0x0c080c08, 0x04000400);
-
-	t0 = _mm_load_si128((__m128i *)a);
-	t1 = _mm_load_si128((__m128i *)(a + 2));
-	r0 = r1 = _mm_setzero_si128();
-
-	m0 = _mm_shuffle_epi8(t1, perm);
-	m1 = _mm_and_si128(m0, mask0);
-	m2 = _mm_and_si128(m0, mask1);
-	m2 = _mm_srli_epi64(m2, 4);
-	m2 = _mm_shuffle_epi8(sqrt1, m2);
-	m1 = _mm_shuffle_epi8(sqrt0, m1);
-	m1 = _mm_xor_si128(m1, m2);
-
-	m2 = _mm_slli_si128(m1, 8);
-	m1 = _mm_and_si128(m1, mask2);
-	m1 = _mm_slli_epi64(m1, 4);
-	m1 = _mm_xor_si128(m1, m2);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m0 = _mm_and_si128(t0, mask2);
-	m0 = _mm_shuffle_epi8(m0, perm);
-	m1 = _mm_and_si128(m0, mask0);
-	m2 = _mm_and_si128(m0, mask1);
-	m2 = _mm_srli_epi64(m2, 4);
-	m2 = _mm_shuffle_epi8(sqrt1, m2);
-	m1 = _mm_shuffle_epi8(sqrt0, m1);
-	m1 = _mm_xor_si128(m1, m2);
-
-	m2 = _mm_srli_si128(m1, 8);
-	m1 = _mm_andnot_si128(mask2, m1);
-	m2 = _mm_slli_epi64(m2, 4);
-	m1 = _mm_xor_si128(m1, m2);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m1 = _mm_srli_si128(t0, 4);
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0xFFFFFFFF));
-	m0 = _mm_shuffle_epi8(m1, perm);
-	m1 = _mm_and_si128(m0, mask0);
-	m2 = _mm_and_si128(m0, mask1);
-	m2 = _mm_srli_epi64(m2, 4);
-	m2 = _mm_shuffle_epi8(sqrt1, m2);
-	m1 = _mm_shuffle_epi8(sqrt0, m1);
-	m1 = _mm_xor_si128(m1, m2);
-	m2 = _mm_slli_si128(m1, 8);
-	m1 = _mm_slli_epi64(m1, 4);
-	m1 = _mm_xor_si128(m1, m2);
-	m1 = _mm_srli_si128(m1, 6);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m1 = _mm_srli_si128(t0, 2);
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0xFFFF));
-	m0 = _mm_shuffle_epi8(m1, perm);
-	m1 = _mm_and_si128(m0, mask0);
-	m2 = _mm_and_si128(m0, mask1);
-	m2 = _mm_srli_epi64(m2, 4);
-	m2 = _mm_shuffle_epi8(sqrt1, m2);
-	m1 = _mm_shuffle_epi8(sqrt0, m1);
-	m1 = _mm_xor_si128(m1, m2);
-	m2 = _mm_slli_si128(m1, 8);
-	m1 = _mm_slli_epi64(m1, 4);
-	m1 = _mm_xor_si128(m1, m2);
-	m1 = _mm_srli_si128(m1, 7);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m1 = _mm_srli_si128(t0, 1);
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x55));
-	m1 = _mm_or_si128(m1, _mm_srli_epi64(m1, 1));
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x33));
-	m1 = _mm_or_si128(m1, _mm_srli_epi64(m1, 2));
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x0F));
-	m1 = _mm_slli_epi64(m1, 4);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m1 = _mm_srli_epi64(t0, 4);
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x5));
-	m1 = _mm_or_si128(m1, _mm_srli_epi64(m1, 1));
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x3));
-	m1 = _mm_slli_epi64(m1, 2);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	m1 = _mm_srli_epi64(t0, 2);
-	m1 = _mm_and_si128(m1, _mm_set_epi32(0, 0, 0, 0x1));
-	m1 = _mm_slli_epi64(m1, 1);
-	t0 = _mm_xor_si128(t0, m1);
-	r0 = _mm_xor_si128(r0, m1);
-
-	sqrt0 = _mm_set_epi32(0x03030202, 0x03030202, 0x01010000, 0x01010000);
-	sqrt1 = _mm_set_epi32(0x0C0C0808, 0x0C0C0808, 0x04040000, 0x04040000);
-
-	m1 = _mm_and_si128(t0, mask0);
-	m2 = _mm_and_si128(t0, mask1);
-	m3 = _mm_and_si128(t1, mask0);
-	m4 = _mm_and_si128(t1, mask1);
-	m2 = _mm_srli_epi64(m2, 4);
-	m4 = _mm_srli_epi64(m4, 4);
-	m2 = _mm_shuffle_epi8(sqrt1, m2);
-	m1 = _mm_shuffle_epi8(sqrt0, m1);
-	m4 = _mm_shuffle_epi8(sqrt1, m4);
-	m3 = _mm_shuffle_epi8(sqrt0, m3);
-	m1 = _mm_or_si128(m1, m2);
-	m3 = _mm_or_si128(m3, m4);
-#ifndef __PCLMUL__
-	rlc_align dig_t x[2];
-	_mm_store_si128((__m128i *)x, m1);
-	u0 = x[0];
-	u1 = x[1];
-	_mm_store_si128((__m128i *)x, m3);
-	u2 = x[0];
-	u3 = x[1];
-#else
-	u0 = _mm_extract_epi64(m1, 0);
-	u1 = _mm_extract_epi64(m1, 1);
-	u2 = _mm_extract_epi64(m3, 0);
-	u3 = _mm_extract_epi64(m3, 1);
-#endif
-
-	for (i = 0; i < 8; i++) {
-		p = (dig_t *)(tab + (16 * i + (u0 & 0x0F)) * sizeof(fb_st));
-		r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-		r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-		u0 >>= 8;
-		p = (dig_t *)(tab + (16 * (i + 8) + (u1 & 0x0F)) * sizeof(fb_st));
-		r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-		r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-		u1 >>= 8;
-		p = (dig_t *)(tab + (16 * (i + 16) + (u2 & 0x0F)) * sizeof(fb_st));
-		r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-		r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-		u2 >>= 8;
-		p = (dig_t *)(tab + (16 * (i + 24) + (u3 & 0xF)) * sizeof(fb_st));
-		r0 = _mm_xor_si128(r0, *(__m128i *)(p));
-		r1 = _mm_xor_si128(r1, *(__m128i *)(p + 2));
-		u3 >>= 8;
-	}
-
-	_mm_store_si128((__m128i *)c, r0);
-	_mm_store_si128((__m128i *)(c + 2), r1);
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_sqr_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_sqr_low.c
deleted file mode 100755
index 30263fdb3340..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_sqr_low.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field squaring.
- *
- * @ingroup bn
- */
-
-#include <tmmintrin.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#include <xmmintrin.h>
-
-void fb_sqrn_low(dig_t *c, const dig_t *a) {
-	__m128i m0, t;
-	int j = 0;
-
-	for (int i = 0; i < RLC_FB_DIGS; i++) {
-		m0 = _mm_set_epi32(0x00000000, a[i] >> 32, 0x00000000, a[i] & 0xFFFFFFFFFFFFFFFF);
-		t = _mm_slli_epi64(m0, 16);
-		t = _mm_or_si128(t, m0);
-		t = _mm_and_si128(t, _mm_set_epi32(0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF));
-		m0 = t;
-		t = _mm_slli_epi64(m0, 8);
-		t = _mm_or_si128(t, m0);
-		t = _mm_and_si128(t, _mm_set_epi32(0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF));
-		m0 = t;
-		t = _mm_slli_epi64(m0, 4);
-		t = _mm_or_si128(t, m0);
-		t = _mm_and_si128(t, _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F));
-		m0 = t;
-		t = _mm_slli_epi64(m0, 2);
-		t = _mm_or_si128(t, m0);
-		t = _mm_and_si128(t, _mm_set_epi32(0x33333333, 0x33333333, 0x33333333, 0x33333333));
-		m0 = t;
-		t = _mm_slli_epi64(m0, 1);
-		t = _mm_or_si128(t, m0);
-		t = _mm_and_si128(t, _mm_set_epi32(0x55555555, 0x55555555, 0x55555555, 0x55555555));
-		_mm_store_si128((__m128i *)(c + j), t);
-		j += 2;
-	}
-}
-
-void fb_sqrl_low(dig_t *c, const dig_t *a) {
-	__m128i m0, m1, m2, m3, m4, m5, m6, mask;
-	__m128i t0;
-
-	t0 = _mm_set_epi32(0x55545150, 0x45444140, 0x15141110, 0x05040100);
-	mask = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	m0 = _mm_load_si128((__m128i *)(a));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m3 = _mm_unpacklo_epi8(m1, m2);
-	m4 = _mm_unpackhi_epi8(m1, m2);
-
-	m0 = _mm_load_si128((__m128i *)(a+2));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m5 = _mm_unpacklo_epi8(m1, m2);
-	m6 = _mm_unpackhi_epi8(m1, m2);
-
-	_mm_store_si128((__m128i *)(c + 0), m3);
-	_mm_store_si128((__m128i *)(c + 2), m4);
-	_mm_store_si128((__m128i *)(c + 4), m5);
-	_mm_store_si128((__m128i *)(c + 6), m6);
-}
-
-#if defined(__INTEL_COMPILER)
-
-void fb_sqrm_low(dig_t *c, const dig_t *a) {
-	__m128i t0, t1, m0, m1, m2, m3, m4, m5, m6, m8, m9, mask;
-	rlc_align dig_t x[2];
-
-	t0 = _mm_set_epi32(0x55545150, 0x45444140, 0x15141110, 0x05040100);
-	mask = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	m0 = _mm_load_si128((__m128i *)(a));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m3 = _mm_unpacklo_epi8(m1, m2);
-	m4 = _mm_unpackhi_epi8(m1, m2);
-
-	m0 = _mm_load_si128((__m128i *)(a+2));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m5 = _mm_unpacklo_epi8(m1, m2);
-	m6 = _mm_unpackhi_epi8(m1, m2);
-
-	m0 = m3;
-	m1 = m4;
-	m2 = m5;
-	m3 = m6;
-
-	REDUCE();
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) x, m1);
-	c[2] = x[0];
-	c[3] = x[1] & 0x07FFFFFFFFFFFFFF;
-}
-
-#else
-
-void fb_sqrm_low(dig_t *c, const dig_t *a) {
-	__m128i t0, m0, m1, m2, m3, m4, m5, m6, mask;
-	rlc_align dig_t t[2*RLC_FB_DIGS];
-
-	t0 = _mm_set_epi32(0x55545150, 0x45444140, 0x15141110, 0x05040100);
-	mask = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	m0 = _mm_load_si128((__m128i *)(a));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m3 = _mm_unpacklo_epi8(m1, m2);
-	m4 = _mm_unpackhi_epi8(m1, m2);
-
-	m0 = _mm_load_si128((__m128i *)(a+2));
-	m1 = _mm_and_si128(m0, mask);
-	m1 = _mm_shuffle_epi8(t0, m1);
-	m2 = _mm_srli_epi64(m0, 4);
-	m2 = _mm_and_si128(m2, mask);
-	m2 = _mm_shuffle_epi8(t0, m2);
-	m5 = _mm_unpacklo_epi8(m1, m2);
-	m6 = _mm_unpackhi_epi8(m1, m2);
-
-	m0 = m3;
-	m1 = m4;
-	m2 = m5;
-	m3 = m6;
-
-	_mm_store_si128((__m128i *) t + 0, m0);
-	_mm_store_si128((__m128i *) t + 1, m1);
-	_mm_store_si128((__m128i *) t + 2, m2);
-	_mm_store_si128((__m128i *) t + 3, m3);
-
-	const int ra = 52;
-	const int rb = 55;
-	const int rc = 57;
-	const int rh = 59;
-	const int lh = 5;
-	const int la = 12;
-	const int lb = 9;
-	const int lc = 7;
-
-	dig_t d = t[7], a0 = t[0], a1 = t[1], a2 = t[2], a3 = t[3], a4 = t[4];
-
-	a4 ^= (d >> rh);
-	a4 ^= (d >> ra);
-	a4 ^= (d >> rb);
-	a4 ^= (d >> rc);
-
-	a3 ^= (d << lh);
-	a3 ^= (d << la);
-	a3 ^= (d << lb);
-	a3 ^= (d << lc);
-
-	d = t[6];
-	a3 ^= (d >> rh);
-	a3 ^= (d >> ra);
-	a3 ^= (d >> rb);
-	a3 ^= (d >> rc);
-
-	a2 ^= (d << lh);
-	a2 ^= (d << la);
-	a2 ^= (d << lb);
-	a2 ^= (d << lc);
-
-	d = t[5];
-	a2 ^= (d >> rh);
-	a2 ^= (d >> ra);
-	a2 ^= (d >> rb);
-	a2 ^= (d >> rc);
-
-	a1 ^= (d << lh);
-	a1 ^= (d << la);
-	a1 ^= (d << lb);
-	a1 ^= (d << lc);
-
-	d = a4;
-	a1 ^= (d >> rh);
-	a1 ^= (d >> ra);
-	a1 ^= (d >> rb);
-	a1 ^= (d >> rc);
-
-	a0 ^= (d << lh);
-	a0 ^= (d << la);
-	a0 ^= (d << lb);
-	a0 ^= (d << lc);
-
-	d = a3 >> rh;
-	a0 ^= d;
-	d <<= rh;
-
-	a0 ^= (d >> ra);
-	a0 ^= (d >> rb);
-	a0 ^= (d >> rc);
-	a3 ^= d;
-
-	c[3] = a3;
-	c[2] = a2;
-	c[1] = a1;
-	c[0] = a0;
-
-	return;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_srt_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_srt_low.c
deleted file mode 100755
index d5708471497e..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_srt_low.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field square root.
- *
- * @ingroup fb
- */
-
-#include <xmmintrin.h>
-#include <tmmintrin.h>
-#ifdef __PCLMUL__
-#include <wmmintrin.h>
-#endif
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-#include "macros.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#define HALF ((int)((RLC_FB_BITS / 2)/(RLC_DIG) + ((RLC_FB_BITS / 2) % RLC_DIG > 0)))
-
-#ifndef __PCLMUL__
-
-void fb_mulh_low(dig_t *c, const dig_t *a) {
-	__m128i m0, m1, m2, m3, m8, m9, t0, t1;
-	uint8_t ta;
-	int j;
-	rlc_align dig_t x[2];
-
-#define LSHIFT8(m2,m1,m0)\
-	m2=_mm_alignr_epi8(m2,m1,15);\
-	m1=_mm_alignr_epi8(m1,m0,15);\
-	m0=_mm_slli_si128(m0,1);
-
-#define M(m1,m0,ta)\
-	const dig_t *tab = fb_poly_tab_srz(ta);\
-	m0=_mm_xor_si128(m0, ((__m128i *)tab)[0]);\
-	m1=_mm_xor_si128(m1, ((__m128i *)tab)[1]);\
-
-	// Main computation
-	m0 = m1 = m2 = m3 = _mm_setzero_si128();
-
-	for (j = 56; j >= 0; j -= 8) {
-		ta = (a[1] >> j) & 0xFF;
-		M(m1, m0, ta);
-		LSHIFT8(m2, m1, m0);
-	}
-	for (j = 56; j >= 8; j -= 8) {
-		ta = (a[0] >> j) & 0xFF;
-		M(m1, m0, ta);
-		LSHIFT8(m2, m1, m0);
-	}
-	ta = a[0] & 0xFF;
-	M(m1, m0, ta);
-
-	RED251(m2,m1,m0);													\
-	m8 = _mm_srli_si128(m1,8);											\
-	m9 = _mm_srli_epi64(m8,59);											\
-	m9 = _mm_slli_epi64(m9,59);											\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,59));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,57));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,55));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,52));						\
-
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) x, m1);
-	c[2] = x[0];
-	c[3] = x[1] & 0x07FFFFFFFFFFFFFF;
-#undef M
-}
-
-#else
-
-void fb_mulh_low(dig_t *c, const dig_t *a) {
-	__m128i ma0, mb0, mb1, m0, m1, m2, m4, m8, m9, t0, t1, t2, t3;
-	dig_t *b = fb_poly_get_srz();
-
-	ma0 = _mm_load_si128((__m128i *)a);
-	mb0 = _mm_load_si128((__m128i *)b);
-	mb1 = _mm_load_si128((__m128i *)b + 1);
-
-	MUL(ma0, mb0);
-	m0 = t0;
-	m1 = t1;
-
-	mb0 = XOR(mb0, mb1);
-
-	MUL(ma0, mb0);
-	m4 = _mm_xor_si128(t0, m0);
-	m2 = _mm_xor_si128(t1, m1);
-
-	m1 = XOR(m1, m4);
-
-	rlc_align dig_t _x[2];
-
-	RED251(m2,m1,m0);													\
-	m8 = _mm_srli_si128(m1,8);											\
-	m9 = _mm_srli_epi64(m8,59);											\
-	m9 = _mm_slli_epi64(m9,59);											\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,59));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,57));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,55));						\
-	m0 = _mm_xor_si128(m0,_mm_srli_epi64(m9,52));						\
-	_mm_store_si128((__m128i *) c + 0, m0);
-	_mm_store_si128((__m128i *) _x, m1);
-	c[2] = _x[0];
-	c[3] = _x[1] & 0x07FFFFFFFFFFFFFF;
-	return;
-#undef M
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_srtn_low(dig_t *c, const dig_t *a) {
-	__m128i m0, m1, m2, perm, mask0, mask1, sqrt0, sqrt1;
-	rlc_align dig_t x[2], d0, d1;
-	rlc_align dig_t t_e[RLC_FB_DIGS] = {0}, t_o[RLC_FB_DIGS] = {0};
-	int i, n;
-
-	//sqrt1 = sqrt0<<2
-	sqrt0 = _mm_set_epi32(0x33322322, 0x31302120, 0x13120302, 0x11100100);
-	sqrt1 = _mm_set_epi32(0xccc88c88, 0xc4c08480, 0x4c480c08, 0x44400400);
-	perm = _mm_set_epi32(0x0F0D0B09, 0x07050301, 0x0E0C0A08, 0x06040200);
-	mask1 = _mm_set_epi32(0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0);
-	mask0 = _mm_set_epi32(0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F, 0x0F0F0F0F);
-
-	n = 0;
-	for (i = 0; i < RLC_FB_DIGS; i += 2) {
-		m1 = _mm_load_si128((__m128i *) & a[i]);
-		m0 = _mm_shuffle_epi8(m1, perm);
-		m1 = _mm_and_si128(m0, mask0);
-		m2 = _mm_and_si128(m0, mask1);
-		m2 = _mm_srli_epi64(m2, 4);
-		m2 = _mm_shuffle_epi8(sqrt1, m2);
-		m1 = _mm_shuffle_epi8(sqrt0, m1);
-		m2 = _mm_or_si128(m1, m2);
-		m0 = _mm_and_si128(m2, mask0);
-		m1 = _mm_and_si128(m2, mask1);
-		_mm_store_si128((__m128i *) x, m0);
-		d0 = x[0] | (x[1] << 4);
-		_mm_store_si128((__m128i *) x, m1);
-		d1 = x[1] | (x[0] >> 4);
-		t_e[n] = d0;
-		t_o[n] = d1;
-		n++;
-	}
-
-	fb_mulh_low(c, t_o);
-	for (i = 0; i < HALF; i++) {
-		c[i] ^= t_e[i];
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_trc_low.c b/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_trc_low.c
deleted file mode 100644
index 7b74e39f06e3..000000000000
--- a/src/dashbls/depends/relic/src/low/curve2251-sse/relic_fb_trc_low.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level trace function.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_trcn_low(const dig_t *a) {
-	return (a[0] ^(a[3] >> 55) ^(a[3] >> 57)) & 0x01;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_add_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_add_low.c
deleted file mode 100644
index c2e2f316d792..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_add_low.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision addition and subtraction
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_add1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	int i;
-	register dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < size && carry; i++, a++, c++) {
-		r0 = (*a) + carry;
-		carry = (r0 < carry);
-		(*c) = r0;
-	}
-	for (; i < size; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-dig_t bn_addn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i;
-	register dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < size; i++, a++, b++, c++) {
-		r0 = (*a) + (*b);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		(*c) = r1;
-	}
-	return carry;
-}
-
-dig_t bn_sub1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < size && carry; i++, c++, a++) {
-		r0 = (*a) - carry;
-		carry = (r0 > (*a));
-		(*c) = r0;
-	}
-	for (; i < size; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-dig_t bn_subn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < size; i++, a++, b++, c++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		(*c) = r0;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_div_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_div_low.c
deleted file mode 100644
index b86f9c8ebae2..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_div_low.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision integer division
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_core.h"
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_divn_low(dig_t *c, dig_t *d, dig_t *a, int sa, dig_t *b, int sb) {
-	int norm, i, n, t, sd;
-	dig_t carry, t1[3], t2[3];
-
-	/* Normalize x and y so that the leading digit of y is bigger than
-	 * 2^(RLC_DIG-1). */
-	norm = util_bits_dig(b[sb - 1]) % RLC_DIG;
-
-	if (norm < (int)(RLC_DIG - 1)) {
-		norm = (RLC_DIG - 1) - norm;
-		carry = bn_lshb_low(a, a, sa, norm);
-		if (carry) {
-			a[sa++] = carry;
-		}
-		carry = bn_lshb_low(b, b, sb, norm);
-		if (carry) {
-			b[sb++] = carry;
-		}
-	} else {
-		norm = 0;
-	}
-
-	n = sa - 1;
-	t = sb - 1;
-
-	/* Shift y so that the most significant digit of y is aligned with the
-	 * most significant digit of x. */
-	dv_lshd(b, b, sb + (n - t), (n - t));
-
-	/* Find the most significant digit of the quotient. */
-	while (dv_cmp(a, b, sa) != RLC_LT) {
-		c[n - t]++;
-		bn_subn_low(a, a, b, sa);
-	}
-
-	/* Shift y back. */
-	dv_rshd(b, b, sb + (n - t), (n - t));
-
-	/* Find the remaining digits. */
-	for (i = n; i >= (t + 1); i--) {
-		dig_t tmp;
-
-		if (i > sa) {
-			continue;
-		}
-
-		if (a[i] == b[t]) {
-			c[i - t - 1] = RLC_MASK(RLC_DIG);
-		} else {
-			RLC_DIV_DIG(c[i - t - 1], tmp, a[i], a[i - 1], b[t]);
-		}
-
-		c[i - t - 1]++;
-		do {
-			c[i - t - 1]--;
-			t1[0] = (t - 1 < 0) ? 0 : b[t - 1];
-			t1[1] = b[t];
-
-			carry = bn_mul1_low(t1, t1, c[i - t - 1], 2);
-			t1[2] = carry;
-
-			t2[0] = (i - 2 < 0) ? 0 : a[i - 2];
-			t2[1] = (i - 1 < 0) ? 0 : a[i - 1];
-			t2[2] = a[i];
-		} while (dv_cmp(t1, t2, 3) == RLC_GT);
-
-		carry = bn_mul1_low(d, b, c[i - t - 1], sb);
-		sd = sb;
-		if (carry) {
-			d[sd++] = carry;
-		}
-
-		carry = bn_subn_low(a + (i - t - 1), a + (i - t - 1), d, sd);
-		sd += (i - t - 1);
-		if (sa - sd > 0) {
-			carry = bn_sub1_low(a + sd, a + sd, carry, sa - sd);
-		}
-
-		if (carry) {
-			sd = sb + (i - t - 1);
-			carry = bn_addn_low(a + (i - t - 1), a + (i - t - 1), b, sb);
-			carry = bn_add1_low(a + sd, a + sd, carry, sa - sd);
-			c[i - t - 1]--;
-		}
-	}
-	/* Remainder should be not be longer than the divisor. */
-	bn_rshb_low(d, a, sb, norm);
-}
-
-void bn_div1_low(dig_t *c, dig_t *d, const dig_t *a, int size, dig_t b) {
-	dig_t q, r, w = 0;
-
-	for (int i = size - 1; i >= 0; i--) {
-		RLC_DIV_DIG(q, r, w, a[i], b);
-		c[i] = q;
-		w = r;
-	}
-	*d = (dig_t)w;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_mod_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_mod_low.c
deleted file mode 100644
index 304422580b40..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_mod_low.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision integer modular reduction
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_modn_low(dig_t *c, const dig_t *a, int sa, const dig_t *m, int sm, dig_t u) {
-	int i, j;
-	dig_t t, r0, r1, r2;
-	dig_t *tmp, *tmpc;
-	const dig_t *tmpm;
-
-	tmpc = c;
-
-	r0 = r1 = r2 = 0;
-	for (i = 0; i < sm; i++, tmpc++, a++) {
-		tmp = c;
-		tmpm = m + i;
-		for (j = 0; j < i; j++, tmp++, tmpm--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmp, *tmpm);
-		}
-		if (i < sa) {
-			RLC_COMBA_ADD(t, r2, r1, r0, *a);
-		}
-		*tmpc = (dig_t)(r0 * u);
-		RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpc, *m);
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = sm; i < 2 * sm - 1; i++, a++) {
-		tmp = c + (i - sm + 1);
-		tmpm = m + sm - 1;
-		for (j = i - sm + 1; j < sm; j++, tmp++, tmpm--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmp, *tmpm);
-		}
-		if (i < sa) {
-			RLC_COMBA_ADD(t, r2, r1, r0, *a);
-		}
-		c[i - sm] = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-
-	if (i < sa) {
-		RLC_COMBA_ADD(t, r2, r1, r0, *a);
-	}
-	c[sm - 1] = r0;
-	if (r1) {
-		bn_subn_low(c, c, m, sm);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_mul_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_mul_low.c
deleted file mode 100644
index 7909a6d266bf..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_mul_low.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision integer multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_mula_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t _c, r0, r1, carry = 0;
-	for (int i = 0; i < size; i++, a++, c++) {
-		/* Multiply the digit *a by d and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		RLC_MUL_DIG(r1, r0, *a, digit);
-		_c = r0 + carry;
-		carry = r1 + (_c < carry);
-		/* Increment the column and assign the result. */
-		*c = *c + _c;
-		/* Update the carry. */
-		carry += (*c < _c);
-	}
-	return carry;
-}
-
-dig_t bn_mul1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t r0, r1, carry = 0;
-	for (int i = 0; i < size; i++, a++, c++) {
-		RLC_MUL_DIG(r1, r0, *a, digit);
-		*c = r0 + carry;
-		carry = r1 + (*c < carry);
-	}
-	return carry;
-}
-
-void bn_muln_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i, j;
-	const dig_t *tmpa, *tmpb;
-	dig_t r0, r1, r2;
-
-	r0 = r1 = r2 = 0;
-	for (i = 0; i < size; i++, c++) {
-		tmpa = a;
-		tmpb = b + i;
-		for (j = 0; j <= i; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = 0; i < size; i++, c++) {
-		tmpa = a + i + 1;
-		tmpb = b + (size - 1);
-		for (j = 0; j < size - (i + 1); j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-}
-
-void bn_muld_low(dig_t *c, const dig_t *a, int sa, const dig_t *b, int sb,
-		int l, int h) {
-	int i, j, ta;
-	const dig_t *tmpa, *tmpb;
-	dig_t r0, r1, r2;
-
-	c += l;
-
-	r0 = r1 = r2 = 0;
-	for (i = l; i < sb; i++, c++) {
-		tmpa = a;
-		tmpb = b + i;
-		for (j = 0; j <= i; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	ta = 0;
-	for (i = sb; i < sa; i++, c++) {
-		tmpa = a + ++ta;
-		tmpb = b + (sb - 1);
-		for (j = 0; j < sb; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = sa; i < h; i++, c++) {
-		tmpa = a + ++ta;
-		tmpb = b + (sb - 1);
-		for (j = 0; j < sa - ta; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_shift_low.c
deleted file mode 100644
index e2555162a0f7..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_shift_low.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lsh1_low(dig_t *c, const dig_t *a, int size) {
-	int i;
-	dig_t r, carry;
-
-	carry = 0;
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the most significant bit. */
-		r = *a >> (RLC_DIG - 1);
-		/* Shift the operand and insert the carry, */
-		*c = (*a << 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-void bn_lshd_low(dig_t *c, const dig_t *a, int size, int digits) {
-	dig_t *top;
-	const dig_t *bot;
-	int i;
-
-	top = c + size + digits - 1;
-	bot = a + size - 1;
-
-	for (i = 0; i < size; i++, top--, bot--) {
-		*top = *bot;
-	}
-	for (i = 0; i < digits; i++, c++) {
-		*c = 0;
-	}
-}
-
-dig_t bn_rsh1_low(dig_t *c, const dig_t *a, int size) {
-	int i;
-	dig_t r, carry;
-
-	c += size - 1;
-	a += size - 1;
-	carry = 0;
-	for (i = size - 1; i >= 0; i--, a--, c--) {
-		/* Get the least significant bit. */
-		r = *a & 0x01;
-		/* Shift the operand and insert the carry. */
-		carry <<= RLC_DIG - 1;
-		*c = (*a >> 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	c += size - 1;
-	a += size - 1;
-	/* Prepare the bit mask. */
-	shift = (RLC_DIG - bits) % RLC_DIG;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = size - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_bn_sqr_low.c b/src/dashbls/depends/relic/src/low/easy/relic_bn_sqr_low.c
deleted file mode 100644
index d6688c661abd..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_bn_sqr_low.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_sqra_low(dig_t *c, const dig_t *a, int size) {
-	int i;
-	dig_t t, c0, c1;
-
-	t = a[0];
-
-#ifdef RLC_CONF_NODBL
-	dig_t r0, r1, _r0, _r1, s0, s1, t0, t1;
-	/* Accumulate this column with the square of a->dp[i]. */
-	RLC_MUL_DIG(_r1, _r0, t, t);
-	r0 = _r0 + c[0];
-	r1 = _r1 + (r0 < _r0);
-	c[0] = r0;
-
-	/* Update the carry. */
-	c0 = r1;
-	c1 = 0;
-
-	/* Version of the main loop not using double-precision types. */
-	for (i = 1; i < size; i++) {
-		RLC_MUL_DIG(_r1, _r0, t, a[i]);
-		r0 = _r0 + _r0;
-		r1 = _r1 + _r1 + (r0 < _r0);
-
-		s0 = r0 + c0;
-		s1 = r1 + (s0 < r0);
-
-		t0 = s0 + c[i];
-		t1 = s1 + (t0 < s0);
-		c[i] = t0;
-
-		/* Accumulate the old delayed carry. */
-		c0 = t1 + c1;
-		/* Compute the new delayed carry. */
-		c1 = (t1 < s1) || (s1 < r1) || (r1 < _r1) || (c0 < c1);
-	}
-#else
-	dbl_t r, r0, r1;
-
-	/* Accumulate this column with the square of a->dp[i]. */
-	r = (dbl_t)(*c) + (dbl_t)(a[0]) * (dbl_t)(a[0]);
-	c[0] = (dig_t)r;
-
-	/* Update the carry. */
-	c0 = (dig_t)(r >> (dbl_t)RLC_DIG);
-	c1 = 0;
-
-	/* Version using double-precision types is hopefully faster. */
-	for (i = 1; i < size; i++) {
-		r = (dbl_t)(a[0]) * (dbl_t)(a[i]);
-		r0 = r + r;
-		r1 = r0 + (dbl_t)(c[i]) + (dbl_t)(c0);
-		c[i] = (dig_t)r1;
-
-		/* Accumulate the old delayed carry. */
-		c0 = (dig_t)((r1 >> (dbl_t)RLC_DIG) + c1);
-		/* Compute the new delayed carry. */
-		c1 = (r0 < r) || (r1 < r0) || (c0 < c1);
-	}
-#endif
-
-	c[size] += c0;
-	c1 += (c[size] < c0);
-	return c1;
-}
-
-void bn_sqrn_low(dig_t *c, const dig_t *a, int size) {
-	int i, j;
-	const dig_t *tmpa, *tmpb;
-	dig_t r0, r1, r2;
-
-	/* Zero the accumulator. */
-	r0 = r1 = r2 = 0;
-
-	/* Comba squaring produces one column of the result per iteration. */
-	for (i = 0; i < size; i++, c++) {
-		tmpa = a;
-		tmpb = a + i;
-
-		/* Compute the number of additions in this column. */
-		j = (i + 1);
-		for (j = 0; j < (i + 1) / 2; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_SQR(r2, r1, r0, *tmpa, *tmpb);
-		}
-		if (!(i & 0x01)) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpa);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = 0; i < size; i++, c++) {
-		tmpa = a + (i + 1);
-		tmpb = a + (size - 1);
-
-		/* Compute the number of additions in this column. */
-		for (j = 0; j < (size - 1 - i) / 2; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_SQR(r2, r1, r0, *tmpa, *tmpb);
-		}
-		if (!((size - i) & 0x01)) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpa);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_add_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_add_low.c
deleted file mode 100644
index 8ceb166d0f96..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_add_low.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-
-	(*c) = (*a) ^ digit;
-	c++;
-	a++;
-	for (i = 0; i < RLC_FB_DIGS - 1; i++, a++, c++) {
-		(*c) = (*a);
-	}
-}
-
-void fb_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, b++, c++) {
-		(*c) = (*a) ^ (*b);
-	}
-}
-
-void fb_addd_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i;
-
-	for (i = 0; i < size; i++, a++, b++, c++) {
-		(*c) = (*a) ^ (*b);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_inv_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_inv_low.c
deleted file mode 100644
index b020b946fe7e..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_inv_low.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @ingroup fb
- */
-
-#include <stdio.h>
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_invn_low(dig_t *c, const dig_t *a) {
-	int j, d, lu, lv, lt, l1, l2, bu, bv;
-	rlc_align dig_t _u[2 * RLC_FB_DIGS], _v[2 * RLC_FB_DIGS];
-	rlc_align dig_t _g1[2 * RLC_FB_DIGS], _g2[2 * RLC_FB_DIGS];
-	dig_t *t = NULL, *u = NULL, *v = NULL, *g1 = NULL, *g2 = NULL, carry;
-
-	dv_zero(_g1, RLC_FB_DIGS + 1);
-	dv_zero(_g2, RLC_FB_DIGS + 1);
-
-	u = _u;
-	v = _v;
-	g1 = _g1;
-	g2 = _g2;
-
-	/* u = a, v = f, g1 = 1, g2 = 0. */
-	dv_copy(u, a, RLC_FB_DIGS);
-	dv_copy(v, fb_poly_get(), RLC_FB_DIGS);
-	g1[0] = 1;
-
-	lu = lv = RLC_FB_DIGS;
-	l1 = l2 = 1;
-
-	bu = fb_bits(u);
-	bv = RLC_FB_BITS + 1;
-	j = bu - bv;
-
-	/* While (u != 1). */
-	while (1) {
-		/* If j < 0 then swap(u, v), swap(g1, g2), j = -j. */
-		if (j < 0) {
-			t = u;
-			u = v;
-			v = t;
-
-			lt = lu;
-			lu = lv;
-			lv = lt;
-
-			t = g1;
-			g1 = g2;
-			g2 = t;
-
-			lt = l1;
-			l1 = l2;
-			l2 = lt;
-
-			j = -j;
-		}
-
-		RLC_RIP(j, d, j);
-
-		/* u = u + v * z^j. */
-		if (j > 0) {
-			carry = fb_lsha_low(u + d, v, j, lv);
-			u[d + lv] ^= carry;
-		} else {
-			fb_addd_low(u + d, u + d, v, lv);
-		}
-
-		/* g1 = g1 + g2 * z^j. */
-		if (j > 0) {
-			carry = fb_lsha_low(g1 + d, g2, j, l2);
-			l1 = (l2 + d >= l1 ? l2 + d : l1);
-			if (carry) {
-				g1[d + l2] ^= carry;
-				l1 = (l2 + d >= l1 ? l1 + 1 : l1);
-			}
-		} else {
-			fb_addd_low(g1 + d, g1 + d, g2, l2);
-			l1 = (l2 + d > l1 ? l2 + d : l1);
-		}
-
-		while (u[lu - 1] == 0)
-			lu--;
-		while (v[lv - 1] == 0)
-			lv--;
-
-		if (lu == 1 && u[0] == 1)
-			break;
-
-		/* j = deg(u) - deg(v). */
-		lt = util_bits_dig(u[lu - 1]) - util_bits_dig(v[lv - 1]);
-		if (lv > lu) {
-			j = -((lv - lu) << RLC_DIG_LOG) + lt;
-		} else {
-			j = ((lu - lv) << RLC_DIG_LOG) + lt;
-		}
-	}
-	/* Return g1. */
-	fb_copy(c, g1);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_itr_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_itr_low.c
deleted file mode 100644
index a8556a783125..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_itr_low.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level iterated squaring/square-root.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_dv.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_itrn_low(dig_t *c, const dig_t *a, dig_t *t) {
-	int i, j;
-	dig_t u, *p;
-	const dig_t *tmp;
-	rlc_align dig_t v[RLC_FB_DIGS];
-
-	fb_zero(v);
-
-	for (i = RLC_DIG - 4; i >= 0; i -= 4) {
-		tmp = a;
-		for (j = 0; j < RLC_FB_DIGS; j++, tmp++) {
-			u = (*tmp >> i) & 0x0F;
-			p = (t + ((j * RLC_DIG + i) * 4 + u) * RLC_FB_DIGS);
-			fb_addn_low(v, v, p);
-		}
-	}
-
-	fb_copy(c, v);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_mul_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_mul_low.c
deleted file mode 100644
index 8f131700d0ac..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_mul_low.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int j, k;
-	dig_t b1, b2;
-
-	if (digit == 0) {
-		dv_zero(c, RLC_FB_DIGS + 1);
-		return;
-	}
-	if (digit == 1) {
-		dv_copy(c, a, RLC_FB_DIGS);
-		c[RLC_FB_DIGS] = 0;
-		return;
-	}
-
-	c[RLC_FB_DIGS] = fb_lshb_low(c, a, util_bits_dig(digit) - 1);
-	for (int i = util_bits_dig(digit) - 2; i > 0; i--) {
-		if (digit & ((dig_t)1 << i)) {
-			j = RLC_DIG - i;
-			b1 = a[0];
-			c[0] ^= (b1 << i);
-			for (k = 1; k < RLC_FB_DIGS; k++) {
-				b2 = a[k];
-				c[k] ^= ((b2 << i) | (b1 >> j));
-				b1 = b2;
-			}
-			c[RLC_FB_DIGS] ^= (b1 >> j);
-		}
-	}
-	if (digit & (dig_t)1) {
-		for (int i = 0; i < RLC_FB_DIGS; i++) {
-			c[i] ^= a[i];
-		}
-	}
-}
-
-void fb_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[16][RLC_FB_DIGS + 1];
-	dig_t r0, r1, r2, r4, r8, u, carry, *tmpc;
-	const dig_t *tmpa;
-	int i, j;
-
-	for (i = 0; i < 2 * RLC_FB_DIGS; i++) {
-		c[i] = 0;
-	}
-
-	for (i = 0; i < 16; i++) {
-		dv_zero(t[i], RLC_FB_DIGS + 1);
-	}
-
-	u = 0;
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		r1 = r0 = b[i];
-		r2 = (r0 << 1) | (u >> (RLC_DIG - 1));
-		r4 = (r0 << 2) | (u >> (RLC_DIG - 2));
-		r8 = (r0 << 3) | (u >> (RLC_DIG - 3));
-		t[0][i] = 0;
-		t[1][i] = r1;
-		t[2][i] = r2;
-		t[3][i] = r1 ^ r2;
-		t[4][i] = r4;
-		t[5][i] = r1 ^ r4;
-		t[6][i] = r2 ^ r4;
-		t[7][i] = r1 ^ r2 ^ r4;
-		t[8][i] = r8;
-		t[9][i] = r1 ^ r8;
-		t[10][i] = r2 ^ r8;
-		t[11][i] = r1 ^ r2 ^ r8;
-		t[12][i] = r4 ^ r8;
-		t[13][i] = r1 ^ r4 ^ r8;
-		t[14][i] = r2 ^ r4 ^ r8;
-		t[15][i] = r1 ^ r2 ^ r4 ^ r8;
-		u = r1;
-	}
-
-	if (u > 0) {
-		r2 = u >> (RLC_DIG - 1);
-		r4 = u >> (RLC_DIG - 2);
-		r8 = u >> (RLC_DIG - 3);
-		t[0][RLC_FB_DIGS] = t[1][RLC_FB_DIGS] = 0;
-		t[2][RLC_FB_DIGS] = t[3][RLC_FB_DIGS] = r2;
-		t[4][RLC_FB_DIGS] = t[5][RLC_FB_DIGS] = r4;
-		t[6][RLC_FB_DIGS] = t[7][RLC_FB_DIGS] = r2 ^ r4;
-		t[8][RLC_FB_DIGS] = t[9][RLC_FB_DIGS] = r8;
-		t[10][RLC_FB_DIGS] = t[11][RLC_FB_DIGS] = r2 ^ r8;
-		t[12][RLC_FB_DIGS] = t[13][RLC_FB_DIGS] = r4 ^ r8;
-		t[14][RLC_FB_DIGS] = t[15][RLC_FB_DIGS] = r2 ^ r4 ^ r8;
-	}
-
-	for (i = RLC_DIG - 4; i > 0; i -= 4) {
-		tmpa = a;
-		tmpc = c;
-		for (j = 0; j < RLC_FB_DIGS; j++, tmpa++, tmpc++) {
-			u = (*tmpa >> i) & 0x0F;
-			fb_addn_low(tmpc, tmpc, t[u]);
-			*(tmpc + RLC_FB_DIGS) ^= t[u][RLC_FB_DIGS];
-		}
-		carry = fb_lshb_low(c, c, 4);
-		fb_lshb_low(c + RLC_FB_DIGS, c + RLC_FB_DIGS, 4);
-		c[RLC_FB_DIGS] ^= carry;
-	}
-
-	for (j = 0; j < RLC_FB_DIGS; j++, a++, c++) {
-		u = *a & 0x0F;
-		fb_addn_low(c, c, t[u]);
-		*(c + RLC_FB_DIGS) ^= t[u][RLC_FB_DIGS];
-	}
-}
-
-void fb_muld_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-    dig_t *tt = RLC_ALLOCA(dig_t, 16 * (size + 1));
-	dig_t *t[16];
-	dig_t u, r0, r1, r2, r4, r8, *tmpc;
-	const dig_t *tmpa;
-	int i, j;
-
-    for(i = 0; i < 16; i++) {
-        t[i] = tt + i * (size + 1);
-	}
-
-	dv_zero(c, 2 * size);
-
-	for (i = 0; i < 16; i++) {
-		dv_zero(t[i], size + 1);
-	}
-
-	u = 0;
-	for (i = 0; i < size; i++) {
-		r1 = r0 = b[i];
-		r2 = (r0 << 1) | (u >> (RLC_DIG - 1));
-		r4 = (r0 << 2) | (u >> (RLC_DIG - 2));
-		r8 = (r0 << 3) | (u >> (RLC_DIG - 3));
-		t[0][i] = 0;
-		t[1][i] = r1;
-		t[2][i] = r2;
-		t[3][i] = r1 ^ r2;
-		t[4][i] = r4;
-		t[5][i] = r1 ^ r4;
-		t[6][i] = r2 ^ r4;
-		t[7][i] = r1 ^ r2 ^ r4;
-		t[8][i] = r8;
-		t[9][i] = r1 ^ r8;
-		t[10][i] = r2 ^ r8;
-		t[11][i] = r1 ^ r2 ^ r8;
-		t[12][i] = r4 ^ r8;
-		t[13][i] = r1 ^ r4 ^ r8;
-		t[14][i] = r2 ^ r4 ^ r8;
-		t[15][i] = r1 ^ r2 ^ r4 ^ r8;
-		u = r1;
-	}
-
-	if (u > 0) {
-		r2 = u >> (RLC_DIG - 1);
-		r4 = u >> (RLC_DIG - 2);
-		r8 = u >> (RLC_DIG - 3);
-		t[0][size] = t[1][size] = 0;
-		t[2][size] = t[3][size] = r2;
-		t[4][size] = t[5][size] = r4;
-		t[6][size] = t[7][size] = r2 ^ r4;
-		t[8][size] = t[9][size] = r8;
-		t[10][size] = t[11][size] = r2 ^ r8;
-		t[12][size] = t[13][size] = r4 ^ r8;
-		t[14][size] = t[15][size] = r2 ^ r4 ^ r8;
-	}
-
-	for (i = RLC_DIG - 4; i > 0; i -= 4) {
-		tmpa = a;
-		tmpc = c;
-		for (j = 0; j < size; j++, tmpa++, tmpc++) {
-			u = (*tmpa >> i) & 0x0F;
-			fb_addd_low(tmpc, tmpc, t[u], size + 1);
-		}
-		bn_lshb_low(c, c, 2 * size, 4);
-	}
-
-	for (j = 0; j < size; j++, a++, c++) {
-		u = *a & 0x0F;
-		fb_addd_low(c, c, t[u], size + 1);
-	}
-
-	RLC_FREE(tt);
-}
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[2 * RLC_FB_DIGS];
-
-	fb_muln_low(t, a, b);
-	fb_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_rdc_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_rdc_low.c
deleted file mode 100644
index 508d0cd949c0..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_rdc_low.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level modular reduction functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void fb_rdct_low(dig_t *c, dig_t *a, int fa) {
-	int i, sh, lh, rh, sa, la, ra;
-	dig_t d;
-
-	RLC_RIP(rh, sh, RLC_FB_BITS);
-	sh++;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(ra, sa, RLC_FB_BITS - fa);
-	sa++;
-	la = RLC_DIG - ra;
-
-	for (i = 2 * RLC_FB_DIGS - 1; i >= sh; i--) {
-		d = a[i];
-		a[i] = 0;
-
-		if (rh == 0) {
-			a[i - sh + 1] ^= d;
-		} else {
-			a[i - sh + 1] ^= (d >> rh);
-			a[i - sh] ^= (d << lh);
-		}
-		if (ra == 0) {
-			a[i - sa + 1] ^= d;
-		} else {
-			a[i - sa + 1] ^= (d >> ra);
-			a[i - sa] ^= (d << la);
-		}
-	}
-
-	if (RLC_FB_BITS % RLC_DIG == 0) {
-		while (a[RLC_FB_DIGS] != 0) {
-
-			d = a[sh - 1] >> rh;
-
-			a[0] ^= d;
-			d <<= rh;
-
-			if (ra == 0) {
-				a[sh - sa] ^= d;
-			} else {
-				a[sh - sa] ^= (d >> ra);
-				if (sh > sa) {
-					a[sh - sa - 1] ^= (d << la);
-				}
-			}
-			a[sh - 1] ^= d;
-		}
-	} else {
-		d = a[sh - 1] >> rh;
-		a[0] ^= d;
-		d <<= rh;
-
-		if (ra == 0) {
-			a[sh - sa] ^= d;
-		} else {
-			a[sh - sa] ^= (d >> ra);
-			if (sh > sa) {
-				a[sh - sa - 1] ^= (d << la);
-			}
-		}
-		a[sh - 1] ^= d;
-	}
-	fb_copy(c, a);
-}
-
-static void fb_rdcp_low(dig_t *c, dig_t *a, int fa, int fb, int fc) {
-	int i, sh, lh, rh, sa, la, ra, sb, lb, rb, sc, lc, rc;
-	dig_t d;
-
-	RLC_RIP(rh, sh, RLC_FB_BITS);
-	sh++;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(ra, sa, RLC_FB_BITS - fa);
-	sa++;
-	la = RLC_DIG - ra;
-
-	RLC_RIP(rb, sb, RLC_FB_BITS - fb);
-	sb++;
-	lb = RLC_DIG - rb;
-
-	RLC_RIP(rc, sc, RLC_FB_BITS - fc);
-	sc++;
-	lc = RLC_DIG - rc;
-
-	for (i = 2 * RLC_FB_DIGS - 1; i >= sh; i--) {
-		d = a[i];
-		a[i] = 0;
-
-		if (rh == 0) {
-			a[i - sh + 1] ^= d;
-		} else {
-			a[i - sh + 1] ^= (d >> rh);
-			a[i - sh] ^= (d << lh);
-		}
-		if (ra == 0) {
-			a[i - sa + 1] ^= d;
-		} else {
-			a[i - sa + 1] ^= (d >> ra);
-			a[i - sa] ^= (d << la);
-		}
-		if (rb == 0) {
-			a[i - sb + 1] ^= d;
-		} else {
-			a[i - sb + 1] ^= (d >> rb);
-			a[i - sb] ^= (d << lb);
-		}
-		if (rc == 0) {
-			a[i - sc + 1] ^= d;
-		} else {
-			a[i - sc + 1] ^= (d >> rc);
-			a[i - sc] ^= (d << lc);
-		}
-	}
-
-	if (RLC_FB_BITS % RLC_DIG == 0) {
-		while (a[RLC_FB_DIGS] != 0) {
-			d = a[sh - 1] >> rh;
-
-			a[0] ^= d;
-			d <<= rh;
-
-			if (ra == 0) {
-				a[sh - sa] ^= d;
-			} else {
-				a[sh - sa] ^= (d >> ra);
-				if (sh > sa) {
-					a[sh - sa - 1] ^= (d << la);
-				}
-			}
-			if (rb == 0) {
-				a[sh - sb] ^= d;
-			} else {
-				a[sh - sb] ^= (d >> rb);
-				if (sh > sb) {
-					a[sh - sb - 1] ^= (d << lb);
-				}
-			}
-			if (rc == 0) {
-				a[sh - sc] ^= d;
-			} else {
-				a[sh - sc] ^= (d >> rc);
-				if (sh > sc) {
-					a[sh - sc - 1] ^= (d << lc);
-				}
-			}
-			a[sh - 1] ^= d;
-		}
-	} else {
-		d = a[sh - 1] >> rh;
-
-		a[0] ^= d;
-		d <<= rh;
-
-		if (ra == 0) {
-			a[sh - sa] ^= d;
-		} else {
-			a[sh - sa] ^= (d >> ra);
-			if (sh > sa) {
-				a[sh - sa - 1] ^= (d << la);
-			}
-		}
-		if (rb == 0) {
-			a[sh - sb] ^= d;
-		} else {
-			a[sh - sb] ^= (d >> rb);
-			if (sh > sb) {
-				a[sh - sb - 1] ^= (d << lb);
-			}
-		}
-		if (rc == 0) {
-			a[sh - sc] ^= d;
-		} else {
-			a[sh - sc] ^= (d >> rc);
-			if (sh > sc) {
-				a[sh - sc - 1] ^= (d << lc);
-			}
-		}
-		a[sh - 1] ^= d;
-	}
-
-	fb_copy(c, a);
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_rdcn_low(dig_t *c, dig_t *a) {
-	int fa, fb, fc;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	if (fb == 0) {
-		fb_rdct_low(c, a, fa);
-	} else {
-		fb_rdcp_low(c, a, fa, fb, fc);
-	}
-}
-
-void fb_rdc1_low(dig_t *c, dig_t *a) {
-	int fa, fb, fc;
-	int sh, lh, rh, sa, la, ra, sb, lb, rb, sc, lc, rc;
-	dig_t d;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	sh = lh = rh = sa = la = ra = sb = lb = rb = sc = lc = rc = 0;
-
-	RLC_RIP(rh, sh, RLC_FB_BITS);
-	sh++;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(ra, sa, RLC_FB_BITS - fa);
-	sa++;
-	la = RLC_DIG - ra;
-
-	if (fb != 0) {
-		RLC_RIP(rb, sb, RLC_FB_BITS - fb);
-		sb++;
-		lb = RLC_DIG - rb;
-
-		RLC_RIP(rc, sc, RLC_FB_BITS - fc);
-		sc++;
-		lc = RLC_DIG - rc;
-	}
-
-	d = a[RLC_FB_DIGS];
-	a[RLC_FB_DIGS] = 0;
-
-	if (rh == 0) {
-		a[RLC_FB_DIGS - sh + 1] ^= d;
-	} else {
-		a[RLC_FB_DIGS - sh + 1] ^= (d >> rh);
-		a[RLC_FB_DIGS - sh] ^= (d << lh);
-	}
-	if (ra == 0) {
-		a[RLC_FB_DIGS - sa + 1] ^= d;
-	} else {
-		a[RLC_FB_DIGS - sa + 1] ^= (d >> ra);
-		a[RLC_FB_DIGS - sa] ^= (d << la);
-	}
-
-	if (fb != 0) {
-		if (rb == 0) {
-			a[RLC_FB_DIGS - sb + 1] ^= d;
-		} else {
-			a[RLC_FB_DIGS - sb + 1] ^= (d >> rb);
-			a[RLC_FB_DIGS - sb] ^= (d << lb);
-		}
-		if (rc == 0) {
-			a[RLC_FB_DIGS - sc + 1] ^= d;
-		} else {
-			a[RLC_FB_DIGS - sc + 1] ^= (d >> rc);
-			a[RLC_FB_DIGS - sc] ^= (d << lc);
-		}
-	}
-
-	d = a[sh - 1] >> rh;
-
-	if (d != 0) {
-		a[0] ^= d;
-		d <<= rh;
-
-		if (ra == 0) {
-			a[sh - sa] ^= d;
-		} else {
-			a[sh - sa] ^= (d >> ra);
-			if (sh > sa) {
-				a[sh - sa - 1] ^= (d << la);
-			}
-		}
-		if (fb != 0) {
-			if (rb == 0) {
-				a[sh - sb] ^= d;
-			} else {
-				a[sh - sb] ^= (d >> rb);
-				if (sh > sb) {
-					a[sh - sb - 1] ^= (d << lb);
-				}
-			}
-			if (rc == 0) {
-				a[sh - sc] ^= d;
-			} else {
-				a[sh - sc] ^= (d >> rc);
-				if (sh > sc) {
-					a[sh - sc - 1] ^= (d << lc);
-				}
-			}
-		}
-		a[sh - 1] ^= d;
-	}
-
-	fb_copy(c, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_shift_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_shift_low.c
deleted file mode 100644
index ca721bd3ad0e..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_shift_low.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_util.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_lsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	/* Prepare the bit mask. */
-	carry = 0;
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, c++) {
-		/* Get the most significant bit. */
-		r = *a >> (RLC_DIG - 1);
-		/* Shift the operand and insert the carry, */
-		*c = (*a << 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_rsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	c += RLC_FB_DIGS - 1;
-	a += RLC_FB_DIGS - 1;
-	carry = 0;
-	for (i = RLC_FB_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the least significant bit. */
-		r = *a & 0x01;
-		/* Shift the operand and insert the carry. */
-		carry <<= RLC_DIG - 1;
-		*c = (*a >> 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	c += RLC_FB_DIGS - 1;
-	a += RLC_FB_DIGS - 1;
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = RLC_FB_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size) {
-	int i, j;
-	dig_t b1, b2;
-
-	j = RLC_DIG - bits;
-	b1 = a[0];
-	c[0] ^= (b1 << bits);
-	if (size == RLC_FB_DIGS) {
-		for (i = 1; i < RLC_FB_DIGS; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	} else {
-		for (i = 1; i < size; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	}
-	return (b1 >> j);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_slv_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_slv_low.c
deleted file mode 100644
index 51e6f01ecdf3..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_slv_low.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field square root.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static const dig_t table_odds[16] = {
-	0, 4, 1, 5, 8, 12, 9, 13, 2, 6, 3, 7, 10, 14, 11, 15
-};
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_slvn_low(dig_t *c, const dig_t *a) {
-	int i, j, k, b, d, v[RLC_FB_BITS];
-	dig_t u, *p;
-	rlc_align dig_t s[RLC_FB_DIGS], t[RLC_FB_DIGS];
-	dig_t mask;
-	const void *tab = fb_poly_get_slv();
-
-	dv_zero(s, RLC_FB_DIGS);
-	dv_copy(t, a, RLC_FB_DIGS);
-
-	for (i = (RLC_FB_BITS - 1)/2; i > 0; i--) {
-		if (fb_get_bit(t, i + i)) {
-			RLC_RIP(b, d, i);
-			t[d] ^= ((dig_t)1 << b);
-			s[d] ^= ((dig_t)1 << b);
-		}
-	}
-
-	k = 0;
-	RLC_RIP(b, d, RLC_FB_BITS);
-	for (i = 0; i < d; i++) {
-		u = t[i];
-		for (j = 0; j < RLC_DIG / 8; j++) {
-			v[k++] = table_odds[((u & 0x0A) + ((u & 0xA0) >> 5))];
-			u >>= 8;
-		}
-	}
-	mask = (b == RLC_DIG ? RLC_DMASK : RLC_MASK(b));
-	u = t[d] & mask;
-	/* We ignore the first even bit if it is present. */
-	for (j = 1; j < b; j += 8) {
-		v[k++] = table_odds[((u & 0x0A) + ((u & 0xA0) >> 5))];
-		u >>= 8;
-	}
-
-	for (i = 0; i < k; i++) {
-		p = (dig_t *)(((char*)tab) + (16 * i + v[i]) * sizeof(fb_st));
-		fb_add(s, s, p);
-	}
-
-	fb_copy(c, s);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_sqr_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_sqr_low.c
deleted file mode 100644
index 7b87260c571b..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_sqr_low.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field shifting.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_dv.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Precomputed table of the squaring of all polynomial with degree less than 4.
- */
-static const dig_t table[16] = {
-	0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15,
-	0x40, 0x41, 0x44, 0x45, 0x50, 0x51, 0x54, 0x55
-};
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_sqrn_low(dig_t *c, const dig_t *a) {
-	dig_t *tmp, x, y, z;
-
-	tmp = c;
-#if RLC_DIG == 8
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmp++) {
-		x = a[i];
-		y = x & 0x0F;
-		z = x >> 4;
-		y = (y | (y << 2)) & 0x33;
-		y = (y | (y << 1)) & 0x55;
-		*tmp++ = y;
-		z = (z | (z << 2)) & 0x33;
-		z = (z | (z << 1)) & 0x55;
-		*tmp = z;
-	}
-#elif RLC_DIG == 16
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmp++) {
-		x = a[i];
-		y = x & 0x00FF;
-		z = x >> 8;
-		y = (y | (y << 4)) & 0x0F0F;
-		y = (y | (y << 2)) & 0x3333;
-		y = (y | (y << 1)) & 0x5555;
-		*tmp++ = y;
-		z = (z | (z << 4)) & 0x0F0F;
-		z = (z | (z << 2)) & 0x3333;
-		z = (z | (z << 1)) & 0x5555;
-		*tmp = z;
-	}
-#elif RLC_DIG == 32
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmp++) {
-		x = a[i];
-		y = x & 0x0000FFFF;
-		z = x >> 16;
-		y = (y | (y << 8)) & 0x00FF00FF;
-		y = (y | (y << 4)) & 0x0F0F0F0F;
-		y = (y | (y << 2)) & 0x33333333;
-		y = (y | (y << 1)) & 0x55555555;
-		*tmp++ = y;
-		z = (z | (z << 8)) & 0x00FF00FF;
-		z = (z | (z << 4)) & 0x0F0F0F0F;
-		z = (z | (z << 2)) & 0x33333333;
-		z = (z | (z << 1)) & 0x55555555;
-		*tmp = z;
-	}
-#elif RLC_DIG == 64
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmp++) {
-		x = a[i];
-		y = x & 0x00000000FFFFFFFF;
-		z = x >> 32;
-		y = (y | (y << 16)) & 0x0000FFFF0000FFFF;
-		y = (y | (y << 8)) & 0x00FF00FF00FF00FF;
-		y = (y | (y << 4)) & 0x0F0F0F0F0F0F0F0F;
-		y = (y | (y << 2)) & 0x3333333333333333;
-		y = (y | (y << 1)) & 0x5555555555555555;
-		*tmp++ = y;
-		z = (z | (z << 16)) & 0x0000FFFF0000FFFF;
-		z = (z | (z << 8)) & 0x00FF00FF00FF00FF;
-		z = (z | (z << 4)) & 0x0F0F0F0F0F0F0F0F;
-		z = (z | (z << 2)) & 0x3333333333333333;
-		z = (z | (z << 1)) & 0x5555555555555555;
-		*tmp = z;
-	}
-#endif
-}
-
-void fb_sqrl_low(dig_t *c, const dig_t *a) {
-	dig_t d, *tmpt;
-
-	tmpt = c;
-#if RLC_DIG == 8
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmpt++) {
-		d = a[i];
-		*tmpt = table[RLC_LOW(d)];
-		tmpt++;
-		*tmpt = table[RLC_HIGH(d)];
-	}
-#elif RLC_DIG == 16
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmpt++) {
-		d = a[i];
-		*tmpt = (table[d & 0xF]) | (table[(d >> 4) & 0xF] << 8);
-		tmpt++;
-		*tmpt = (table[(d >> 8) & 0xF] << 00) | (table[(d >> 12) & 0xF] << 8);
-	}
-#elif RLC_DIG == 32
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmpt++) {
-		d = a[i];
-		*tmpt = (table[d & 0xF]) | (table[(d >> 4) & 0xF] << 8) | (table[(d >> 8) & 0xF] << 16) | (table[(d >> 12) & 0xF] << 24);
-		tmpt++;
-		*tmpt = (table[(d >> 16) & 0xF] << 00) | (table[(d >> 20) & 0xF] << 8) | (table[(d >> 24) & 0xF] << 16) | (table[(d >> 28) & 0xF] << 24);
-	}
-#elif RLC_DIG == 64
-	for (int i = 0; i < RLC_FB_DIGS; i++, tmpt++) {
-		d = a[i];
-		*tmpt = (table[d & 0xF] << 00) | (table[(d >> 4) & 0xF] << 8) |
-				(table[(d >> 8) & 0xF] << 16) | (table[(d >> 12) & 0xF] << 24) |
-				(table[(d >> 16) & 0xF] << 32) | (table[(d >> 20) & 0xF] << 40) | (table[(d >> 24) & 0xF] << 48) | (table[(d >> 28) & 0xF] << 56);
-		tmpt++;
-		*tmpt = (table[(d >> 32) & 0xF] << 00) | (table[(d >> 36) & 0xF] << 8) |
-				(table[(d >> 40) & 0xF] << 16) | (table[(d >> 44) & 0xF] << 24) |
-				(table[(d >> 48) & 0xF] << 32) | (table[(d >> 52) & 0xF] << 40) | (table[(d >> 56) & 0xF] << 48) | (table[(d >> 60) & 0xF] << 56);
-	}
-#endif
-}
-
-void fb_sqrm_low(dig_t *c, const dig_t *a) {
-	rlc_align dig_t t[2 * RLC_FB_DIGS];
-
-	fb_sqrl_low(t, a);
-	fb_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_srt_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_srt_low.c
deleted file mode 100644
index fbbe7b69a39e..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_srt_low.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field square root.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#define HALF ((int)((RLC_FB_BITS / 2)/(RLC_DIG) + ((RLC_FB_BITS / 2) % RLC_DIG > 0)))
-
-static const dig_t t0[16] = {
-	0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15
-};
-static const dig_t t1[16] = {
-	0, 4, 1, 5, 8, 12, 9, 13, 2, 6, 3, 7, 10, 14, 11, 15
-};
-
-static void fb_srtt_low(dig_t *c, const dig_t *a, int fa) {
-	int i, j, n, h, sh, rh, lh, sa, la, ra;
-	dig_t d, d_e, d_o;
-	rlc_align dig_t t[2 * RLC_FB_DIGS] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-	h = (sh + 1) >> 1;
-	rh = (h << RLC_DIG_LOG) - 1 - (RLC_FB_BITS - 1) / 2;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(la, sa, (fa + 1) >> 1);
-	ra = RLC_DIG - la;
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 2; j += 4) {
-			d_e |= t0[((d & 0x05) + ((d & 0x50) >> 3))] << j;
-			d_o |= t1[((d & 0x0A) + ((d & 0xA0) >> 5))] << j;
-			d >>= 8;
-		}
-
-		i++;
-		if (i < sh) {
-			d = a[i];
-
-			for (j = RLC_DIG / 2; j < RLC_DIG; j += 4) {
-				d_e |= t0[((d & 0x05) + ((d & 0x50) >> 3))] << j;
-				d_o |= t1[((d & 0x0A) + ((d & 0xA0) >> 5))] << j;
-				d >>= 8;
-			}
-		}
-
-		t[n] ^= d_e;
-
-		if (rh == 0) {
-			t[h + n] = d_o;
-		} else {
-			t[h + n - 1] ^= (d_o << lh);
-			t[h + n] ^= (d_o >> rh);
-		}
-		if (la == 0) {
-			t[n + sa] ^= d_o;
-		} else {
-			t[n + sa] ^= (d_o << la);
-			t[n + sa + 1] ^= (d_o >> ra);
-		}
-	}
-	fb_copy(c, t);
-}
-
-static void fb_srtp_low(dig_t *c, const dig_t *a, int fa, int fb, int fc) {
-	int i, j, n, h, sh, rh, lh, sa, la, ra, sb, lb, rb, sc, lc, rc;
-	dig_t d, d_e, d_o;
-	rlc_align dig_t t[RLC_FB_DIGS] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-	h = (sh + 1) >> 1;
-	rh = (h << RLC_DIG_LOG) - 1 - (RLC_FB_BITS - 1) / 2;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(la, sa, (fa + 1) >> 1);
-	ra = RLC_DIG - la;
-
-	RLC_RIP(lb, sb, (fb + 1) >> 1);
-	rb = RLC_DIG - lb;
-
-	RLC_RIP(lc, sc, (fc + 1) >> 1);
-	rc = RLC_DIG - lc;
-
-	for (i = 0; i < sh; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 2; j += 4) {
-			d_e |= t0[((d & 0x5) + ((d & 0x50) >> 3))] << j;
-			d_o |= t1[((d & 0xA) + ((d & 0xA0) >> 5))] << j;
-			d >>= 8;
-		}
-		i++;
-
-		if (i < sh) {
-			d = a[i];
-			for (j = RLC_DIG / 2; j < RLC_DIG; j += 4) {
-				d_e |= t0[((d & 0x5) + ((d & 0x50) >> 3))] << j;
-				d_o |= t1[((d & 0xA) + ((d & 0xA0) >> 5))] << j;
-				d >>= 8;
-			}
-		}
-
-		t[n] ^= d_e;
-
-		if (rh == 0) {
-			t[h + n] = d_o;
-		} else {
-			t[h + n - 1] ^= (d_o << lh);
-			t[h + n] ^= (d_o >> rh);
-		}
-		if (la == 0) {
-			t[n + sa] ^= d_o;
-		} else {
-			t[n + sa] ^= (d_o << la);
-			t[n + sa + 1] ^= (d_o >> ra);
-		}
-		if (lb == 0) {
-			t[n + sb] ^= d_o;
-		} else {
-			t[n + sb] ^= (d_o << lb);
-			t[n + sb + 1] ^= (d_o >> rb);
-		}
-		if (lc == 0) {
-			t[n + sc] ^= d_o;
-		} else {
-			t[n + sc] ^= (d_o << lc);
-			t[n + sc + 1] ^= (d_o >> rc);
-		}
-	}
-	fb_copy(c, t);
-}
-
-static void fb_sqrt_low(dig_t *c, const dig_t *a) {
-	int i, j, n, sh;
-	dig_t d, d_e, d_o;
-	rlc_align dig_t t[2 * RLC_FB_DIGS] = { 0 }, s[RLC_FB_DIGS + 1] = { 0 };
-	rlc_align dig_t t_e[RLC_FB_DIGS] = { 0 }, t_o[RLC_FB_DIGS] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 2; j += 4) {
-			d_e |= t0[((d & 0x05) + ((d & 0x50) >> 3))] << j;
-			d_o |= t1[((d & 0x0A) + ((d & 0xA0) >> 5))] << j;
-			d >>= 8;
-		}
-
-		i++;
-		if (i < sh && i < RLC_FB_DIGS) {
-			d = a[i];
-
-			for (j = RLC_DIG / 2; j < RLC_DIG; j += 4) {
-				d_e |= t0[((d & 0x05) + ((d & 0x50) >> 3))] << j;
-				d_o |= t1[((d & 0x0A) + ((d & 0xA0) >> 5))] << j;
-				d >>= 8;
-			}
-		}
-
-		t_e[n] = d_e;
-		t_o[n] = d_o;
-	}
-	if (fb_poly_tab_srz(0) == NULL) {
-		dv_copy(s, fb_poly_get_srz() + HALF, RLC_FB_DIGS - HALF);
-		fb_muld_low(t + HALF, t_o, s, HALF);
-		fb_muld_low(s, t_o, fb_poly_get_srz(), HALF);
-		fb_addd_low(t, t, s, RLC_FB_DIGS + 1);
-		fb_rdcn_low(c, t);
-		fb_addd_low(c, c, t_e, HALF);
-	} else {
-		dig_t u, carry, *tmpa, *tmpc;
-
-		for (i = RLC_DIG - 8; i > 0; i -= 8) {
-			tmpa = t_o;
-			tmpc = t;
-			for (j = 0; j < HALF; j++, tmpa++, tmpc++) {
-				u = (*tmpa >> i) & 0xFF;
-				fb_addn_low(tmpc, tmpc, fb_poly_tab_srz(u));
-			}
-			carry = fb_lshb_low(t, t, 8);
-			fb_lshb_low(t + RLC_FB_DIGS, t + RLC_FB_DIGS, 8);
-			t[RLC_FB_DIGS] ^= carry;
-		}
-		for (j = 0; j < HALF; j++) {
-			u = t_o[j] & 0xFF;
-			fb_addn_low(t + j, t + j, fb_poly_tab_srz(u));
-		}
-		fb_zero(c);
-		fb_rdcn_low(c, t);
-		fb_addd_low(c, c, t_e, HALF);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_srtn_low(dig_t *c, const dig_t *a) {
-	int fa, fb, fc;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	if (fb == 0) {
-		if (fa % 2 == 0) {
-			fb_sqrt_low(c, a);
-		} else {
-			fb_srtt_low(c, a, fa);
-		}
-	} else {
-		if ((fa % 2 == 0) || (fb % 2 == 0) || (fc % 2 == 0)) {
-			fb_sqrt_low(c, a);
-		} else {
-			fb_srtp_low(c, a, fa, fb, fc);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fb_trc_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fb_trc_low.c
deleted file mode 100644
index 90aff33933bb..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fb_trc_low.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level trace function.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_trcn_low(const dig_t *a) {
-	int ta, tb, tc;
-	dig_t r;
-
-	fb_poly_get_trc(&ta, &tb, &tc);
-
-#if ALLOC == AUTO
-	r = fb_get_bit(a, ta);
-	if (tb != -1) {
-		r ^= fb_get_bit(a, tb);
-	}
-	if (tc != -1) {
-		r ^= fb_get_bit(a, tc);
-	}
-#else
-	r = fb_get_bit((const fb_t)a, ta);
-	if (tb != -1) {
-		r ^= fb_get_bit((const fb_t)a, tb);
-	}
-	if (tc != -1) {
-		r ^= fb_get_bit((const fb_t)a, tc);
-	}
-#endif
-
-	return r;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_add_low.c
deleted file mode 100644
index 594c0e6f6592..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_add_low.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < RLC_FP_DIGS && carry; i++, a++, c++) {
-		r0 = (*a) + carry;
-		carry = (r0 < carry);
-		(*c) = r0;
-	}
-	for (; i < RLC_FP_DIGS; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, b++, c++) {
-		r0 = (*a) + (*b);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		(*c) = r1;
-	}
-	return carry;
-}
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, b++) {
-		r0 = (*a) + (*b);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < 2 * RLC_FP_DIGS; i++, a++, b++) {
-		r0 = (*a) + (*b);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	return carry;
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_addd_low(c, a, b);
-
-	if (carry || (dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < RLC_FP_DIGS; i++, c++, a++) {
-		r0 = (*a) - carry;
-		carry = (r0 > (*a));
-		(*c) = r0;
-	}
-	return carry;
-}
-
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, b++, c++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		(*c) = r0;
-	}
-	return carry;
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, b++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		c[i] = r0;
-	}
-	if (carry) {
-		fp_addn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	if (fp_subd_low(c, a, b)) {
-		fp_addn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i;
-	dig_t carry, r0, diff;
-
-	/* Zero the carry. */
-	carry = 0;
-	for (i = 0; i < 2 * RLC_FP_DIGS; i++, a++, b++) {
-		diff = (*a) - (*b);
-		r0 = diff - carry;
-		carry = ((*a) < (*b)) || (carry && !diff);
-		c[i] = r0;
-	}
-	return carry;
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	if (fp_is_zero(a)) {
-		fp_zero(c);
-	} else {
-		fp_subn_low(c, fp_prime_get(), a);
-	}
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		(*c) = r1;
-	}
-	return carry;
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t carry, c0, c1, r0, r1;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r0 = (*a) + (*a);
-		c0 = (r0 < (*a));
-		r1 = r0 + carry;
-		c1 = (r1 < r0);
-		carry = c0 | c1;
-		c[i] = r1;
-	}
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-
-	fp_add1_low(c + RLC_FP_DIGS, a + RLC_FP_DIGS, carry);
-
-	carry = fp_rsh1_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS);
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_inv_low.c
deleted file mode 100644
index 02c43b679e48..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_inv_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	bn_st e;
-
-	bn_make(&e, RLC_FP_DIGS);
-
-	e.used = RLC_FP_DIGS;
-	dv_copy(e.dp, fp_prime_get(), RLC_FP_DIGS);
-	bn_sub1_low(e.dp, e.dp, 2, RLC_FP_DIGS);
-#if AUTO == ALLOC
-	fp_exp(c, a, &e);
-#else
-	fp_exp(c, (const fp_t)a, &e);
-#endif
-
-	bn_clean(&e);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_mul_low.c
deleted file mode 100644
index 8295ab6182ec..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_mul_low.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	dig_t _c, r0, r1, carry = 0;
-	for (int i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *a by d and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		RLC_MUL_DIG(r1, r0, *a, digit);
-		_c = r0 + carry;
-		carry = r1 + (_c < carry);
-		/* Increment the column and assign the result. */
-		*c = *c + _c;
-		/* Update the carry. */
-		carry += (*c < _c);
-	}
-	return carry;
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	dig_t r0, r1, carry = 0;
-	for (int i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		RLC_MUL_DIG(r1, r0, *a, digit);
-		*c = r0 + carry;
-		carry = r1 + (*c < carry);
-	}
-	return carry;
-}
-
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	int i, j;
-	const dig_t *tmpa, *tmpb;
-	dig_t r0, r1, r2;
-
-	r0 = r1 = r2 = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, c++) {
-		tmpa = a;
-		tmpb = b + i;
-		for (j = 0; j <= i; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = 0; i < RLC_FP_DIGS; i++, c++) {
-		tmpa = a + i + 1;
-		tmpb = b + (RLC_FP_DIGS - 1);
-		for (j = 0; j < RLC_FP_DIGS - (i + 1); j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpb);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-}
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-
-	fp_muln_low(t, a, b);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_rdc_low.c
deleted file mode 100644
index 6854aec0a818..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, 2 * RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] < 0) == (sform[i] < 0)) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] < 0) == (sform[0] < 0)) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_addm_low(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
-
-void fp_rdcn_low(dig_t *c, dig_t *a) {
-	int i, j;
-	dig_t t, r0, r1, r2, u, *tmp, *tmpc;
-	const dig_t *m, *tmpm;
-
-	u = *(fp_prime_get_rdc());
-	m = fp_prime_get();
-	tmpc = c;
-
-	r0 = r1 = r2 = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, tmpc++, a++) {
-		tmp = c;
-		tmpm = m + i;
-		for (j = 0; j < i; j++, tmp++, tmpm--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmp, *tmpm);
-		}
-		RLC_COMBA_ADD(t, r2, r1, r0, *a);
-		*tmpc = (dig_t)(r0 * u);
-		RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpc, *m);
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-
-	for (i = RLC_FP_DIGS; i < 2 * RLC_FP_DIGS - 1; i++, a++) {
-		tmp = c + (i - RLC_FP_DIGS + 1);
-		tmpm = m + RLC_FP_DIGS - 1;
-		for (j = i - RLC_FP_DIGS + 1; j < RLC_FP_DIGS; j++, tmp++, tmpm--) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmp, *tmpm);
-		}
-		RLC_COMBA_ADD(t, r2, r1, r0, *a);
-		c[i - RLC_FP_DIGS] = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	RLC_COMBA_ADD(t, r2, r1, r0, *a);
-	c[RLC_FP_DIGS - 1] = r0;
-
-	if (r1 || dv_cmp(c, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(c, c, m);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_shift_low.c
deleted file mode 100644
index d62e56d7fefd..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_shift_low.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	/* Prepare the bit mask. */
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Get the most significant bit. */
-		r = *a >> (RLC_DIG - 1);
-		/* Shift the operand and insert the carry, */
-		*c = (*a << 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	/* Prepare the bit mask. */
-	mask = ((dig_t)1 << (dig_t)bits) - 1;
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fp_rsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	c += RLC_FP_DIGS - 1;
-	a += RLC_FP_DIGS - 1;
-	carry = 0;
-	for (i = RLC_FP_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the least significant bit. */
-		r = *a & 0x01;
-		/* Shift the operand and insert the carry. */
-		carry <<= RLC_DIG - 1;
-		*c = (*a >> 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	c += RLC_FP_DIGS - 1;
-	a += RLC_FP_DIGS - 1;
-	/* Prepare the bit mask. */
-	mask = ((dig_t)1 << (dig_t)bits) - 1;
-	shift = RLC_DIG - bits;
-	carry = 0;
-	for (i = RLC_FP_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fp_sqr_low.c
deleted file mode 100644
index 6953c2ef0999..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	int i, j;
-	const dig_t *tmpa, *tmpb;
-	dig_t r0, r1, r2;
-
-	/* Zero the accumulator. */
-	r0 = r1 = r2 = 0;
-
-	/* Comba squaring produces one column of the result per iteration. */
-	for (i = 0; i < RLC_FP_DIGS; i++, c++) {
-		tmpa = a;
-		tmpb = a + i;
-
-		/* Compute the number of additions in this column. */
-		for (j = 0; j < (i + 1) / 2; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_SQR(r2, r1, r0, *tmpa, *tmpb);
-		}
-		if (!(i & 0x01)) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpa);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	for (i = 0; i < RLC_FP_DIGS; i++, c++) {
-		tmpa = a + (i + 1);
-		tmpb = a + (RLC_FP_DIGS - 1);
-
-		/* Compute the number of additions in this column. */
-		for (j = 0; j < (RLC_FP_DIGS - 1 - i) / 2; j++, tmpa++, tmpb--) {
-			RLC_COMBA_STEP_SQR(r2, r1, r0, *tmpa, *tmpb);
-		}
-		if (!((RLC_FP_DIGS - i) & 0x01)) {
-			RLC_COMBA_STEP_MUL(r2, r1, r0, *tmpa, *tmpa);
-		}
-		*c = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-
-	fp_sqrn_low(t, a);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fpx_add_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fpx_add_low.c
deleted file mode 100755
index 8f2656768506..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fpx_add_low.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field addition functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_addn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-}
-
-void fp2_addm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_addm_low(c[0], a[0], b[0]);
-	fp_addm_low(c[1], a[1], b[1]);
-}
-
-void fp2_addd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-}
-
-void fp2_addc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-}
-
-void fp2_subn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-}
-
-void fp2_subm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_subm_low(c[0], a[0], b[0]);
-	fp_subm_low(c[1], a[1], b[1]);
-}
-
-void fp2_subd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-}
-
-void fp2_subc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-}
-
-void fp2_dbln_low(fp2_t c, fp2_t a) {
-	/* 2 * (a0 + a1 * u) = 2 * a0 + 2 * a1 * u. */
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-}
-
-void fp2_dblm_low(fp2_t c, fp2_t a) {
-	fp_dblm_low(c[0], a[0]);
-	fp_dblm_low(c[1], a[1]);
-}
-
-void fp2_norm_low(fp2_t c, fp2_t a) {
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-#ifdef FP_QNRES
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		fp_copy(t[0], a[1]);
-		fp_add(c[1], a[0], a[1]);
-		fp_sub(c[0], a[0], t[0]);
-#else
-		int qnr = fp2_field_get_qnr();
-		switch (fp_prime_get_mod8()) {
-			case 3:
-				/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-				fp_neg(t[0], a[1]);
-				fp_add(c[1], a[0], a[1]);
-				fp_add(c[0], t[0], a[0]);
-				break;
-			case 1:
-			case 5:
-				/* If p = 1,5 mod 8, (i) is a QNR/CNR. */
-				fp2_mul_art(c, a);
-				break;
-			case 7:
-				/* If p = 7 mod 8, we choose (2^k + i) as QNR/CNR. */
-				fp2_mul_art(t, a);
-				fp2_copy(c, a);
-				while (qnr > 1) {
-					fp2_dbl(c, c);
-					qnr = qnr >> 1;
-				}
-				fp2_add(c, c, t);
-				break;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-void fp2_nord_low(dv2_t c, dv2_t a) {
-	dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-
-#ifdef FP_QNRES
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		/* (a_0 + a_1 * i) * (1 + i) = (a_0 - a_1) + (a_0 + a_1) * u. */
-		dv_copy(t[0], a[1], 2 * RLC_FP_DIGS);
-		fp_addc_low(c[1], a[0], a[1]);
-		fp_subc_low(c[0], a[0], t[0]);
-#else
-		int qnr = fp2_field_get_qnr();
-		switch (fp_prime_get_mod8()) {
-			case 3:
-				/* If p = 3 mod 8, (1 + i) is a QNR, i^2 = -1. */
-				/* (a_0 + a_1 * i) * (1 + i) = (a_0 - a_1) + (a_0 + a_1) * i. */
-				dv_copy(t[0], a[1], 2 * RLC_FP_DIGS);
-				fp_addc_low(c[1], a[0], a[1]);
-				fp_subc_low(c[0], a[0], t[0]);
-				break;
-			case 1:
-			case 5:
-				/* If p = 1,5 mod 8, (i) is a QNR. */
-				dv_copy(t[0], a[0], 2 * RLC_FP_DIGS);
-				dv_zero(t[1], RLC_FP_DIGS);
-				dv_copy(t[1] + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-				fp_subc_low(c[0], t[1], a[1]);
-				for (int i = -1; i > fp_prime_get_qnr(); i--) {
-					fp_subc_low(c[0], c[0], a[1]);
-				}
-				dv_copy(c[1], t[0], 2 * RLC_FP_DIGS);
-				break;
-			case 7:
-				/* If p = 7 mod 8, (2^k + i) is a QNR/CNR.   */
-				dv_copy(t[0], a[0], 2 * RLC_FP_DIGS);
-				dv_copy(t[1], a[1], 2 * RLC_FP_DIGS);
-				while (qnr > 1) {
-					fp2_addc_low(t, t, t);
-					qnr = qnr >> 1;
-				}
-				fp_subc_low(c[0], t[0], a[1]);
-				fp_addc_low(c[1], t[1], a[0]);
-				break;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp2_norh_low(dv2_t c, dv2_t a) {
-#ifdef FP_QNRES
-	dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		/* (a_0 + a_1 * i) * (1 + i) = (a_0 - a_1) + (a_0 + a_1) * u. */
-		dv_copy(t[1], a[1], 2 * RLC_FP_DIGS);
-		fp_addd_low(c[1], a[0], a[1]);
-		/* c_0 = c_0 + 2^N * p/2. */
-		dv_copy(t[0], a[0], 2 * RLC_FP_DIGS);
-		bn_lshb_low(t[0] + RLC_FP_DIGS - 1, t[0] + RLC_FP_DIGS - 1, RLC_FP_DIGS + 1, 1);
-		fp_addn_low(t[0] + RLC_FP_DIGS, t[0] + RLC_FP_DIGS, fp_prime_get());
-		bn_rshb_low(t[0] + RLC_FP_DIGS - 1, t[0] + RLC_FP_DIGS - 1, RLC_FP_DIGS + 1, 1);
-		fp_subd_low(c[0], t[0], t[1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv2_free(t);
-	}
-#else
-		fp2_nord_low(c, a);
-#endif
-}
-
-void fp3_addn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-	fp_addn_low(c[2], a[2], b[2]);
-}
-
-void fp3_addm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addm_low(c[0], a[0], b[0]);
-	fp_addm_low(c[1], a[1], b[1]);
-	fp_addm_low(c[2], a[2], b[2]);
-}
-
-void fp3_addd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-	fp_addd_low(c[2], a[2], b[2]);
-}
-
-void fp3_addc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-	fp_addc_low(c[2], a[2], b[2]);
-}
-
-void fp3_subn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-	fp_subn_low(c[2], a[2], b[2]);
-}
-
-void fp3_subm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subm_low(c[0], a[0], b[0]);
-	fp_subm_low(c[1], a[1], b[1]);
-	fp_subm_low(c[2], a[2], b[2]);
-}
-
-void fp3_subd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-	fp_subd_low(c[2], a[2], b[2]);
-}
-
-void fp3_subc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-	fp_subc_low(c[2], a[2], b[2]);
-}
-
-void fp3_dbln_low(fp3_t c, fp3_t a) {
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-	fp_dbln_low(c[2], a[2]);
-}
-
-void fp3_dblm_low(fp3_t c, fp3_t a) {
-	fp_dblm_low(c[0], a[0]);
-	fp_dblm_low(c[1], a[1]);
-	fp_dblm_low(c[2], a[2]);
-}
-
-void fp3_nord_low(dv3_t c, dv3_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_copy(t, a[0], 2 * RLC_FP_DIGS);
-		dv_copy(c[0], a[2], 2 * RLC_FP_DIGS);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_addc_low(c[0], c[0], a[2]);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(c[0], c[0], a[2]);
-		}
-		dv_copy(c[2], a[1], 2 * RLC_FP_DIGS);
-		dv_copy(c[1], t, 2 * RLC_FP_DIGS);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fpx_mul_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fpx_mul_low.c
deleted file mode 100755
index 4a88aa05b016..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fpx_mul_low.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field multiplication functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_muln_low(dv2_t c, fp2_t a, fp2_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 + a_1, t1 = b_0 + b_1. */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t0, a[0], a[1]);
-	fp_addn_low(t1, b[0], b[1]);
-#else
-	fp_addm_low(t0, a[0], a[1]);
-	fp_addm_low(t1, b[0], b[1]);
-#endif
-	/* c_0 = a_0 * b_0, c_1 = a_1 * b_1. */
-	fp_muln_low(c[0], a[0], b[0]);
-	fp_muln_low(c[1], a[1], b[1]);
-	/* t2 = (a_0 + a_1) * (b_0 + b_1). */
-	fp_muln_low(t2, t0, t1);
-
-	/* t0 = (a_0 * b_0) + (a_1 * b_1). */
-#ifdef RLC_FP_ROOM
-	fp_addd_low(t0, c[0], c[1]);
-#else
-	fp_addc_low(t0, c[0], c[1]);
-#endif
-
-	/* c_0 = (a_0 * b_0) + u^2 * (a_1 * b_1). */
-	fp_subc_low(c[0], c[0], c[1]);
-
-#ifndef FP_QNRES
-	/* t1 = u^2 * (a_1 * b_1). */
-	for (int i = -1; i > fp_prime_get_qnr(); i--) {
-		fp_subc_low(c[0], c[0], c[1]);
-	}
-#endif
-
-	/* c_1 = t2 - t0. */
-#ifdef RLC_FP_ROOM
-	fp_subd_low(c[1], t2, t0);
-#else
-	fp_subc_low(c[1], t2, t0);
-#endif
-}
-
-void fp2_mulc_low(dv2_t c, fp2_t a, fp2_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 + a_1, t1 = b_0 + b_1. */
-	fp_addn_low(t0, a[0], a[1]);
-	fp_addn_low(t1, b[0], b[1]);
-
-	/* c_0 = a_0 * b_0, c_1 = a_1 * b_1, t2 = (a_0 + a_1) * (b_0 + b_1). */
-	fp_muln_low(c[0], a[0], b[0]);
-	fp_muln_low(c[1], a[1], b[1]);
-	fp_muln_low(t2, t0, t1);
-
-	/* t0 = (a_0 * b_0) + (a_1 * b_1). */
-	fp_addd_low(t0, c[0], c[1]);
-
-	/* c_0 = (a_0 * b_0) + u^2 * (a_1 * b_1). */
-	fp_subd_low(c[0], c[0], c[1]);
-
-#ifndef FP_QNRES
-	/* t1 = u^2 * (a_1 * b_1). */
-	for (int i = -1; i > fp_prime_get_qnr(); i--) {
-		fp_subd_low(c[0], c[0], c[1]);
-	}
-#endif
-
-	/* c_1 = (t2 - t0). */
-	fp_subd_low(c[1], t2, t0);
-
-	/* c_0 = c_0 + 2^N * p/4. */
-	bn_lshb_low(c[0] + RLC_FP_DIGS - 1, c[0] + RLC_FP_DIGS - 1, RLC_FP_DIGS + 1, 2);
-	fp_addn_low(c[0] + RLC_FP_DIGS, c[0] + RLC_FP_DIGS, fp_prime_get());
-	bn_rshb_low(c[0] + RLC_FP_DIGS - 1, c[0] + RLC_FP_DIGS - 1, RLC_FP_DIGS + 1, 2);
-}
-
-void fp2_mulm_low(fp2_t c, fp2_t a, fp2_t b) {
-	rlc_align dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-		fp2_muln_low(t, a, b);
-		fp2_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp3_muln_low(dv3_t c, fp3_t a, fp3_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS], t3[2 * RLC_FP_DIGS];
-	rlc_align dig_t t4[2 * RLC_FP_DIGS], t5[2 * RLC_FP_DIGS], t6[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 * b_0, t1 = a_1 * b_1, t2 = a_2 * b_2. */
-	fp_muln_low(t0, a[0], b[0]);
-	fp_muln_low(t1, a[1], b[1]);
-	fp_muln_low(t2, a[2], b[2]);
-
-	/* t3 = (a_1 + a_2) * (b_1 + b_2). */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[1], a[2]);
-	fp_addn_low(t4, b[1], b[2]);
-#else
-	fp_addm_low(t3, a[1], a[2]);
-	fp_addm_low(t4, b[1], b[2]);
-#endif
-	fp_muln_low(t5, t3, t4);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t1, t2);
-#else
-	fp_addc_low(t6, t1, t2);
-#endif
-	fp_subc_low(t4, t5, t6);
-	fp_addc_low(c[0], t0, t4);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t4);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t4);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t4, a[0], a[1]);
-	fp_addn_low(t5, b[0], b[1]);
-#else
-	fp_addm_low(t4, a[0], a[1]);
-	fp_addm_low(t5, b[0], b[1]);
-#endif
-	fp_muln_low(t6, t4, t5);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t4, t0, t1);
-#else
-	fp_addc_low(t4, t0, t1);
-#endif
-	fp_subc_low(t4, t6, t4);
-	fp_addc_low(c[1], t4, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t5, a[0], a[2]);
-	fp_addn_low(t6, b[0], b[2]);
-#else
-	fp_addm_low(t5, a[0], a[2]);
-	fp_addm_low(t6, b[0], b[2]);
-#endif
-	fp_muln_low(t4, t5, t6);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t0, t2);
-#else
-	fp_addc_low(t6, t0, t2);
-#endif
-	fp_subc_low(t5, t4, t6);
-	fp_addc_low(c[2], t5, t1);
-}
-
-void fp3_mulm_low(fp3_t c, fp3_t a, fp3_t b) {
-	dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_muln_low(t, a, b);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fpx_rdc_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fpx_rdc_low.c
deleted file mode 100755
index 9671c8c99bab..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fpx_rdc_low.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field modular reduction functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_rdcn_low(fp2_t c, dv2_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-#endif
-}
-
-void fp3_rdcn_low(fp3_t c, dv3_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-	fp_rdcn_low(c[2], a[2]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/easy/relic_fpx_sqr_low.c b/src/dashbls/depends/relic/src/low/easy/relic_fpx_sqr_low.c
deleted file mode 100755
index 01e55cc82a5a..000000000000
--- a/src/dashbls/depends/relic/src/low/easy/relic_fpx_sqr_low.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field squaring functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_sqrn_low(dv2_t c, fp2_t a) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-
-	/* t0 = (a0 + a1). */
-#ifdef RLC_FP_ROOM
-	/* if we have room for carries, we can avoid reductions here. */
-	fp_addn_low(t0, a[0], a[1]);
-#else
-	fp_addm_low(t0, a[0], a[1]);
-#endif
-	/* t1 = (a0 - a1). */
-	fp_subm_low(t1, a[0], a[1]);
-
-#ifdef FP_QNRES
-
-#ifdef RLC_FP_ROOM
-	fp_dbln_low(t2, a[0]);
-#else
-	fp_dblm_low(t2, a[0]);
-#endif
-	/* c1 = 2 * a0 * a1. */
-	fp_muln_low(c[1], t2, a[1]);
-	/* c_0 = a_0^2 + a_1^2 * u^2. */
-	fp_muln_low(c[0], t0, t1);
-
-#else /* !FP_QNRES */
-
-	/* t1 = a0 - a1 * u^2. */
-	for (int i = -1; i > fp_prime_get_qnr(); i--) {
-		fp_subm_low(t1, t1, a[1]);
-	}
-	for (int i = 1; i < fp_prime_get_qnr(); i++) {
-		fp_addm_low(t1, t1, a[1]);
-	}
-
-	if (fp_prime_get_qnr() == -1) {
-		/* t2 = 2 * a0. */
-		fp_dbl(t2, a[0]);
-		/* c1 = 2 * a0 * a1. */
-		fp_muln_low(c[1], t2, a[1]);
-		/* c0 = a0^2 + a_1^2 * u^2. */
-		fp_muln_low(c[0], t0, t1);
-	} else {
-		/* c1 = a0 * a1. */
-		fp_muln_low(c[1], a[0], a[1]);
-		/* c0 = a0^2 + b_0^2 * u^2. */
-		fp_muln_low(c[0], t0, t1);
-
-#ifdef RLC_FP_ROOM
-		for (int i = -1; i > fp_prime_get_qnr(); i--) {
-			fp_addd_low(c[0], c[0], c[1]);
-		}
-		for (int i = 1; i < fp_prime_get_qnr(); i++) {
-			fp_subd_low(c[0], c[0], c[1]);
-		}
-		/* c1 = 2 * a0 * a1. */
-		fp_addd_low(c[1], c[1], c[1]);
-#else
-		for (int i = -1; i > fp_prime_get_qnr(); i--) {
-			fp_addc_low(c[0], c[0], c[1]);
-		}
-		for (int i = 1; i < fp_prime_get_qnr(); i++) {
-			fp_subc_low(c[0], c[0], c[1]);
-		}
-		/* c1 = 2 * a0 * a1. */
-		fp_addc_low(c[1], c[1], c[1]);
-#endif
-	}
-#endif
-	/* c = c0 + c1 * u. */
-}
-
-void fp2_sqrm_low(fp2_t c, fp2_t a) {
-	rlc_align dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-		fp2_sqrn_low(t, a);
-		fp2_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp3_sqrn_low(dv3_t c, fp3_t a) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-	rlc_align dig_t t3[2 * RLC_FP_DIGS], t4[2 * RLC_FP_DIGS];
-
-	/* t0 = a_0^2. */
-	fp_sqrn_low(t0, a[0]);
-
-	/* t1 = 2 * a_1 * a_2. */
-#ifdef RLC_FP_ROOM
-	fp_dbln_low(t2, a[1]);
-#else
-	fp_dblm_low(t2, a[1]);
-#endif
-
-	fp_muln_low(t1, t2, a[2]);
-
-	/* t3 = (a_0 + a_2 + a_1)^2, t4 = (a_0 + a_2 - a_1)^2. */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[0], a[2]);
-	fp_addn_low(t4, t3, a[1]);
-#else
-	fp_addm_low(t3, a[0], a[2]);
-	fp_addm_low(t4, t3, a[1]);
-#endif
-	fp_subm_low(t2, t3, a[1]);
-	fp_sqrn_low(t3, t4);
-	fp_sqrn_low(t4, t2);
-
-	/* t2 = a_2^2. */
-	fp_sqrn_low(t2, a[2]);
-
-	/* t4 = (t4 + t3)/2. */
-#ifdef RLC_FP_ROOM
-	fp_addd_low(t4, t4, t3);
-#else
-	fp_addc_low(t4, t4, t3);
-#endif
-	fp_hlvd_low(t4, t4);
-
-	/* t3 = t3 - t4 - t1. */
-	fp_subc_low(t3, t3, t4);
-	fp_subc_low(t3, t3, t1);
-
-	/* c_2 = t4 - t0 - t2. */
-	fp_subc_low(c[2], t4, t0);
-	fp_subc_low(c[2], c[2], t2);
-
-	/* c_0 = t0 + t1 * B. */
-	fp_addc_low(c[0], t0, t1);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t1);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t1);
-	}
-
-	/* c_1 = t3 + t2 * B. */
-	fp_addc_low(c[1], t3, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-}
-
-void fp3_sqrm_low(fp3_t c, fp3_t a) {
-	rlc_align dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_sqrn_low(t, a);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/fiat/CMakeLists.txt b/src/dashbls/depends/relic/src/low/fiat/CMakeLists.txt
deleted file mode 100644
index 8635d1b5ad8e..000000000000
--- a/src/dashbls/depends/relic/src/low/fiat/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(INHERIT "gmp-sec")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
-
-set(FIAT_CMAKE ${CMAKE_SOURCE_DIR}/cmake/fiat.cmake)
-set(FIAT_FP "${CMAKE_SOURCE_DIR}/src/low/fiat/fiat_fp.c")
-
-include(${FIAT_CMAKE})
-add_custom_target(fiat DEPENDS ${FIAT_FP})
diff --git a/src/dashbls/depends/relic/src/low/fiat/relic_fp_add_low.tmpl b/src/dashbls/depends/relic/src/low/fiat/relic_fp_add_low.tmpl
deleted file mode 100644
index cce5ecdd0091..000000000000
--- a/src/dashbls/depends/relic/src/low/fiat/relic_fp_add_low.tmpl
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_add_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, RLC_FP_DIGS);
-}
-
-#include "fiat_fp.c"
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_fp_add(c, a, b);
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry;
-
-	carry = mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-
-	if (carry || dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		mpn_sub_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_sub_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_fp_sub(c, a, b);
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	if (mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS)) {
-		mpn_add_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	fiat_fp_opp(c, a);
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	return mpn_add_n(c, a, a, RLC_FP_DIGS);
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = mpn_add_n(c, a, a, RLC_FP_DIGS);
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-    dig_t carry = 0;
-
-    if (a[0] & 1) {
-            carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-    } else {
-            dv_copy(c, a, RLC_FP_DIGS);
-    }
-    mpn_rshift(c, c, RLC_FP_DIGS, 1);
-    if (carry) {
-            c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-    }
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-
-	mpn_add_1(c + RLC_FP_DIGS, a + RLC_FP_DIGS, RLC_FP_DIGS, carry);
-
-	carry = mpn_rshift(c + RLC_FP_DIGS, c + RLC_FP_DIGS, RLC_FP_DIGS, 1);
-	mpn_rshift(c, c, RLC_FP_DIGS, 1);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/fiat/relic_fp_mul_low.tmpl b/src/dashbls/depends/relic/src/low/fiat/relic_fp_mul_low.tmpl
deleted file mode 100644
index e9f06dcd53d6..000000000000
--- a/src/dashbls/depends/relic/src/low/fiat/relic_fp_mul_low.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	mpn_mul_n(c, a, b, RLC_FP_DIGS);
-}
-
-#include "fiat_fp.c"
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_fp_mul(c, a, b);
-}
diff --git a/src/dashbls/depends/relic/src/low/fiat/relic_fp_sqr_low.tmpl b/src/dashbls/depends/relic/src/low/fiat/relic_fp_sqr_low.tmpl
deleted file mode 100644
index c5f23adebee6..000000000000
--- a/src/dashbls/depends/relic/src/low/fiat/relic_fp_sqr_low.tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	mpn_mul_n(c, a, a, RLC_FP_DIGS);
-}
-
-#include "fiat_fp.c"
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fiat_fp_square(c, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_add_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_add_low.c
deleted file mode 100644
index d80a52a9143f..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_add_low.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision addition and subtraction
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_add1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_add_1_itch(size));
-	dig_t r = mpn_sec_add_1(c, a, size, digit, t);
-	RLC_FREE(t);
-	return r;
-}
-
-dig_t bn_addn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	return mpn_add_n(c, a, b, size);
-}
-
-dig_t bn_sub1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_sub_1_itch(size));
-	dig_t r = mpn_sec_sub_1(c, a, size, digit, t);
-	RLC_FREE(t);
-	return r;
-}
-
-dig_t bn_subn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	return mpn_sub_n(c, a, b, size);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_div_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_div_low.c
deleted file mode 100644
index 4b83667b1d48..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_div_low.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision division functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_divn_low(dig_t *c, dig_t *d, dig_t *a, int sa, dig_t *b, int sb) {
-	dig_t u[sa], *t = RLC_ALLOCA(dig_t, mpn_sec_div_qr_itch(sa, sb));
-
-	mpn_copyd(u, a, sa);
-	c[sa - sb] = mpn_sec_div_qr(c, u, sa, b, sb, t);
-	mpn_copyd(d, u, sa);
-	RLC_FREE(t);
-}
-
-void bn_div1_low(dig_t *c, dig_t *d, const dig_t *a, int size, dig_t b) {
-	dig_t u[size], *t = RLC_ALLOCA(dig_t, mpn_sec_div_qr_itch(size, 1));
-
-	mpn_copyd(u, a, size);
-	c[size - 1] = mpn_sec_div_qr(c, u, size, &b, 1, t);
-	*d = u[0];
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mod_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mod_low.c
deleted file mode 100644
index 0bb394c671c6..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mod_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision integer modular reduction
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-#include <string.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_modn_low(dig_t *c, const dig_t *a, int sa, const dig_t *m, int sm,
-		dig_t u) {
-	dig_t *s = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(sm, 1));
-	dig_t r, *tc = c, t[sm + 1];
-
-	mpn_copyd(c, a, sa);
-	for (int i = 0; i < sm; i++, tc++) {
-		r = (dig_t)(*tc * u);
-		mpn_sec_mul(t, m, sm, &r, 1, s);
-		*tc = t[sm] + mpn_add_n(tc, tc, t, sm);
-	}
-	mpn_cnd_sub_n(mpn_add_n(c, c, tc, sm), c, c, m, sm);
-	RLC_FREE(s);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mul_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mul_low.c
deleted file mode 100644
index ee999713b7d1..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_mul_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_mula_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t u[size + 1], *t = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(size, 1));
-	mpn_sec_mul(u, a, size, &digit, 1, t);
-	return u[size] + mpn_add_n(c, c, u, size);
-}
-
-dig_t bn_mul1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	dig_t u[size + 1], *t = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(size, 1));
-	mpn_sec_mul(u, a, size, &digit, 1, t);
-	mpn_copyd(c, u, size);
-	return u[size];
-}
-
-void bn_muln_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(size, size));
-	mpn_sec_mul(c, a, size, b, size, t);
-	RLC_FREE(t);
-}
-
-void bn_muld_low(dig_t *c, const dig_t *a, int sa, const dig_t *b, int sb,
-		int low, int high) {
-	(void)low;
-	(void)high;
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(sa, sb));
-	mpn_sec_mul(c, a, sa, b, sb, t);
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_shift_low.c
deleted file mode 100644
index 4ca729761f48..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_shift_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lsh1_low(dig_t *c, const dig_t *a, int size) {
-	return mpn_lshift(c, a, size, 1);
-}
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	return mpn_lshift(c, a, size, bits);
-}
-
-dig_t bn_rsh1_low(dig_t *c, const dig_t *a, int size) {
-	return mpn_rshift(c, a, size, 1);
-}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	return mpn_rshift(c, a, size, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_sqr_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_sqr_low.c
deleted file mode 100644
index 8e960c558c26..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_bn_sqr_low.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-#include "relic_alloc.h"
-
-#include "assert.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_sqra_low(dig_t *c, const dig_t *a, int size) {
-	dig_t c0, c1, digit = a[0];
-
-	c0 = mpn_addmul_1(c, a, size, a[0]);
-	c1 = mpn_add_1(c + size, c + size, 1, c0);
-	if (size > 1) {
-		c0 = mpn_addmul_1(c + 1, a + 1, size - 1, digit);
-		c1 += mpn_add_1(c + size, c + size, 1, c0);
-	}
-	return c1;
-}
-
-void bn_sqrn_low(dig_t *c, const dig_t *a, int size) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_sqr_itch(size));
-	mpn_sec_sqr(c, a, size, t);
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_add_low.c
deleted file mode 100644
index 943a6a027c38..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_add_low.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_add_1_itch(RLC_FP_DIGS));
-	dig_t r = mpn_sec_add_1(c, a, RLC_FP_DIGS, digit, t);
-	RLC_FREE(t);
-	return r;
-}
-
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = mpn_add_n(c, a, b, RLC_FP_DIGS);
-	dig_t cond = dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT;
-	mpn_cnd_sub_n(carry | cond, c, c, fp_prime_get(), RLC_FP_DIGS);
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-	dig_t cond = dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT;
-	mpn_cnd_sub_n(carry | cond, c + RLC_FP_DIGS, c + RLC_FP_DIGS,
-		fp_prime_get(), RLC_FP_DIGS);
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_sub_1_itch(RLC_FP_DIGS));
-	dig_t r = mpn_sec_sub_1(c, a, RLC_FP_DIGS, digit, t);
-	RLC_FREE(t);
-	return r;
-}
-
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = mpn_sub_n(c, a, b, RLC_FP_DIGS);
-	mpn_cnd_add_n(carry, c, c, fp_prime_get(), RLC_FP_DIGS);
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS);
-	mpn_cnd_sub_n(carry, c + RLC_FP_DIGS, c + RLC_FP_DIGS,
-		fp_prime_get(), RLC_FP_DIGS);
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	if (fp_is_zero(a)) {
-		fp_zero(c);
-	} else {
-		mpn_sub_n(c, fp_prime_get(), a, RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	return mpn_add_n(c, a, a, RLC_FP_DIGS);
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = mpn_add_n(c, a, a, RLC_FP_DIGS);
-	dig_t cond = dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT;
-	mpn_cnd_sub_n(carry | cond, c, c, fp_prime_get(), RLC_FP_DIGS);
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-    dig_t carry = mpn_cnd_add_n(a[0] & 1, c, a, fp_prime_get(), RLC_FP_DIGS);
-    mpn_rshift(c, c, RLC_FP_DIGS, 1);
-    c[RLC_FP_DIGS - 1] ^= ((dig_t)carry << (RLC_DIG - 1));
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_add_1_itch(RLC_FP_DIGS));
-	dig_t carry = mpn_cnd_add_n(a[0] & 1, c, a, fp_prime_get(), RLC_FP_DIGS);
-	mpn_sec_add_1(c + RLC_FP_DIGS, a + RLC_FP_DIGS, RLC_FP_DIGS, carry, t);
-	carry = mpn_rshift(c + RLC_FP_DIGS, c + RLC_FP_DIGS, RLC_FP_DIGS, 1);
-	mpn_rshift(c, c, RLC_FP_DIGS, 1);
-	c[RLC_FP_DIGS - 1] ^= ((dig_t)carry << (RLC_DIG - 1));
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_inv_low.c
deleted file mode 100644
index f9e5f8900e6e..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_inv_low.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	rlc_align dig_t u[RLC_FP_DIGS];
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_invert_itch(RLC_FP_DIGS));
-	mp_bitcnt_t cnt = 2 * RLC_FP_DIGS * GMP_NUMB_BITS;
-
-#if FP_RDC == MONTY
-	rlc_align dig_t s[2 * RLC_FP_DIGS];
-	dv_copy(s, a, RLC_FP_DIGS);
-	dv_zero(s + RLC_FP_DIGS, RLC_FP_DIGS);
-	fp_rdcn_low(u, s);
-#else
-	fp_copy(u, a);
-#endif
-
-	mpn_sec_invert(c, u, fp_prime_get(), RLC_FP_DIGS, cnt, t);
-
-#if FP_RDC == MONTY
-	dv_zero(s, RLC_FP_DIGS);
-	dv_copy(s + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	dig_t *v = RLC_ALLOCA(dig_t, mpn_sec_div_qr_itch(RLC_FP_DIGS, RLC_FP_DIGS));
-	mpn_sec_div_r(s, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS, v);
-	dv_copy(c, s, RLC_FP_DIGS);
-	RLC_FREE(v);
-#endif
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_mul_low.c
deleted file mode 100644
index b56c89068ff8..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_mul_low.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_mul_itch(RLC_FP_DIGS, RLC_FP_DIGS));
-	mpn_sec_mul(c, a, RLC_FP_DIGS, b, RLC_FP_DIGS, t);
-	RLC_FREE(t);
-}
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-	fp_muln_low(t, a, b);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_rdc_low.c
deleted file mode 100644
index 47e22535007c..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, 2 * RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] < 0) == (sform[i] < 0)) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] < 0) == (sform[0] < 0)) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_addm_low(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
-
-void fp_rdcn_low(dig_t *c, dig_t *a) {
-	dig_t r, u = *(fp_prime_get_rdc());
-	const dig_t *m = fp_prime_get();
-
-	for (int i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r = (dig_t)(*a * u);
-		*a = mpn_addmul_1(a, m, RLC_FP_DIGS, r);
-	}
-	fp_addm_low(c, a, a - RLC_FP_DIGS);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_shift_low.c
deleted file mode 100644
index ff52aaa70a7d..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_shift_low.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, 1);
-}
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, 1);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_sqr_low.c
deleted file mode 100644
index 1b36342b1f3d..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp-sec/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_alloc.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	dig_t *t = RLC_ALLOCA(dig_t, mpn_sec_sqr_itch(RLC_FP_DIGS));
-	mpn_sec_sqr(c, a, RLC_FP_DIGS, t);
-	RLC_FREE(t);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-	fp_sqrn_low(t, a);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_add_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_add_low.c
deleted file mode 100644
index 1c0cdfe9dbb7..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_add_low.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision addition and subtraction
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_add1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	return mpn_add_1(c, a, size, digit);
-}
-
-dig_t bn_addn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	return mpn_add_n(c, a, b, size);
-}
-
-dig_t bn_sub1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	return mpn_sub_1(c, a, size, digit);
-}
-
-dig_t bn_subn_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	return mpn_sub_n(c, a, b, size);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_div_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_div_low.c
deleted file mode 100644
index 96cc11eb9f96..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_div_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision division functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_divn_low(dig_t *c, dig_t *d, dig_t *a, int sa, dig_t *b, int sb) {
-	mpn_tdiv_qr(c, d, 0, a, sa, b, sb);
-}
-
-void bn_div1_low(dig_t *c, dig_t *d, const dig_t *a, int size, dig_t b) {
-	*d = mpn_divrem_1(c, 0, a, size, b);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_mod_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_mod_low.c
deleted file mode 100644
index f219a8a5b2f7..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_mod_low.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision integer modular reduction
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-#include <string.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void bn_modn_low(dig_t *c, const dig_t *a, int sa, const dig_t *m, int sm,
-		dig_t u) {
-	int i;
-	dig_t r, *tmpc;
-
-	tmpc = c;
-
-	for (i = 0; i < sa; i++, tmpc++, a++) {
-		*tmpc = *a;
-	}
-
-	tmpc = c;
-
-	for (i = 0; i < sm; i++, tmpc++) {
-		r = (dig_t)(*tmpc * u);
-		*tmpc = mpn_addmul_1(tmpc, m, sm, r);
-	}
-	if (mpn_add_n(c, c, tmpc, sm)) {
-		mpn_sub_n(c, c, m, sm);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_mul_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_mul_low.c
deleted file mode 100644
index 2229b6d2ef14..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_mul_low.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_mula_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	return mpn_addmul_1(c, a, size, digit);
-}
-
-dig_t bn_mul1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	return mpn_mul_1(c, a, size, digit);
-}
-
-void bn_muln_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	mpn_mul_n(c, a, b, size);
-}
-
-void bn_muld_low(dig_t *c, const dig_t *a, int sizea, const dig_t *b, int sizeb,
-		int low, int high) {
-	(void)low;
-	(void)high;
-	mpn_mul(c, a, sizea, b, sizeb);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_shift_low.c
deleted file mode 100644
index 0445b5ab8ad2..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_shift_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lsh1_low(dig_t *c, const dig_t *a, int size) {
-	return mpn_lshift(c, a, size, 1);
-}
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	return mpn_lshift(c, a, size, bits);
-}
-
-dig_t bn_rsh1_low(dig_t *c, const dig_t *a, int size) {
-	return mpn_rshift(c, a, size, 1);
-}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	return mpn_rshift(c, a, size, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_bn_sqr_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_bn_sqr_low.c
deleted file mode 100644
index 8ca81d3343d8..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_bn_sqr_low.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the multiple precision integer arithmetic multiplication
- * functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_sqra_low(dig_t *c, const dig_t *a, int size) {
-	dig_t c0, c1, digit = a[0];
-
-	c0 = mpn_addmul_1(c, a, size, a[0]);
-	c1 = mpn_add_1(c + size, c + size, 1, c0);
-	if (size > 1) {
-		c0 = mpn_addmul_1(c + 1, a + 1, size - 1, digit);
-		c1 += mpn_add_1(c + size, c + size, 1, c0);
-	}
-	return c1;
-}
-
-void bn_sqrn_low(dig_t *c, const dig_t *a, int size) {
-	mpn_mul_n(c, a, a, size);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fb_add_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fb_add_low.c
deleted file mode 100644
index ef4a876c4f7d..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fb_add_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include <gmp.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-
-	(*c) = (*a) ^ digit;
-	c++;
-	a++;
-	for (i = 0; i < RLC_FB_DIGS - 1; i++, a++, c++)
-		(*c) = (*a);
-}
-
-void fb_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	mpn_xor_n(c, a, b, RLC_FB_DIGS);
-}
-
-void fb_addd_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	mpn_xor_n(c, a, b, size);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fb_shift_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fb_shift_low.c
deleted file mode 100644
index 3ba5cf16c968..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fb_shift_low.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fb.h"
-#include "relic_util.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_lsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_lshift(c, a, RLC_FB_DIGS, 1);
-}
-
-dig_t fb_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FB_DIGS, bits);
-}
-
-dig_t fb_rsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_rshift(c, a, RLC_FB_DIGS, 1);
-}
-
-dig_t fb_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FB_DIGS, bits);
-}
-
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size) {
-	int i, j;
-	dig_t b1, b2;
-
-	j = RLC_DIG - bits;
-	b1 = a[0];
-	c[0] ^= (b1 << bits);
-	if (size == RLC_FB_DIGS) {
-		for (i = 1; i < RLC_FB_DIGS; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	} else {
-		for (i = 1; i < size; i++) {
-			b2 = a[i];
-			c[i] ^= ((b2 << bits) | (b1 >> j));
-			b1 = b2;
-		}
-	}
-	return (b1 >> j);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_add_low.c
deleted file mode 100644
index a445aa2d919b..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_add_low.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_add_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry;
-
-	carry = mpn_add_n(c, a, b, RLC_FP_DIGS);
-
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = mpn_sub_n(c, c, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry;
-
-	carry = mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-
-	if (carry || dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		mpn_sub_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_sub_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	if (mpn_sub_n(c, a, b, RLC_FP_DIGS)) {
-		mpn_add_n(c, c, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	if (mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS)) {
-		mpn_add_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	if (fp_is_zero(a)) {
-		fp_zero(c);
-	} else {
-		mpn_sub_n(c, fp_prime_get(), a, RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	return mpn_add_n(c, a, a, RLC_FP_DIGS);
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = mpn_add_n(c, a, a, RLC_FP_DIGS);
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-    dig_t carry = 0;
-
-    if (a[0] & 1) {
-            carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-    } else {
-            dv_copy(c, a, RLC_FP_DIGS);
-    }
-    mpn_rshift(c, c, RLC_FP_DIGS, 1);
-    if (carry) {
-            c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-    }
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-
-	mpn_add_1(c + RLC_FP_DIGS, a + RLC_FP_DIGS, RLC_FP_DIGS, carry);
-
-	carry = mpn_rshift(c + RLC_FP_DIGS, c + RLC_FP_DIGS, RLC_FP_DIGS, 1);
-	mpn_rshift(c, c, RLC_FP_DIGS, 1);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_inv_low.c
deleted file mode 100644
index f6d6659bec0d..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_inv_low.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_mul_low.c
deleted file mode 100644
index 223567b02116..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_mul_low.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	mpn_mul_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-
-	fp_muln_low(t, a, b);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_rdc_low.c
deleted file mode 100644
index d8953cf9c244..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, 2 * RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] < 0) == (sform[i] < 0)) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] < 0) == (sform[0] < 0)) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_addm_low(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
-
-void fp_rdcn_low(dig_t *c, dig_t *a) {
-	dig_t r, u = *(fp_prime_get_rdc());
-	const dig_t *m = fp_prime_get();
-
-	for (int i = 0; i < RLC_FP_DIGS; i++, a++) {
-		r = (dig_t)(*a * u);
-		*a = mpn_addmul_1(a, m, RLC_FP_DIGS, r);
-	}
-	fp_addm_low(c, a, a - RLC_FP_DIGS);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_shift_low.c
deleted file mode 100644
index fd176b9f48a0..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_shift_low.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, 1);
-}
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rsh1_low(dig_t *c, const dig_t *a) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, 1);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/gmp/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/gmp/relic_fp_sqr_low.c
deleted file mode 100644
index 740291f2b818..000000000000
--- a/src/dashbls/depends/relic/src/low/gmp/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	mpn_mul_n(c, a, a, RLC_FP_DIGS);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	rlc_align dig_t t[2 * RLC_FP_DIGS];
-
-	fp_sqrn_low(t, a);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_163_ld.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_163_ld.inc
deleted file mode 100644
index 494690dd91bf..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_163_ld.inc
+++ /dev/null
@@ -1,2344 +0,0 @@
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,-2(r1)
-
-    /* COL_WRITE_MOV */
-    mov -2(r1),0(r15)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_MOV */
-    mov r5,2(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,4(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,6(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,8(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,10(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,12(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,14(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,16(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,18(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_MOV */
-    mov -2(r1),20(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    /* SUB */
-    sub #22,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*10,r15
-    mov @r15+,r4
-    
-    
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-
-    mov r5,2*0(r15)
-    mov r6,2*1(r15)
-    mov r7,2*2(r15)
-    mov r8,2*3(r15)
-    mov r9,2*4(r15)
-    mov r10,2*5(r15)
-    mov r11,2*6(r15)
-    mov r12,2*7(r15)
-    mov r13,2*8(r15)
-    mov -2(r1),2*9(r15)
-    
-    sub #2*11,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    mov @r15+,-2(r1)
-    mov @r15+,-4(r1)
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    mov r5,-2*11(r15)
-    mov r6,-2*10(r15)
-    mov r7,-2*9(r15)
-    mov r8,-2*8(r15)
-    mov r9,-2*7(r15)
-    mov r10,-2*6(r15)
-    mov r11,-2*5(r15)
-    mov r12,-2*4(r15)
-    mov r13,-2*3(r15)
-    mov -2(r1),-2*2(r15)
-    mov -4(r1),-2*1(r15)
-
-    /* SUB */
-    sub #22,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,16(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),18(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,20(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* SUB */
-    sub #22,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*10,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    xor @r15+,-2(r1)
-    xor @r15+,r5
-    sub #2*10,r15
-
-    
-    rla r4
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-
-    mov r6,2*0(r15)
-    mov r7,2*1(r15)
-    mov r8,2*2(r15)
-    mov r9,2*3(r15)
-    mov r10,2*4(r15)
-    mov r11,2*5(r15)
-    mov r12,2*6(r15)
-    mov r13,2*7(r15)
-    mov -2(r1),2*8(r15)
-    mov r5,2*9(r15)
-    
-    sub #2*11,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    mov @r15+,-2(r1)
-    mov @r15+,-4(r1)
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    mov r5,-2*11(r15)
-    mov r6,-2*10(r15)
-    mov r7,-2*9(r15)
-    mov r8,-2*8(r15)
-    mov r9,-2*7(r15)
-    mov r10,-2*6(r15)
-    mov r11,-2*5(r15)
-    mov r12,-2*4(r15)
-    mov r13,-2*3(r15)
-    mov -2(r1),-2*2(r15)
-    mov -4(r1),-2*1(r15)
-
-    /* SUB */
-    sub #22,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),16(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,18(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,20(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* SUB */
-    sub #22,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*10,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    xor @r15+,-2(r1)
-    xor @r15+,r5
-    xor @r15+,r6
-    sub #2*10,r15
-
-    
-    rla r4
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r4
-
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r4
-
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r4
-
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-
-    mov r7,2*0(r15)
-    mov r8,2*1(r15)
-    mov r9,2*2(r15)
-    mov r10,2*3(r15)
-    mov r11,2*4(r15)
-    mov r12,2*5(r15)
-    mov r13,2*6(r15)
-    mov -2(r1),2*7(r15)
-    mov r5,2*8(r15)
-    mov r6,2*9(r15)
-    
-    sub #2*11,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    mov @r15+,-2(r1)
-    mov @r15+,-4(r1)
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -2(r1)
-    rlc -4(r1)
-    rlc r4
-
-    mov r5,-2*11(r15)
-    mov r6,-2*10(r15)
-    mov r7,-2*9(r15)
-    mov r8,-2*8(r15)
-    mov r9,-2*7(r15)
-    mov r10,-2*6(r15)
-    mov r11,-2*5(r15)
-    mov r12,-2*4(r15)
-    mov r13,-2*3(r15)
-    mov -2(r1),-2*2(r15)
-    mov -4(r1),-2*1(r15)
-
-    /* SUB */
-    sub #22,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,0(r15)
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,2(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,4(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,6(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,8(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,10(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,12(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),14(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,16(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,18(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,20(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r8,22(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,24(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,26(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,28(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,30(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,32(r15)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),34(r15)
-
-    /* COL_WRITE_XOR */
-    xor r5,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,40(r15)
-
-    /* SUB */
-    sub #22,r14
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld.inc
deleted file mode 100644
index c9993ebe2a84..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld.inc
+++ /dev/null
@@ -1,6416 +0,0 @@
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,16(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,18(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,20(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,22(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,24(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,26(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,28(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,30(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,32(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r7,34(r15)
-
-    /* COL_WRITE_MOV */
-    mov r8,36(r15)
-
-    /* COL_WRITE_MOV */
-    mov r9,38(r15)
-
-    /* COL_WRITE_MOV */
-    mov r10,40(r15)
-
-    /* COL_WRITE_MOV */
-    mov r11,42(r15)
-
-    /* COL_WRITE_MOV */
-    mov r12,44(r15)
-
-    /* COL_WRITE_MOV */
-    mov r13,46(r15)
-
-    /* COL_WRITE_MOV */
-    mov r6,48(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,18(r15)
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,20(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,22(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,24(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,26(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,28(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,30(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,32(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,34(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,36(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,38(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,40(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,42(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,44(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,46(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,48(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,50(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r8,52(r15)
-
-    /* COL_WRITE_MOV */
-    mov r9,54(r15)
-
-    /* COL_WRITE_MOV */
-    mov r10,56(r15)
-
-    /* COL_WRITE_MOV */
-    mov r11,58(r15)
-
-    /* COL_WRITE_MOV */
-    mov r12,60(r15)
-
-    /* COL_WRITE_MOV */
-    mov r13,62(r15)
-
-    /* COL_WRITE_MOV */
-    mov r6,64(r15)
-
-    /* COL_WRITE_MOV */
-    mov r7,66(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST_LAST_7 */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-
-    mov r5,-2*7(r15)
-    mov r6,-2*6(r15)
-    mov r7,-2*5(r15)
-    mov r8,-2*4(r15)
-    mov r9,-2*3(r15)
-    mov r10,-2*2(r15)
-    mov r11,-2*1(r15)
-    
-    sub #2*34,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,0(r15)
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,2(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,4(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,6(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,8(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,10(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,12(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,14(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,16(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,18(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,20(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,22(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,24(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,26(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,28(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,30(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,32(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r9,34(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,48(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,18(r15)
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,20(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,22(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,24(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,26(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,28(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,30(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,32(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,34(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,36(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,38(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,40(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,42(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,44(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,46(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,48(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,50(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r10,52(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,66(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST_LAST_7 */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-
-    mov r5,-2*7(r15)
-    mov r6,-2*6(r15)
-    mov r7,-2*5(r15)
-    mov r8,-2*4(r15)
-    mov r9,-2*3(r15)
-    mov r10,-2*2(r15)
-    mov r11,-2*1(r15)
-    
-    sub #2*34,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,0(r15)
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,2(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,4(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,6(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,8(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,10(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,12(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,14(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,16(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,18(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,20(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,22(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,24(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,26(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,28(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,30(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,32(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r11,34(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,48(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,18(r15)
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,20(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,22(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,24(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,26(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,28(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,30(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,32(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,34(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,36(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,38(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,40(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,42(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,44(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,46(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,48(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,50(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r12,52(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,66(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST_LAST_7 */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-
-    mov r5,-2*7(r15)
-    mov r6,-2*6(r15)
-    mov r7,-2*5(r15)
-    mov r8,-2*4(r15)
-    mov r9,-2*3(r15)
-    mov r10,-2*2(r15)
-    mov r11,-2*1(r15)
-    
-    sub #2*34,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,0(r15)
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,2(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,4(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,6(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,8(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,10(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,12(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,14(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,16(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,18(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,20(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,22(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,24(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,26(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,28(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,30(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,32(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r13,34(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,48(r15)
-
-    /* SUB */
-    sub #34,r14
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,18(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,20(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,22(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,24(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,26(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,28(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,30(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,32(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,34(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,36(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,38(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,40(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,42(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,44(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,46(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,48(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,50(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r6,52(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,66(r15)
-
-    /* SUB */
-    sub #34,r14
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld_k2.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld_k2.inc
deleted file mode 100644
index 243caa02518d..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_271_ld_k2.inc
+++ /dev/null
@@ -1,1884 +0,0 @@
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_MOV */
-    mov r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r5
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,16(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #18,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*8,r15
-    mov @r15+,r4
-    
-    
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r5,2*0(r15)
-    mov r6,2*1(r15)
-    mov r7,2*2(r15)
-    mov r8,2*3(r15)
-    mov r9,2*4(r15)
-    mov r10,2*5(r15)
-    mov r11,2*6(r15)
-    mov r12,2*7(r15)
-    mov r13,2*8(r15)
-    
-    sub #2*9,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #18,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r5
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,16(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #18,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*8,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r5
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    sub #2*9,r15
-
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r5,2*0(r15)
-    mov r6,2*1(r15)
-    mov r7,2*2(r15)
-    mov r8,2*3(r15)
-    mov r9,2*4(r15)
-    mov r10,2*5(r15)
-    mov r11,2*6(r15)
-    mov r12,2*7(r15)
-    mov r13,2*8(r15)
-    
-    sub #2*9,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #18,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r5
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,16(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #18,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*8,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r5
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    sub #2*9,r15
-
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r5,2*0(r15)
-    mov r6,2*1(r15)
-    mov r7,2*2(r15)
-    mov r8,2*3(r15)
-    mov r9,2*4(r15)
-    mov r10,2*5(r15)
-    mov r11,2*6(r15)
-    mov r12,2*7(r15)
-    mov r13,2*8(r15)
-    
-    sub #2*9,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #18,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r5
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,16(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r5,18(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,20(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,22(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,24(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,26(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,28(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,30(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,32(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,34(r15)
-
-    /* SUB */
-    sub #18,r14
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_283_ld.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_283_ld.inc
deleted file mode 100644
index 501b0bb40569..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_283_ld.inc
+++ /dev/null
@@ -1,6776 +0,0 @@
-
-    clr 2*(2*18 - 1)(r15)
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,16(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,18(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,20(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,22(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,24(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,26(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,28(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,30(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,32(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,34(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r8,36(r15)
-
-    /* COL_WRITE_MOV */
-    mov r9,38(r15)
-
-    /* COL_WRITE_MOV */
-    mov r10,40(r15)
-
-    /* COL_WRITE_MOV */
-    mov r11,42(r15)
-
-    /* COL_WRITE_MOV */
-    mov r12,44(r15)
-
-    /* COL_WRITE_MOV */
-    mov r13,46(r15)
-
-    /* COL_WRITE_MOV */
-    mov r6,48(r15)
-
-    /* COL_WRITE_MOV */
-    mov r7,50(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,18(r15)
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,20(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,22(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,24(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,26(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,28(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,30(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,32(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,34(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,36(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,38(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,40(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,42(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,44(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,46(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,48(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,50(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,52(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r10,54(r15)
-
-    /* COL_WRITE_MOV */
-    mov r11,56(r15)
-
-    /* COL_WRITE_MOV */
-    mov r12,58(r15)
-
-    /* COL_WRITE_MOV */
-    mov r13,60(r15)
-
-    /* COL_WRITE_MOV */
-    mov r6,62(r15)
-
-    /* COL_WRITE_MOV */
-    mov r7,64(r15)
-
-    /* COL_WRITE_MOV */
-    mov r8,66(r15)
-
-    /* COL_WRITE_MOV */
-    mov r9,68(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #72,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,0(r15)
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,2(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,4(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,6(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,8(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,10(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,12(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,14(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,16(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,18(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,20(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,22(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,24(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,26(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,28(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,30(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,32(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,34(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r12,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,48(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,50(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,18(r15)
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,20(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,22(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,24(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,26(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,28(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,30(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,32(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,34(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,36(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,38(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,40(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,42(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,44(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,46(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,48(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,50(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,52(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r6,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,66(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,68(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #72,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,16(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,18(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,20(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,22(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,24(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,26(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,28(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,30(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,32(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,34(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r8,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,48(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,50(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,18(r15)
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,20(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,22(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,24(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,26(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,28(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,30(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,32(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,34(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,36(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,38(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,40(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,42(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,44(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,46(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,48(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,50(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,52(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r10,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,66(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,68(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SHIFT_FAST_CARRY */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-
-    /* SUB */
-    sub #72,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,0(r15)
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,2(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,4(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,6(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,8(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,10(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,12(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,14(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,16(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,18(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,20(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,22(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,24(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,26(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,28(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,30(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,32(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,34(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r12,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,38(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,44(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,46(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,48(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,50(r15)
-
-    /* SUB */
-    sub #36,r14
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    mov @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,18(r15)
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,20(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,22(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,24(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,26(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,28(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,30(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,32(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,34(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,36(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,38(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,40(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,42(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,44(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,46(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,48(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,50(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    mov r4,r5
-    rla r4
-    rla r4
-    rla r4
-    add r5,r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #18,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,52(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r6,54(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,56(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,58(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,60(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,62(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,64(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,66(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,68(r15)
-
-    /* SUB */
-    sub #36,r14
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k2.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k2.inc
deleted file mode 100644
index 1341e7e2999a..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k2.inc
+++ /dev/null
@@ -1,2698 +0,0 @@
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,-4(r1)
-
-    /* COL_WRITE_MOV */
-    mov -4(r1),0(r15)
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_MOV */
-    mov -2(r1),2(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_MOV */
-    mov r5,4(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,6(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,8(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,10(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,12(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,14(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,16(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,18(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,20(r15)
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-4(r1)
-
-    /* COL_WRITE_MOV */
-    mov -4(r1),22(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    /* SUB */
-    sub #24,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*11,r15
-    mov @r15+,r4
-    
-    
-    
-    rla r4
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc r4
-
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc r4
-
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc r4
-
-    rlc -2(r1)
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-
-    mov -2(r1),2*0(r15)
-    mov r5,2*1(r15)
-    mov r6,2*2(r15)
-    mov r7,2*3(r15)
-    mov r8,2*4(r15)
-    mov r9,2*5(r15)
-    mov r10,2*6(r15)
-    mov r11,2*7(r15)
-    mov r12,2*8(r15)
-    mov r13,2*9(r15)
-    mov -4(r1),2*10(r15)
-    
-    sub #2*12,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-    
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    mov r5,-2*3(r15)
-    mov r6,-2*2(r15)
-    mov r7,-2*1(r15)
-
-    /* SUB */
-    sub #24,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),0(r15)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,2(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,4(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,6(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,8(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,10(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,12(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,14(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,16(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,18(r15)
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-4(r1)
-
-    /* COL_WRITE_XOR */
-    xor -4(r1),20(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),22(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    /* SUB */
-    sub #24,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*11,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r5
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    xor @r15+,-4(r1)
-    xor @r15+,-2(r1)
-    sub #2*11,r15
-
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-
-    mov r5,2*0(r15)
-    mov r6,2*1(r15)
-    mov r7,2*2(r15)
-    mov r8,2*3(r15)
-    mov r9,2*4(r15)
-    mov r10,2*5(r15)
-    mov r11,2*6(r15)
-    mov r12,2*7(r15)
-    mov r13,2*8(r15)
-    mov -4(r1),2*9(r15)
-    mov -2(r1),2*10(r15)
-    
-    sub #2*12,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-    
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    mov r5,-2*3(r15)
-    mov r6,-2*2(r15)
-    mov r7,-2*1(r15)
-
-    /* SUB */
-    sub #24,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,0(r15)
-
-    mov @r4+,r6
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,2(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,4(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,6(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,8(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,10(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,12(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,14(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,16(r15)
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-4(r1)
-
-    /* COL_WRITE_XOR */
-    xor -4(r1),18(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),20(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,22(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* SUB */
-    sub #24,r14
-
-    /* SHIFT_FAST_KARATSUBA */
-    add #2*11,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_FAST_KARATSUBA_XORS */
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    xor @r15+,-4(r1)
-    xor @r15+,-2(r1)
-    xor @r15+,r5
-    sub #2*11,r15
-
-    
-    rla r4
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r5
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc -4(r1)
-    rlc -2(r1)
-    rlc r5
-
-    mov r6,2*0(r15)
-    mov r7,2*1(r15)
-    mov r8,2*2(r15)
-    mov r9,2*3(r15)
-    mov r10,2*4(r15)
-    mov r11,2*5(r15)
-    mov r12,2*6(r15)
-    mov r13,2*7(r15)
-    mov -4(r1),2*8(r15)
-    mov -2(r1),2*9(r15)
-    mov r5,2*10(r15)
-    
-    sub #2*12,r15
-
-    clr r4
-
-    /* SHIFT_FAST */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    mov @r15+,r13
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    mov r5,-2*9(r15)
-    mov r6,-2*8(r15)
-    mov r7,-2*7(r15)
-    mov r8,-2*6(r15)
-    mov r9,-2*5(r15)
-    mov r10,-2*4(r15)
-    mov r11,-2*3(r15)
-    mov r12,-2*2(r15)
-    mov r13,-2*1(r15)
-    
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    swpb r4
-    
-    rla r4
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    rlc r5
-    rlc r6
-    rlc r7
-    rlc r4
-
-    mov r5,-2*3(r15)
-    mov r6,-2*2(r15)
-    mov r7,-2*1(r15)
-
-    /* SUB */
-    sub #24,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-4(r1)
-
-    /* COL_WRITE_XOR */
-    xor -4(r1),16(r15)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    mov @r4+,-4(r1)
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,-2(r1)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),18(r15)
-
-    xor @r4+,r5
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    mov @r4+,-2(r1)
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r5
-
-    /* COL_WRITE_XOR */
-    xor r5,20(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    mov @r4+,r5
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,22(r15)
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,-4(r1)
-
-    xor @r4+,-2(r1)
-
-    xor @r4+,r5
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r7,24(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,26(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,28(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,30(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,32(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,34(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,36(r15)
-
-    /* COL_WRITE_XOR */
-    xor -4(r1),38(r15)
-
-    /* COL_WRITE_XOR */
-    xor -2(r1),40(r15)
-
-    /* COL_WRITE_XOR */
-    xor r5,42(r15)
-
-    /* COL_WRITE_XOR */
-    xor r6,44(r15)
-
-    /* SUB */
-    sub #24,r14
-
-    /* CLR */
-    clr 46(r15)
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k3.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k3.inc
deleted file mode 100644
index f8f854687d5c..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_mul_353_ld_k3.inc
+++ /dev/null
@@ -1,1603 +0,0 @@
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_MOV */
-    mov r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_MOV */
-    mov r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_MOV */
-    mov r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_MOV */
-    mov r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_MOV */
-    mov r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_MOV */
-    mov r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_MOV */
-    mov r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_3 */
-    mov @r14+,r4
-    swpb r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_MOV */
-    mov r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #16,r14
-
-    /* SHIFT_HIGH */
-    add #2*7,r15
-    mov @r15+,r4
-    
-    
-    
-    rla r4
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r6,2*0(r15)
-    mov r7,2*1(r15)
-    mov r8,2*2(r15)
-    mov r9,2*3(r15)
-    mov r10,2*4(r15)
-    mov r11,2*5(r15)
-    mov r12,2*6(r15)
-    mov r13,2*7(r15)
-    
-    sub #2*8,r15
-
-    /* SHIFT_LOW */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    mov r5,-2*8(r15)
-    mov r6,-2*7(r15)
-    mov r7,-2*6(r15)
-    mov r8,-2*5(r15)
-    mov r9,-2*4(r15)
-    mov r10,-2*3(r15)
-    mov r11,-2*2(r15)
-    mov r12,-2*1(r15)
-
-    /* SUB */
-    sub #16,r15
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_2 */
-    mov @r14+,r4
-    swpb r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #16,r14
-
-    /* SHIFT_HIGH */
-    add #2*7,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_HIGH_XORS */
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    sub #2*8,r15
-
-    
-    rla r4
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r6,2*0(r15)
-    mov r7,2*1(r15)
-    mov r8,2*2(r15)
-    mov r9,2*3(r15)
-    mov r10,2*4(r15)
-    mov r11,2*5(r15)
-    mov r12,2*6(r15)
-    mov r13,2*7(r15)
-    
-    sub #2*8,r15
-
-    /* SHIFT_LOW */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    mov r5,-2*8(r15)
-    mov r6,-2*7(r15)
-    mov r7,-2*6(r15)
-    mov r8,-2*5(r15)
-    mov r9,-2*4(r15)
-    mov r10,-2*3(r15)
-    mov r11,-2*2(r15)
-    mov r12,-2*1(r15)
-
-    /* SUB */
-    sub #16,r15
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_1 */
-    mov @r14+,r4
-    rra r4
-    rra r4
-    rra r4
-    rra r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* SUB */
-    sub #16,r14
-
-    /* SHIFT_HIGH */
-    add #2*7,r15
-    mov @r15+,r4
-    
-    
-    /* SHIFT_HIGH_XORS */
-    xor @r15+,r6
-    xor @r15+,r7
-    xor @r15+,r8
-    xor @r15+,r9
-    xor @r15+,r10
-    xor @r15+,r11
-    xor @r15+,r12
-    xor @r15+,r13
-    sub #2*8,r15
-
-    
-    rla r4
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-    rlc r4
-
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-    rlc r13
-
-    mov r6,2*0(r15)
-    mov r7,2*1(r15)
-    mov r8,2*2(r15)
-    mov r9,2*3(r15)
-    mov r10,2*4(r15)
-    mov r11,2*5(r15)
-    mov r12,2*6(r15)
-    mov r13,2*7(r15)
-    
-    sub #2*8,r15
-
-    /* SHIFT_LOW */
-    mov @r15+,r5
-    mov @r15+,r6
-    mov @r15+,r7
-    mov @r15+,r8
-    mov @r15+,r9
-    mov @r15+,r10
-    mov @r15+,r11
-    mov @r15+,r12
-    
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    rla r5
-    rlc r6
-    rlc r7
-    rlc r8
-    rlc r9
-    rlc r10
-    rlc r11
-    rlc r12
-
-    mov r5,-2*8(r15)
-    mov r6,-2*7(r15)
-    mov r7,-2*6(r15)
-    mov r8,-2*5(r15)
-    mov r9,-2*4(r15)
-    mov r10,-2*3(r15)
-    mov r11,-2*2(r15)
-    mov r12,-2*1(r15)
-
-    /* SUB */
-    sub #16,r15
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    mov @r4+,r6
-
-    /* COL_WRITE_XOR */
-    xor r6,0(r15)
-
-    mov @r4+,r7
-
-    mov @r4+,r8
-
-    mov @r4+,r9
-
-    mov @r4+,r10
-
-    mov @r4+,r11
-
-    mov @r4+,r12
-
-    mov @r4+,r13
-
-    mov @r4+,r6
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r7
-
-    /* COL_WRITE_XOR */
-    xor r7,2(r15)
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    mov @r4+,r7
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r8
-
-    /* COL_WRITE_XOR */
-    xor r8,4(r15)
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    mov @r4+,r8
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r9
-
-    /* COL_WRITE_XOR */
-    xor r9,6(r15)
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    mov @r4+,r9
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r10
-
-    /* COL_WRITE_XOR */
-    xor r10,8(r15)
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    mov @r4+,r10
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r11
-
-    /* COL_WRITE_XOR */
-    xor r11,10(r15)
-
-    xor @r4+,r12
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    mov @r4+,r11
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r12
-
-    /* COL_WRITE_XOR */
-    xor r12,12(r15)
-
-    xor @r4+,r13
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    mov @r4+,r12
-
-    /* INDEX_READ_0 */
-    mov @r14+,r4
-    and #0xF,r4
-
-    /* INDEX_MULT */
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    rla r4
-    
-    add r1,r4
-    add #0,r4
-
-    xor @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r13,14(r15)
-
-    xor @r4+,r6
-
-    xor @r4+,r7
-
-    xor @r4+,r8
-
-    xor @r4+,r9
-
-    xor @r4+,r10
-
-    xor @r4+,r11
-
-    xor @r4+,r12
-
-    mov @r4+,r13
-
-    /* COL_WRITE_XOR */
-    xor r6,16(r15)
-
-    /* COL_WRITE_XOR */
-    xor r7,18(r15)
-
-    /* COL_WRITE_XOR */
-    xor r8,20(r15)
-
-    /* COL_WRITE_XOR */
-    xor r9,22(r15)
-
-    /* COL_WRITE_XOR */
-    xor r10,24(r15)
-
-    /* COL_WRITE_XOR */
-    xor r11,26(r15)
-
-    /* COL_WRITE_XOR */
-    xor r12,28(r15)
-
-    /* COL_WRITE_XOR */
-    xor r13,30(r15)
-
-    /* SUB */
-    sub #16,r14
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_271_penta.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_271_penta.inc
deleted file mode 100644
index f60959b8318e..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_271_penta.inc
+++ /dev/null
@@ -1,498 +0,0 @@
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    mov r5,2*(0+3)(r1)
-    mov r5,2*(0+5)(r1)
-    mov r5,2*(0+6)(r1)
-    mov r5,2*(0+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r7,2*0(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    mov r5,2*(1+3)(r1)
-    xor r5,2*(1+5)(r1)
-    mov r5,2*(1+6)(r1)
-    mov r5,2*(1+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r7,2*1(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(2+3)(r1)
-    xor r5,2*(2+5)(r1)
-    xor r5,2*(2+6)(r1)
-    mov r5,2*(2+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r7,2*2(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(3+3)(r1)
-    xor r5,2*(3+5)(r1)
-    xor r5,2*(3+6)(r1)
-    mov r5,2*(3+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    xor r7,2*3(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(4+3)(r1)
-    xor r5,2*(4+5)(r1)
-    xor r5,2*(4+6)(r1)
-    mov r5,2*(4+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    xor r7,2*4(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(5+3)(r1)
-    xor r5,2*(5+5)(r1)
-    xor r5,2*(5+6)(r1)
-    mov r5,2*(5+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    xor r7,2*5(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(6+3)(r1)
-    xor r5,2*(6+5)(r1)
-    xor r5,2*(6+6)(r1)
-    mov r5,2*(6+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    xor r7,2*6(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(7+3)(r1)
-    xor r5,2*(7+5)(r1)
-    xor r5,2*(7+6)(r1)
-    mov r5,2*(7+8)(r1)
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    xor r7,2*7(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r8: odd, high, in low byte (carry)
-    mov.b fb_srt_table_odds(r4),r8
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    xor r7,2*8(r1)
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, low, in high byte
-    swpb r5
-    //add carry
-    //r5: odd
-    bis r8,r5
-
-    xor r5,2*(8+3)(r1)
-    xor r5,2*(8+5)(r1)
-    xor r5,2*(8+6)(r1)
-    mov r5,2*(8+8)(r1)
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_353_trino.inc b/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_353_trino.inc
deleted file mode 100644
index 263315d59a83..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fb_srt_353_trino.inc
+++ /dev/null
@@ -1,667 +0,0 @@
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    mov r7,2*0(r1)
-
-    mov r8,2*(0+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(0+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    mov r7,2*1(r1)
-
-    mov r8,2*(1+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(1+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    mov r7,2*2(r1)
-
-    mov r8,2*(2+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(2+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*3(r1)
-
-    mov r8,2*(3+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(3+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*4(r1)
-
-    mov r8,2*(4+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(4+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*5(r1)
-
-    mov r8,2*(5+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(5+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*6(r1)
-
-    mov r8,2*(6+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(6+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*7(r1)
-
-    mov r8,2*(7+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(7+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*8(r1)
-
-    xor r8,2*(8+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(8+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*9(r1)
-
-    xor r8,2*(9+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(9+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    //r7: even, low
-    mov.b fb_srt_table_evens(r4),r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    //r5: odd, low
-    mov.b fb_srt_table_odds(r4),r8
-
-
-    mov @r14+,r4
-
-    mov r4,r5
-    mov r4,r6
-    and #0x55,r4
-    swpb r5
-    rla r5
-    and #0xAA,r5
-    bis r5,r4
-    mov.b fb_srt_table_evens(r4),r5
-    //r5: even, high
-    swpb r5
-    //r7: even
-    bis r5,r7
-
-    mov r6,r4
-    and #0xAA,r4
-    swpb r6
-    rra r6
-    and #0x55,r6
-    bis r6,r4
-    mov.b fb_srt_table_odds(r4),r5
-    //r5: odd, high
-    swpb r5
-    //r8: odd
-    bis r5,r8
-    
-    xor r7,2*10(r1)
-
-    xor r8,2*(10+3)(r1)
-    
-    rrc r9
-    rlc r8
-    rlc r9
-    
-    mov r8,2*(10+11)(r1)
-
-    //reads a[i]
-    mov @r14+,r4
-
-    xor r4,2*11(r1)
-    
-    mov r9,2*(11+11)(r1)
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_160_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_160_comba.inc
deleted file mode 100644
index c5f3158b6700..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_160_comba.inc
+++ /dev/null
@@ -1,376 +0,0 @@
-
-    push r2
-    dint
-    nop
-    bis #MPYDLYWRTEN,&MPY32CTL0
-    bic #MPYDLY32,&MPY32CTL0
-    mov #SUMEXT,r12
-    mov #RES0,r10
-    clr r11
-
-    /* STEP_FIRST */
-    mov @r15+,&MPY32L
-    mov @r15+,&MPY32H
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_FIRST */
-    nop
-    mov @r10+,2*0(r13)
-    mov @r10+,2*(0+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr &RES3
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*2(r14),r4
-    mov 2*(2+1)(r14),r5
-
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*2(r13)
-    add @r12,r11
-    mov @r10+,2*(2+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*4(r14),r6
-    mov 2*(4+1)(r14),r7
-
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*4(r13)
-    add @r12,r11
-    mov @r10+,2*(4+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*6(r14),r8
-    mov 2*(6+1)(r14),r9
-
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*6(r13)
-    add @r12,r11
-    mov @r10+,2*(6+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*8(r13)
-    add @r12,r11
-    mov @r10+,2*(8+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*10(r13)
-    add @r12,r11
-    mov @r10+,2*(10+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*8(r14),r4
-    mov 2*(8+1)(r14),r5
-
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*12(r13)
-    add @r12,r11
-    mov @r10+,2*(12+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*14(r13)
-    add @r12,r11
-    mov @r10+,2*(14+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*16(r13)
-    add @r12,r11
-    mov @r10+,2*(16+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*10,r15
-
-    /* END */
-    mov @r10+,2*18(r13)
-    mov @r10,2*(18+1)(r13)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_256_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_256_comba.inc
deleted file mode 100644
index c6c7d857bd86..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul32_256_comba.inc
+++ /dev/null
@@ -1,817 +0,0 @@
-
-    push r2
-    dint
-    nop
-    bis #MPYDLYWRTEN,&MPY32CTL0
-    bic #MPYDLY32,&MPY32CTL0
-    mov #SUMEXT,r12
-    mov #RES0,r10
-    clr r11
-
-    /* STEP_FIRST */
-    mov @r15+,&MPY32L
-    mov @r15+,&MPY32H
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_FIRST */
-    nop
-    mov @r10+,2*0(r13)
-    mov @r10+,2*(0+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr &RES3
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*2(r14),r4
-    mov 2*(2+1)(r14),r5
-
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*2(r13)
-    add @r12,r11
-    mov @r10+,2*(2+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*4(r14),r6
-    mov 2*(4+1)(r14),r7
-
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*4(r13)
-    add @r12,r11
-    mov @r10+,2*(4+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*6(r14),r8
-    mov 2*(6+1)(r14),r9
-
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*6(r13)
-    add @r12,r11
-    mov @r10+,2*(6+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*8(r13)
-    add @r12,r11
-    mov @r10+,2*(8+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*10,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*10(r13)
-    add @r12,r11
-    mov @r10+,2*(10+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*12,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*12(r14),&OP2L
-    mov 2*(12+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*12(r13)
-    add @r12,r11
-    mov @r10+,2*(12+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*14,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*14(r14),&OP2L
-    mov 2*(14+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*12(r14),&OP2L
-    mov 2*(12+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2L
-    mov 2*(0+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*14(r13)
-    add @r12,r11
-    mov @r10+,2*(14+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*14,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*14(r14),&OP2L
-    mov 2*(14+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*12(r14),&OP2L
-    mov 2*(12+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*16(r13)
-    add @r12,r11
-    mov @r10+,2*(16+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*12,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov 2*14(r14),r4
-    mov 2*(14+1)(r14),r5
-
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*12(r14),&OP2L
-    mov 2*(12+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*18(r13)
-    add @r12,r11
-    mov @r10+,2*(18+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*10,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*12(r14),r6
-    mov 2*(12+1)(r14),r7
-
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),&OP2L
-    mov 2*(10+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*20(r13)
-    add @r12,r11
-    mov @r10+,2*(20+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*10(r14),r8
-    mov 2*(10+1)(r14),r9
-
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2L
-    mov 2*(8+1)(r14),&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*22(r13)
-    add @r12,r11
-    mov @r10+,2*(22+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*24(r13)
-    add @r12,r11
-    mov @r10+,2*(24+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    add @r12,r11
-    
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*26(r13)
-    add @r12,r11
-    mov @r10+,2*(26+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC32L
-    mov @r15+,&MAC32H
-    
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10+,2*28(r13)
-    add @r12,r11
-    mov @r10+,2*(28+1)(r13)
-    mov @r10+,&RES0
-    mov @r10+,&RES1
-    sub #2*4,r10
-    mov r11,&RES2
-    clr r11
-    clr &RES3
-
-    /* DEC */
-    sub #2*16,r15
-
-    /* END */
-    mov @r10+,2*30(r13)
-    mov @r10,2*(30+1)(r13)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_128_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_128_comba.inc
deleted file mode 100644
index cee0e8cad62d..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_128_comba.inc
+++ /dev/null
@@ -1,623 +0,0 @@
-
-    push r2
-    dint
-    nop
-    mov #SUMEXT,r12
-    mov #RESLO,r10
-    mov #RESHI,r9
-    clr r11
-
-    /* STEP_FIRST */
-    mov @r15+,&MPY
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_FIRST */
-    nop
-    mov @r10,2*0(r13)
-    mov @r9,&RESLO
-    mov r11,&RESHI
-
-    /* DEC */
-    sub #2*1,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*1(r14),r4
-
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*1(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*2(r14),r5
-
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*2(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*3,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*3(r14),r6
-
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*3(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*4(r14),r7
-
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*4(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*5,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*5(r14),r8
-
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*5(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*6(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*7,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*7(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*7,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*8(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*7(r14),r4
-
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*9(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*5,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),r5
-
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*10(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*11(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*3,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*12(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*13(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*1,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*14(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* END */
-    mov @r10,2*15(r13)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_160_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_160_comba.inc
deleted file mode 100644
index cc9bf1bf1dd7..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_mul_160_comba.inc
+++ /dev/null
@@ -1,919 +0,0 @@
-
-    push r2
-    dint
-    nop
-    mov #SUMEXT,r12
-    mov #RESLO,r10
-    mov #RESHI,r9
-    clr r11
-
-    /* STEP_FIRST */
-    mov @r15+,&MPY
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_FIRST */
-    nop
-    mov @r10,2*0(r13)
-    mov @r9,&RESLO
-    mov r11,&RESHI
-
-    /* DEC */
-    sub #2*1,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*1(r14),r4
-
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*1(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*2(r14),r5
-
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*2(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*3,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*3(r14),r6
-
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*3(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*4(r14),r7
-
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*4(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*5,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*5(r14),r8
-
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*5(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*6(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*7,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*7(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*8(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*8(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*9,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*9(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*0(r14),&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*9(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*9,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*9(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r4,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*10(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*8,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov 2*9(r14),r4
-
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*8(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*11(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*7,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*8(r14),r5
-
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*12(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*6,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*7(r14),r6
-
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*13(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*5,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov 2*6(r14),r7
-
-    mov r7,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r8,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*14(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*4,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r7,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*15(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*3,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r6,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*16(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*2,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* STEP_THIRD_MORE */
-    mov @r15+,&MAC
-    add @r12,r11
-    
-    mov r5,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*17(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*1,r15
-
-    /* STEP_SECOND / STEP_THIRD_MORE_1 */
-    mov @r15+,&MAC
-    
-    mov r4,&OP2
-
-
-    /* COLUMN_END_SECOND_MORE */
-    nop
-    mov @r10,2*18(r13)
-    add @r12,r11
-    mov @r9,&RESLO
-    mov r11,&RESHI
-    clr r11
-
-    /* DEC */
-    sub #2*10,r15
-
-    /* END */
-    mov @r10,2*19(r13)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_160_montgomery_sparse.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_160_montgomery_sparse.inc
deleted file mode 100644
index ff83b016c8c7..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_160_montgomery_sparse.inc
+++ /dev/null
@@ -1,471 +0,0 @@
-
-  
-  clr r9
-  clr r10
-  clr r11
-  mov @r15+,r5
-  mov @r15+,r6
-  sub #2*2,r15
-  mov #RES0,r4
-  mov #SUMEXT,r8
-  push r2
-  dint
-  nop
-  bis #MPYDLYWRTEN,&MPY32CTL0
-  bic #MPYDLY32,&MPY32CTL0
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r5,&MPY32L
-  mov r6,&MPY32H
-  mov #1033,&OP2L
-  mov #27201,&OP2H
-  mov #13767,&MPY32L
-  mov #3232,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r9
-  addc @r15+,r10
-  adc r11
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #60544,&OP2L
-  mov #16799,&OP2H
-
-  /* COLEND_STAGE1_A_1STEP */
-  nop
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  sub #2*4,r4
-  mov r9,&MPY32L
-  mov r10,&MPY32H
-  mov #1033,&OP2L
-  mov #27201,&OP2H
-  mov #13767,&MPY32L
-  mov #3232,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r11
-  addc @r15+,r5
-  adc r6
-
-    /* DEC */
-    sub #2*6,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #49152,&OP2L
-  mov #32745,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #60544,&OP2L
-  mov #16799,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  add @r8,r10
-  sub #2*4,r4
-  mov r11,&MPY32L
-  mov r5,&MPY32H
-  mov #1033,&OP2L
-  mov #27201,&OP2H
-  mov #13767,&MPY32L
-  mov #3232,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r6
-  addc @r15+,r9
-  adc r10
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #28368,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #49152,&OP2L
-  mov #32745,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #60544,&OP2L
-  mov #16799,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  add @r8,r5
-  sub #2*4,r4
-  mov r6,&MPY32L
-  mov r9,&MPY32H
-  mov #1033,&OP2L
-  mov #27201,&OP2H
-  mov #13767,&MPY32L
-  mov #3232,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r10
-  addc @r15+,r11
-  adc r5
-
-    /* DEC */
-    sub #2*10,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #9216,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #28368,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #49152,&OP2L
-  mov #32745,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #60544,&OP2L
-  mov #16799,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  add @r8,r9
-  sub #2*4,r4
-  mov r10,&MPY32L
-  mov r11,&MPY32H
-  mov #1033,&OP2L
-  mov #27201,&OP2H
-  mov #13767,&MPY32L
-  mov #3232,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r5
-  addc @r15+,r6
-  adc r9
-
-
-  /* STATE CHANGE */
-
-
-    /* DEC */
-    sub #2*10,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #9216,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #28368,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #49152,&OP2L
-  mov #32745,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #60544,&OP2L
-  mov #16799,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  add @r8,r11
-  sub #2*4,r4
-  mov r5,2*0(r14)
-  mov r6,2*(0+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r5
-  clr r6
-  add 2*2(r15),r9
-  addc 2*(2+1)(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*6,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #9216,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #28368,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #49152,&OP2L
-  mov #32745,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  add @r8,r6
-  sub #2*4,r4
-  mov r9,2*2(r14)
-  mov r10,2*(2+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  clr r10
-  add 2*4(r15),r11
-  addc 2*(4+1)(r15),r5
-  adc r6
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #9216,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #28368,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  add @r8,r10
-  sub #2*4,r4
-  mov r11,2*4(r14)
-  mov r5,2*(4+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  clr r5
-  add 2*6(r15),r6
-  addc 2*(6+1)(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #9216,&OP2H
-
-  /* COLEND_STAGE2_A_1STEP */
-  nop
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  sub #2*4,r4
-  mov r6,2*6(r14)
-  mov r9,2*(6+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r6
-  clr r9
-  add 2*8(r15),r10
-  addc 2*(8+1)(r15),r11
-  adc r5
-
-    /* DEC */
-    sub #2*10,r15
-
-  mov r10,2*8(r14)
-  mov r11,2*(8+1)(r14)
-  mov r5,r11
-  pop r2
-  eint
-  
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_256_montgomery_sparse.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_256_montgomery_sparse.inc
deleted file mode 100644
index a0bfcecef8f3..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc32_256_montgomery_sparse.inc
+++ /dev/null
@@ -1,998 +0,0 @@
-
-  
-  clr r9
-  clr r10
-  clr r11
-  mov @r15+,r5
-  mov @r15+,r6
-  sub #2*2,r15
-  mov #RES0,r4
-  mov #SUMEXT,r8
-  push r2
-  dint
-  nop
-  bis #MPYDLYWRTEN,&MPY32CTL0
-  bic #MPYDLY32,&MPY32CTL0
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r5,&MPY32L
-  mov r6,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r9
-  addc @r15+,r10
-  adc r11
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_1STEP */
-  nop
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  sub #2*4,r4
-  mov r9,&MPY32L
-  mov r10,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r11
-  addc @r15+,r5
-  adc r6
-
-    /* DEC */
-    sub #2*6,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  add @r8,r10
-  sub #2*4,r4
-  mov r11,&MPY32L
-  mov r5,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r6
-  addc @r15+,r9
-  adc r10
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  add @r8,r5
-  sub #2*4,r4
-  mov r6,&MPY32L
-  mov r9,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r10
-  addc @r15+,r11
-  adc r5
-
-    /* DEC */
-    sub #2*10,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  add @r8,r9
-  sub #2*4,r4
-  mov r10,&MPY32L
-  mov r11,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r5
-  addc @r15+,r6
-  adc r9
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  add @r8,r11
-  sub #2*4,r4
-  mov r5,&MPY32L
-  mov r6,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r9
-  addc @r15+,r10
-  adc r11
-
-    /* DEC */
-    sub #2*14,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  add @r8,r6
-  sub #2*4,r4
-  mov r9,&MPY32L
-  mov r10,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r11
-  addc @r15+,r5
-  adc r6
-
-    /* DEC */
-    sub #2*16,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  nop
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  add @r8,r10
-  sub #2*4,r4
-  mov r11,&MPY32L
-  mov r5,&MPY32H
-  mov #13797,&OP2L
-  mov #55188,&OP2H
-  mov #19,&MPY32L
-  mov #0,&MPY32H
-  mov @r4+,0(r15)
-  mov @r4+,2(r15)
-  mov @r15+,&OP2L
-  mov @r15+,&OP2H
-  sub #2*2,r4
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  sub #2*4,r4
-
-  /* COLEND_STAGE1_B */
-  add @r15+,r6
-  addc @r15+,r9
-  adc r10
-
-
-  /* STATE CHANGE */
-
-
-    /* DEC */
-    sub #2*16,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r5
-
-  mov #0,&OP2L
-  mov #42752,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  add @r8,r5
-  sub #2*4,r4
-  mov r6,2*0(r14)
-  mov r9,2*(0+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r6
-  clr r9
-  add 2*2(r15),r10
-  addc 2*(2+1)(r15),r11
-  adc r5
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  add @r8,r9
-  sub #2*4,r4
-  mov r10,2*2(r14)
-  mov r11,2*(2+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  clr r11
-  add 2*4(r15),r5
-  addc 2*(4+1)(r15),r6
-  adc r9
-
-    /* DEC */
-    sub #2*10,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r11
-
-  mov #0,&OP2L
-  mov #24865,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  adc r11
-  add @r8,r11
-  sub #2*4,r4
-  mov r5,2*4(r14)
-  mov r6,2*(4+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r5
-  clr r6
-  add 2*6(r15),r9
-  addc 2*(6+1)(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r6
-
-  mov #8,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  adc r6
-  add @r8,r6
-  sub #2*4,r4
-  mov r9,2*6(r14)
-  mov r10,2*(6+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  clr r10
-  add 2*8(r15),r11
-  addc 2*(8+1)(r15),r5
-  adc r6
-
-    /* DEC */
-    sub #2*6,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2L
-  mov #47668,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  addc @r4+,r9
-  adc r10
-  add @r8,r10
-  sub #2*4,r4
-  mov r11,2*8(r14)
-  mov r5,2*(8+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  clr r5
-  add 2*10(r15),r6
-  addc 2*(10+1)(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* STEP */
-  
-  mov @r15+,&MAC32L
-  mov @r15+,&MAC32H
-
-  
-  mov #1,&OP2L
-  mov #16384,&OP2H
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  nop
-  add @r4+,r6
-  addc @r4+,r9
-  addc @r4+,r10
-  addc @r4+,r11
-  adc r5
-  add @r8,r5
-  sub #2*4,r4
-  mov r6,2*10(r14)
-  mov r9,2*(10+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r6
-  clr r9
-  add 2*12(r15),r10
-  addc 2*(12+1)(r15),r11
-  adc r5
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY32L
-  mov @r15+,&MPY32H
-
-  
-  mov #25730,&OP2L
-  mov #9507,&OP2H
-
-  /* COLEND_STAGE2_A_1STEP */
-  nop
-  add @r4+,r10
-  addc @r4+,r11
-  addc @r4+,r5
-  addc @r4+,r6
-  adc r9
-  sub #2*4,r4
-  mov r10,2*12(r14)
-  mov r11,2*(12+1)(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  clr r11
-  add 2*14(r15),r5
-  addc 2*(14+1)(r15),r6
-  adc r9
-
-    /* DEC */
-    sub #2*16,r15
-
-  mov r5,2*14(r14)
-  mov r6,2*(14+1)(r14)
-  mov r9,r11
-  pop r2
-  eint
-  
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_160_montgomery_sparse.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_160_montgomery_sparse.inc
deleted file mode 100644
index 6098461fcd35..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_160_montgomery_sparse.inc
+++ /dev/null
@@ -1,946 +0,0 @@
-
-  
-    push r13
-
-  clr r10
-  clr r11
-  mov @r15,r9
-  
-  mov #RESLO,r4
-  mov #RESHI,r5
-
-  mov #SUMEXT,r8
-  push r2
-  dint
-  nop
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-    /* DEC */
-    sub #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,r6
-
-  mov r6,&MPY
-
-  
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_1STEP */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #60544,&OP2
-
-    /* DEC */
-    sub #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,r7
-
-  mov r7,&MAC
-
-  
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #60544,&OP2
-
-    /* DEC */
-    sub #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,r13
-
-  mov r13,&MAC
-
-  
-  add @r8,r11
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #60544,&OP2
-
-    /* DEC */
-    sub #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r10
-
-  mov #16799,&OP2
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #49152,&OP2
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #28368,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #32745,&OP2
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #28368,&OP2
-
-    /* DEC */
-    sub #2*5,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #28368,&OP2
-
-    /* DEC */
-    sub #2*5,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #13767,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-
-  /* STATE CHANGE */
-
-
-    /* DEC */
-    sub #2*9,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #28368,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov @r15+,r6
-
-  mov r6,&MAC
-
-  
-  add @r8,r9
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov @r15+,r7
-
-  mov r7,&MAC
-
-  
-  add @r8,r9
-
-  mov #60544,&OP2
-
-  /* STEP */
-  
-  mov @r15+,r13
-
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #3232,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*0(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*1(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #28368,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r10
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r10
-
-  mov #16799,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r10
-
-  mov #60544,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*1(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*5(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #28368,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r11
-
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r11
-
-  mov #49152,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r11
-
-  mov #16799,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*2(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*7(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #28368,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r9
-
-  mov #32745,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #49152,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*3(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*7(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  mov #28368,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r10
-
-  mov #32745,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*4(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*9(r15),r9
-  adc r10
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #28368,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*5(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*9(r15),r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #28368,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*6(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*10(r15),r11
-  adc r9
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* COLEND_STAGE2_A_1STEP */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  mov r11,2*7(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*11(r15),r9
-  adc r10
-
-  /* STEP */
-  
-  mov r13,&MPY
-
-  
-  mov #9216,&OP2
-
-  /* COLEND_STAGE2_A_1STEP */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  mov r9,2*8(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*12(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*7,r15
-
-  mov r10,2*9(r14)
-  pop r2
-  eint
-  
-    pop r13
-
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256_montgomery_sparse.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256_montgomery_sparse.inc
deleted file mode 100644
index 43dafe967b8c..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256_montgomery_sparse.inc
+++ /dev/null
@@ -1,1960 +0,0 @@
-
-  
-    push r13
-
-  clr r10
-  clr r11
-  mov @r15,r9
-  
-  mov #RESLO,r4
-  mov #RESHI,r5
-
-  mov #SUMEXT,r8
-  push r2
-  dint
-  nop
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* COLEND_STAGE1_A_0STEP */
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,r6
-
-  mov r6,&MPY
-
-  
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_1STEP */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #19,&OP2
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,r7
-
-  mov r7,&MAC
-
-  
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #19,&OP2
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,r13
-
-  mov r13,&MAC
-
-  
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r13,&MPY
-
-  
-  mov #19,&OP2
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #24865,&OP2
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #24865,&OP2
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #24865,&OP2
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #19840,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #8,&OP2
-
-    /* DEC */
-    sub #2*7,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #19840,&OP2
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* ONE_STEP */
-  
-  add r6,r9
-
-  adc r10
-  adc r11
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #19840,&OP2
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #16384,&OP2
-
-  /* ONE_STEP */
-  
-  add r7,r10
-
-  adc r11
-  adc r9
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #47668,&OP2
-
-    /* DEC */
-    sub #2*10,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-
-  /* COLEND_STAGE1_B */
-  add @r15,r11
-  adc r9
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add r13,r11
-
-  adc r9
-  addc @r8,r10
-
-    /* DEC */
-    sub #2*11,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-
-  /* COLEND_STAGE1_B */
-  add @r15,r9
-  adc r10
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r11
-
-  mov #16384,&OP2
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r9
-
-  adc r10
-  addc @r8,r11
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #42752,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* COLEND_STAGE1_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,&MPY
-  mov r12,&OP2
-  mov @r4,@r15
-  mov #19,&MPY
-  mov @r15+,&OP2
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-
-  /* COLEND_STAGE1_B */
-  add @r15,r10
-  adc r11
-
-
-  /* STATE CHANGE */
-
-
-    /* DEC */
-    sub #2*15,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r10
-
-  adc r11
-  addc @r8,r9
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #24865,&OP2
-
-    /* INC */
-    add #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* STEP */
-  
-  mov @r15+,r6
-
-  mov r6,&MAC
-
-  
-  add @r8,r9
-
-  mov #42752,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*0(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*3(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r11
-
-  adc r9
-  addc @r8,r10
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #24865,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r10
-
-  mov #19,&OP2
-
-    /* INC */
-    add #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,r7
-
-  mov r7,&MAC
-
-  
-  add @r8,r10
-
-  mov #42752,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*1(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*3(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r9
-
-  adc r10
-  addc @r8,r11
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #24865,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r11
-
-  mov #19,&OP2
-
-    /* INC */
-    add #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,r13
-
-  mov r13,&MAC
-
-  
-  add @r8,r11
-
-  mov #42752,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*2(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*3(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*12,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r10
-
-  adc r11
-  addc @r8,r9
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #24865,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #19,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*3(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*7(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*8,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r11
-
-  adc r9
-  addc @r8,r10
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2
-
-    /* INC */
-    add #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r10
-
-  mov #24865,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*4(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*8(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*7,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r9
-
-  adc r10
-  addc @r8,r11
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #19840,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r11
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r11
-
-  mov #24865,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*5(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*10(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*5,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r10
-
-  adc r11
-  addc @r8,r9
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r9
-
-  mov #8,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #24865,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*6(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*10(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*5,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r11
-
-  adc r9
-  addc @r8,r10
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r10
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r10
-
-  mov #19840,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r10
-
-  mov #8,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*7(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*11(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*4,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r11
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add @r15+,r9
-
-  adc r10
-  addc @r8,r11
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r11
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r11
-
-  mov #19840,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*8(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*12(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*3,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  add @r8,r9
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add r6,r10
-
-  adc r11
-  addc @r8,r9
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r9
-
-  mov #47668,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #19840,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*9(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*13(r15),r11
-  adc r9
-
-    /* DEC */
-    sub #2*2,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov @r15+,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  add @r8,r10
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add r7,r11
-
-  adc r9
-  addc @r8,r10
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r10
-
-  mov #47668,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*10(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*14(r15),r9
-  adc r10
-
-    /* DEC */
-    sub #2*1,r15
-
-  /* STEP */
-  
-  mov @r15+,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov r6,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  add @r8,r11
-
-  mov #16384,&OP2
-
-  /* ONE_STEP_PENDING */
-  
-  add r13,r9
-
-  adc r10
-  addc @r8,r11
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  add @r8,r11
-  mov r9,2*11(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*15(r15),r10
-  adc r11
-
-  /* STEP */
-  
-  mov r6,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov r7,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  add @r8,r9
-
-  mov #16384,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r10
-  addc @r5,r11
-  adc r9
-  add @r8,r9
-  mov r10,2*12(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r10
-  add 2*16(r15),r11
-  adc r9
-
-  /* STEP */
-  
-  mov r7,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* STEP */
-  
-  mov r13,&MAC
-
-  
-  mov #25730,&OP2
-
-  /* COLEND_STAGE2_A_2MORE_STEPS */
-  add @r4,r11
-  addc @r5,r9
-  adc r10
-  add @r8,r10
-  mov r11,2*13(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r11
-  add 2*17(r15),r9
-  adc r10
-
-  /* STEP */
-  
-  mov r13,&MPY
-
-  
-  mov #9507,&OP2
-
-  /* COLEND_STAGE2_A_1STEP */
-  add @r4,r9
-  addc @r5,r10
-  adc r11
-  mov r9,2*14(r14)
-
-  /* COLEND_STAGE2_B */
-  clr r9
-  add 2*18(r15),r10
-  adc r11
-
-    /* DEC */
-    sub #2*13,r15
-
-  mov r10,2*15(r14)
-  pop r2
-  eint
-  
-    pop r13
-
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256p1.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256p1.inc
deleted file mode 100644
index b93e6161c155..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_rdc_256p1.inc
+++ /dev/null
@@ -1,675 +0,0 @@
-
-    clr r11
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk0
-    mov #-1,r11
-    sk0:
-
-    /* noncached */
-    add 2*0(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*16(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*18(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*22(r14),r12
-    adc r11
-
-    /* save cache */
-    mov 2*24(r14),r13
-    sub r13,r12
-    adc r11
-
-    /* save cache */
-    mov 2*26(r14),r9
-    sub r9,r12
-    adc r11
-
-    /* save cache */
-    mov 2*28(r14),r7
-    sub r7,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*0(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk1
-    mov #-1,r11
-    sk1:
-
-    /* noncached */
-    add 2*1(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*17(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*19(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*23(r14),r12
-    adc r11
-
-    /* save cache */
-    mov 2*25(r14),r10
-    sub r10,r12
-    adc r11
-
-    /* save cache */
-    mov 2*27(r14),r8
-    sub r8,r12
-    adc r11
-
-    /* save cache */
-    mov 2*29(r14),r6
-    sub r6,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*1(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk2
-    mov #-1,r11
-    sk2:
-
-    /* noncached */
-    add 2*2(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*18(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*20(r14),r12
-    adc r11
-
-    /* cached */
-    sub r13,r12
-    adc r11
-
-    /* cached */
-    sub r9,r12
-    adc r11
-
-    /* cached */
-    sub r7,r12
-    adc r11
-
-    /* save cache */
-    mov 2*30(r14),r5
-    sub r5,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*2(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk3
-    mov #-1,r11
-    sk3:
-
-    /* noncached */
-    add 2*3(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*19(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*21(r14),r12
-    adc r11
-
-    /* cached */
-    sub r10,r12
-    adc r11
-
-    /* cached */
-    sub r8,r12
-    adc r11
-
-    /* cached */
-    sub r6,r12
-    adc r11
-
-    /* save cache */
-    mov 2*31(r14),r4
-    sub r4,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*3(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk4
-    mov #-1,r11
-    sk4:
-
-    /* noncached */
-    add 2*4(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*20(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*22(r14),r12
-    adc r11
-
-    /* cached */
-    sub r9,r12
-    adc r11
-
-    /* cached */
-    sub r7,r12
-    adc r11
-
-    /* cached */
-    sub r5,r12
-    adc r11
-
-    sub #3,r11
-    mov r12,2*4(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk5
-    mov #-1,r11
-    sk5:
-
-    /* noncached */
-    add 2*5(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*21(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*23(r14),r12
-    adc r11
-
-    /* cached */
-    sub r8,r12
-    adc r11
-
-    /* cached */
-    sub r6,r12
-    adc r11
-
-    /* cached */
-    sub r4,r12
-    adc r11
-
-    sub #3,r11
-    mov r12,2*5(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk6
-    mov #-1,r11
-    sk6:
-
-    /* noncached */
-    add 2*6(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*22(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*22(r14),r12
-    adc r11
-
-    /* cached */
-    add r13,r12
-    adc r11
-
-    /* cached */
-    add r13,r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* cached */
-    sub r5,r12
-    adc r11
-
-    /* noncached */
-    sub 2*16(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*18(r14),r12
-    adc r11
-
-    sub #3,r11
-    mov r12,2*6(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk7
-    mov #-1,r11
-    sk7:
-
-    /* noncached */
-    add 2*7(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*23(r14),r12
-    adc r11
-
-    /* noncached */
-    add 2*23(r14),r12
-    adc r11
-
-    /* cached */
-    add r10,r12
-    adc r11
-
-    /* cached */
-    add r10,r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* cached */
-    sub r4,r12
-    adc r11
-
-    /* noncached */
-    sub 2*17(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*19(r14),r12
-    adc r11
-
-    sub #3,r11
-    mov r12,2*7(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk8
-    mov #-1,r11
-    sk8:
-
-    /* noncached */
-    add 2*8(r14),r12
-    adc r11
-
-    /* cached */
-    add r13,r12
-    adc r11
-
-    /* cached */
-    add r13,r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* noncached */
-    sub 2*18(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*20(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*8(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk9
-    mov #-1,r11
-    sk9:
-
-    /* noncached */
-    add 2*9(r14),r12
-    adc r11
-
-    /* cached */
-    add r10,r12
-    adc r11
-
-    /* cached */
-    add r10,r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* noncached */
-    sub 2*19(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*21(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*9(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk10
-    mov #-1,r11
-    sk10:
-
-    /* noncached */
-    add 2*10(r14),r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* noncached */
-    sub 2*20(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*22(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*10(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk11
-    mov #-1,r11
-    sk11:
-
-    /* noncached */
-    add 2*11(r14),r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* noncached */
-    sub 2*21(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*23(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*11(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk12
-    mov #-1,r11
-    sk12:
-
-    /* noncached */
-    add 2*12(r14),r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* cached */
-    add r7,r12
-    adc r11
-
-    /* cached */
-    add r9,r12
-    adc r11
-
-    /* noncached */
-    sub 2*16(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*18(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*12(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk13
-    mov #-1,r11
-    sk13:
-
-    /* noncached */
-    add 2*13(r14),r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* cached */
-    add r6,r12
-    adc r11
-
-    /* cached */
-    add r8,r12
-    adc r11
-
-    /* noncached */
-    sub 2*17(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*19(r14),r12
-    adc r11
-
-    sub #2,r11
-    mov r12,2*13(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk14
-    mov #-1,r11
-    sk14:
-
-    /* noncached */
-    add 2*14(r14),r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* cached */
-    add r5,r12
-    adc r11
-
-    /* noncached */
-    add 2*16(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*20(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*22(r14),r12
-    adc r11
-
-    /* cached */
-    sub r13,r12
-    adc r11
-
-    /* cached */
-    sub r9,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*14(r15)
-
-    mov r11,r12
-    clr r11
-    tst r12
-    jge sk15
-    mov #-1,r11
-    sk15:
-
-    /* noncached */
-    add 2*15(r14),r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* cached */
-    add r4,r12
-    adc r11
-
-    /* noncached */
-    add 2*17(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*21(r14),r12
-    adc r11
-
-    /* noncached */
-    sub 2*23(r14),r12
-    adc r11
-
-    /* cached */
-    sub r10,r12
-    adc r11
-
-    /* cached */
-    sub r8,r12
-    adc r11
-
-    sub #4,r11
-    mov r12,2*15(r15)
-
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_160_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_160_comba.inc
deleted file mode 100644
index ce5a62b86781..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_160_comba.inc
+++ /dev/null
@@ -1,245 +0,0 @@
-
-    push r2
-    dint
-    nop
-    bis #MPYDLYWRTEN,&MPY32CTL0
-    bic #MPYDLY32,&MPY32CTL0
-    mov #SUMEXT,r13
-    clr r12
-
-    mov @r15+,r4
-    mov @r15+,r5
-
-    mov @r15+,r6
-    mov @r15+,r7
-
-    mov @r15+,r8
-    mov @r15+,r9
-
-    mov @r15+,r10
-    mov @r15+,r11
-
-    sub #2*8,r15
-
-    /* SELF_STEP_FIRST */
-    mov r4,&MPY32L
-    mov r5,&MPY32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*0(r14)
-    mov &RES1,2*(0+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r6,&OP2L
-    mov r7,&OP2H
-    add &SUMEXT,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*2(r14)
-    add @r13,r12
-    mov &RES1,2*(2+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r8,&OP2L
-    mov r9,&OP2H
-    add &SUMEXT,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* SELF_STEP */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*4(r14)
-    add @r13,r12
-    mov &RES1,2*(4+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-    add &SUMEXT,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*6(r14)
-    add @r13,r12
-    mov &RES1,2*(6+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* SELF_STEP */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*8(r14)
-    add @r13,r12
-    mov &RES1,2*(8+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    mov 2*8(r15),r4
-    mov 2*(8+1)(r15),r5
-
-    /* STEP_1 */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*10(r14)
-    add @r13,r12
-    mov &RES1,2*(10+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* SELF_STEP */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*12(r14)
-    add @r13,r12
-    mov &RES1,2*(12+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*14(r14)
-    add @r13,r12
-    mov &RES1,2*(14+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* SELF_STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*16(r14)
-    add @r13,r12
-    mov &RES1,2*(16+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* END */
-    mov &RES0,2*18(r14)
-    mov &RES1,2*(18+1)(r14)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_256_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_256_comba.inc
deleted file mode 100644
index 102a78c4c1d9..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr32_256_comba.inc
+++ /dev/null
@@ -1,509 +0,0 @@
-
-    push r2
-    dint
-    nop
-    bis #MPYDLYWRTEN,&MPY32CTL0
-    bic #MPYDLY32,&MPY32CTL0
-    mov #SUMEXT,r13
-    clr r12
-
-    mov @r15+,r4
-    mov @r15+,r5
-
-    mov @r15+,r6
-    mov @r15+,r7
-
-    mov @r15+,r8
-    mov @r15+,r9
-
-    mov @r15+,r10
-    mov @r15+,r11
-
-    sub #2*8,r15
-
-    /* SELF_STEP_FIRST */
-    mov r4,&MPY32L
-    mov r5,&MPY32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*0(r14)
-    mov &RES1,2*(0+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r6,&OP2L
-    mov r7,&OP2H
-    add &SUMEXT,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*2(r14)
-    add @r13,r12
-    mov &RES1,2*(2+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r8,&OP2L
-    mov r9,&OP2H
-    add &SUMEXT,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* SELF_STEP */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*4(r14)
-    add @r13,r12
-    mov &RES1,2*(4+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-    add &SUMEXT,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*6(r14)
-    add @r13,r12
-    mov &RES1,2*(6+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* SELF_STEP */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*8(r14)
-    add @r13,r12
-    mov &RES1,2*(8+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-    add &SUMEXT,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*10(r14)
-    add @r13,r12
-    mov &RES1,2*(10+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* SELF_STEP */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    add @r13,r12
-    mov r10,&OP2L
-    mov r11,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*12(r14)
-    add @r13,r12
-    mov &RES1,2*(12+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov 2*14(r15),&OP2L
-    mov 2*15(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*14(r15),&OP2L
-    mov 2*15(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    add @r13,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*14(r14)
-    add @r13,r12
-    mov &RES1,2*(14+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    mov 2*14(r15),r4
-    mov 2*(14+1)(r15),r5
-
-    /* STEP_1 */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*12(r15),&OP2L
-    mov 2*13(r15),&OP2H
-
-    /* STEP_2MORE */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    add @r13,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-
-    /* SELF_STEP */
-    mov 2*8(r15),&MAC32L
-    mov 2*9(r15),&MAC32H
-    add @r13,r12
-    mov 2*8(r15),&OP2L
-    mov 2*9(r15),&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*16(r14)
-    add @r13,r12
-    mov &RES1,2*(16+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    mov 2*12(r15),r6
-    mov 2*(12+1)(r15),r7
-
-    /* STEP_2MORE */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-    add &SUMEXT,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* STEP_2MORE */
-    mov 2*8(r15),&MAC32L
-    mov 2*9(r15),&MAC32H
-    add @r13,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-    add &SUMEXT,r12
-    mov 2*10(r15),&OP2L
-    mov 2*11(r15),&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*18(r14)
-    add @r13,r12
-    mov &RES1,2*(18+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* STEP_2MORE */
-    mov 2*8(r15),&MAC32L
-    mov 2*9(r15),&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-    add &SUMEXT,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    mov 2*10(r15),r8
-    mov 2*(10+1)(r15),r9
-
-    /* SELF_STEP */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r8,&OP2L
-    mov r9,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*20(r14)
-    add @r13,r12
-    mov &RES1,2*(20+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    mov 2*8(r15),r10
-    mov 2*(8+1)(r15),r11
-
-    /* STEP_1 */
-    mov r10,&MAC32L
-    mov r11,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* STEP_2MORE */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-    add &SUMEXT,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*22(r14)
-    add @r13,r12
-    mov &RES1,2*(22+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r8,&MAC32L
-    mov r9,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* SELF_STEP */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    add @r13,r12
-    mov r6,&OP2L
-    mov r7,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*24(r14)
-    add @r13,r12
-    mov &RES1,2*(24+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* STEP_1 */
-    mov r6,&MAC32L
-    mov r7,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-    add &SUMEXT,r12
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*26(r14)
-    add @r13,r12
-    mov &RES1,2*(26+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* SELF_STEP_1 */
-    mov r4,&MAC32L
-    mov r5,&MAC32H
-    mov r4,&OP2L
-    mov r5,&OP2H
-
-    /* COLUMN_END */
-    mov &RES0,2*28(r14)
-    add @r13,r12
-    mov &RES1,2*(28+1)(r14)
-    mov &RES2,&RES0
-    mov &RES3,&RES1
-    mov r12,&RES2
-    clr &RES3
-    clr r12
-
-    /* END */
-    mov &RES0,2*30(r14)
-    mov &RES1,2*(30+1)(r14)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_128_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_128_comba.inc
deleted file mode 100644
index 637a7cdd4790..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_128_comba.inc
+++ /dev/null
@@ -1,353 +0,0 @@
-
-    push r2
-    dint
-    nop
-    mov #SUMEXT,r13
-    clr r12
-
-    mov @r15+,r4
-
-    mov @r15+,r5
-
-    mov @r15+,r6
-
-    mov @r15+,r7
-
-    mov @r15+,r8
-
-    mov @r15+,r9
-
-    mov @r15+,r10
-
-    mov @r15+,r11
-
-    sub #2*8,r15
-
-    /* SELF_STEP_FIRST */
-    mov r4,&MPY
-    mov r4,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*0(r14)
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*1(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r6,&OP2
-    add &SUMEXT,r12
-    mov r6,&OP2
-
-    /* SELF_STEP */
-    mov r5,&MAC
-    add @r13,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*2(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r6,&OP2
-    add &SUMEXT,r12
-    mov r6,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*3(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* SELF_STEP */
-    mov r6,&MAC
-    add @r13,r12
-    mov r6,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*4(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*5(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* SELF_STEP */
-    mov r7,&MAC
-    add @r13,r12
-    mov r7,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*6(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*7(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r5,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* SELF_STEP */
-    mov r8,&MAC
-    add @r13,r12
-    mov r8,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*8(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r6,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*9(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r7,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* SELF_STEP */
-    mov r9,&MAC
-    add @r13,r12
-    mov r9,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*10(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r8,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r9,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*11(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r9,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* SELF_STEP */
-    mov r10,&MAC
-    add @r13,r12
-    mov r10,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*12(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r10,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*13(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* SELF_STEP_1 */
-    mov r11,&MAC
-    mov r11,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*14(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* END */
-    mov &RESLO,2*15(r14)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_160_comba.inc b/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_160_comba.inc
deleted file mode 100644
index d34861820518..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/fp_sqr_160_comba.inc
+++ /dev/null
@@ -1,510 +0,0 @@
-
-    push r2
-    dint
-    nop
-    mov #SUMEXT,r13
-    clr r12
-
-    mov @r15+,r4
-
-    mov @r15+,r5
-
-    mov @r15+,r6
-
-    mov @r15+,r7
-
-    mov @r15+,r8
-
-    mov @r15+,r9
-
-    mov @r15+,r10
-
-    mov @r15+,r11
-
-    sub #2*8,r15
-
-    /* SELF_STEP_FIRST */
-    mov r4,&MPY
-    mov r4,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*0(r14)
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*1(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r6,&OP2
-    add &SUMEXT,r12
-    mov r6,&OP2
-
-    /* SELF_STEP */
-    mov r5,&MAC
-    add @r13,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*2(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r6,&OP2
-    add &SUMEXT,r12
-    mov r6,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*3(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* SELF_STEP */
-    mov r6,&MAC
-    add @r13,r12
-    mov r6,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*4(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r7,&OP2
-    add &SUMEXT,r12
-    mov r7,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*5(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* SELF_STEP */
-    mov r7,&MAC
-    add @r13,r12
-    mov r7,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*6(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r8,&OP2
-    add &SUMEXT,r12
-    mov r8,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*7(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov 2*8(r15),&OP2
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* SELF_STEP */
-    mov r8,&MAC
-    add @r13,r12
-    mov r8,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*8(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r4,&MAC
-    mov 2*9(r15),&OP2
-    add &SUMEXT,r12
-    mov 2*9(r15),&OP2
-
-    /* STEP_2MORE */
-    mov r5,&MAC
-    add @r13,r12
-    mov 2*8(r15),&OP2
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r9,&OP2
-    add &SUMEXT,r12
-    mov r9,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*9(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    mov 2*9(r15),r4
-
-    /* STEP_1 */
-    mov r5,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* STEP_2MORE */
-    mov r6,&MAC
-    add @r13,r12
-    mov 2*8(r15),&OP2
-    add &SUMEXT,r12
-    mov 2*8(r15),&OP2
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* SELF_STEP */
-    mov r9,&MAC
-    add @r13,r12
-    mov r9,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*10(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r6,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    mov 2*8(r15),r5
-
-    /* STEP_2MORE */
-    mov r7,&MAC
-    add @r13,r12
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* STEP_2MORE */
-    mov r9,&MAC
-    add @r13,r12
-    mov r10,&OP2
-    add &SUMEXT,r12
-    mov r10,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*11(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r7,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* STEP_2MORE */
-    mov r8,&MAC
-    add @r13,r12
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* STEP_2MORE */
-    mov r9,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* SELF_STEP */
-    mov r10,&MAC
-    add @r13,r12
-    mov r10,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*12(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r8,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* STEP_2MORE */
-    mov r9,&MAC
-    add @r13,r12
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* STEP_2MORE */
-    mov r10,&MAC
-    add @r13,r12
-    mov r11,&OP2
-    add &SUMEXT,r12
-    mov r11,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*13(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r9,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* STEP_2MORE */
-    mov r10,&MAC
-    add @r13,r12
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* SELF_STEP */
-    mov r11,&MAC
-    add @r13,r12
-    mov r11,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*14(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r10,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* STEP_2MORE */
-    mov r11,&MAC
-    add @r13,r12
-    mov r5,&OP2
-    add &SUMEXT,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*15(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r11,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* SELF_STEP */
-    mov r5,&MAC
-    add @r13,r12
-    mov r5,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*16(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* STEP_1 */
-    mov r5,&MAC
-    mov r4,&OP2
-    add &SUMEXT,r12
-    mov r4,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*17(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* SELF_STEP_1 */
-    mov r4,&MAC
-    mov r4,&OP2
-
-    /* COLUMN_END */
-    mov &RESLO,2*18(r14)
-    add @r13,r12
-    mov &RESHI,&RESLO
-    mov r12,&RESHI
-    clr r12
-
-    /* END */
-    mov &RESLO,2*19(r14)
-    pop r2
-    eint
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.c
deleted file mode 100644
index 9c8ec9679786..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision addition and subtraction
- * functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_add1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	int i;
-	register dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < size && carry; i++, a++, c++) {
-		r0 = (*a) + carry;
-		carry = (r0 < carry);
-		(*c) = r0;
-	}
-	for (; i < size; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-//dig_t bn_addn_low(dig_t *c, dig_t *a, dig_t *b, int size) {
-//	int i;
-//	register dig_t carry, c0, c1, r0, r1;
-//
-//	carry = 0;
-//	for (i = 0; i < size; i++, a++, b++, c++) {
-//		r0 = (*a) + (*b);
-//		c0 = (r0 < (*a));
-//		r1 = r0 + carry;
-//		c1 = (r1 < r0);
-//		carry = c0 | c1;
-//		(*c) = r1;
-//	}
-//	return carry;
-//}
-
-dig_t bn_sub1_low(dig_t *c, const dig_t *a, dig_t digit, int size) {
-	int i;
-	dig_t carry, r0;
-
-	carry = digit;
-	for (i = 0; i < size && carry; i++, c++, a++) {
-		r0 = (*a) - carry;
-		carry = (r0 > (*a));
-		(*c) = r0;
-	}
-	for (; i < size; i++, a++, c++) {
-		(*c) = (*a);
-	}
-	return carry;
-}
-
-//dig_t bn_subn_low(dig_t *c, dig_t *a, dig_t *b, int size) {
-//	int i;
-//	dig_t carry, r0, diff;
-//
-//	/* Zero the carry. */
-//	carry = 0;
-//	for (i = 0; i < size; i++, a++, b++, c++) {
-//		diff = (*a) - (*b);
-//		r0 = diff - carry;
-//		carry = ((*a) < (*b)) || (carry && !diff);
-//		(*c) = r0;
-//	}
-//	return carry;
-//}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.s
deleted file mode 100644
index a4884ab455c1..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_add_low.s
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "relic_conf.h"
-
-.text
-.align 2
-.global bn_addn_low
-.global bn_subn_low
-
-
-bn_addn_low:
-    push r9
-    push r10
-    push r11
-    clr r11
-back1:
-    tst r12
-    jz skip1
-    mov @r14+,r9
-    add @r13+,r9
-    clr r10
-    adc r10
-    add r11,r9
-    clr r11
-    adc r11
-    mov r9,@r15
-    bis r10,r11
-    incd r15
-    dec r12
-    jmp back1
-skip1:
-    mov r11,r15
-    pop r11
-    pop r10
-    pop r9
-    ret
-
-bn_subn_low:
-    push r9
-    push r10
-    push r11
-    clr r11
-back2:
-    tst r12
-    jz skip3
-    mov @r14+,r9
-    sub @r13+,r9
-    clr r10
-    sbc r10
-    tst r11
-    jz skip2
-    add r11,r9
-    clr r11
-    sbc r11
-    bis r11,r10
-skip2:
-    mov r10,r11
-    mov r9,@r15
-    incd r15
-    dec r12
-    jmp back2
-skip3:
-    mov r11,r15
-    and #1,r15
-    pop r11
-    pop r10
-    pop r9
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.c
deleted file mode 100644
index 3f784c556596..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level multiple precision bit shifting functions.
- *
- * @ingroup bn
- */
-
-#include "relic_bn.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t bn_lsh1_low(dig_t *c, const dig_t *a, int size) {
-	int i;
-	dig_t r, carry;
-
-	carry = 0;
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the most significant bit. */
-		r = *a >> (RLC_DIG - 1);
-		/* Shift the operand and insert the carry, */
-		*c = (*a << 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t bn_lshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = 0; i < size; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-//dig_t bn_rsh1_low(dig_t *c, dig_t *a, int size) {
-//	int i;
-//	dig_t r, carry;
-//
-//	c += size - 1;
-//	a += size - 1;
-//	carry = 0;
-//	for (i = size - 1; i >= 0; i--, a--, c--) {
-//		/* Get the least significant bit. */
-//		r = *a & 0x01;
-//		/* Shift the operand and insert the carry. */
-//		carry <<= RLC_DIG - 1;
-//		*c = (*a >> 1) | carry;
-//		/* Update the carry. */
-//		carry = r;
-//	}
-//	return carry;
-//}
-
-dig_t bn_rshb_low(dig_t *c, const dig_t *a, int size, int bits) {
-	int i;
-	dig_t r, carry, shift, mask;
-
-	c += size - 1;
-	a += size - 1;
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = size - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.s
deleted file mode 100644
index 4690177d8d6e..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_bn_shift_low.s
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "relic_conf.h"
-
-.text
-.align 2
-.global bn_rsh1_low
-
-
-bn_rsh1_low:
-    push r10
-    push r11
-    dec r13
-    rla r13
-    add r13,r15
-    add r13,r14
-    rra r13
-    inc r13
-    clr r10
-back:
-    tst r13
-    jz skip
-    mov @r14,r12
-    clrc
-    rrc r12
-    clr r11
-    rrc r11
-    bis r12,r10
-    mov r10,@r15
-    mov r11,r10
-    decd r15
-    decd r14
-    dec r13
-    jmp back
-skip:
-    rla r10
-    rlc r10
-    pop r11
-    pop r10
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.c
deleted file mode 100644
index 07a50dc9f9ca..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_add1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-
-	(*c) = (*a) ^ digit;
-	c++;
-	a++;
-	for (i = 0; i < RLC_FB_DIGS - 1; i++, a++, c++)
-		(*c) = (*a);
-}
-
-void fb_addd_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	int i;
-
-	for (i = 0; i < size; i++, a++, b++, c++)
-		(*c) = (*a) ^ (*b);
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.s
deleted file mode 100644
index 89938d4ca501..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_add_low.s
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field addition and subtraction
- * functions.
- *
- * @ingroup fb
- */
-
-#include "relic_conf.h"
-
-.text
-.align 2
-
-.global fb_addn_low
-
-fb_addn_low:
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,@r15
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*1(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*2(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*3(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*4(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*5(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*6(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*7(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*8(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*9(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*10(r15)
-#if (FB_POLYN > 176)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*11(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*12(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*13(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*14(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*15(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*16(r15)
-#if (FB_POLYN > 272)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*17(r15)
-#if (FB_POLYN > 288)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*18(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*19(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*20(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*21(r15)
-    mov @r14+,r12
-    xor @r13+,r12
-    mov r12,2*22(r15)
-#endif
-#endif
-#endif
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.c
deleted file mode 100644
index b79bdda9dc61..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_bn_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int j, k;
-	dig_t b1, b2;
-
-	if (digit == 0) {
-		dv_zero(c, RLC_FB_DIGS + 1);
-		return;
-	}
-	if (digit == 1) {
-		dv_copy(c, a, RLC_FB_DIGS);
-		return;
-	}
-
-	c[RLC_FB_DIGS] = fb_lshb_low(c, a, util_bits_dig(digit) - 1);
-	for (int i = util_bits_dig(digit) - 2; i > 0; i--) {
-		if (digit & ((dig_t)1 << i)) {
-			j = RLC_DIG - i;
-			b1 = a[0];
-			c[0] ^= (b1 << i);
-			for (k = 1; k < RLC_FB_DIGS; k++) {
-				b2 = a[k];
-				c[k] ^= ((b2 << i) | (b1 >> j));
-				b1 = b2;
-			}
-			c[RLC_FB_DIGS] ^= (b1 >> j);
-		}
-	}
-	if (digit & (dig_t)1) {
-		fb_addn_low(c, c, a);
-	}
-}
-
-/*
-void fb_muln_low(dig_t *c, dig_t *a, dig_t *b) {
-	dv_t table[16];
-	dig_t r0, r1, r2, r4, r8, u, carry, *tmpa, *tmpc;
-	int i, j;
-
-	for (i = 0; i < 16; i++) {
-		dv_null(table[i]);
-	}
-	for (i = 0; i < 2 * RLC_FB_DIGS; i++) {
-		c[i] = 0;
-	}
-	for (i = 0; i < 16; i++) {
-		dv_new(table[i]);
-		dv_zero(table[i], RLC_FB_DIGS + 1);
-	}
-
-	u = 0;
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		r1 = r0 = b[i];
-		r2 = (r0 << 1) | (u >> (RLC_DIG - 1));
-		r4 = (r0 << 2) | (u >> (RLC_DIG - 2));
-		r8 = (r0 << 3) | (u >> (RLC_DIG - 3));
-		table[0][i] = 0;
-		table[1][i] = r1;
-		table[2][i] = r2;
-		table[3][i] = r1 ^ r2;
-		table[4][i] = r4;
-		table[5][i] = r1 ^ r4;
-		table[6][i] = r2 ^ r4;
-		table[7][i] = r1 ^ r2 ^ r4;
-		table[8][i] = r8;
-		table[9][i] = r1 ^ r8;
-		table[10][i] = r2 ^ r8;
-		table[11][i] = r1 ^ r2 ^ r8;
-		table[12][i] = r4 ^ r8;
-		table[13][i] = r1 ^ r4 ^ r8;
-		table[14][i] = r2 ^ r4 ^ r8;
-		table[15][i] = r1 ^ r2 ^ r4 ^ r8;
-		u = r1;
-	}
-
-	if (u > 0) {
-		r2 = u >> (RLC_DIG - 1);
-		r4 = u >> (RLC_DIG - 2);
-		r8 = u >> (RLC_DIG - 3);
-		table[0][RLC_FB_DIGS] = table[1][RLC_FB_DIGS] = 0;
-		table[2][RLC_FB_DIGS] = table[3][RLC_FB_DIGS] = r2;
-		table[4][RLC_FB_DIGS] = table[5][RLC_FB_DIGS] = r4;
-		table[6][RLC_FB_DIGS] = table[7][RLC_FB_DIGS] = r2 ^ r4;
-		table[8][RLC_FB_DIGS] = table[9][RLC_FB_DIGS] = r8;
-		table[10][RLC_FB_DIGS] = table[11][RLC_FB_DIGS] = r2 ^ r8;
-		table[12][RLC_FB_DIGS] = table[13][RLC_FB_DIGS] = r4 ^ r8;
-		table[14][RLC_FB_DIGS] = table[15][RLC_FB_DIGS] = r2 ^ r4 ^ r8;
-	}
-
-	for (i = RLC_DIG - 4; i >= 4; i -= 4) {
-		tmpa = a;
-		tmpc = c;
-		for (j = 0; j < RLC_FB_DIGS; j++, tmpa++, tmpc++) {
-			u = (*tmpa >> i) & 0x0F;
-			fb_addn_low(tmpc, tmpc, table[u]);
-			*(tmpc + RLC_FB_DIGS) ^= table[u][RLC_FB_DIGS];
-		}
-		carry = fb_lshb_low(c, c, 4);
-		fb_lshb_low(c + RLC_FB_DIGS, c + RLC_FB_DIGS, 4);
-		c[RLC_FB_DIGS] ^= carry;
-	}
-	for (j = 0; j < RLC_FB_DIGS; j++, a++, c++) {
-		u = *a & 0x0F;
-		fb_addn_low(c, c, table[u]);
-		*(c + RLC_FB_DIGS) ^= table[u][RLC_FB_DIGS];
-	}
-
-	for (i = 0; i < 16; i++) {
-		dv_free(table[i]);
-	}
-}
-*/
-void fb_muld_low(dig_t *c, const dig_t *a, const dig_t *b, int size) {
-	dv_t table[16];
-	dig_t u, *tmpc, r0, r1, r2, r4, r8;
-	const dig_t *tmpa;
-	int i, j;
-
-	for (i = 0; i < 16; i++) {
-		dv_null(table[i]);
-	}
-
-	dv_zero(c, 2 * size);
-
-	for (i = 0; i < 16; i++) {
-		dv_new(table[i]);
-		dv_zero(table[i], size + 1);
-	}
-
-	u = 0;
-	for (i = 0; i < size; i++) {
-		r1 = r0 = b[i];
-		r2 = (r0 << 1) | (u >> (RLC_DIG - 1));
-		r4 = (r0 << 2) | (u >> (RLC_DIG - 2));
-		r8 = (r0 << 3) | (u >> (RLC_DIG - 3));
-		table[0][i] = 0;
-		table[1][i] = r1;
-		table[2][i] = r2;
-		table[3][i] = r1 ^ r2;
-		table[4][i] = r4;
-		table[5][i] = r1 ^ r4;
-		table[6][i] = r2 ^ r4;
-		table[7][i] = r1 ^ r2 ^ r4;
-		table[8][i] = r8;
-		table[9][i] = r1 ^ r8;
-		table[10][i] = r2 ^ r8;
-		table[11][i] = r1 ^ r2 ^ r8;
-		table[12][i] = r4 ^ r8;
-		table[13][i] = r1 ^ r4 ^ r8;
-		table[14][i] = r2 ^ r4 ^ r8;
-		table[15][i] = r1 ^ r2 ^ r4 ^ r8;
-		u = r1;
-	}
-
-	if (u > 0) {
-		r2 = u >> (RLC_DIG - 1);
-		r4 = u >> (RLC_DIG - 2);
-		r8 = u >> (RLC_DIG - 3);
-		table[0][size] = table[1][size] = 0;
-		table[2][size] = table[3][size] = r2;
-		table[4][size] = table[5][size] = r4;
-		table[6][size] = table[7][size] = r2 ^ r4;
-		table[8][size] = table[9][size] = r8;
-		table[10][size] = table[11][size] = r2 ^ r8;
-		table[12][size] = table[13][size] = r4 ^ r8;
-		table[14][size] = table[15][size] = r2 ^ r4 ^ r8;
-	}
-
-	for (i = RLC_DIG - 4; i >= 4; i -= 4) {
-		tmpa = a;
-		tmpc = c;
-		for (j = 0; j < size; j++, tmpa++, tmpc++) {
-			u = (*tmpa >> i) & 0x0F;
-			fb_addd_low(tmpc, tmpc, table[u], size + 1);
-		}
-		bn_lshb_low(c, c, 2 * size, 4);
-	}
-	for (j = 0; j < size; j++, a++, c++) {
-		u = *a & 0x0F;
-		fb_addd_low(c, c, table[u], size + 1);
-	}
-	for (i = 0; i < 16; i++) {
-		dv_free(table[i]);
-	}
-}
-
-void fb_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t rlc_align t[2 * RLC_FB_DIGS];
-
-	fb_muln_low(t, a, b);
-	fb_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.s
deleted file mode 100644
index 637f1805b08f..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low.s
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "relic_fb_low.h"
-
-#ifdef WITH_FB
-
-#if FB_POLYN == 283
-#include "relic_fb_mul_low_283.s"
-#elif FB_POLYN == 163
-#include "relic_fb_mul_low_163.s"
-#elif FB_POLYN == 353
-#include "relic_fb_mul_low_353.s"
-#elif FB_POLYN == 271
-#include "relic_fb_mul_low_271.s"
-#else
-#error Field not supported
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_163.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_163.s
deleted file mode 100644
index dec4c75f034d..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_163.s
+++ /dev/null
@@ -1,341 +0,0 @@
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-//#define KARATSUBA
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR       r14
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR       r13
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR       r15
-
-/*
- * Temporary register.
- */
-#define RT          r4
-
-/*
- * Pointer to the table.
- */
-#define T_PTR       r12
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4     (FB_POLYN + 4)
-
-/*
- * Size in digits of a precomputation table line.
- */
-#define T_LINE 16
-
-/*
- * Size of the multiplication precomputation table in digits.
- */
-#define T_DIGS  (16 * T_LINE)
-
-.macro PROLOGUE
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-.endm
-
-.macro RLC_MULN_TABLE
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 10 /* fill 11 columns */
-.endm
-
-.macro RLC_MULN_TABLE_KARATSUBA
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 8 /* fill 9 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_FILL_TABLE i, j
-    .if \i == 0
-        PREP_FIRST  r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .else
-        PREP_COLUMN \i + \i, r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .endif
-    incd T_PTR
-    .if \i < \j
-        RLC_FILL_TABLE \i + 1, \j
-    .endif
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-    mov     @B_PTR+, \r1    ; r1 = b[0]
-    mov     \r1, \r2
-    rla     \r2             ; r2 = r1 << 1
-    mov     \r2, \r4
-    rla     \r4             ; r4 = r1 << 2
-    mov     \r4, \r8
-    rla     \r8             ; r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-    mov     \r1, RT
-
-    mov     @B_PTR+, \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST r1, r2, r4, r8
-    mov     \r1, RT
-
-    clr     \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN r1, r2, r4, r8
-    clr     0(T_PTR)
-    mov     \r1, 1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    mov     \r2, 2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    mov     \r1, RT
-    xor     \r2, RT
-    mov     RT, 3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    xor     \r4, RT
-    mov     RT, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    xor     \r1, RT
-    mov     RT, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r1, RT
-    xor     \r4, RT
-    mov     RT, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r1, RT
-    xor     \r8, RT
-    mov     RT, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    xor     \r2, RT
-    mov     RT, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    xor     \r1, RT
-    mov     RT, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    xor     \r1, \r4
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    xor     \r2, \r4
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    xor     \r1, \r4
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST r1, r2, r4, r8
-    /*
-     * Since the last bit of the 17th digit of a number is 0, then
-     * r1 and r2 for the 18th digit are zero.
-     */
-    clr     @T_PTR
-    clr     1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    clr     2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    clr     3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    mov     \r4, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    mov     \r4, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r4, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r8, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    mov     \r8, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    mov     \r8, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro EPILOGUE
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-.endm
-
-.text
-.align 2
-
-.global fb_muln_low
-
-#ifndef KARATSUBA
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    /* pushes */
-    PROLOGUE
-
-    sub #512,r1
-
-    RLC_MULN_TABLE
-
-#include "fb_mul_163_ld.inc"
-
-    add #512,r1
-
-    /* pops */
-    EPILOGUE
-
-#else
-
-#define TEMP_SIZE 72
-#define RLC_TABLE_SIZE 512
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    //pushes
-    PROLOGUE
-
-    clr 2*17(r14)
-    clr 2*17(r13)
-
-    //allocate temp area
-    sub #TEMP_SIZE,r1
-
-
-    //compute t0 = a0 + a1
-    mov r14,r11
-    add #2*9,r11
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8
-        mov @r14+,r12
-        xor @r11+,r12
-        mov r12,(2 * \i)(r1)
-    .endr
-
-    //compute t1 = b0 + b1
-    mov r13,r11
-    add #2*9,r11
-    .irp i, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        mov @r13+,r12
-        xor @r11+,r12
-        mov r12,(2 * \i)(r1)
-    .endr
-
-    //restore pointers
-    sub #2*9,r14
-    sub #2*9,r13
-
-    //compute c01 = a0b0
-    push r13
-    call #fb_muln_low_karatsuba
-
-    //compute c23 = a1b1
-    add #2*9,r14
-    mov @r1,r13
-    add #2*9,r13
-    add #2*18,r15
-    call #fb_muln_low_karatsuba
-    //"pop r13"
-    add #2,r1
-    //restore and push c
-    sub #2*18,r15
-    push r15
-    //compute t23 = t0t1
-    mov r1,r15
-    mov r1,r14
-    mov r1,r13
-    add #2*18+2,r15
-    add #2,r14
-    add #2*9+2,r13
-    call #fb_muln_low_karatsuba
-
-    //pop c
-    pop r15
-
-    //r14 = &t23
-    mov r1,r14
-    add #2*18,r14
-
-    //compute t23 += c01 (a0b0)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //compute t23 += c23 (a1b1)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //set r15 from &c4 to &c1
-    sub #2*3*9,r15
-
-    //compute c12 += t23
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r14+,(2 * \i)(r15)
-    .endr
-
-    add #TEMP_SIZE,r1
-    //pops
-    EPILOGUE
-
-fb_muln_low_karatsuba:
-
-    sub #RLC_TABLE_SIZE,r1
-
-    RLC_MULN_TABLE_KARATSUBA
-
-#include "ld_mult_271_karatsuba.inc"
-
-    add #RLC_TABLE_SIZE,r1
-
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_271.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_271.s
deleted file mode 100644
index f7b3b6666513..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_271.s
+++ /dev/null
@@ -1,349 +0,0 @@
-/* This file should be included and not compiled directly */
-
-#define KARATSUBA
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR       r14
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR       r13
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR       r15
-
-/*
- * Temporary register.
- */
-#define RT          r4
-
-/*
- * Pointer to the table.
- */
-#define T_PTR       r12
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4     (FB_POLYN + 4)
-
-/*
- * Size in digits of a precomputation table line.
- */
-#ifdef KARATSUBA
-#define T_LINE 16
-#elif (POLY_M4 % WSIZE) > 0
-#define T_LINE  (POLY_M4/WSIZE + 1)
-#else
-#define T_LINE  (POLY_M4/WSIZE)
-#endif
-
-/*
- * Size of the multiplication precomputation table in digits.
- */
-#define T_DIGS  (16 * T_LINE)
-
-.macro PROLOGUE
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-.endm
-
-.macro RLC_MULN_TABLE
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 16 /* fill 17 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_MULN_TABLE_KARATSUBA
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 8 /* fill 9 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_FILL_TABLE i, j
-    .if \i == 0
-        PREP_FIRST  r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .else
-        PREP_COLUMN \i + \i, r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .endif
-    incd T_PTR
-    .if \i < \j
-        RLC_FILL_TABLE \i + 1, \j
-    .endif
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-    mov     @B_PTR+, \r1    ; r1 = b[0]
-    mov     \r1, \r2
-    rla     \r2             ; r2 = r1 << 1
-    mov     \r2, \r4
-    rla     \r4             ; r4 = r1 << 2
-    mov     \r4, \r8
-    rla     \r8             ; r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-    mov     \r1, RT
-
-    mov     @B_PTR+, \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST r1, r2, r4, r8
-    mov     \r1, RT
-
-    clr     \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN r1, r2, r4, r8
-    clr     0(T_PTR)
-    mov     \r1, 1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    mov     \r2, 2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    mov     \r1, RT
-    xor     \r2, RT
-    mov     RT, 3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    xor     \r4, RT
-    mov     RT, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    xor     \r1, RT
-    mov     RT, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r1, RT
-    xor     \r4, RT
-    mov     RT, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r1, RT
-    xor     \r8, RT
-    mov     RT, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    xor     \r2, RT
-    mov     RT, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    xor     \r1, RT
-    mov     RT, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    xor     \r1, \r4
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    xor     \r2, \r4
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    xor     \r1, \r4
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST r1, r2, r4, r8
-    /*
-     * Since the last bit of the 17th digit of a number is 0, then
-     * r1 and r2 for the 18th digit are zero.
-     */
-    clr     0(T_PTR)
-    clr     1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    clr     2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    clr     3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    mov     \r4, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    mov     \r4, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r4, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r8, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    mov     \r8, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    mov     \r8, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro EPILOGUE
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-.endm
-
-.text
-.align 2
-
-.global fb_muln_low
-
-#ifndef KARATSUBA
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    /* pushes */
-    PROLOGUE
-
-    sub #576,r1
-
-    RLC_MULN_TABLE
-
-#include "fb_mul_271_ld.inc"
-
-    add #576,r1
-
-    /* pops */
-    EPILOGUE
-
-#else
-
-#define TEMP_SIZE 72
-#define RLC_TABLE_SIZE 512
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    //pushes
-    PROLOGUE
-
-    clr 2*17(r14)
-    clr 2*17(r13)
-
-    //allocate temp area
-    sub #TEMP_SIZE,r1
-
-
-    //compute t0 = a0 + a1
-    mov r14,r11
-    add #2*9,r11
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8
-        mov @r14+,r12
-        xor @r11+,r12
-        mov r12,(2 * \i)(r1)
-    .endr
-
-    //compute t1 = b0 + b1
-    mov r13,r11
-    add #2*9,r11
-    .irp i, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        mov @r13+,r12
-        xor @r11+,r12
-        mov r12,(2 * \i)(r1)
-    .endr
-
-    //restore pointers
-    sub #2*9,r14
-    sub #2*9,r13
-
-    //compute c01 = a0b0
-    push r13
-    call #fb_muln_low_karatsuba
-
-    //compute c23 = a1b1
-    add #2*9,r14
-    mov @r1,r13
-    add #2*9,r13
-    add #2*18,r15
-    call #fb_muln_low_karatsuba
-    //"pop r13"
-    add #2,r1
-    //restore and push c
-    sub #2*18,r15
-    push r15
-    //compute t23 = t0t1
-    mov r1,r15
-    mov r1,r14
-    mov r1,r13
-    add #2*18+2,r15
-    add #2,r14
-    add #2*9+2,r13
-    call #fb_muln_low_karatsuba
-
-    //pop c
-    pop r15
-
-    //r14 = &t23
-    mov r1,r14
-    add #2*18,r14
-
-    //compute t23 += c01 (a0b0)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //compute t23 += c23 (a1b1)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //set r15 from &c4 to &c1
-    sub #2*3*9,r15
-
-    //compute c12 += t23
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r14+,(2 * \i)(r15)
-    .endr
-
-    add #TEMP_SIZE,r1
-    //pops
-    EPILOGUE
-
-fb_muln_low_karatsuba:
-
-    sub #RLC_TABLE_SIZE,r1
-
-    RLC_MULN_TABLE_KARATSUBA
-
-#include "fb_mul_271_ld_k2.inc"
-
-    add #RLC_TABLE_SIZE,r1
-
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_283.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_283.s
deleted file mode 100644
index ffe9342615bd..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_283.s
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-//#define KARATSUBA
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR		r14
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR		r13
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR		r15
-
-/*
- * Temporary register.
- */
-#define RT			r4
-
-/*
- * Pointer to the table.
- */
-#define T_PTR		r12
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4		(FB_POLYN + 4)
-
-/*
- * Size in digits of a precomputation table line.
- */
-#ifdef KARATSUBA
-#define T_LINE 16
-#elif (POLY_M4 % WSIZE) > 0
-#define T_LINE	(POLY_M4/WSIZE + 1)
-#else
-#define T_LINE	(POLY_M4/WSIZE)
-#endif
-
-/*
- * Size of the multiplication precomputation table in digits.
- */
-#define T_DIGS	(16 * T_LINE)
-
-.macro PROLOGUE
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-.endm
-
-.macro RLC_MULN_TABLE
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 17 /* fill 18 columns */
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_MULN_TABLE_KARATSUBA
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 8 /* fill 9 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_FILL_TABLE i, j
-    .if \i == 0
-        PREP_FIRST  r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .else
-        PREP_COLUMN \i + \i, r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .endif
-    incd T_PTR
-    .if \i < \j
-        RLC_FILL_TABLE \i + 1, \j
-    .endif
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-	mov		@B_PTR+, \r1	; r1 = b[0]
-	mov		\r1, \r2
-	rla		\r2				; r2 = r1 << 1
-	mov		\r2, \r4
-	rla		\r4				; r4 = r1 << 2
-	mov 	\r4, \r8
-	rla		\r8				; r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-	mov		\r1, RT
-
-	mov		@B_PTR+, \r1
-	mov		\r1, \r2
-	rla		RT
-	rlc		\r2
-	mov		\r2, \r4
-	rla 	RT
-	rlc		\r4
-	mov		\r4, \r8
-	rla		RT
-	rlc		\r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST r1, r2, r4, r8
-    mov     \r1, RT
-
-    clr     \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN r1, r2, r4, r8
-	clr     0(T_PTR)
-	mov     \r1, 1*2*T_LINE(T_PTR)	; tab[1][i] = r1
-	mov     \r2, 2*2*T_LINE(T_PTR)	; tab[2][i] = r2
-	mov     \r1, RT
-	xor     \r2, RT
-	mov		RT, 3*2*T_LINE(T_PTR)	; tab[3][i] = r1^r2
-	mov		\r4, 4*2*T_LINE(T_PTR)	; tab[4][i] = r4
-	xor		\r4, RT
-	mov		RT, 7*2*T_LINE(T_PTR)	; tab[7][i] = r1^r2^r4
-	xor		\r1, RT
-	mov		RT, 6*2*T_LINE(T_PTR)	; tab[6][i] = r2^r4
-	mov		\r1, RT
-	xor		\r4, RT
-	mov		RT, 5*2*T_LINE(T_PTR)	; tab[5][i] = r1^r4
-	mov		\r8, 8*2*T_LINE(T_PTR)	; tab[8][i] = r8
-	mov		\r1, RT
-	xor		\r8, RT
-	mov		RT, 9*2*T_LINE(T_PTR)	; tab[9][i] = r1^r8
-	xor		\r2, RT
-	mov		RT, 11*2*T_LINE(T_PTR)	; tab[11][i] = r1^r2^r8
-	xor		\r1, RT
-	mov		RT, 10*2*T_LINE(T_PTR)	; tab[10][i] = r2^r8
-	xor		\r8, \r4
-	mov		\r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-	xor		\r1, \r4
-	mov		\r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-	xor		\r2, \r4
-	mov		\r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-	xor		\r1, \r4
-	mov		\r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST r1, r2, r4, r8
-    /*
-     * Since the last bit of the 17th digit of a number is 0, then
-     * r1 and r2 for the 18th digit are zero.
-     */
-    clr     @T_PTR
-    clr     1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    clr     2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    clr     3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    mov     \r4, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    mov     \r4, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r4, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r8, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    mov     \r8, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    mov     \r8, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro EPILOGUE
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-.endm
-
-.text
-.align 2
-
-.global fb_muln_low
-
-#ifndef KARATSUBA
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    /* pushes */
-	PROLOGUE
-
-	sub #576,r1
-
-	RLC_MULN_TABLE
-
-#include "fb_mul_283_ld.inc"
-
-    add #576,r1
-
-    /* pops */
-	EPILOGUE
-
-#else
-
-#define TEMP_SIZE 72
-#define RLC_TABLE_SIZE 512
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    //pushes
-	PROLOGUE
-
-	clr 2*17(r14)
-	clr 2*17(r13)
-
-    //allocate temp area
-	sub #TEMP_SIZE,r1
-
-
-	//compute t0 = a0 + a1
-	mov r14,r11
-	add #2*9,r11
-	.irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8
-    	mov @r14+,r12
-    	xor @r11+,r12
-    	mov r12,(2 * \i)(r1)
-    .endr
-
-    //compute t1 = b0 + b1
-    mov r13,r11
-    add #2*9,r11
-    .irp i, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        mov @r13+,r12
-        xor @r11+,r12
-        mov r12,(2 * \i)(r1)
-    .endr
-
-    //restore pointers
-    sub #2*9,r14
-    sub #2*9,r13
-
-    //compute c01 = a0b0
-    push r13
-    call #fb_muln_low_karatsuba
-
-    //compute c23 = a1b1
-    add #2*9,r14
-    mov @r1,r13
-    add #2*9,r13
-    add #2*18,r15
-    call #fb_muln_low_karatsuba
-    //"pop r13"
-    add #2,r1
-    //restore and push c
-    sub #2*18,r15
-    push r15
-    //compute t23 = t0t1
-    mov r1,r15
-    mov r1,r14
-    mov r1,r13
-    add #2*18+2,r15
-    add #2,r14
-    add #2*9+2,r13
-    call #fb_muln_low_karatsuba
-
-    //pop c
-    pop r15
-
-    //r14 = &t23
-    mov r1,r14
-    add #2*18,r14
-
-    //compute t23 += c01 (a0b0)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //compute t23 += c23 (a1b1)
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r15+,(2 * \i)(r14)
-    .endr
-
-    //set r15 from &c4 to &c1
-    sub #2*3*9,r15
-
-    //compute c12 += t23
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        xor @r14+,(2 * \i)(r15)
-    .endr
-
-    add #TEMP_SIZE,r1
-    //pops
-	EPILOGUE
-
-fb_muln_low_karatsuba:
-
-    sub #RLC_TABLE_SIZE,r1
-
-    RLC_MULN_TABLE_KARATSUBA
-
-#include "ld_mult_271_karatsuba.inc"
-
-    add #RLC_TABLE_SIZE,r1
-
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353.s
deleted file mode 100644
index e9ec4a671e15..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353.s
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#define KARATSUBA
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR		r14
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR		r13
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR		r15
-
-/*
- * Temporary register.
- */
-#define RT			r4
-
-/*
- * Pointer to the table.
- */
-#define T_PTR		r12
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4		(FB_POLYN + 4)
-
-/*
- * Size in digits of a precomputation table line.
- */
-#ifdef KARATSUBA
-#define T_LINE 16
-#elif (POLY_M4 % WSIZE) > 0
-#define T_LINE	(POLY_M4/WSIZE + 1)
-#else
-#define T_LINE	(POLY_M4/WSIZE)
-#endif
-
-/*
- * Size of the multiplication precomputation table in digits.
- */
-#define T_DIGS	(16 * T_LINE)
-
-.macro PROLOGUE
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-.endm
-
-.macro RLC_MULN_TABLE
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 16 /* fill 17 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_MULN_TABLE_KARATSUBA
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 11 /* fill 12 columns */
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_FILL_TABLE i, j
-    .if \i == 0
-        PREP_FIRST  r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .else
-        PREP_COLUMN \i + \i, r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .endif
-    incd T_PTR
-    .if \i < \j
-        RLC_FILL_TABLE \i + 1, \j
-    .endif
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-	mov		@B_PTR+, \r1	; r1 = b[0]
-	mov		\r1, \r2
-	rla		\r2				; r2 = r1 << 1
-	mov		\r2, \r4
-	rla		\r4				; r4 = r1 << 2
-	mov 	\r4, \r8
-	rla		\r8				; r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-	mov		\r1, RT
-
-	mov		@B_PTR+, \r1
-	mov		\r1, \r2
-	rla		RT
-	rlc		\r2
-	mov		\r2, \r4
-	rla 	RT
-	rlc		\r4
-	mov		\r4, \r8
-	rla		RT
-	rlc		\r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST r1, r2, r4, r8
-    mov     \r1, RT
-
-    clr     \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN r1, r2, r4, r8
-	clr     0(T_PTR)
-	mov     \r1, 1*2*T_LINE(T_PTR)	; tab[1][i] = r1
-	mov     \r2, 2*2*T_LINE(T_PTR)	; tab[2][i] = r2
-	mov     \r1, RT
-	xor     \r2, RT
-	mov		RT, 3*2*T_LINE(T_PTR)	; tab[3][i] = r1^r2
-	mov		\r4, 4*2*T_LINE(T_PTR)	; tab[4][i] = r4
-	xor		\r4, RT
-	mov		RT, 7*2*T_LINE(T_PTR)	; tab[7][i] = r1^r2^r4
-	xor		\r1, RT
-	mov		RT, 6*2*T_LINE(T_PTR)	; tab[6][i] = r2^r4
-	mov		\r1, RT
-	xor		\r4, RT
-	mov		RT, 5*2*T_LINE(T_PTR)	; tab[5][i] = r1^r4
-	mov		\r8, 8*2*T_LINE(T_PTR)	; tab[8][i] = r8
-	mov		\r1, RT
-	xor		\r8, RT
-	mov		RT, 9*2*T_LINE(T_PTR)	; tab[9][i] = r1^r8
-	xor		\r2, RT
-	mov		RT, 11*2*T_LINE(T_PTR)	; tab[11][i] = r1^r2^r8
-	xor		\r1, RT
-	mov		RT, 10*2*T_LINE(T_PTR)	; tab[10][i] = r2^r8
-	xor		\r8, \r4
-	mov		\r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-	xor		\r1, \r4
-	mov		\r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-	xor		\r2, \r4
-	mov		\r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-	xor		\r1, \r4
-	mov		\r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST r1, r2, r4, r8
-    /*
-     * Since the last bit of the 17th digit of a number is 0, then
-     * r1 and r2 for the 18th digit are zero.
-     */
-    clr     @T_PTR
-    clr     1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    clr     2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    clr     3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    mov     \r4, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    mov     \r4, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r4, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r8, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    mov     \r8, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    mov     \r8, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro EPILOGUE
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-	ret
-.endm
-
-.text
-.align 2
-
-.global fb_muln_low
-
-#ifndef KARATSUBA
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    /* pushes */
-	PROLOGUE
-
-	sub #576,r1
-
-	RLC_MULN_TABLE
-
-#include "ld_mult_271.inc"
-
-    add #576,r1
-
-    /* pops */
-	EPILOGUE
-
-#else
-
-#define TEMP_SIZE 96
-#define RLC_TABLE_SIZE 512
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    //pushes
-	PROLOGUE
-
-    //allocate temp area
-	sub #TEMP_SIZE,r1
-
-	//compute t0(12) = a0(11) + a1(12)
-	mov r14,r11
-	add #2*11,r11
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 0)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 1)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 2)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 3)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 4)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 5)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 6)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 7)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 8)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 9)(r1)
-	mov @r14+,r12
-	xor @r11+,r12
-	mov r12,(2 * 10)(r1)
-    mov @r11,(2 * 11)(r1)
-
-    //compute t1(12) = b0(11) + b1(12)
-    mov r13,r11
-    add #2*11,r11
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 12)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 13)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 14)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 15)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 16)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 17)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 18)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 19)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 20)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 21)(r1)
-    mov @r13+,r12
-    xor @r11+,r12
-    mov r12,(2 * 22)(r1)
-    mov @r11,(2 * 23)(r1)
-
-    //restore pointers
-    sub #2*11,r14
-    sub #2*11,r13
-
-    //compute c01 = a0b0
-    push r13
-    push 2*11(r14)
-    push 2*11(r13)
-    clr 2*11(r14)
-    clr 2*11(r13)
-    call #fb_muln_low_karatsuba
-    mov 4(r1),r13
-    pop 2*11(r13)
-    pop 2*11(r14)
-
-    //compute c23 = a1b1
-    add #2*11,r14
-    mov @r1,r13
-    add #2*11,r13
-    add #2*22,r15
-    call #fb_muln_low_karatsuba
-    //"pop r13"
-    add #2,r1
-    //restore and push c
-    sub #2*22,r15
-    push r15
-    //compute t23 = t0t1
-    mov r1,r15
-    mov r1,r14
-    mov r1,r13
-    add #2*24+2,r15
-    add #2,r14
-    add #2*12+2,r13
-    call #fb_muln_low_karatsuba
-
-    //pop c
-    pop r15
-
-    //r14 = &t23
-    mov r1,r14
-    add #2*24,r14
-
-    //compute t23 += c01 (a0b0)
-    xor @r15+,(2 * 0)(r14)
-    xor @r15+,(2 * 1)(r14)
-    xor @r15+,(2 * 2)(r14)
-    xor @r15+,(2 * 3)(r14)
-    xor @r15+,(2 * 4)(r14)
-    xor @r15+,(2 * 5)(r14)
-    xor @r15+,(2 * 6)(r14)
-    xor @r15+,(2 * 7)(r14)
-    xor @r15+,(2 * 8)(r14)
-    xor @r15+,(2 * 9)(r14)
-    xor @r15+,(2 * 10)(r14)
-    xor @r15+,(2 * 11)(r14)
-    xor @r15+,(2 * 12)(r14)
-    xor @r15+,(2 * 13)(r14)
-    xor @r15+,(2 * 14)(r14)
-    xor @r15+,(2 * 15)(r14)
-    xor @r15+,(2 * 16)(r14)
-    xor @r15+,(2 * 17)(r14)
-    xor @r15+,(2 * 18)(r14)
-    xor @r15+,(2 * 19)(r14)
-    xor @r15+,(2 * 20)(r14)
-    xor @r15+,(2 * 21)(r14)
-
-    //compute t23 += c23 (a1b1)
-    xor @r15+,(2 * 0)(r14)
-    xor @r15+,(2 * 1)(r14)
-    xor @r15+,(2 * 2)(r14)
-    xor @r15+,(2 * 3)(r14)
-    xor @r15+,(2 * 4)(r14)
-    xor @r15+,(2 * 5)(r14)
-    xor @r15+,(2 * 6)(r14)
-    xor @r15+,(2 * 7)(r14)
-    xor @r15+,(2 * 8)(r14)
-    xor @r15+,(2 * 9)(r14)
-    xor @r15+,(2 * 10)(r14)
-    xor @r15+,(2 * 11)(r14)
-    xor @r15+,(2 * 12)(r14)
-    xor @r15+,(2 * 13)(r14)
-    xor @r15+,(2 * 14)(r14)
-    xor @r15+,(2 * 15)(r14)
-    xor @r15+,(2 * 16)(r14)
-    xor @r15+,(2 * 17)(r14)
-    xor @r15+,(2 * 18)(r14)
-    xor @r15+,(2 * 19)(r14)
-    xor @r15+,(2 * 20)(r14)
-    xor @r15+,(2 * 21)(r14)
-    xor @r15+,(2 * 22)(r14)
-    xor @r15+,(2 * 23)(r14)
-
-    //set r15 from &c4 to &c1
-    sub #2*(22+24-11),r15
-
-    //compute c12 += t23
-    xor @r14+,(2 * 0)(r15)
-    xor @r14+,(2 * 1)(r15)
-    xor @r14+,(2 * 2)(r15)
-    xor @r14+,(2 * 3)(r15)
-    xor @r14+,(2 * 4)(r15)
-    xor @r14+,(2 * 5)(r15)
-    xor @r14+,(2 * 6)(r15)
-    xor @r14+,(2 * 7)(r15)
-    xor @r14+,(2 * 8)(r15)
-    xor @r14+,(2 * 9)(r15)
-    xor @r14+,(2 * 10)(r15)
-    xor @r14+,(2 * 11)(r15)
-    xor @r14+,(2 * 12)(r15)
-    xor @r14+,(2 * 13)(r15)
-    xor @r14+,(2 * 14)(r15)
-    xor @r14+,(2 * 15)(r15)
-    xor @r14+,(2 * 16)(r15)
-    xor @r14+,(2 * 17)(r15)
-    xor @r14+,(2 * 18)(r15)
-    xor @r14+,(2 * 19)(r15)
-    xor @r14+,(2 * 20)(r15)
-    xor @r14+,(2 * 21)(r15)
-    xor @r14+,(2 * 22)(r15)
-    xor @r14+,(2 * 23)(r15)
-
-    skip:
-
-    add #TEMP_SIZE,r1
-    //pops
-	EPILOGUE
-
-fb_muln_low_karatsuba:
-
-    sub #RLC_TABLE_SIZE,r1
-
-    RLC_MULN_TABLE_KARATSUBA
-
-#include "fb_mul_353_ld_k2.inc"
-
-    add #RLC_TABLE_SIZE,r1
-
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353_k3.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353_k3.s
deleted file mode 100644
index d4502704e25e..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_mul_low_353_k3.s
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Binary field multiplication functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#define KARATSUBA
-
-/*
- * Pointer register which points to the parameter a.
- */
-#define A_PTR		r14
-
-/*
- * Pointer register which points to the parameter b.
- */
-#define B_PTR		r13
-
-/*
- * Pointer register which points to the parameter c.
- */
-#define C_PTR		r15
-
-/*
- * Temporary register.
- */
-#define RT			r4
-
-/*
- * Pointer to the table.
- */
-#define T_PTR		r12
-
-/*
- * Size in bits of the multiplication of a binary field element by a polynomial
- * with degree lower than 4.
- */
-#define POLY_M4		(FB_POLYN + 4)
-
-/*
- * Size in digits of a precomputation table line.
- */
-#define T_LINE 16
-
-/*
- * Size of the multiplication precomputation table in digits.
- */
-#define T_DIGS	(16 * T_LINE)
-
-/*
- * Precomputation table stored on a custom section (address must be terminated
- * in 0x00).
- */
-.data
-.align 2
-
-.macro PROLOGUE
-    .irp i, 4, 5, 6, 7, 8, 9, 10, 11
-        push    r\i
-    .endr
-.endm
-
-.macro RLC_MULN_TABLE
-    mov     r1, T_PTR
-    RLC_FILL_TABLE 0, 7 /* fill 8 columns */
-    PREP_LAST   r6, r7, r8, r9 /* fill last column */
-    FILL_COLUMN r6, r7, r8, r9
-    sub #2*T_LINE, T_PTR /* restore T_PTR */
-    sub #2*T_LINE, B_PTR /* restore B_PTR */
-.endm
-
-.macro RLC_FILL_TABLE i, j
-    .if \i == 0
-        PREP_FIRST  r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .else
-        PREP_COLUMN \i + \i, r6, r7, r8, r9
-        FILL_COLUMN r6, r7, r8, r9
-    .endif
-    incd T_PTR
-    .if \i < \j
-        RLC_FILL_TABLE \i + 1, \j
-    .endif
-.endm
-
-/*
- * Prepares the first column values.
- */
-.macro PREP_FIRST r1, r2, r4, r8
-	mov		@B_PTR+, \r1	; r1 = b[0]
-	mov		\r1, \r2
-	rla		\r2				; r2 = r1 << 1
-	mov		\r2, \r4
-	rla		\r4				; r4 = r1 << 2
-	mov 	\r4, \r8
-	rla		\r8				; r8 = r1 << 3
-.endm
-
-/*
- * Prepares the values for column i.
- */
-.macro PREP_COLUMN i, r1, r2, r4, r8
-	mov		\r1, RT
-
-	mov		@B_PTR+, \r1
-	mov		\r1, \r2
-	rla		RT
-	rlc		\r2
-	mov		\r2, \r4
-	rla 	RT
-	rlc		\r4
-	mov		\r4, \r8
-	rla		RT
-	rlc		\r8
-.endm
-
-/*
- * Prepares the values for the last column.
- */
-.macro PREP_LAST r1, r2, r4, r8
-    mov     \r1, RT
-
-    clr     \r1
-    mov     \r1, \r2
-    rla     RT
-    rlc     \r2
-    mov     \r2, \r4
-    rla     RT
-    rlc     \r4
-    mov     \r4, \r8
-    rla     RT
-    rlc     \r8
-.endm
-
-/*
- * Fills a column of the precomputation table.
- */
-.macro FILL_COLUMN r1, r2, r4, r8
-	clr     @T_PTR
-	mov     \r1, 1*2*T_LINE(T_PTR)	; tab[1][i] = r1
-	mov     \r2, 2*2*T_LINE(T_PTR)	; tab[2][i] = r2
-	mov     \r1, RT
-	xor     \r2, RT
-	mov		RT, 3*2*T_LINE(T_PTR)	; tab[3][i] = r1^r2
-	mov		\r4, 4*2*T_LINE(T_PTR)	; tab[4][i] = r4
-	xor		\r4, RT
-	mov		RT, 7*2*T_LINE(T_PTR)	; tab[7][i] = r1^r2^r4
-	xor		\r1, RT
-	mov		RT, 6*2*T_LINE(T_PTR)	; tab[6][i] = r2^r4
-	mov		\r1, RT
-	xor		\r4, RT
-	mov		RT, 5*2*T_LINE(T_PTR)	; tab[5][i] = r1^r4
-	mov		\r8, 8*2*T_LINE(T_PTR)	; tab[8][i] = r8
-	mov		\r1, RT
-	xor		\r8, RT
-	mov		RT, 9*2*T_LINE(T_PTR)	; tab[9][i] = r1^r8
-	xor		\r2, RT
-	mov		RT, 11*2*T_LINE(T_PTR)	; tab[11][i] = r1^r2^r8
-	xor		\r1, RT
-	mov		RT, 10*2*T_LINE(T_PTR)	; tab[10][i] = r2^r8
-	xor		\r8, \r4
-	mov		\r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-	xor		\r1, \r4
-	mov		\r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-	xor		\r2, \r4
-	mov		\r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-	xor		\r1, \r4
-	mov		\r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro FILL_LAST r1, r2, r4, r8
-    /*
-     * r1 for the last digit is zero.
-     */
-    clr     @T_PTR
-    mov     \r1, 1*2*T_LINE(T_PTR)  ; tab[1][i] = r1
-    mov     \r2, 2*2*T_LINE(T_PTR)  ; tab[2][i] = r2
-    mov     \r2, RT
-    mov     RT, 3*2*T_LINE(T_PTR)   ; tab[3][i] = r1^r2
-    mov     \r4, 4*2*T_LINE(T_PTR)  ; tab[4][i] = r4
-    xor     \r4, RT
-    mov     RT, 7*2*T_LINE(T_PTR)   ; tab[7][i] = r1^r2^r4
-    mov     RT, 6*2*T_LINE(T_PTR)   ; tab[6][i] = r2^r4
-    mov     \r4, 5*2*T_LINE(T_PTR)   ; tab[5][i] = r1^r4
-    mov     \r8, 8*2*T_LINE(T_PTR)  ; tab[8][i] = r8
-    mov     \r8, RT
-    mov     RT, 9*2*T_LINE(T_PTR)   ; tab[9][i] = r1^r8
-    xor     \r2, RT
-    mov     RT, 11*2*T_LINE(T_PTR)  ; tab[11][i] = r1^r2^r8
-    mov     RT, 10*2*T_LINE(T_PTR)  ; tab[10][i] = r2^r8
-    xor     \r8, \r4
-    mov     \r4, 12*2*T_LINE(T_PTR); tab[12][i] = r4^r8
-    mov     \r4, 13*2*T_LINE(T_PTR); tab[13][i] = r1^r4^r8
-    xor     \r2, \r4
-    mov     \r4, 15*2*T_LINE(T_PTR); tab[15][i] = r1^r2^r4^r8
-    mov     \r4, 14*2*T_LINE(T_PTR); tab[14][i] = r2^r4^r8
-.endm
-
-.macro EPILOGUE
-	.irp i, 11, 10, 9, 8, 7, 6, 5, 4
-		pop 	r\i
-	.endr
-	ret
-.endm
-
-.text
-.align 2
-
-.global fb_muln_low
-
-#define TEMP_SIZE 192
-#define RLC_TABLE_SIZE 512
-
-fb_muln_low:
-    /* r15: c
-       r14: a
-       r13: b
-    */
-    //pushes
-	PROLOGUE
-
-	clr 2*23(r14)
-	clr 2*23(r13)
-
-    //allocate temp area
-	sub #TEMP_SIZE,r1
-
-	//compute t0(8) = a0(8) + a1(8)
-	//compute t1(8) = a1(8) + a2(8)
-	//compute t2(8) = a0(8) + a1(8) + a2(8)
-	mov r14,r11
-	mov r14,r10
-	add #2*8,r11
-	add #2*16,r10
-	//r14: a0 / r11: a1 / r10: a2
-	.irp i, 0, 1, 2, 3, 4, 5, 6, 7
-    	mov @r14+,r12 //a0
-    	mov r12,r9
-    	xor @r11+,r12 //a0 + a1
-    	mov r12,(2 * \i)(r1)
-    	xor @r10+,r12 //a0 + a1 + a2
-    	mov r12,(2 * (\i + 16))(r1)
-    	xor r9,r12 //a1 + a2
-    	mov r12,(2 * (\i + 8))(r1)
-    .endr
-
-	//compute t3(8) = b0(8) + b1(8)
-	//compute t4(8) = b1(8) + b2(8)
-	//compute t5(8) = b0(8) + b1(8) + b2(8)
-	mov r13,r11
-	mov r13,r10
-	add #2*8,r11
-	add #2*16,r10
-	//r14: a0 / r11: a1 / r10: a2
-	.irp i, 0, 1, 2, 3, 4, 5, 6, 7
-    	mov @r13+,r12 //a0
-    	mov r12,r9
-    	xor @r11+,r12 //a0 + a1
-    	mov r12,(2 * (\i + 24))(r1)
-    	xor @r10+,r12 //a0 + a1 + a2
-    	mov r12,(2 * (\i + 40))(r1)
-    	xor r9,r12 //a1 + a2
-    	mov r12,(2 * (\i + 32))(r1)
-    .endr
-
-    //restore pointers
-    sub #2*8,r14
-    sub #2*8,r13
-
-    //compute c01 = a0b0 (v0)
-    push r13
-    call #fb_muln_low_karatsuba
-
-    //compute c45 = a2b2 (v2)
-    add #2*16,r14
-    mov @r1,r13
-    add #2*16,r13
-    add #2*32,r15
-    call #fb_muln_low_karatsuba
-
-    //compute t67 = a1b1 (v1)
-    pop r13
-    //restore and push c
-    sub #2*(4*8),r15
-    push r15
-    sub #2*8,r14
-    add #2*8,r13
-    mov r1,r15
-    add #2*(6*8+1),r15
-    call #fb_muln_low_karatsuba
-
-    //compute t89 = t0t3 (v3)
-    add #2*(2*8),r15
-    mov r15,r14
-    sub #2*(8*8),r14
-    mov r15,r13
-    sub #2*(5*8),r13
-    call #fb_muln_low_karatsuba
-
-    //compute t10,11 = t1t4 (v4)
-    add #2*(2*8),r15
-    mov r15,r14
-    sub #2*(9*8),r14
-    mov r15,r13
-    sub #2*(6*8),r13
-    call #fb_muln_low_karatsuba
-
-    //compute c23 = t2t5 (v5)
-    mov r15,r14
-    sub #2*(8*8),r14
-    mov r15,r13
-    sub #2*(5*8),r13
-    pop r15
-    add #2*(2*8),r15
-    call #fb_muln_low_karatsuba
-
-    //restore c to c1
-    sub #2*(1*8),r15
-
-    //add what's left to c2
-    //move c1 (v0H) to regs
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        mov @r15+,\i
-    .endr
-    //c2' += t7 (v1H)
-    mov r1,r14
-    add #2*(7*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c2' += t8 (v3L)
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c2' += t9 (v3H)
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c2' += t10 (v4L)
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c2 += c2'
-    xor r4,(2*0)(r15)
-    xor r5,(2*1)(r15)
-    xor r6,(2*2)(r15)
-    xor r7,(2*3)(r15)
-    xor r8,(2*4)(r15)
-    xor r9,(2*5)(r15)
-    xor r10,(2*6)(r15)
-    xor r11,(2*7)(r15)
-
-    //add what's left to c1
-    //move c0 (v0L) to regs
-    sub #2*(2*8),r15
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        mov @r15+,\i
-    .endr
-    //c1' += t6 (v1L)
-    sub #2*(5*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c1' += t8 (v3L)
-    add #2*(1*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c1 += c1'
-    xor r4,(2*0)(r15)
-    xor r5,(2*1)(r15)
-    xor r6,(2*2)(r15)
-    xor r7,(2*3)(r15)
-    xor r8,(2*4)(r15)
-    xor r9,(2*5)(r15)
-    xor r10,(2*6)(r15)
-    xor r11,(2*7)(r15)
-
-    //add what's left to c3
-    //move t9 (v3H) to regs
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        mov @r14+,\i
-    .endr
-    //c3' += t11 (v4H)
-    add #2*(1*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    sub #2*(6*8),r14
-    //c3' += t6 (v1L)
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c3' += c4 (v2L)
-    add #2*(3*8),r15
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r15+,\i
-    .endr
-    add #2*(3*8),r14
-    //c3' += t10 (v4L)
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c3 += c3'
-    sub #2*(2*8),r15
-    xor r4,(2*0)(r15)
-    xor r5,(2*1)(r15)
-    xor r6,(2*2)(r15)
-    xor r7,(2*3)(r15)
-    xor r8,(2*4)(r15)
-    xor r9,(2*5)(r15)
-    xor r10,(2*6)(r15)
-    xor r11,(2*7)(r15)
-
-    //add what's left to c4
-    //move t7 (v1H) to regs
-    sub #2*(4*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        mov @r14+,\i
-    .endr
-    //c4' += c5 (v2H)
-    add #2*(2*8),r15
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r15+,\i
-    .endr
-    //c4' += t11 (v4H)
-    add #2*(3*8),r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        xor @r14+,\i
-    .endr
-    //c4 += c4'
-    sub #2*(2*8),r15
-    xor r4,(2*0)(r15)
-    xor r5,(2*1)(r15)
-    xor r6,(2*2)(r15)
-    xor r7,(2*3)(r15)
-    xor r8,(2*4)(r15)
-    xor r9,(2*5)(r15)
-    xor r10,(2*6)(r15)
-    xor r11,(2*7)(r15)
-
-    skip:
-
-    add #TEMP_SIZE,r1
-    //pops
-	EPILOGUE
-
-fb_muln_low_karatsuba:
-
-    sub #RLC_TABLE_SIZE,r1
-
-    RLC_MULN_TABLE
-
-#include "fb_mul_353_ld_k3.inc"
-
-    add #RLC_TABLE_SIZE,r1
-
-    ret
-
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.c
deleted file mode 100644
index 9c6567d4ec96..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level modular reduction functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_rdc1_low(dig_t *c, dig_t *a) {
-	int fa, fb, fc;
-	int sh, lh, rh, sa, la, ra, sb, lb, rb, sc, lc, rc;
-	dig_t d;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	sh = lh = rh = sa = la = ra = sb = lb = rb = sc = lc = rc = 0;
-
-	RLC_RIP(rh, sh, RLC_FB_BITS);
-	sh++;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(ra, sa, RLC_FB_BITS - fa);
-	sa++;
-	la = RLC_DIG - ra;
-
-	if (fb != -1) {
-		RLC_RIP(rb, sb, RLC_FB_BITS - fb);
-		sb++;
-		lb = RLC_DIG - rb;
-
-		RLC_RIP(rc, sc, RLC_FB_BITS - fc);
-		sc++;
-		lc = RLC_DIG - rc;
-	}
-
-	d = a[RLC_FB_DIGS];
-	a[RLC_FB_DIGS] = 0;
-
-	if (rh == 0) {
-		a[RLC_FB_DIGS - sh + 1] ^= d;
-	} else {
-		a[RLC_FB_DIGS - sh + 1] ^= (d >> rh);
-		a[RLC_FB_DIGS - sh] ^= (d << lh);
-	}
-	if (ra == 0) {
-		a[RLC_FB_DIGS - sa + 1] ^= d;
-	} else {
-		a[RLC_FB_DIGS - sa + 1] ^= (d >> ra);
-		a[RLC_FB_DIGS - sa] ^= (d << la);
-	}
-
-	if (fb != -1) {
-		if (rb == 0) {
-			a[RLC_FB_DIGS - sb + 1] ^= d;
-		} else {
-			a[RLC_FB_DIGS - sb + 1] ^= (d >> rb);
-			a[RLC_FB_DIGS - sb] ^= (d << lb);
-		}
-		if (rc == 0) {
-			a[RLC_FB_DIGS - sc + 1] ^= d;
-		} else {
-			a[RLC_FB_DIGS - sc + 1] ^= (d >> rc);
-			a[RLC_FB_DIGS - sc] ^= (d << lc);
-		}
-	}
-
-	d = a[sh - 1] >> rh;
-
-	if (d != 0) {
-		a[0] ^= d;
-		d <<= rh;
-
-		if (ra == 0) {
-			a[sh - sa] ^= d;
-		} else {
-			a[sh - sa] ^= (d >> ra);
-			if (sh > sa) {
-				a[sh - sa - 1] ^= (d << la);
-			}
-		}
-		if (fb != -1) {
-			if (rb == 0) {
-				a[sh - sb] ^= d;
-			} else {
-				a[sh - sb] ^= (d >> rb);
-				if (sh > sb) {
-					a[sh - sb - 1] ^= (d << lb);
-				}
-			}
-			if (rc == 0) {
-				a[sh - sc] ^= d;
-			} else {
-				a[sh - sc] ^= (d >> rc);
-				if (sh > sc) {
-					a[sh - sc - 1] ^= (d << lc);
-				}
-			}
-		}
-		a[sh - 1] ^= d;
-	}
-
-	fb_copy(c, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.s
deleted file mode 100644
index 44a6fe7ec401..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low.s
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_rdcn_low
-
-.text
-.align 2
-
-
-#if FB_POLYN == 283
-#include "relic_fb_rdc_low_283.s"
-#elif FB_POLYN == 163
-#include "relic_fb_rdc_low_163.s"
-#elif FB_POLYN == 271
-#include "relic_fb_rdc_low_271.s"
-#elif FB_POLYN == 353
-#include "relic_fb_rdc_low_353.s"
-#else 
-#error "Field not supported"
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_163.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_163.s
deleted file mode 100644
index b69fcd5ed912..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_163.s
+++ /dev/null
@@ -1,104 +0,0 @@
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_rdcn_low
-
-.text
-.align 2
-
-.macro REDC_COL i
-    //reduce into a[i]
-    //r8: carry
-    //r9 pending a[i+1] write
-
-    .if \i > 0
-        mov (2 * (10 + \i))(r14),r10
-    .else
-        mov (2 * (10 + \i))(r15),r10
-        and #0x7,(2 * (10 + \i))(r15)
-        and #0xFFF8,r10
-    .endif
-
-    mov r10,r13
-    clr r12
-    rla r13
-    rlc r12
-    rla r13
-    rlc r12
-    rla r13
-    rlc r12
-    mov r13,r11
-
-    xor r12,r9
-    rla r13
-    rlc r12
-    xor r12,r9
-    .if \i < 10
-        //write a[i+1]
-        mov r9,(2 * (\i + 1))(r15)
-    .endif
-    mov r13,r9
-    xor r11,r9
-
-    //r9: a[i]
-    xor (2 * \i)(r14),r9
-
-    //"carry"
-    .if \i < 10
-        xor r8,r9
-    .endif
-
-    xor r10,r9
-
-    .if \i > 0
-        clr r8
-        clrc
-        rrc r10
-        rrc r8
-        rrc r10
-        rrc r8
-        rrc r10
-        rrc r8
-
-        xor r10,r9
-    .else
-        clrc
-        rrc r10
-        clrc
-        rrc r10
-        clrc
-        rrc r10
-
-        xor r10,r9
-    .endif
-.endm
-
-fb_rdcn_low:
-    /* r15: c
-       r14: a
-    */
-    push r8
-    push r9
-    push r10
-    push r11
-
-    REDC_COL 10
-    REDC_COL 9
-    REDC_COL 8
-    REDC_COL 7
-    REDC_COL 6
-    REDC_COL 5
-    REDC_COL 4
-    REDC_COL 3
-    REDC_COL 2
-    REDC_COL 1
-    REDC_COL 0
-
-    mov r9,@r15
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_271.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_271.s
deleted file mode 100644
index 5e5c79af9c5e..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_271.s
+++ /dev/null
@@ -1,194 +0,0 @@
-fb_rdcn_low:
-    /* r15: c
-       r14: a
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-    mov 2*33(r14),r13
-    mov r13,r11
-    mov r13,r7
-
-    mov 2*32(r14),r12
-    mov r12,r10
-    mov r12,r6
-
-    mov 2*31(r14),r4
-    mov r4,r9
-    mov r4,r5
-    xor r4,r11
-
-    mov 2*30(r14),r4
-    mov r4,r8
-    mov r4,r4
-    xor r4,r10
-
-    xor 2*29(r14),r13
-    mov r13,2*29(r14)
-    xor r13,r9
-    xor r13,r7
-
-    xor 2*28(r14),r12
-    mov r12,2*28(r14)
-    xor r12,r8
-    xor r12,r6
-
-    xor 2*27(r14),r11
-    mov r11,2*27(r14)
-    xor r11,r7
-    xor r11,r5
-
-    xor 2*26(r14),r10
-    mov r10,2*26(r14)
-    xor r10,r6
-    xor r10,r4
-
-    xor 2*25(r14),r9
-    mov r9,2*25(r14)
-    xor r9,r5
-    xor r9,r13
-
-    xor 2*24(r14),r8
-    mov r8,2*24(r14)
-    xor r8,r4
-    xor r8,r12
-
-    xor 2*23(r14),r7
-    mov r7,2*23(r14)
-    xor r7,r13
-    xor r7,r11
-
-    xor 2*22(r14),r6
-    mov r6,2*22(r14)
-    xor r6,r12
-    xor r6,r10
-
-    xor 2*21(r14),r5
-    mov r5,2*21(r14)
-    xor r5,r11
-    xor r5,r9
-
-    xor 2*20(r14),r4
-    mov r4,2*20(r14)
-    xor r4,r10
-    xor r4,r8
-
-    xor 2*19(r14),r13
-    mov r13,2*19(r14)
-    xor r13,r9
-    xor r13,r7
-
-    xor 2*18(r14),r12
-    mov r12,2*18(r14)
-    xor r12,r8
-    xor r12,r6
-
-    xor 2*17(r14),r11
-    mov r11,2*17(r14)
-    xor r11,r7
-    xor r11,r5
-
-    xor r10,2*16(r14)
-    xor r9,2*15(r14)
-    xor r8,2*14(r14)
-    xor r7,2*13(r14)
-    xor r6,2*12(r14)
-    xor r5,2*11(r14)
-    xor r4,2*10(r14)
-    xor r13,2*9(r14)
-    xor r12,2*8(r14)
-    xor r11,2*7(r14)
-
-    //Add 1-shifted part
-
-    //Digits 0-8
-
-    add #2*17,r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11, r12
-        mov @r14+,\i
-    .endr
-    sub #2*26,r14
-
-    rla r4
-    .irp i, r5, r6, r7, r8, r9, r10, r11, r12
-        rlc \i
-    .endr
-    clr r13
-    adc r13
-
-    xor @r14+,r4
-    mov r4,2*0(r15)
-    xor @r14+,r5
-    mov r5,2*1(r15)
-    xor @r14+,r6
-    mov r6,2*2(r15)
-    xor @r14+,r7
-    mov r7,2*3(r15)
-    xor @r14+,r8
-    mov r8,2*4(r15)
-    xor @r14+,r9
-    mov r9,2*5(r15)
-    xor @r14+,r10
-    mov r10,2*6(r15)
-    xor @r14+,r11
-    mov r11,2*7(r15)
-    xor @r14+,r12
-    mov r12,2*8(r15)
-
-    //Digits 9-16
-
-    add #2*17,r14
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        mov @r14+,\i
-    .endr
-    sub #2*25,r14
-
-    rrc r13
-    .irp i, r4, r5, r6, r7, r8, r9, r10, r11
-        rlc \i
-    .endr
-
-    xor @r14+,r4
-    mov r4,2*9(r15)
-    xor @r14+,r5
-    mov r5,2*10(r15)
-    xor @r14+,r6
-    mov r6,2*11(r15)
-    xor @r14+,r7
-    mov r7,2*12(r15)
-    xor @r14+,r8
-    mov r8,2*13(r15)
-    xor @r14+,r9
-    mov r9,2*14(r15)
-    xor @r14+,r10
-    mov r10,2*15(r15)
-
-    xor @r14+,r11
-    mov r11,r12
-    and #0x7FFF,r11
-    mov r11,(2 * 16)(r15)
-
-    and #0x8000,r12
-    xor r12,2*(16 - 4)(r15)
-    xor r12,2*(16 - 6)(r15)
-    xor r12,2*(16 - 10)(r15)
-    rla r12
-    clr r13
-    adc r13
-    xor r13,0(r15)
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_283.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_283.s
deleted file mode 100644
index 264ef30c44ab..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_283.s
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_rdcn_low
-
-.text
-.align 2
-
-.macro REDC_COL i
-    //reduce into a[i]
-    //r8: carry
-    //r9 pending a[i+1] write
-
-    .if \i > 0
-        mov (2 * (17 + \i))(r14),r10
-    .else
-        mov (2 * (17 + \i))(r15),r10
-        and #0x7FF,(2 * (17 + \i))(r15)
-        and #0xF800,r10
-    .endif
-
-    mov r10,r13
-    clr r12
-    rla r13
-    rlc r12
-
-    .if \i < 18
-        xor r12,r9
-        //write a[i+1]
-        .if \i == 17
-            mov r9,(2 * (\i + 1))(r14)
-        .else
-            mov r9,(2 * (\i + 1))(r15)
-        .endif
-    .endif
-    mov r13,r9
-
-    //r9: a[i]
-    xor (2 * \i)(r14),r9
-
-    //"carry"
-    .if \i < 18
-        xor r8,r9
-    .endif
-
-    .if \i > 0
-        mov r10,r11
-        //clear high byte
-        mov.b r10,r10
-        swpb r10
-        swpb r11
-        mov.b r11,r11
-
-        mov r10,r12
-        mov r11,r13
-
-        clrc
-        rrc r11
-        rrc r10
-        rrc r11
-        rrc r10
-        rrc r11
-        rrc r10
-        // << 8 >> 3 (<< 5)
-        xor r11,r9
-        mov r10,r8
-
-        rla r12
-        rlc r13
-        rla r12
-        rlc r13
-        // << 8 << 2 (<< 10)
-        xor r13,r9
-        xor r12,r8
-
-        rla r12
-        rlc r13
-        rla r12
-        rlc r13
-        // << 8 << 4 (<< 12)
-        xor r13,r9
-        xor r12,r8
-    .else
-        //clear high byte
-        swpb r10
-        mov.b r10,r10
-
-        mov r10,r13
-
-        clrc
-        rrc r10
-        rrc r10
-        rrc r10
-        // << 8 >> 3 (<< 5)
-        xor r10,r9
-
-        rla r13
-        rla r13
-        // << 8 << 2 (<< 10)
-        xor r13,r9
-
-        rla r13
-        rla r13
-        // << 8 << 4 (<< 12)
-        xor r13,r9
-    .endif
-.endm
-
-fb_rdcn_low:
-    /* r15: c
-       r14: a
-    */
-    push r8
-    push r9
-    push r10
-    push r11
-
-    REDC_COL 18
-    REDC_COL 17
-    REDC_COL 16
-    REDC_COL 15
-    REDC_COL 14
-    REDC_COL 13
-    REDC_COL 12
-    REDC_COL 11
-    REDC_COL 10
-    REDC_COL 9
-    REDC_COL 8
-    REDC_COL 7
-    REDC_COL 6
-    REDC_COL 5
-    REDC_COL 4
-    REDC_COL 3
-    REDC_COL 2
-    REDC_COL 1
-    REDC_COL 0
-
-    mov r9,@r15
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-	ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_353.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_353.s
deleted file mode 100644
index dd576f24d52b..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_rdc_low_353.s
+++ /dev/null
@@ -1,170 +0,0 @@
-fb_rdcn_low:
-    /* r15: c
-       r14: a
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-    add #2*37,r14
-    .irp reg, r11, r10, r9, r8, r7, r6, r5, r4
-        mov @r14+, \reg
-    .endr
-    sub #2*(37+8),r14
-    /*
-    mov 2*44(r14),r4
-    mov 2*43(r14),r5
-    mov 2*42(r14),r6
-    mov 2*41(r14),r7
-    mov 2*40(r14),r8
-    mov 2*39(r14),r9
-    mov 2*38(r14),r10
-    mov 2*37(r14),r11
-    */
-
-    clrc
-    .irp reg, r4, r5, r6, r7, r8, r9, r10, r11
-        rrc \reg
-    .endr
-    clr r12
-    rrc r12
-
-    xor r4,2*22(r14)
-    xor r5,2*21(r14)
-    xor r6,2*20(r14)
-    xor r7,2*19(r14)
-    xor r8,2*18(r14)
-    xor r9,2*17(r14)
-    xor r10,2*16(r14)
-    xor r11,2*15(r14)
-
-    clrc
-    .irp reg, r4, r5, r6, r7, r8, r9, r10, r11, r12
-        rrc \reg
-    .endr
-
-    xor r4,2*28(r14)
-    xor r5,2*27(r14)
-    xor r6,2*26(r14)
-    xor r7,2*25(r14)
-    xor r8,2*24(r14)
-    xor r9,2*23(r14)
-    xor r10,2*22(r14)
-    xor r11,2*21(r14)
-
-
-    add #2*29,r14
-    .irp reg, r11, r10, r9, r8, r7, r6, r5, r4
-        mov @r14+, \reg
-    .endr
-    sub #2*(29+8),r14
-    /*
-    mov 2*36(r14),r4
-    mov 2*35(r14),r5
-    mov 2*34(r14),r6
-    mov 2*33(r14),r7
-    mov 2*32(r14),r8
-    mov 2*31(r14),r9
-    mov 2*30(r14),r10
-    mov 2*29(r14),r11
-    */
-
-    rla r12
-    rlc r12
-    .irp reg, r4, r5, r6, r7, r8, r9, r10, r11
-        rrc \reg
-    .endr
-    clr r13
-    rrc r13
-
-    xor r4,2*14(r14)
-    xor r5,2*13(r14)
-    xor r6,2*12(r14)
-    xor r7,2*11(r14)
-    xor r8,2*10(r14)
-    xor r9,2*9(r14)
-    xor r10,2*8(r14)
-    xor r11,2*7(r14)
-
-    rrc r12
-    .irp reg, r4, r5, r6, r7, r8, r9, r10, r11, r13
-        rrc \reg
-    .endr
-    mov r13,r12
-
-    xor r4,2*20(r14)
-    xor r5,2*19(r14)
-    xor r6,2*18(r14)
-    xor r7,2*17(r14)
-    xor r8,2*16(r14)
-    xor r9,2*15(r14)
-    xor r10,2*14(r14)
-    xor r11,2*13(r14)
-
-
-    add #2*22,r14
-    .irp reg, r10, r9, r8, r7, r6, r5, r4
-        mov @r14+, \reg
-    .endr
-    sub #2*(22+7),r14
-    /*
-    mov 2*28(r14),r4
-    mov 2*27(r14),r5
-    mov 2*26(r14),r6
-    mov 2*25(r14),r7
-    mov 2*24(r14),r8
-    mov 2*23(r14),r9
-    mov 2*22(r14),r10
-    */
-    and #0x1,2*22(r14)
-    and #0xFFFE,r10
-
-    rla r12
-    rlc r12
-    .irp reg, r4, r5, r6, r7, r8, r9, r10
-        rrc \reg
-    .endr
-    clr r13
-    rrc r13
-
-    xor r4,2*6(r14)
-    xor r5,2*5(r14)
-    xor r6,2*4(r14)
-    xor r7,2*3(r14)
-    xor r8,2*2(r14)
-    xor r9,2*1(r14)
-    xor r10,2*0(r14)
-
-    clrc
-    rrc r12
-    .irp reg, r4, r5, r6, r7, r8, r9, r10, r13
-        rrc \reg
-    .endr
-
-    xor r4,2*12(r14)
-    xor r5,2*11(r14)
-    xor r6,2*10(r14)
-    xor r7,2*9(r14)
-    xor r8,2*8(r14)
-    xor r9,2*7(r14)
-    xor r10,2*6(r14)
-    xor r13,2*5(r14)
-
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22
-        mov @r14+,(2 * \i)(r15)
-    .endr
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.c
deleted file mode 100644
index 593445682741..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_util.h"
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fb_lshadd1_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd2_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd3_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd4_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd5_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd6_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd7_low(dig_t *c, const dig_t *a, int size);
-dig_t fb_lshadd8_low(dig_t *c, const dig_t *a, int size);
-
-dig_t fb_lsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	/* Prepare the bit mask. */
-	carry = 0;
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, c++) {
-		/* Get the most significant bit. */
-		r = *a >> (RLC_DIG - 1);
-		/* Shift the operand and insert the carry, */
-		*c = (*a << 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = 0; i < RLC_FB_DIGS; i++, a++, c++) {
-		/* Get the needed least significant bits. */
-		r = ((*a) >> shift) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) << bits) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_rsh1_low(dig_t *c, const dig_t *a) {
-	int i;
-	dig_t r, carry;
-
-	c += RLC_FB_DIGS - 1;
-	a += RLC_FB_DIGS - 1;
-	carry = 0;
-	for (i = RLC_FB_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the least significant bit. */
-		r = *a & 0x01;
-		/* Shift the operand and insert the carry. */
-		carry <<= RLC_DIG - 1;
-		*c = (*a >> 1) | carry;
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	int i;
-	dig_t r, carry, mask, shift;
-
-	c += RLC_FB_DIGS - 1;
-	a += RLC_FB_DIGS - 1;
-	/* Prepare the bit mask. */
-	shift = RLC_DIG - bits;
-	carry = 0;
-	mask = RLC_MASK(bits);
-	for (i = RLC_FB_DIGS - 1; i >= 0; i--, a--, c--) {
-		/* Get the needed least significant bits. */
-		r = (*a) & mask;
-		/* Shift left the operand. */
-		*c = ((*a) >> bits) | (carry << shift);
-		/* Update the carry. */
-		carry = r;
-	}
-	return carry;
-}
-
-dig_t fb_lsha_low(dig_t *c, const dig_t *a, int bits, int size) {
-	int i, j;
-	dig_t b1, b2;
-
-	switch (bits) {
-	case 0:
-		return 0;
-	case 1:
-		return fb_lshadd1_low(c, a, size);
-	case 2:
-		return fb_lshadd2_low(c, a, size);
-	case 3:
-		return fb_lshadd3_low(c, a, size);
-	case 4:
-		return fb_lshadd4_low(c, a, size);
-	case 5:
-		return fb_lshadd5_low(c, a, size);
-	case 6:
-		return fb_lshadd6_low(c, a, size);
-	case 7:
-		return fb_lshadd7_low(c, a, size);
-	case 8:
-		return fb_lshadd8_low(c, a, size);
-	}
-
-	j = RLC_DIG - bits;
-	b1 = a[0];
-	c[0] ^= (b1 << bits);
-	for (i = 1; i < size; i++) {
-		b2 = a[i];
-		c[i] ^= ((b2 << bits) | (b1 >> j));
-		b1 = b2;
-	}
-	return (b1 >> j);
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.s
deleted file mode 100644
index cf55c9486903..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_shift_low.s
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field bit shifting functions.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_lshadd1_low
-.global fb_lshadd2_low
-.global fb_lshadd3_low
-.global fb_lshadd4_low
-.global fb_lshadd5_low
-.global fb_lshadd6_low
-.global fb_lshadd7_low
-.global fb_lshadd8_low
-
-.text
-.align 2
-
-fb_lshadd1_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r11
-    clr		r11
-fb_lshadd1_loop:
-    mov 	@r14+,r12
-    rrc		r11
-    rlc		r12
-    rlc		r11
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd1_loop
-
-	mov		r11,r15
-	pop		r11
-	ret
-
-fb_lshadd2_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd2_loop:
-    mov 	@r14+,r12
-    clr		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd2_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd3_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd3_loop:
-    mov 	@r14+,r12
-    clr		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd3_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd4_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd4_loop:
-    mov 	@r14+,r12
-    clr		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd4_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd5_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd5_loop:
-    mov 	@r14+,r12
-    clr		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd5_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd6_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd6_loop:
-    mov 	@r14+,r12
-    clr		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    rla		r12
-    rlc		r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd6_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd7_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd7_loop:
-    mov 	@r14+,r12
-    mov		r12, r11
-    and		#0xFF,r12
-    and		#0xFF00,r11
-    swpb	r12
-    swpb	r11
-    clrc
-    rrc		r11
-    rrc		r12
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd7_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
-
-fb_lshadd8_low:
-    /* r15: c
-       r14: a
-       r13: size
-    */
-    push	r10
-    push	r11
-    clr		r10
-fb_lshadd8_loop:
-    mov 	@r14+,r12
-    mov		r12,r11
-    and		#0xFF,r12
-    and		#0xFF00,r11
-    swpb	r12
-    swpb	r11
-    xor 	r10,r12
-    mov		r11,r10
-    xor 	@r15+,r12
-    mov 	r12,-2(r15)
-    dec		r13
-    jnz		fb_lshadd8_loop
-
-	mov		r11, r15
-	pop		r11
-	pop		r10
-	ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.c
deleted file mode 100644
index 5cfac64c4b21..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field shifting.
- *
- * @ingroup fb
- */
-
-#include "relic_fb.h"
-#include "relic_dv.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/**
- * Precomputed table of the squaring of all polynomial with degree less than 8.
- */
-const dig_t fb_sqrl_table[256] = { 0x0, 0x1, 0x4, 0x5, 0x10, 0x11, 0x14, 0x15,
-		0x40, 0x41, 0x44, 0x45, 0x50, 0x51, 0x54, 0x55, 0x100, 0x101, 0x104,
-		0x105, 0x110, 0x111, 0x114, 0x115, 0x140, 0x141, 0x144, 0x145, 0x150,
-		0x151, 0x154, 0x155, 0x400, 0x401, 0x404, 0x405, 0x410, 0x411, 0x414,
-		0x415, 0x440, 0x441, 0x444, 0x445, 0x450, 0x451, 0x454, 0x455, 0x500,
-		0x501, 0x504, 0x505, 0x510, 0x511, 0x514, 0x515, 0x540, 0x541, 0x544,
-		0x545, 0x550, 0x551, 0x554, 0x555, 0x1000, 0x1001, 0x1004, 0x1005,
-		0x1010, 0x1011, 0x1014, 0x1015, 0x1040, 0x1041, 0x1044, 0x1045, 0x1050,
-		0x1051, 0x1054, 0x1055, 0x1100, 0x1101, 0x1104, 0x1105, 0x1110, 0x1111,
-		0x1114, 0x1115, 0x1140, 0x1141, 0x1144, 0x1145, 0x1150, 0x1151, 0x1154,
-		0x1155, 0x1400, 0x1401, 0x1404, 0x1405, 0x1410, 0x1411, 0x1414, 0x1415,
-		0x1440, 0x1441, 0x1444, 0x1445, 0x1450, 0x1451, 0x1454, 0x1455, 0x1500,
-		0x1501, 0x1504, 0x1505, 0x1510, 0x1511, 0x1514, 0x1515, 0x1540, 0x1541,
-		0x1544, 0x1545, 0x1550, 0x1551, 0x1554, 0x1555, 0x4000, 0x4001, 0x4004,
-		0x4005, 0x4010, 0x4011, 0x4014, 0x4015, 0x4040, 0x4041, 0x4044, 0x4045,
-		0x4050, 0x4051, 0x4054, 0x4055, 0x4100, 0x4101, 0x4104, 0x4105, 0x4110,
-		0x4111, 0x4114, 0x4115, 0x4140, 0x4141, 0x4144, 0x4145, 0x4150, 0x4151,
-		0x4154, 0x4155, 0x4400, 0x4401, 0x4404, 0x4405, 0x4410, 0x4411, 0x4414,
-		0x4415, 0x4440, 0x4441, 0x4444, 0x4445, 0x4450, 0x4451, 0x4454, 0x4455,
-		0x4500, 0x4501, 0x4504, 0x4505, 0x4510, 0x4511, 0x4514, 0x4515, 0x4540,
-		0x4541, 0x4544, 0x4545, 0x4550, 0x4551, 0x4554, 0x4555, 0x5000, 0x5001,
-		0x5004, 0x5005, 0x5010, 0x5011, 0x5014, 0x5015, 0x5040, 0x5041, 0x5044,
-		0x5045, 0x5050, 0x5051, 0x5054, 0x5055, 0x5100, 0x5101, 0x5104, 0x5105,
-		0x5110, 0x5111, 0x5114, 0x5115, 0x5140, 0x5141, 0x5144, 0x5145, 0x5150,
-		0x5151, 0x5154, 0x5155, 0x5400, 0x5401, 0x5404, 0x5405, 0x5410, 0x5411,
-		0x5414, 0x5415, 0x5440, 0x5441, 0x5444, 0x5445, 0x5450, 0x5451, 0x5454,
-		0x5455, 0x5500, 0x5501, 0x5504, 0x5505, 0x5510, 0x5511, 0x5514, 0x5515,
-		0x5540, 0x5541, 0x5544, 0x5545, 0x5550, 0x5551, 0x5554, 0x5555 };
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.s
deleted file mode 100644
index eb3a89c244a4..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_sqr_low.s
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field shifting.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_sqrl_low
-
-.text
-.align 2
-
-.macro STEP i
-    mov @r14+,r13
-    mov r13,r12
-    //clear high byte
-    mov.b r13,r13
-    rla r13
-    mov fb_sqrl_table(r13),2*(2 * \i)(r15)
-    swpb r12
-    //clear high byte
-    mov.b r12,r12
-    rla r12
-    mov fb_sqrl_table(r12),2*(2 * \i + 1)(r15)
-.endm
-
-fb_sqrl_low:
-    /* r15: c
-       r14: a
-    */
-    STEP 0
-    STEP 1
-    STEP 2
-    STEP 3
-    STEP 4
-    STEP 5
-    STEP 6
-    STEP 7
-    STEP 8
-    STEP 9
-    STEP 10
-#if (FB_POLYN > 176)
-    STEP 11
-    STEP 12
-    STEP 13
-    STEP 14
-    STEP 15
-    STEP 16
-#if (FB_POLYN > 272)
-    STEP 17
-#if (FB_POLYN > 288)
-    STEP 18
-    STEP 19
-    STEP 20
-    STEP 21
-    STEP 22
-#endif
-#endif
-#endif
-
-	ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.c
deleted file mode 100644
index a2d0195a0afb..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field square root.
- *
- * @ingroup fb
- */
-
-#include <stdlib.h>
-
-#include "relic_fb.h"
-#include "relic_fb_low.h"
-#include "relic_util.h"
-
-#if FB_POLYN != 271 && FB_POLYN != 353
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#define HALF ((int)((RLC_FB_BITS / 2)/(RLC_DIG) + ((RLC_FB_BITS / 2) % RLC_DIG > 0)))
-
-static const dig_t table_evens[16] = {
-	0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15
-};
-static const dig_t table_odds[16] = {
-	0, 4, 1, 5, 8, 12, 9, 13, 2, 6, 3, 7, 10, 14, 11, 15
-};
-
-static void fb_srtt_low(dig_t *c, const dig_t *a, int fa) {
-	int i, j, n, h, sh, rh, lh, sa, la, ra;
-	dig_t d, d_e, d_o;
-	align dig_t t[2 * RLC_FB_DIGS] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-	h = (sh + 1) >> 1;
-	rh = (h << RLC_DIG_LOG) - 1 - (RLC_FB_BITS - 1) / 2;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(la, sa, (fa + 1) >> 1);
-	ra = RLC_DIG - la;
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 8; j++) {
-			d_e |= table_evens[((d & 0x05) + ((d & 0x50) >> 3))] << (j << 2);
-			d_o |= table_odds[((d & 0x0A) + ((d & 0xA0) >> 5))] << (j << 2);
-			d >>= 8;
-		}
-
-		i++;
-		if (i < sh) {
-			d = a[i];
-
-			for (j = 0; j < RLC_DIG / 8; j++) {
-				d_e |= table_evens[((d & 0x05) + ((d & 0x50) >> 3))] <<
-						((RLC_DIG / 2) + (j << 2));
-				d_o |= table_odds[((d & 0x0A) + ((d & 0xA0) >> 5))] <<
-						((RLC_DIG / 2) + (j << 2));
-				d >>= 8;
-			}
-		}
-
-		t[n] ^= d_e;
-
-		if (rh == 0) {
-			t[h + n] = d_o;
-		} else {
-			t[h + n - 1] ^= (d_o << lh);
-			t[h + n] ^= (d_o >> rh);
-		}
-		if (la == 0) {
-			t[n + sa] ^= d_o;
-		} else {
-			t[n + sa] ^= (d_o << la);
-			t[n + sa + 1] ^= (d_o >> ra);
-		}
-	}
-	fb_copy(c, t);
-}
-
-static void fb_srtp_low(dig_t *c, const dig_t *a, int fa, int fb, int fc) {
-	int i, j, n, h, sh, rh, lh, sa, la, ra, sb, lb, rb, sc, lc, rc;
-	dig_t d, d_e, d_o;
-	align dig_t t[] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-	h = (sh + 1) >> 1;
-	rh = (h << RLC_DIG_LOG) - 1 - (RLC_FB_BITS - 1) / 2;
-	lh = RLC_DIG - rh;
-
-	RLC_RIP(la, sa, (fa + 1) >> 1);
-	ra = RLC_DIG - la;
-
-	RLC_RIP(lb, sb, (fb + 1) >> 1);
-	rb = RLC_DIG - lb;
-
-	RLC_RIP(lc, sc, (fc + 1) >> 1);
-	rc = RLC_DIG - lc;
-
-	for (i = 0; i < sh; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 8; j++) {
-			d_e |= table_evens[((d & 0x5) + ((d & 0x50) >> 3))] << (j << 2);
-			d_o |= table_odds[((d & 0xA) + ((d & 0xA0) >> 5))] << (j << 2);
-			d >>= 8;
-		}
-		i++;
-
-		if (i < sh) {
-			d = a[i];
-			for (j = 0; j < RLC_DIG / 8; j++) {
-				d_e |= table_evens[((d & 0x5) + ((d & 0x50) >> 3))] <<
-						(RLC_DIG / 2 + (j << 2));
-				d_o |= table_odds[((d & 0xA) + ((d & 0xA0) >> 5))] <<
-						(RLC_DIG / 2 + (j << 2));
-				d >>= 8;
-			}
-		}
-
-		t[n] ^= d_e;
-
-		if (rh == 0) {
-			t[h + n] = d_o;
-		} else {
-			t[h + n - 1] ^= (d_o << lh);
-			t[h + n] ^= (d_o >> rh);
-		}
-		if (la == 0) {
-			t[n + sa] ^= d_o;
-		} else {
-			t[n + sa] ^= (d_o << la);
-			t[n + sa + 1] ^= (d_o >> ra);
-		}
-		if (lb == 0) {
-			t[n + sb] ^= d_o;
-		} else {
-			t[n + sb] ^= (d_o << lb);
-			t[n + sb + 1] ^= (d_o >> rb);
-		}
-		if (lc == 0) {
-			t[n + sc] ^= d_o;
-		} else {
-			t[n + sc] ^= (d_o << lc);
-			t[n + sc + 1] ^= (d_o >> rc);
-		}
-	}
-	fb_copy(c, t);
-}
-
-static void fb_sqrt_low(dig_t *c, const dig_t *a) {
-	int i, j, n, sh;
-	dig_t d, d_e, d_o;
-	align dig_t t[2 * RLC_FB_DIGS] = { 0 }, s[RLC_FB_DIGS + 1] = { 0 };
-	align dig_t t_e[RLC_FB_DIGS] = { 0 }, t_o[RLC_FB_DIGS] = { 0 };
-
-	sh = 1 + (RLC_FB_BITS >> RLC_DIG_LOG);
-
-	for (i = 0; i < RLC_FB_DIGS; i++) {
-		n = i >> 1;
-		d = a[i];
-
-		d_e = d_o = 0;
-		for (j = 0; j < RLC_DIG / 8; j++) {
-			d_e |= table_evens[((d & 0x05) + ((d & 0x50) >> 3))] << (j << 2);
-			d_o |= table_odds[((d & 0x0A) + ((d & 0xA0) >> 5))] << (j << 2);
-			d >>= 8;
-		}
-
-		i++;
-		if (i < sh && i < RLC_FB_DIGS) {
-			d = a[i];
-
-			for (j = 0; j < RLC_DIG / 8; j++) {
-				d_e |= table_evens[((d & 0x05) + ((d & 0x50) >> 3))] <<
-						((RLC_DIG / 2) + (j << 2));
-				d_o |= table_odds[((d & 0x0A) + ((d & 0xA0) >> 5))] <<
-						((RLC_DIG / 2) + (j << 2));
-				d >>= 8;
-			}
-		}
-
-		t_e[n] = d_e;
-		t_o[n] = d_o;
-	}
-	if (fb_poly_tab_srz(0) == NULL) {
-		dv_copy(s, fb_poly_get_srz() + HALF, RLC_FB_DIGS - HALF);
-		fb_muld_low(t + HALF, t_o, s, HALF);
-		fb_muld_low(s, t_o, fb_poly_get_srz(), HALF);
-		fb_addd_low(t, t, s, RLC_FB_DIGS + 1);
-		fb_rdcn_low(c, t);
-		fb_addd_low(c, c, t_e, HALF);
-	} else {
-		dig_t u, carry, *tmpa, *tmpc;
-
-		for (i = RLC_DIG - 8; i > 0; i -= 8) {
-			tmpa = t_o;
-			tmpc = t;
-			for (j = 0; j < HALF; j++, tmpa++, tmpc++) {
-				u = (*tmpa >> i) & 0xFF;
-				fb_addn_low(tmpc, tmpc, fb_poly_tab_srz(u));
-			}
-			carry = fb_lshb_low(t, t, 8);
-			fb_lshb_low(t + RLC_FB_DIGS, t + RLC_FB_DIGS, 8);
-			t[RLC_FB_DIGS] ^= carry;
-		}
-		for (j = 0; j < HALF; j++) {
-			u = t_o[j] & 0xFF;
-			fb_addn_low(t + j, t + j, fb_poly_tab_srz(u));
-		}
-		fb_zero(c);
-		fb_rdcn_low(c, t);
-		fb_addd_low(c, c, t_e, HALF);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fb_srtn_low(dig_t *c, const dig_t *a) {
-	int fa, fb, fc;
-
-	fb_poly_get_rdc(&fa, &fb, &fc);
-
-	if (fb == 0) {
-		if (fa % 2 == 0) {
-			fb_sqrt_low(c, a);
-		} else {
-			fb_srtt_low(c, a, fa);
-		}
-	} else {
-		if ((fa % 2 == 0) || (fb % 2 == 0) || (fc % 2 == 0)) {
-			fb_sqrt_low(c, a);
-		} else {
-			fb_srtp_low(c, a, fa, fb, fc);
-		}
-	}
-}
-
-#else
-
-const uint8_t fb_srt_table_evens[256] = { 0, 1, 16, 17, 2, 3, 18, 19, 32, 33,
-	48, 49, 34, 35, 50, 51, 4, 5, 20, 21, 6, 7, 22, 23, 36, 37, 52, 53,	38, 39,
-	54, 55, 64, 65, 80, 81, 66, 67, 82, 83, 96, 97, 112, 113, 98, 99, 114, 115,
-	68, 69, 84, 85, 70, 71, 86, 87, 100, 101, 116, 117, 102, 103, 118, 119, 8,
-	9, 24, 25, 10, 11, 26, 27, 40, 41, 56, 57, 42, 43, 58, 59, 12, 13, 28, 29,
-	14, 15, 30, 31, 44, 45, 60, 61, 46, 47, 62, 63, 72, 73, 88, 89, 74, 75, 90,
-	91, 104, 105, 120, 121, 106, 107, 122, 123,	76, 77, 92, 93, 78, 79, 94, 95,
-	108, 109, 124, 125, 110, 111, 126, 127, 128, 129, 144, 145, 130, 131, 146,
-	147, 160, 161, 176, 177, 162, 163, 178, 179, 132, 133, 148, 149, 134, 135,
-	150, 151, 164, 165, 180, 181, 166, 167, 182, 183, 192, 193, 208, 209, 194,
-	195, 210, 211, 224, 225, 240, 241, 226, 227, 242, 243, 196, 197, 212, 213,
-	198, 199, 214, 215, 228, 229, 244, 245, 230, 231, 246, 247, 136, 137, 152,
-	153, 138, 139, 154, 155, 168, 169, 184, 185, 170, 171, 186, 187, 140, 141,
-	156, 157, 142, 143, 158, 159, 172, 173, 188, 189, 174, 175, 190, 191, 200,
-	201, 216, 217, 202, 203, 218, 219, 232, 233, 248, 249, 234, 235, 250, 251,
-	204, 205, 220, 221, 206, 207, 222, 223, 236, 237, 252, 253, 238, 239, 254,
-	255 };
-
-const uint8_t fb_srt_table_odds[256] = { 0, 16, 1, 17, 32, 48, 33, 49, 2, 18, 3,
-	19, 34, 50, 35, 51, 64, 80, 65, 81, 96, 112, 97, 113, 66, 82, 67, 83, 98,
-	114, 99, 115, 4, 20, 5, 21, 36, 52, 37, 53, 6, 22, 7, 23, 38, 54, 39, 55,
-	68, 84, 69, 85, 100, 116, 101, 117, 70, 86, 71, 87,	102, 118, 103, 119, 128,
-	144, 129, 145, 160, 176, 161, 177, 130, 146, 131, 147, 162, 178, 163, 179,
-	192, 208, 193, 209, 224, 240, 225, 241,	194, 210, 195, 211, 226, 242, 227,
-	243, 132, 148, 133, 149, 164, 180,	165, 181, 134, 150, 135, 151, 166, 182,
-	167, 183, 196, 212, 197, 213, 228, 244, 229, 245, 198, 214, 199, 215, 230,
-	246, 231, 247, 8, 24, 9, 25, 40, 56, 41, 57, 10, 26, 11, 27, 42, 58, 43, 59,
-	72, 88, 73, 89,	104, 120, 105, 121, 74, 90, 75, 91, 106, 122, 107, 123, 12,
-	28, 13, 29, 44, 60, 45, 61, 14, 30, 15, 31, 46, 62, 47, 63, 76, 92, 77, 93,
-	108, 124, 109, 125, 78, 94, 79, 95, 110, 126, 111, 127, 136, 152, 137, 153,
-	168, 184, 169, 185, 138, 154, 139, 155, 170, 186, 171, 187, 200, 216, 201,
-	217, 232, 248, 233, 249, 202, 218, 203, 219, 234, 250, 235, 251, 140, 156,
-	141, 157, 172, 188, 173, 189, 142, 158, 143, 159, 174, 190, 175, 191, 204,
-	220, 205, 221, 236, 252, 237, 253, 206, 222, 207, 223, 238, 254, 239, 255 };
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.s
deleted file mode 100644
index c32030498bef..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fb_srt_low.s
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2007 Project RELIC
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level binary field square root.
- *
- * @ingroup fb
- */
-
-#include "relic_fb_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-.global fb_srtn_low
-
-.text
-.align 2
-
-#if FB_POLYN == 271
-
-fb_srtn_low:
-    /* r15: c
-       r14: a
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    sub #2*17,r1
-
-    clr r8
-
-#include "fb_srt_271_penta.inc"
-
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-        mov @r1+,(2 * \i)(r15)
-    .endr
-
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-	ret
-
-#elif FB_POLYN == 353
-
-fb_srtn_low:
-    /* r15: c
-       r14: a
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    sub #2*23,r1
-
-    clr r9
-
-#include "fb_srt_353_trino.inc"
-
-    .irp i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22
-        mov @r1+,(2 * \i)(r15)
-    .endr
-
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.c
deleted file mode 100644
index 02d8c22ca633..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_subd_low(c, a, b);
-	if (carry) {
-		fp_addn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry = fp_addd_low(c, a, b);
-	if (carry || (dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		fp_subn_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get());
-	}
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	fp_dbl(c, a);
-}
-
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fp_sub(c, a, b);
-}
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fp_add(c, a, b);
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = fp_addn_low(c, a, fp_prime_get());
-	} else {
-		fp_copy(c, a);
-	}
-
-	fp_add1_low(c + RLC_FP_DIGS, a + RLC_FP_DIGS, carry);
-
-	carry = fp_rsh1_low(c + RLC_FP_DIGS, c + RLC_FP_DIGS);
-	fp_rsh1_low(c, c);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.s
deleted file mode 100644
index eaf9ad2aaa2b..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_add_low.s
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Copyright 2007-2009 RELIC Project
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_conf.h"
-
-.text
-.align 2
-.global fp_add1_low
-.global fp_addn_low
-.global fp_addd_low
-.global fp_sub1_low
-.global fp_subn_low
-.global fp_subd_low
-.global fp_dbln_low
-
-
-fp_add1_low:
-	add @r14+,r13
-	mov r13,@r15
-	mov @r14+,r12
-	adc r12
-	mov r12,2*1(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*2(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*3(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*4(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*5(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*6(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*7(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*8(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*9(r15)
-#if (FP_PRIME > 160)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*10(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*11(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*12(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*13(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*14(r15)
-	mov @r14+,r12
-	adc r12
-	mov r12,2*15(r15)
-#endif
-	clr r15
-	adc r15
-	ret
-
-
-fp_addn_low:
-	mov @r14+,r12
-	add @r13+,r12
-	mov r12,@r15
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*1(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*2(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*3(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*4(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*5(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*6(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*7(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*8(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*9(r15)
-#if (FP_PRIME > 160)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*10(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*11(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*12(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*13(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*14(r15)
-	mov @r14+,r12
-	addc @r13+,r12
-	mov r12,2*15(r15)
-#endif
-	clr r15
-	adc r15
-	ret
-
-fp_dbln_low:
-    mov r14,r13
-    br #fp_addn_low
-
-fp_addd_low:
-    mov @r14+,r12
-    add @r13+,r12
-    mov r12,@r15
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*1(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*2(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*3(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*4(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*5(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*6(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*7(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*8(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*9(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*10(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*11(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*12(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*13(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*14(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*15(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*16(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*17(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*18(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*19(r15)
-#if (FP_PRIME > 160)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*20(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*21(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*22(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*23(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*24(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*25(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*26(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*27(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*28(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*29(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*30(r15)
-    mov @r14+,r12
-    addc @r13+,r12
-    mov r12,2*31(r15)
-#endif
-    clr r15
-    adc r15
-    ret
-
-fp_sub1_low:
-	mov @r14+,r12
-	sub r13,r12
-	mov r12,2*0(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*1(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*2(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*3(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*4(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*5(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*6(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*7(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*8(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*9(r15)
-#if (FP_PRIME > 160)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*10(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*11(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*12(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*13(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*14(r15)
-	mov @r14+,r12
-	sbc r12
-	mov r12,2*15(r15)
-#endif
-	clr r15
-	adc r15
-	xor #1,r15
-	ret
-
-fp_subn_low:
-	mov @r14+,r12
-	sub @r13+,r12
-	mov r12,@r15
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*1(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*2(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*3(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*4(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*5(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*6(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*7(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*8(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*9(r15)
-#if (FP_PRIME > 160)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*10(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*11(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*12(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*13(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*14(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*15(r15)
-#endif
-	clr r15
-	adc r15
-	xor #1,r15
-	ret
-
-fp_subd_low:
-	mov @r14+,r12
-	sub @r13+,r12
-	mov r12,@r15
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*1(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*2(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*3(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*4(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*5(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*6(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*7(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*8(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*9(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*10(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*11(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*12(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*13(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*14(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*15(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*16(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*17(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*18(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*19(r15)
-#if (FP_PRIME > 160)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*20(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*21(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*22(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*23(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*24(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*25(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*26(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*27(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*28(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*29(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*30(r15)
-	mov @r14+,r12
-	subc @r13+,r12
-	mov r12,2*31(r15)
-#endif
-	clr r15
-	adc r15
-	xor #1,r15
-	ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_inv_low.c
deleted file mode 100644
index 5b94516d7ecb..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_inv_low.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-le&vel in&version functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include "relic_bn.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	bn_t bnc;
-	bn_t bna;
-	bn_t gcd;
-	bn_t bnp;
-	const dig_t *p;
-
-	bn_null(bnc);
-	bn_null(bna);
-	bn_null(gcd);
-	bn_null(bnp);
-
-	bn_new(bnc);
-	bn_new(bna);
-	bn_new(gcd);
-	bn_new(bnp);
-
-	p = fp_prime_get();
-
-#if FP_RDC == MONTY
-	fp_prime_back(bna, a);
-#else
-	bna->used = RLC_FP_DIGS;
-	dv_copy(bna->dp, a, RLC_FP_DIGS);
-#endif
-	bnp->used = RLC_FP_DIGS;
-	dv_copy(bnp->dp, p, RLC_FP_DIGS);
-
-	bn_gcd_ext(gcd, bnc, NULL, bna, bnp);
-
-	while (bn_sign(bnc) == RLC_NEG) {
-		bn_add(bnc, bnc, bnp);
-	}
-	while (bn_cmp(bnc, bnp) != RLC_LT) {
-		bn_sub(bnc, bnc, bnp);
-	}
-
-#if FP_RDC == MONTY
-	fp_prime_conv(c, bnc);
-#else
-	dv_copy(c, bnc->dp, bnc->used);
-	for (int i = bnc->used; i < RLC_FP_DIGS; i++) {
-		c[i] = 0;
-	}
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.c
deleted file mode 100644
index 821795811461..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2007-2009 RELIC Project
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*c) + (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	int i;
-	dig_t carry;
-	dbl_t r;
-
-	carry = 0;
-	for (i = 0; i < RLC_FP_DIGS; i++, a++, c++) {
-		/* Multiply the digit *tmpa by b and accumulate with the previous
-		 * result in the same columns and the propagated carry. */
-		r = (dbl_t)(*a) * (dbl_t)(digit) + (dbl_t)(carry);
-		/* Increment the column and assign the result. */
-		*c = (dig_t)r;
-		/* Update the carry. */
-		carry = (dig_t)(r >> (dbl_t)RLC_DIG);
-	}
-	return carry;
-}
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.s
deleted file mode 100644
index e2c539e1c0cd..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low.s
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2007-2009 RELIC Project
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "relic_conf.h"
-
-#ifdef MSP430X
-#include <msp430.h>
-#else
-
-/* For some reason these are not defined in asm */
-#define MPY                0x0130  /* Multiply Unsigned/Operand 1 */
-#define MPYS               0x0132  /* Multiply Signed/Operand 1 */
-#define MAC                0x0134  /* Multiply Unsigned and Accumulate/Operand 1 */
-#define MACS               0x0136  /* Multiply Signed and Accumulate/Operand 1 */
-#define OP2                0x0138  /* Operand 2 */
-#define RESLO              0x013A  /* Result Low Word */
-#define RESHI              0x013C  /* Result High Word */
-#define SUMEXT             0x013E  /* Sum Extend */
-
-#endif
-
-.text
-.align 2
-
-.global fp_muln_low
-
-
-#if FP_PRIME <= 160 && FP_PRIME > (160-16)
-
-#include "relic_fp_mul_low_160.s"
-
-#elif FP_PRIME <= 256 && FP_PRIME > (256 - 16)
-
-#include "relic_fp_mul_low_256.s"
-
-#else
-
-#error "Unsupported prime field size"
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_160.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_160.s
deleted file mode 100644
index 4a2f1204f9fd..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_160.s
+++ /dev/null
@@ -1,32 +0,0 @@
-fp_muln_low:
-    mov r13,r12
-    mov r15,r13
-    mov r12,r15
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-#ifdef MSP430X2
-
-#include "fp_mul32_160_comba.inc"
-
-#else
-
-#include "fp_mul_160_comba.inc"
-
-#endif
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_256.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_256.s
deleted file mode 100644
index 48059c09a12a..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_mul_low_256.s
+++ /dev/null
@@ -1,340 +0,0 @@
-#ifdef MSP430X2
-
-fp_muln_low:
-    mov r13,r12
-    mov r15,r13
-    mov r12,r15
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-#include "fp_mul32_256_comba.inc"
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
-#else
-
-.global fp_muln_low_half
-
-fp_muln_low_half:
-#include "fp_mul_128_comba.inc"
-    ret
-
-fp_muln_low:
-    /* r15 = x
-     * r14 = y
-     * r13 = z
-     * r12 = t
-     */
-
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-    mov r13,r12
-    mov r15,r13
-    mov r12,r15
-    /* temp area */
-    sub #4*16,r1
-    mov r1,r12
-
-
-    /* t2 = x0 + x1
-     * read: r14, r15
-     * write: r4,r8-11
-     * output: r4
-     */
-
-    /* a = r11
-     * b = r10
-     * c = r9
-     * carry = r4
-     */
-    mov r15, r11
-    mov r15, r10
-    add #16,r10
-    mov r12, r9
-    add #16*2,r9
-    /* sum */
-    mov @r11+,r8
-    add @r10+,r8
-    mov r8,2*0(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*1(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*2(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*3(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*4(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*5(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*6(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*7(r9)
-    clr r4
-    adc r4
-
-    /* t3 = y0 + y1 */
-    /* read: r14, r15
-     * write: r4,r8-11
-     * output: r4
-     */
-
-    /* a = r11
-     * b = r10
-     * c = r9
-     * carry = r4
-     */
-    mov r14, r11
-    mov r14, r10
-    add #16,r10
-    mov r12, r9
-    add #16*3,r9
-    /* sum */
-    mov @r11+,r8
-    add @r10+,r8
-    mov r8,2*0(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*1(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*2(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*3(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*4(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*5(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*6(r9)
-    mov @r11+,r8
-    addc @r10+,r8
-    mov r8,2*7(r9)
-    swpb r4
-    adc r4
-
-    /* z0z1 = x0.y0 */
-    /* read: r13-15
-     * write: all
-     * stack end: c z
-     */
-
-    push r4
-    push r13
-    call #fp_muln_low_half
-
-    /* z2z3 = x1.y1 */
-    /* read: r13-15
-     * write: all
-     */
-
-    add #16,r15
-    add #16,r14
-    add #16*2,r13
-    call #fp_muln_low_half
-
-    /* t0t1 = t2.t3 */
-    /* read: r13-15
-     * write: all
-     * stack end:
-     */
-
-    /* we need t, the stack has two ints, so t = sp + 2*2 */
-    mov r1,r15
-    add #2*2,r15 /* t */
-    mov r15,r14
-    mov r15,r13
-    add #16*2,r15
-    add #16*3,r14
-    call #fp_muln_low_half
-    mov r13,r15 /* t */
-    pop r14 /* z */
-    pop r13 /* c */
-
-    /* move t1 to registers */
-
-    mov r15,r12
-    add #16,r12
-    mov @r12+,r4
-    mov @r12+,r5
-    mov @r12+,r6
-    mov @r12+,r7
-    mov @r12+,r8
-    mov @r12+,r9
-    mov @r12+,r10
-    mov @r12+,r11
-
-    /* t1 += t2 */
-
-    clr r12 /* r12 holds the carry now */
-    bit #1,r13
-    jz skip1
-    add #16*2,r15
-    /* inc */
-    add @r15+,r4
-    addc @r15+,r5
-    addc @r15+,r6
-    addc @r15+,r7
-    addc @r15+,r8
-    addc @r15+,r9
-    addc @r15+,r10
-    addc @r15+,r11
-    adc r12
-    sub #16*3,r15 /* recover t */
-skip1:
-
-    /* t1 += t3 */
-
-    bit #0x100,r13
-    jz skip2
-    /* inc */
-    add #16*3,r15
-    add @r15+,r4
-    addc @r15+,r5
-    addc @r15+,r6
-    addc @r15+,r7
-    addc @r15+,r8
-    addc @r15+,r9
-    addc @r15+,r10
-    addc @r15+,r11
-    adc r12
-    sub #16*4,r15 /* recover t */
-skip2:
-
-    /* if (c1&c2) c++;
-     *
-     */
-
-    cmp #0x101,r13
-    jne skip3
-    inc r12
-skip3:
-
-    /* t0t1 -= z0z1 */
-
-    /* t0 -= z0 */
-    sub @r14+,2*0(r15)
-    subc @r14+,2*1(r15)
-    subc @r14+,2*2(r15)
-    subc @r14+,2*3(r15)
-    subc @r14+,2*4(r15)
-    subc @r14+,2*5(r15)
-    subc @r14+,2*6(r15)
-    subc @r14+,2*7(r15)
-    /* t1 -= z1 */
-    subc @r14+,r4
-    subc @r14+,r5
-    subc @r14+,r6
-    subc @r14+,r7
-    subc @r14+,r8
-    subc @r14+,r9
-    subc @r14+,r10
-    subc @r14+,r11
-    /* sub carry */
-    sbc r12
-
-    /* t0t1 -= z2z3 */
-
-    /* t0 -= z2 */
-    sub @r14+,2*0(r15)
-    subc @r14+,2*1(r15)
-    subc @r14+,2*2(r15)
-    subc @r14+,2*3(r15)
-    subc @r14+,2*4(r15)
-    subc @r14+,2*5(r15)
-    subc @r14+,2*6(r15)
-    subc @r14+,2*7(r15)
-    /* t1 -= z3 */
-    subc @r14+,r4
-    subc @r14+,r5
-    subc @r14+,r6
-    subc @r14+,r7
-    subc @r14+,r8
-    subc @r14+,r9
-    subc @r14+,r10
-    subc @r14+,r11
-    /* sub carry */
-    sbc r12
-
-    /* z1z2 += t0t1 */
-
-    sub #16*3,r14 /* recover z */
-    /* z1 += t0 */
-    add @r15+,2*0(r14)
-    addc @r15+,2*1(r14)
-    addc @r15+,2*2(r14)
-    addc @r15+,2*3(r14)
-    addc @r15+,2*4(r14)
-    addc @r15+,2*5(r14)
-    addc @r15+,2*6(r14)
-    addc @r15+,2*7(r14)
-    /* z2 += t1 */
-    addc r4,2*8(r14)
-    addc r5,2*9(r14)
-    addc r6,2*10(r14)
-    addc r7,2*11(r14)
-    addc r8,2*12(r14)
-    addc r9,2*13(r14)
-    addc r10,2*14(r14)
-    addc r11,2*15(r14)
-    /* add carry */
-    adc r12
-
-    /* add carry */
-
-    add r12,2*16(r14)
-    jnc skip4
-    adc 2*17(r14)
-    adc 2*18(r14)
-    adc 2*19(r14)
-    adc 2*20(r14)
-    adc 2*21(r14)
-    adc 2*22(r14)
-    adc 2*23(r14)
-skip4:
-
-    /* delete temp area */
-    add #16*4,r1
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low.s
deleted file mode 100644
index bf3ba1966141..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2007-2009 RELIC Project
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_conf.h"
-
-#ifdef MSP430X
-#include <msp430.h>
-#else
-
-/* For some reason these are not defined in asm */
-#define MPY                0x0130  /* Multiply Unsigned/Operand 1 */
-#define MPYS               0x0132  /* Multiply Signed/Operand 1 */
-#define MAC                0x0134  /* Multiply Unsigned and Accumulate/Operand 1 */
-#define MACS               0x0136  /* Multiply Signed and Accumulate/Operand 1 */
-#define OP2                0x0138  /* Operand 2 */
-#define RESLO              0x013A  /* Result Low Word */
-#define RESHI              0x013C  /* Result High Word */
-#define SUMEXT             0x013E  /* Sum Extend */
-
-#endif
-
-.text
-.align 2
-#if FP_RDC == MONTY
-.global fp_rdcn_low
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-fp_rdcn_low:
-    /*
-     * r15: t
-     * r14: z
-     * r13: m
-     * r12: n'
-     */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-    mov r15,r11
-    call #fp_prime_get
-    mov r15,r13
-#ifndef MSP430X2
-    call #fp_prime_get_rdc
-    mov @r15,r15
-    mov r15,r12
-#endif
-    mov r14,r15
-    mov r11,r14
-
-#if FP_PRIME <= 160 && FP_PRIME > (160-16)
-
-#ifdef MSP430X2
-#include "fp_rdc32_160_montgomery_sparse.inc"
-#else
-#include "fp_rdc_160_montgomery_sparse.inc"
-#endif
-
-#elif FP_PRIME <= 256 && FP_PRIME > (256 - 16)
-
-#ifdef MSP430X2
-#include "fp_rdc32_256_montgomery_sparse.inc"
-#else
-#include "fp_rdc_256_montgomery_sparse.inc"
-#endif
-
-#else
-#error "Unsupported prime field size"
-#endif
-
-    /* r14: z
-     * r13: m
-     */
-    /* subtract? */
-    tst r11
-    jnz subtract /* jmp to subtract */
-#if FP_PRIME <= 256 && FP_PRIME > (256 - 16)
-    cmp 2*15(r13),2*15(r14)
-    jlo dont_subtract /* m > z, jmp to DO NOT subtract */
-    jne subtract /* m < z, jmp to subtract */
-    cmp 2*14(r13),2*14(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*13(r13),2*13(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*12(r13),2*12(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*11(r13),2*11(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*10(r13),2*10(r14)
-    jlo dont_subtract
-    jne subtract
-#endif
-    cmp 2*9(r13),2*9(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*8(r13),2*8(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*7(r13),2*7(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*6(r13),2*6(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*5(r13),2*5(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*4(r13),2*4(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*3(r13),2*3(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*2(r13),2*2(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*1(r13),2*1(r14)
-    jlo dont_subtract
-    jne subtract
-    cmp 2*0(r13),2*0(r14)
-    jlo dont_subtract
-    /* subtract */
-subtract:
-    sub @r13+,0*2(r14)
-    subc @r13+,1*2(r14)
-    subc @r13+,2*2(r14)
-    subc @r13+,3*2(r14)
-    subc @r13+,4*2(r14)
-    subc @r13+,5*2(r14)
-    subc @r13+,6*2(r14)
-    subc @r13+,7*2(r14)
-    subc @r13+,8*2(r14)
-    subc @r13+,9*2(r14)
-#if FP_PRIME <= 256 && FP_PRIME > (256 - 16)
-    subc @r13+,10*2(r14)
-    subc @r13+,11*2(r14)
-    subc @r13+,12*2(r14)
-    subc @r13+,13*2(r14)
-    subc @r13+,14*2(r14)
-    subc @r13+,15*2(r14)
-#endif
-dont_subtract:
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
-#else
-.global fp_rdcs_low
-
-#if FP_PRIME == 160
-
-#ifdef EP_ENDOM
-#include "relic_fp_rdc_low_160k1.s"
-#else
-#include "relic_fp_rdc_low_160p1.s"
-#endif
-
-#elif FP_PRIME == 256
-
-#ifdef EP_ENDOM
-#include "relic_fp_rdc_low_256k1.s"
-#else
-#include "relic_fp_rdc_low_256p1.s"
-#endif
-
-#else
-
-#error Unsupported field size
-
-#endif
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160k1.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160k1.s
deleted file mode 100644
index 6f9eb1ecb5ab..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160k1.s
+++ /dev/null
@@ -1,234 +0,0 @@
-fp_rdcs_low:
-
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-    /* compute q0.c, add lo(qo.c) to r0 */
-    mov #0x538D,&MPY
-
-    add #2*10,r14
-
-    mov @r14+,r13
-    mov r13,&OP2
-    mov &RESLO,r4
-    mov &RESHI,r5
-    mov r13,r6
-    clr r7
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    addc r13,r7
-    clr r8
-    adc r8
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r6
-    addc &RESHI,r7
-    addc r13,r8
-    clr r9
-    adc r9
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r7
-    addc &RESHI,r8
-    addc r13,r9
-    clr r10
-    adc r10
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r8
-    addc &RESHI,r9
-    addc r13,r10
-    clr r11
-    adc r11
-
-    add r4,-2*15(r14)
-    addc r5,-2*14(r14)
-    addc r6,-2*13(r14)
-    addc r7,-2*12(r14)
-    addc r8,-2*11(r14)
-    clr r12
-    adc r12
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r9
-    addc &RESHI,r10
-    addc r13,r11
-    clr r4
-    adc r4
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r10
-    addc &RESHI,r11
-    addc r13,r4
-    clr r5
-    adc r5
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r11
-    addc &RESHI,r4
-    addc r13,r5
-    clr r6
-    adc r6
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r4
-    addc &RESHI,r5
-    addc r13,r6
-    clr r7
-    adc r7
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    addc r13,r7
-    clr r8
-    adc r8
-
-    rrc r12
-    addc r9,-2*15(r14)
-    addc r10,-2*14(r14)
-    addc r11,-2*13(r14)
-    addc r4,-2*12(r14)
-    addc r5,-2*11(r14)
-    clr r12
-    adc r12
-
-    sub #2*20,r14
-
-
-    /* q1 = high(q0.c) */
-    /* compute q1.c, add lo(q1.c) to r1 */
-
-    mov r6,&OP2
-    mov &RESLO,r4
-    mov &RESHI,r5
-
-    mov r7,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    adc r7
-    clr r9
-    adc r9
-
-    mov r8,r13
-    mov r13,&OP2
-    add &RESLO,r6
-    addc &RESHI,r7
-    addc r9,r8
-    clr r9
-    adc r9
-
-    add @r14+,r4
-    mov r4,2*0(r15)
-    addc @r14+,r5
-    mov r5,2*1(r15)
-    addc @r14+,r6
-    mov r6,2*2(r15)
-    addc @r14+,r7
-    mov r7,2*3(r15)
-    addc @r14+,r8
-    mov r8,2*4(r15)
-    addc @r14+,r9
-    mov r9,2*5(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*6(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*7(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*8(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*9(r15)
-    adc r12
-
-    /* q2 = high(q1.c) = 0 */
-subtract1:
-    tst r12
-    jz skip1
-    sub #0xAC73,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFE,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-    sbc r12
-    jmp subtract1
-skip1:
-
-    cmp #0xFFFF,2*9(r15)
-    jlo skip2 /* m > z, jmp to DO NOT subtract */
-    jne subtract2 /* m < z, jmp to subtract */
-    cmp #0xFFFF,2*8(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*7(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*6(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*5(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*4(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*3(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFE,2*2(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*1(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xAC73,2*0(r15)
-    jlo skip2
-    jne subtract2
-    /* subtract */
-subtract2:
-    /*** DECREMENT ***/
-    sub #0xAC73,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFE,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-skip2:
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160p1.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160p1.s
deleted file mode 100644
index ecae270b7142..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_160p1.s
+++ /dev/null
@@ -1,210 +0,0 @@
-fp_rdcs_low:
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-    /* create temp area */
-    sub #2*4,r1
-
-    /* shift right q0 */
-    clrc
-    mov 2*19(r14),r13
-    rrc r13
-    mov r13,2*3(r1)
-    mov 2*18(r14),r13
-    rrc r13
-    mov r13,2*2(r1)
-    mov 2*17(r14),r13
-    rrc r13
-    mov r13,2*1(r1)
-    mov 2*16(r14),r13
-    rrc r13
-    mov r13,2*0(r1)
-    mov 2*15(r14),r13
-    rrc r13
-    mov r13,r11
-    mov 2*14(r14),r13
-    rrc r13
-    mov r13,r10
-    mov 2*13(r14),r13
-    rrc r13
-    mov r13,r9
-    mov 2*12(r14),r13
-    rrc r13
-    mov r13,r8
-    mov 2*11(r14),r13
-    rrc r13
-    mov r13,r7
-    mov 2*10(r14),r13
-    rrc r13
-    mov r13,r6
-    clr r13
-    rrc r13
-    mov r13,r5
-    clr r4
-
-    /* compute q0.c: add q0 to q0 << 31 */
-    add #2*10,r14
-    add @r14+,r4
-    addc @r14+,r5
-    addc @r14+,r6
-    addc @r14+,r7
-    addc @r14+,r8
-    addc @r14+,r9
-    addc @r14+,r10
-    addc @r14+,r11
-    addc @r14+,2*0(r1)
-    addc @r14+,2*1(r1)
-    adc 2*2(r1)
-    adc 2*3(r1)
-    sub #2*20,r14
-
-    /* r = r + low(q0.c) */
-    mov @r14+,r13
-    add r4,r13
-    mov r13,2*0(r15)
-    mov @r14+,r13
-    addc r5,r13
-    mov r13,2*1(r15)
-    mov @r14+,r13
-    addc r6,r13
-    mov r13,2*2(r15)
-    mov @r14+,r13
-    addc r7,r13
-    mov r13,2*3(r15)
-    mov @r14+,r13
-    addc r8,r13
-    mov r13,2*4(r15)
-    mov @r14+,r13
-    addc r9,r13
-    mov r13,2*5(r15)
-    mov @r14+,r13
-    addc r10,r13
-    mov r13,2*6(r15)
-    mov @r14+,r13
-    addc r11,r13
-    mov r13,2*7(r15)
-    mov @r14+,r13
-    addc 2*0(r1),r13
-    mov r13,2*8(r15)
-    mov @r14+,r13
-    addc 2*1(r1),r13
-    mov r13,2*9(r15)
-    clr r12
-    adc r12
-    sub #2*10,r14
-
-    /* TODO: check if q1 is 0 */
-
-    /* q1 = high(q0.c) */
-    /* shift right q1 */
-    clrc
-    mov 2*3(r1),r13
-    rrc r13
-    mov r13,r7
-    mov 2*2(r1),r13
-    rrc r13
-    mov r13,r6
-    clr r13
-    rrc r13
-    mov r13,r5
-    clr r4
-
-    /* compute q1.c: add q1 to q1 << 31 */
-    add 2*2(r1),r4
-    addc 2*3(r1),r5
-    adc r6
-    adc r7
-
-    /* r = r + low(q1.c) */
-    add r4,2*0(r15)
-    addc r5,2*1(r15)
-    addc r6,2*2(r15)
-    addc r7,2*3(r15)
-    adc 2*4(r15)
-    adc 2*5(r15)
-    adc 2*6(r15)
-    adc 2*7(r15)
-    adc 2*8(r15)
-    adc 2*9(r15)
-    adc r12
-
-    /* q2 = high(q1.c) = 0 */
-
-subtract1:
-    tst r12
-    jz skip1
-    sub #0xFFFF,0*2(r15)
-    subc #0x7FFF,1*2(r15)
-    subc #0xFFFF,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-    sbc r12
-    jmp subtract1
-skip1:
-
-    cmp #0xFFFF,2*9(r15)
-    jlo skip2 /* m > z, jmp to DO NOT subtract */
-    jne subtract2 /* m < z, jmp to subtract */
-    cmp #0xFFFF,2*8(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*7(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*6(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*5(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*4(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*3(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*2(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0x7FFF,2*1(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*0(r15)
-    jlo skip2
-    jne subtract2
-    /* subtract */
-subtract2:
-    /*** DECREMENT ***/
-    sub #0xFFFF,0*2(r15)
-    subc #0x7FFF,1*2(r15)
-    subc #0xFFFF,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-skip2:
-    /* delete temp area */
-    add #2*4,r1
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256k1.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256k1.s
deleted file mode 100644
index b0b37e2b9af9..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256k1.s
+++ /dev/null
@@ -1,350 +0,0 @@
-fp_rdcs_low:
-
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-    /* compute q0.c, add lo(qo.c) to r0 */
-    mov #0x03D1,&MPY
-
-    add #2*16,r14
-
-    /* 5 words */
-
-    mov @r14+,r13
-    mov r13,&OP2
-    mov &RESLO,r4
-    mov &RESHI,r5
-    mov r13,r6
-    clr r7
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    addc r13,r7
-    clr r8
-    adc r8
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r6
-    addc &RESHI,r7
-    addc r13,r8
-    clr r9
-    adc r9
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r7
-    addc &RESHI,r8
-    addc r13,r9
-    clr r10
-    adc r10
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r8
-    addc &RESHI,r9
-    addc r13,r10
-    clr r11
-    adc r11
-
-    add r4,-2*21(r14)
-    addc r5,-2*20(r14)
-    addc r6,-2*19(r14)
-    addc r7,-2*18(r14)
-    addc r8,-2*17(r14)
-    clr r12
-    adc r12
-
-    /* 5 words */
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r9
-    addc &RESHI,r10
-    addc r13,r11
-    clr r4
-    adc r4
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r10
-    addc &RESHI,r11
-    addc r13,r4
-    clr r5
-    adc r5
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r11
-    addc &RESHI,r4
-    addc r13,r5
-    clr r6
-    adc r6
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r4
-    addc &RESHI,r5
-    addc r13,r6
-    clr r7
-    adc r7
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    addc r13,r7
-    clr r8
-    adc r8
-
-    rrc r12
-    addc r9,-2*21(r14)
-    addc r10,-2*20(r14)
-    addc r11,-2*19(r14)
-    addc r4,-2*18(r14)
-    addc r5,-2*17(r14)
-    clr r12
-    adc r12
-
-    /* 6 words */
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r6
-    addc &RESHI,r7
-    addc r13,r8
-    clr r9
-    adc r9
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r7
-    addc &RESHI,r8
-    addc r13,r9
-    clr r10
-    adc r10
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r8
-    addc &RESHI,r9
-    addc r13,r10
-    clr r11
-    adc r11
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r9
-    addc &RESHI,r10
-    addc r13,r11
-    clr r4
-    adc r4
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r10
-    addc &RESHI,r11
-    addc r13,r4
-    clr r5
-    adc r5
-
-    mov @r14+,r13
-    mov r13,&OP2
-    add &RESLO,r11
-    addc &RESHI,r4
-    addc r13,r5
-    clr r13
-    adc r13
-
-    rrc r12
-    addc r6,-2*22(r14)
-    addc r7,-2*21(r14)
-    addc r8,-2*20(r14)
-    addc r9,-2*19(r14)
-    addc r10,-2*18(r14)
-    addc r11,-2*17(r14)
-    clr r12
-    adc r12
-
-    sub #2*32,r14
-
-    /* TODO: can be removed with renaming */
-    mov r4,r6
-    mov r5,r7
-    mov r13,r8
-
-    /* q1 = high(q0.c) */
-    /* compute q1.c, add lo(q1.c) to r1 */
-
-    mov r6,&OP2
-    mov &RESLO,r4
-    mov &RESHI,r5
-
-    mov r7,&OP2
-    add &RESLO,r5
-    addc &RESHI,r6
-    adc r7
-    clr r9
-    adc r9
-
-    mov r8,r13
-    mov r13,&OP2
-    add &RESLO,r6
-    addc &RESHI,r7
-    addc r9,r8
-    clr r9
-    adc r9
-
-    add @r14+,r4
-    mov r4,2*0(r15)
-    addc @r14+,r5
-    mov r5,2*1(r15)
-    addc @r14+,r6
-    mov r6,2*2(r15)
-    addc @r14+,r7
-    mov r7,2*3(r15)
-    addc @r14+,r8
-    mov r8,2*4(r15)
-    addc @r14+,r9
-    mov r9,2*5(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*6(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*7(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*8(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*9(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*10(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*11(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*12(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*13(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*14(r15)
-    clr r10
-    addc @r14+,r10
-    mov r10,2*15(r15)
-    adc r12
-
-    /* q2 = high(q1.c) = 0 */
-subtract1:
-    tst r12
-    jz skip1
-    sub #0xFC2F,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFE,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-    subc #0xFFFF,10*2(r15)
-    subc #0xFFFF,11*2(r15)
-    subc #0xFFFF,12*2(r15)
-    subc #0xFFFF,13*2(r15)
-    subc #0xFFFF,14*2(r15)
-    subc #0xFFFF,15*2(r15)
-    sbc r12
-    jmp subtract1
-skip1:
-
-    cmp #0xFFFF,2*15(r15)
-    jlo skip2 /* m > z, jmp to DO NOT subtract */
-    jne subtract2 /* m < z, jmp to subtract */
-    cmp #0xFFFF,2*14(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*13(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*12(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*11(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*10(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*9(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*8(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*7(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*6(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*5(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*4(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*3(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFE,2*2(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFFFF,2*1(r15)
-    jlo skip2
-    jne subtract2
-    cmp #0xFC2F,2*0(r15)
-    jlo skip2
-    jne subtract2
-    /* subtract */
-subtract2:
-    /*** DECREMENT ***/
-    sub #0xFC2F,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFE,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    subc #0xFFFF,6*2(r15)
-    subc #0xFFFF,7*2(r15)
-    subc #0xFFFF,8*2(r15)
-    subc #0xFFFF,9*2(r15)
-    subc #0xFFFF,10*2(r15)
-    subc #0xFFFF,11*2(r15)
-    subc #0xFFFF,12*2(r15)
-    subc #0xFFFF,13*2(r15)
-    subc #0xFFFF,14*2(r15)
-    subc #0xFFFF,15*2(r15)
-skip2:
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256p1.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256p1.s
deleted file mode 100644
index efcdb0ceab50..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_rdc_low_256p1.s
+++ /dev/null
@@ -1,134 +0,0 @@
-fp_rdcs_low:
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-#include "fp_rdc_256p1.inc"
-
-add1:
-    tst r11
-    jge skip1
-    add #0xFFFF,0*2(r15)
-    addc #0xFFFF,1*2(r15)
-    addc #0xFFFF,2*2(r15)
-    addc #0xFFFF,3*2(r15)
-    addc #0xFFFF,4*2(r15)
-    addc #0xFFFF,5*2(r15)
-    adc 6*2(r15)
-    adc 7*2(r15)
-    adc 8*2(r15)
-    adc 9*2(r15)
-    adc 10*2(r15)
-    adc 11*2(r15)
-    addc #1,12*2(r15)
-    adc 13*2(r15)
-    addc #0xFFFF,14*2(r15)
-    addc #0xFFFF,15*2(r15)
-    adc r11
-    jmp add1
-skip1:
-
-subtract2:
-    tst r11
-    jz skip2
-    sub #0xFFFF,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFF,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    sbc 6*2(r15)
-    sbc 7*2(r15)
-    sbc 8*2(r15)
-    sbc 9*2(r15)
-    sbc 10*2(r15)
-    sbc 11*2(r15)
-    subc #1,12*2(r15)
-    sbc 13*2(r15)
-    subc #0xFFFF,14*2(r15)
-    subc #0xFFFF,15*2(r15)
-    sbc r11
-    jmp subtract2
-skip2:
-
-    cmp #0xFFFF,2*15(r15)
-    jlo skip3 /* m > z, jmp to DO NOT subtract */
-    jne subtract3 /* m < z, jmp to subtract */
-    cmp #0xFFFF,2*14(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*13(r15)
-    jlo skip3
-    jne subtract3
-    cmp #1,2*12(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*11(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*10(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*9(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*8(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*7(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0,2*6(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*5(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*4(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*3(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*2(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*1(r15)
-    jlo skip3
-    jne subtract3
-    cmp #0xFFFF,2*0(r15)
-    jlo skip3
-    /* subtract */
-subtract3:
-    /*** DECREMENT ***/
-    sub #0xFFFF,0*2(r15)
-    subc #0xFFFF,1*2(r15)
-    subc #0xFFFF,2*2(r15)
-    subc #0xFFFF,3*2(r15)
-    subc #0xFFFF,4*2(r15)
-    subc #0xFFFF,5*2(r15)
-    sbc 6*2(r15)
-    sbc 7*2(r15)
-    sbc 8*2(r15)
-    sbc 9*2(r15)
-    sbc 10*2(r15)
-    sbc 11*2(r15)
-    subc #1,12*2(r15)
-    sbc 13*2(r15)
-    subc #0xFFFF,14*2(r15)
-    subc #0xFFFF,15*2(r15)
-skip3:
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low.s
deleted file mode 100644
index d85eea24f588..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low.s
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2007-2009 RELIC Project
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file.
- *
- * RELIC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include "relic_conf.h"
-#include "relic_fp_low.h"
-
-#ifdef MSP430X
-#include <msp430.h>
-#else
-
-/* For some reason these are not defined in asm */
-#define MPY                0x0130  /* Multiply Unsigned/Operand 1 */
-#define MPYS               0x0132  /* Multiply Signed/Operand 1 */
-#define MAC                0x0134  /* Multiply Unsigned and Accumulate/Operand 1 */
-#define MACS               0x0136  /* Multiply Signed and Accumulate/Operand 1 */
-#define OP2                0x0138  /* Operand 2 */
-#define RESLO              0x013A  /* Result Low Word */
-#define RESHI              0x013C  /* Result High Word */
-#define SUMEXT             0x013E  /* Sum Extend */
-
-#endif
-
-.text
-.align 2
-
-.global fp_sqrn_low
-
-
-#if FP_PRIME <= 160 && FP_PRIME > (160-16)
-
-#include "relic_fp_sqr_low_160.s"
-
-#elif FP_PRIME <= 256 && FP_PRIME > (256 - 16)
-
-#include "relic_fp_sqr_low_256.s"
-
-#else
-
-#error Unsupported field size
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_160.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_160.s
deleted file mode 100644
index 3f03f746433f..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_160.s
+++ /dev/null
@@ -1,33 +0,0 @@
-fp_sqrn_low:
-    mov r15,r12
-    mov r14,r15
-    mov r12,r14
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-
-#ifdef MSP430X2
-
-#include "fp_sqr32_160_comba.inc"
-
-#else
-
-#include "fp_sqr_160_comba.inc"
-
-#endif
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_256.s b/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_256.s
deleted file mode 100644
index 5681dd46c50d..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fp_sqr_low_256.s
+++ /dev/null
@@ -1,170 +0,0 @@
-#ifdef MSP430X2
-
-fp_sqrn_low:
-    /* r15 = x
-    * r14 = z
-    * r13 = t
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-    mov r15,r12
-    mov r14,r15
-    mov r12,r14
-
-#include "fp_sqr32_256_comba.inc"
-
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
-#else
-
-fp_sqrn_low_half:
-#include "fp_sqr_128_comba.inc"
-    ret
-
-fp_sqrn_low:
-    /* r15 = x
-    * r14 = z
-    * r13 = t
-    */
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-    push r10
-    push r11
-    mov r15,r12
-    mov r14,r15
-    mov r12,r14
-    /* temp area */
-    sub #4*16,r1
-    mov r1,r13
-
-    /* z0z1 = x0.x0 */
-    push r14
-    push r13
-    call #fp_sqrn_low_half
-
-    /* z2z3 = x1.x1 */
-    add #16,r15
-    add #2*16,r14
-    call #fp_sqrn_low_half
-
-    /* t0t1 = x0.x1 */
-    pop r13
-    mov r15,r14
-    sub #16,r15
-    call #fp_muln_low_half
-    pop r14
-
-    /* z1z2 += t0t1 */
-    /* r15: t
-    * r14: z
-    */
-    mov r13,r15
-    add #16,r14
-    /* z1 += t0 */
-    mov @r15+,r12
-    rla r12
-    mov @r15+,r11
-    rlc r11
-    mov @r15+,r10
-    rlc r10
-    mov @r15+,r9
-    rlc r9
-    mov @r15+,r8
-    rlc r8
-    mov @r15+,r7
-    rlc r7
-    mov @r15+,r6
-    rlc r6
-    mov @r15+,r5
-    rlc r5
-    clr r4
-    adc r4
-
-    add r12,2*0(r14)
-    addc r11,2*1(r14)
-    addc r10,2*2(r14)
-    addc r9,2*3(r14)
-    addc r8,2*4(r14)
-    addc r7,2*5(r14)
-    addc r6,2*6(r14)
-    addc r5,2*7(r14)
-    clr r13
-    adc r13
-
-    /* z2 += t1 */
-    bis r4,r2 /* carry = r4 */
-
-    mov @r15+,r12
-    rlc r12
-    mov @r15+,r11
-    rlc r11
-    mov @r15+,r10
-    rlc r10
-    mov @r15+,r9
-    rlc r9
-    mov @r15+,r8
-    rlc r8
-    mov @r15+,r7
-    rlc r7
-    mov @r15+,r6
-    rlc r6
-    mov @r15+,r5
-    rlc r5
-    clr r4
-    adc r4
-
-    bis r13,r2 /* carry = r13 */
-
-    addc r12,2*8(r14)
-    addc r11,2*9(r14)
-    addc r10,2*10(r14)
-    addc r9,2*11(r14)
-    addc r8,2*12(r14)
-    addc r7,2*13(r14)
-    addc r6,2*14(r14)
-    addc r5,2*15(r14)
-    adc r4
-
-    /* add carry */
-    add r4,2*16(r14)
-    jnc skip1
-    adc 2*17(r14)
-    adc 2*18(r14)
-    adc 2*19(r14)
-    adc 2*20(r14)
-    adc 2*21(r14)
-    adc 2*22(r14)
-    adc 2*23(r14)
-skip1:
-
-    /* delete temp area */
-    add #4*16,r1
-    pop r11
-    pop r10
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    ret
-
-#endif
diff --git a/src/dashbls/depends/relic/src/low/msp-asm/relic_fpx_add_low.c b/src/dashbls/depends/relic/src/low/msp-asm/relic_fpx_add_low.c
deleted file mode 100644
index be614e59587b..000000000000
--- a/src/dashbls/depends/relic/src/low/msp-asm/relic_fpx_add_low.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * RELIC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with RELIC. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level quadratic extension field multiplication
- * functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_fp.h"
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_addn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-}
-
-void fp2_addm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_add(c[0], a[0], b[0]);
-	fp_add(c[1], a[1], b[1]);
-}
-
-void fp2_addd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-}
-
-void fp2_addc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-}
-
-void fp2_subn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-}
-
-void fp2_subm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_sub(c[0], a[0], b[0]);
-	fp_sub(c[1], a[1], b[1]);
-}
-
-void fp2_dbln_low(fp2_t c, fp2_t a) {
-	/* 2 * (a0 + a1 * u) = 2 * a0 + 2 * a1 * u. */
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-}
-
-void fp2_subd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-}
-
-void fp2_subc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-}
-
-void fp2_dblm_low(fp2_t c, fp2_t a) {
-	/* 2 * (a0 + a1 * u) = 2 * a0 + 2 * a1 * u. */
-	fp_dbl(c[0], a[0]);
-	fp_dbl(c[1], a[1]);
-}
-
-void fp2_norm_low(fp2_t c, fp2_t a) {
-	fp2_t t;
-	bn_t b;
-
-	fp2_null(t);
-	bn_null(b);
-
-	RLC_TRY {
-		fp2_new(t);
-		bn_new(b);
-
-#if FP_PRIME == 158
-		fp_dbl(t[0], a[0]);
-		fp_dbl(t[0], t[0]);
-		fp_sub(t[0], t[0], a[1]);
-		fp_dbl(t[1], a[1]);
-		fp_dbl(t[1], t[1]);
-		fp_add(c[1], a[0], t[1]);
-		fp_copy(c[0], t[0]);
-#elif defined(FP_QNRES)
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		fp_neg(t[0], a[1]);
-		fp_add(c[1], a[0], a[1]);
-		fp_add(c[0], t[0], a[0]);
-#else
-		switch (fp_prime_get_mod8()) {
-			case 3:
-				/* If p = 3 mod 8, (1 + u) is a QNR/CNR. */
-				fp_neg(t[0], a[1]);
-				fp_add(c[1], a[0], a[1]);
-				fp_add(c[0], t[0], a[0]);
-				break;
-			case 5:
-				/* If p = 5 mod 8, (u) is a QNR/CNR. */
-				fp2_mul_art(c, a);
-				break;
-			case 7:
-				/* If p = 7 mod 8, we choose (2^(lg_4(b-1)) + u) as QNR/CNR. */
-				fp2_mul_art(t, a);
-				fp2_dbl(c, a);
-				fp_prime_back(b, ep_curve_get_b());
-				for (int i = 1; i < bn_bits(b) / 2; i++) {
-					fp2_dbl(c, c);
-				}
-				fp2_add(c, c, t);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-		bn_free(b);
-	}
-}
-
-void fp2_nord_low(dv2_t c, dv2_t a) {
-	dv2_t t;
-	bn_t b;
-
-	dv2_null(t);
-	bn_null(b);
-
-	RLC_TRY {
-		dv2_new(t);
-		bn_new(b);
-
-#if FP_PRIME == 158
-		fp_addc_low(t[0], a[0], a[0]);
-		fp_addc_low(t[0], t[0], t[0]);
-		fp_subc_low(t[0], t[0], a[1]);
-		fp_addc_low(t[1], a[1], a[1]);
-		fp_addc_low(t[1], t[1], t[1]);
-		fp_addc_low(c[1], a[0], t[1]);
-		dv_copy(c[0], t[0], 2 * RLC_FP_DIGS);
-#elif defined(FP_QNRES)
-		/* If p = 3 mod 8, (1 + i) is a QNR/CNR. */
-		/* (a_0 + a_1 * i) * (1 + i) = (a_0 - a_1) + (a_0 + a_1) * u. */
-		dv_copy(t[0], a[1], 2 * RLC_FP_DIGS);
-		fp_addc_low(c[1], a[0], a[1]);
-		fp_subc_low(c[0], a[0], t[0]);
-#else
-		switch (fp_prime_get_mod8()) {
-			case 3:
-				/* If p = 3 mod 8, (1 + u) is a QNR, u^2 = -1. */
-				/* (a_0 + a_1 * u) * (1 + u) = (a_0 - a_1) + (a_0 + a_1) * u. */
-				dv_copy(t[0], a[1], 2 * RLC_FP_DIGS);
-				fp_addc_low(c[1], a[0], a[1]);
-				fp_subc_low(c[0], a[0], t[0]);
-				break;
-			case 5:
-				/* If p = 5 mod 8, (u) is a QNR. */
-				dv_copy(t[0], a[0], 2 * RLC_FP_DIGS);
-				dv_zero(t[1], RLC_FP_DIGS);
-				dv_copy(t[1] + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-				fp_subc_low(c[0], t[1], a[1]);
-				for (int i = -1; i > fp_prime_get_qnr(); i--) {
-					fp_subc_low(c[0], c[0], a[1]);
-				}
-				dv_copy(c[1], t[0], 2 * RLC_FP_DIGS);
-				break;
-			case 7:
-				/* If p = 7 mod 8, (2^lg_4(b-1) + u) is a QNR/CNR.   */
-				/* (a_0 + a_1 * u)(2^lg_4(b-1) + u) =
-				 * (2^lg_4(b-1)a_0 - a_1) + (a_0 + 2^lg_4(b-1)a_1 * u. */
-				fp2_addc_low(t, a, a);
-				fp_prime_back(b, ep_curve_get_b());
-				for (int i = 1; i < bn_bits(b) / 2; i++) {
-					fp2_addc_low(t, t, t);
-				}
-				fp_subc_low(c[0], t[0], a[1]);
-				fp_addc_low(c[1], t[1], a[0]);
-				break;
-			default:
-				RLC_THROW(ERR_NO_VALID);
-				break;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv2_free(t);
-		bn_free(b);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-446/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-446/macro.s
deleted file mode 100644
index 9ba3bc524669..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/macro.s
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-/* We use the towering to decide between BN-446 and B12-446. */
-#ifdef FP_QNRES
-#define P0 0x311c0026aab0aaab
-#define P1 0x56ee4528c573b5cc
-#define P2 0x824e6dc3e23acdee
-#define P3 0x0f75a64bbac71602
-#define P4 0x0095a4b78a02fe32
-#define P5 0x200fc34965aad640
-#define P6 0x3cdee0fb28c5e535
-#define U0 0xcd63fd900035fffd
-#else
-#define P0	0x0000132000000067
-#define P1	0x0057C00000015C00
-#define P2	0x870000000B040000
-#define P3	0x0000001800000000
-#define P4	0x00000D800000021C
-#define P5	0x002400000002D000
-#define P6	0x2400000000000000
-#define U0	0x6BD6C9022CBCE4A9
-#endif
-
-.text
-
-.macro ADD1 i j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro ADDN i j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUB1 i j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUBN i j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro DBLN i j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	1, 6, 1, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	2, 6, 2, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	3, 6, 3, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	4, 6, 4, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	5, 6, 5, \C, \R1, \R2, \R0, \A, \B
-
-	movq	48(\A),%rax
-	mulq	48(\B)
-	addq	%rax  ,\R2
-	movq	\R2   ,96(\C)
-	adcq	%rdx  ,\R0
-	movq	\R0   ,104(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN1	1, 6, \R1, \R2, \R0, \A, \P
-	RDCN1	2, 6, \R2, \R0, \R1, \A, \P
-	RDCN1	3, 6, \R0, \R1, \R2, \A, \P
-	RDCN1	4, 6, \R1, \R2, \R0, \A, \P
-	RDCN1	5, 6, \R2, \R0, \R1, \A, \P
-	RDCN1	6, 6, \R0, \R1, \R2, \A, \P
-	addq	8*13(\A), \R1
-	movq	\R1, 8*13(\A)
-
-	movq	56(\A), %r11
-	movq	64(\A), %r12
-	movq	72(\A), %r13
-	movq	80(\A), %r14
-	movq	88(\A), %r15
-	movq	96(\A), %rcx
-	movq	104(\A), %rbp
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-
-	cmovc	56(\A), %r11
-	cmovc	64(\A), %r12
-	cmovc	72(\A), %r13
-	cmovc	80(\A), %r14
-	cmovc	88(\A), %r15
-	cmovc	96(\A), %rcx
-	cmovc	104(\A), %rbp
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_add_low.s
deleted file mode 100644
index cf343d17abcd..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_add_low.s
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-
-.text
-
-.global fp_add1_low
-.global fp_addn_low
-.global fp_addm_low
-.global fp_addd_low
-.global fp_addc_low
-.global fp_sub1_low
-.global fp_subn_low
-.global fp_subm_low
-.global fp_subd_low
-.global fp_subc_low
-.global fp_negm_low
-.global fp_dbln_low
-.global fp_dblm_low
-.global fp_hlvm_low
-.global fp_hlvd_low
-
-fp_add1_low:
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1 1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addn_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-fp_addm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-    push    %r14
-    push    %r15
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-    movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-    movq	%r14, %r15
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-    sbbq	p6(%rip), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-    cmovnc	%r15, %r14
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-    movq	%r14, 48(%rdi)
-	xorq	%rax, %rax
-
-    pop		%r15
-    pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_addd_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addc_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-    push	%r14
-    push	%r15
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1 (RLC_FP_DIGS - 1)
-
-	movq     56(%rsi), %r8
-	adcq     56(%rdx), %r8
-	movq     64(%rsi), %r9
-	adcq     64(%rdx), %r9
-	movq     72(%rsi), %r10
-	adcq     72(%rdx), %r10
-	movq     80(%rsi), %r11
-	adcq     80(%rdx), %r11
-	movq     88(%rsi), %r12
-	adcq     88(%rdx), %r12
-	movq     96(%rsi), %r13
-	adcq     96(%rdx), %r13
-    movq     104(%rsi), %r14
-	adcq     104(%rdx), %r14
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-    movq	%r14, %r15
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-    sbbq	p6(%rip), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-    cmovnc	%r15, %r14
-
-	movq	%r8 , 56(%rdi)
-	movq	%r9 , 64(%rdi)
-	movq	%r10, 72(%rdi)
-	movq	%r11, 80(%rdi)
-	movq	%r12, 88(%rdi)
-	movq	%r13, 96(%rdi)
-    movq	%r14, 104(%rdi)
-	xorq	%rax, %rax
-
-    pop	%r15
-    pop	%r14
-	pop	%r13
-	pop	%r12
-	pop	%rbp
-	pop	%rbx
-	ret
-
-fp_sub1_low:
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subn_low:
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 1 (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-fp_subm_low:
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1 (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-
-    addq	%rax,  0(%rdi)
-    adcq	%rcx,  8(%rdi)
-    adcq	%r8,  16(%rdi)
-    adcq	%r9,  24(%rdi)
-    adcq	%r10, 32(%rdi)
-    adcq	%r11, 40(%rdi)
-    adcq	%rdx, 48(%rdi)
-
-	ret
-
-fp_subd_low:
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subc_low:
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rsi
-
-    addq	%rax,  56(%rdi)
-    adcq	%rcx,  64(%rdi)
-    adcq	%r8,   72(%rdi)
-    adcq	%r9,   80(%rdi)
-    adcq	%r10,  88(%rdi)
-    adcq	%r11,  96(%rdi)
-    adcq	%rsi,  104(%rdi)
-
-	ret
-
-fp_negm_low:
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-	sbbq 	48(%rsi), %r8
-	movq 	%r8     , 48(%rdi)
-  	ret
-
-fp_dbln_low:
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-fp_dblm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-    push	%r14
-    push	%r15
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-    movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-    movq	%r14, %r15
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-    sbbq	p6(%rip), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-    cmovnc	%r15, %r14
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-    movq	%r14, 48(%rdi)
-	xorq	%rax, %rax
-
-    pop	%r15
-    pop	%r14
-	pop	%r13
-	pop	%r12
-	pop	%rbp
-	pop	%rbx
-	ret
-
-fp_hlvm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
-
-fp_hlvd_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-    movq	56(%rsi) , %r15
-    adcq	$0       , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-	movq	104(%rsi), %rsi
-	adcq	$0       , %rsi
-
-	rcrq	$1, %rsi
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-    movq 	%rsi, 104(%rdi)
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.c
deleted file mode 100644
index 6d56114bbe79..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.s b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.s
deleted file mode 100644
index 00bb1c1034d9..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_inv_low.s
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level in&version functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/* No carry */
-.macro _DBL R, i
-	movq	\i+0(\R), %rdx
-	addq	%rdx, \i+0(\R)
-	movq	\i+8(\R), %rdx
-	adcq	%rdx, \i+8(\R)
-	movq	\i+16(\R), %rdx
-	adcq	%rdx, \i+16(\R)
-	movq	\i+24(\R), %rdx
-	adcq	%rdx, \i+24(\R)
-	movq	\i+32(\R), %rdx
-	adcq	%rdx, \i+32(\R)
-	movq	\i+40(\R), %rdx
-	adcq	%rdx, \i+40(\R)
-	movq	\i+48(\R), %rdx
-	adcq	%rdx, \i+48(\R)
-	movq	\i+56(\R), %rdx
-	adcq	%rdx, \i+56(\R)
-.endm
-
-.global fp_invn_asm
-
-/**
- * rdi = x1, rsi = a
- */
-fp_invn_asm:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-	subq 	$256, %rsp
-
-	/* v = p. */
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-
-	/* rsp[0..7] = u = a. */
-	movq	0(%rsi),%rax
-	movq	%rax,0(%rsp)
-	movq	8(%rsi),%rax
-	movq	%rax,8(%rsp)
-	movq	16(%rsi),%rax
-	movq	%rax,16(%rsp)
-	movq	24(%rsi),%rax
-	movq	%rax,24(%rsp)
-	movq	32(%rsi),%rax
-	movq	%rax,32(%rsp)
-	movq	40(%rsi),%rax
-	movq	%rax,40(%rsp)
-	movq	48(%rsi),%rax
-	movq	%rax,48(%rsp)
-	xorq	%rax, %rax
-
-	/* rsp[7..15] = x1 = 1. */
-	movq	$1,56(%rsp)
-	movq	$0,64(%rsp)
-	movq	$0,72(%rsp)
-	movq	$0,80(%rsp)
-	movq	$0,88(%rsp)
-	movq	$0,96(%rsp)
-	movq	$0,104(%rsp)
-
-	/* rsp[16..23] = x2 = 0. */
-	movq	$0,128(%rsp)
-	movq	$0,136(%rsp)
-	movq	$0,144(%rsp)
-	movq	$0,152(%rsp)
-	movq	$0,160(%rsp)
-	movq	$0,168(%rsp)
-	movq	$0,176(%rsp)
-	movq	$0,184(%rsp)
-
-loop:
-	movq	%r8,%rdx
-	orq		%r9,%rdx
-	orq		%r10,%rdx
-	orq		%r11,%rdx
-	orq		%r12,%rdx
-	orq		%r13,%rdx
-	orq		%r14,%rdx
-	orq		%r15,%rdx
-	jz		end
-
-	inc		%rax
-	test	$1, %r8
-	jnz 	v_odd
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	/* fp_dbln_low(x1). */
-	_DBL 	%rsp, 64
-	jmp 	loop
-v_odd:
-	movq	0(%rsp),%rdx
-	test	$1, %rdx
-	jnz 	u_odd
-
-	/* fp_rsh1_low(u). */
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	/* fp_dbln_low(x2). */
-	_DBL	%rsp, 128
-	jmp 	loop
-u_odd:
-	subq	0(%rsp), %r8
-	sbbq	8(%rsp), %r9
-	sbbq	16(%rsp), %r10
-	sbbq	24(%rsp), %r11
-	sbbq	32(%rsp), %r12
-	sbbq	40(%rsp), %r13
-	sbbq	48(%rsp), %r14
-	sbbq	56(%rsp), %r15
-	jc 		cmp_lt
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	movq	64(%rsp), %rdx
-	addq	%rdx, 128(%rsp)
-	movq	72(%rsp), %rdx
-	adcq	%rdx, 136(%rsp)
-	movq	80(%rsp), %rdx
-	adcq	%rdx, 144(%rsp)
-	movq	88(%rsp), %rdx
-	adcq	%rdx, 152(%rsp)
-	movq	96(%rsp), %rdx
-	adcq	%rdx, 160(%rsp)
-	movq	104(%rsp), %rdx
-	adcq	%rdx, 168(%rsp)
-	movq	112(%rsp), %rdx
-	adcq	%rdx, 176(%rsp)
-	movq	120(%rsp), %rdx
-	adcq	%rdx, 184(%rsp)
-
-	_DBL 	%rsp, 64
-	jmp 	loop
-cmp_lt:
-	addq	0(%rsp), %r8
-	adcq	8(%rsp), %r9
-	adcq	16(%rsp), %r10
-	adcq	24(%rsp), %r11
-	adcq	32(%rsp), %r12
-	adcq	40(%rsp), %r13
-	adcq	48(%rsp), %r14
-	adcq	56(%rsp), %r15
-
-	subq	%r8, 0(%rsp)
-	sbbq	%r9, 8(%rsp)
-	sbbq	%r10, 16(%rsp)
-	sbbq	%r11, 24(%rsp)
-	sbbq	%r12, 32(%rsp)
-	sbbq	%r13, 40(%rsp)
-	sbbq	%r14, 48(%rsp)
-	sbbq	%r15, 56(%rsp)
-
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	movq	128(%rsp), %rdx
-	addq	%rdx, 64(%rsp)
-	movq	136(%rsp), %rdx
-	adcq	%rdx, 72(%rsp)
-	movq	144(%rsp), %rdx
-	adcq	%rdx, 80(%rsp)
-	movq	152(%rsp), %rdx
-	adcq	%rdx, 88(%rsp)
-	movq	160(%rsp), %rdx
-	adcq	%rdx, 96(%rsp)
-	movq	168(%rsp), %rdx
-	adcq	%rdx, 104(%rsp)
-	movq	176(%rsp), %rdx
-	adcq	%rdx, 112(%rsp)
-	movq	184(%rsp), %rdx
-	adcq	%rdx, 120(%rsp)
-
-	_DBL 	%rsp, 128
-	jmp 	loop
-end:
-	movq	64(%rsp), %r9
-	movq	%r9, 0(%rdi)
-	movq	72(%rsp), %r9
-	movq	%r9, 8(%rdi)
-	movq	80(%rsp), %r9
-	movq	%r9, 16(%rdi)
-	movq	88(%rsp), %r9
-	movq	%r9, 24(%rdi)
-	movq	96(%rsp), %r9
-	movq	%r9, 32(%rdi)
-	movq	104(%rsp), %r9
-	movq	%r9, 40(%rdi)
-	movq	112(%rsp), %r9
-	movq	%r9, 48(%rdi)
-	movq	120(%rsp), %r9
-	movq	%r9, 56(%rdi)
-exit:
-	addq 	$256, %rsp
-	pop		%rbx
-	pop		%rbp
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.c
deleted file mode 100644
index 128d98834319..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @version $Id: relic_fp_mul_low.c 683 2011-03-10 23:51:23Z dfaranha $
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.s
deleted file mode 100644
index ed9660ea6f14..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global fp_muln_low
-.global fp_mulm_low
-
-fp_muln_low:
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-fp_mulm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$128, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$128, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.c
deleted file mode 100644
index 154942d35935..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t _r[2 * RLC_FP_DIGS], r[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, b0, d0, b1, d1;
-	dig_t carry;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	carry = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			if (sform[i] > 0) {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		if (sform[0] > 0) {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-
-		dv_copy(_r, _q, first);
-		if (b0 > 0) {
-			_r[first - 1] &= RLC_MASK(b0);
-		}
-		carry = fp_addn_low(r, r, _r);
-		if (carry) {
-			fp_subn_low(r, r, m);
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.s
deleted file mode 100644
index 22f6feeef1a2..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global fp_rdcn_low
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-fp_rdcn_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.c
deleted file mode 100644
index 483de745b0c9..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.s
deleted file mode 100644
index b8e29818dcfa..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_shift_low.s
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-.text
-.global fp_rsh1_low
-.global fp_lsh1_low
-
-fp_rsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	shrd	$1, %r9, %r8
-	shrd	$1, %r10, %r9
-	shrd	$1, %r11, %r10
-	shrd	$1, %rax, %r11
-	shrd	$1, %rcx, %rax
-	shrd	$1, %rdx, %rcx
-	shr		$1, %rdx
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	ret
-
-fp_lsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	shld	$1, %rcx, %rdx
-	shld	$1, %rax, %rcx
-	shld	$1, %r11, %rax
-	shld	$1, %r10, %r11
-	shld	$1, %r9, %r10
-	shld	$1, %r8, %r9
-	shl		$1, %r8
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	xorq	%rax, %rax
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_sqr_low.c
deleted file mode 100644
index c458e3a657b3..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-446/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-455/CMakeLists.txt
deleted file mode 100755
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-455/macro.s
deleted file mode 100644
index 1c97f993074c..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/macro.s
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#define P0	0xAAA00001800002AB
-#define P1	0xA6C589556B2AA956
-#define P2	0xB3DB9994ACE86D1B
-#define P3	0x4BD93954FCB314B8
-#define P4	0x3F665E3A5B1D5623
-#define P5	0xA00E0F95B4920300
-#define P6	0x555955557955572A
-#define P7	0x0000000000000055
-#define U0	0x4B3EF8137F4017FD
-
-.text
-
-.macro ADD1 i j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro ADDN i j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUB1 i j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUBN i j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro DBLN i j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 7, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	1, 7, 1, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	2, 7, 2, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	3, 7, 3, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	4, 7, 4, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	5, 7, 5, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	6, 7, 6, \C, \R0, \R1, \R2, \A, \B
-
-	movq	56(\A),%rax
-	mulq	56(\B)
-	addq	%rax  ,\R1
-	movq	\R1   ,112(\C)
-	adcq	%rdx  ,\R2
-	movq	\R2   ,120(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	1, 7, \R2, \R0, \R1, \A, \P
-	RDCN1	2, 7, \R0, \R1, \R2, \A, \P
-	RDCN1	3, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	4, 7, \R2, \R0, \R1, \A, \P
-	RDCN1	5, 7, \R0, \R1, \R2, \A, \P
-	RDCN1	6, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	7, 7, \R2, \R0, \R1, \A, \P
-	addq	8*15(\A), \R0
-	movq	\R0, 120(\A)
-
-	movq	64(\A), %r11
-	movq	72(\A), %r12
-	movq	80(\A), %r13
-	movq	88(\A), %r14
-	movq	96(\A), %r15
-	movq	104(\A), %rcx
-	movq	112(\A), %rbp
-	movq	120(\A), %rdx
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-	sbbq	p7(%rip), %rdx
-
-	cmovc	64(\A), %r11
-	cmovc	72(\A), %r12
-	cmovc	80(\A), %r13
-	cmovc	88(\A), %r14
-	cmovc	96(\A), %r15
-	cmovc	104(\A), %rcx
-	cmovc	112(\A), %rbp
-	cmovc	120(\A), %rdx
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-	movq	%rdx,56(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_add_low.s
deleted file mode 100644
index df1253cdb46f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_add_low.s
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-p7: .quad P7
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-.global p7
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-.hidden p7
-
-.text
-
-.global fp_add1_low
-.global fp_addn_low
-.global fp_addm_low
-.global fp_addd_low
-.global fp_addc_low
-.global fp_sub1_low
-.global fp_subn_low
-.global fp_subm_low
-.global fp_subd_low
-.global fp_subc_low
-.global fp_negm_low
-.global fp_dbln_low
-.global fp_dblm_low
-.global fp_hlvm_low
-.global fp_hlvd_low
-
-fp_add1_low:
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1 1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addn_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-fp_addm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-	movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-	movq	56(%rdx), %r15
-	adcq	56(%rsi), %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-
-	movq	8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_addd_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addc_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1 (RLC_FP_DIGS - 1)
-
-	movq     64(%rsi), %r8
-	adcq     64(%rdx), %r8
-	movq     72(%rsi), %r9
-	adcq     72(%rdx), %r9
-	movq     80(%rsi), %r10
-	adcq     80(%rdx), %r10
-	movq     88(%rsi), %r11
-	adcq     88(%rdx), %r11
-	movq     96(%rsi), %r12
-	adcq     96(%rdx), %r12
-	movq    104(%rsi), %r13
-	adcq    104(%rdx), %r13
-	movq    112(%rsi), %r14
-	adcq    112(%rdx), %r14
-	movq    120(%rsi), %r15
-	adcq    120(%rdx), %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-	mov		8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  64(%rdi)
-	movq	%r9 ,  72(%rdi)
-	movq	%r10,  80(%rdi)
-	movq	%r11,  88(%rdi)
-	movq	%r12,  96(%rdi)
-	movq	%r13, 104(%rdi)
-	movq	%r14, 112(%rdi)
-	movq	%r15, 120(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_sub1_low:
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subn_low:
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 1 (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-fp_subm_low:
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1 (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-	cmovc	p7(%rip), %rsi
-
-    addq	%rax,  0(%rdi)
-    adcq	%rcx,  8(%rdi)
-    adcq	%r8,  16(%rdi)
-    adcq	%r9,  24(%rdi)
-    adcq	%r10, 32(%rdi)
-    adcq	%r11, 40(%rdi)
-    adcq	%rdx, 48(%rdi)
-    adcq	%rsi, 56(%rdi)
-
-	ret
-
-fp_subd_low:
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subc_low:
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rsi
-	cmovc	p7(%rip), %rdx
-
-    addq	%rax,  64(%rdi)
-    adcq	%rcx,  72(%rdi)
-    adcq	%r8,   80(%rdi)
-    adcq	%r9,   88(%rdi)
-    adcq	%r10,  96(%rdi)
-    adcq	%r11, 104(%rdi)
-    adcq	%rsi, 112(%rdi)
-    adcq	%rdx, 120(%rdi)
-
-	ret
-
-fp_negm_low:
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    or 	    56(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-	sbbq 	48(%rsi), %r8
-	movq 	%r8     , 48(%rdi)
-    cmovnz 	p7(%rip), %r8
-	sbbq 	56(%rsi), %r8
-	movq 	%r8     , 56(%rdi)
-  	ret
-
-fp_dbln_low:
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-fp_dblm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-	movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-	movq	56(%rsi), %r15
-	adcq	%r15    , %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-	movq	8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_hlvm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-	movq	56(%rsi), %rdx
-	adcq	%rdx    , %r15
-
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
-/*
-fp_hlvd_low2:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	movq	%rsp, b0
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-	movq	104(%rsi), %rsi
-	adcq	$0       , %rsi
-	movq	112(%rsi), %rsi
-	adcq	$0       , %rsi
-	movq	120(%rsi), %rsp
-	adcq	$0       , %rsp
-
-	rcrq	$1, %rdi
-  	rcrq 	$1, %rsp
-  	rcrq	$1, %rsi
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	xchgq	b0  , %rsp
-	movq	%rdi, b1
-	pop		%rdi
-
-	xchgq	b1  , %rsp
-  	movq 	%rsp, 120(%rdi)
-	xchgq	b0  , %rsp
-  	movq	%rsp, 112(%rdi)
-	xchgq	b1  , %rsp
-  	movq 	%rsi, 104(%rdi)
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-*/
-fp_hlvd_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-
-	push	%rbp
-
-	movq	104(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 104(%rdi)
-	movq	112(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 112(%rdi)
-	movq	120(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 120(%rdi)
-
-	pop		%rbp
-
-	rcrq	$1, 120(%rdi)
-	rcrq	$1, 112(%rdi)
-	rcrq	$1, 104(%rdi)
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.c
deleted file mode 100644
index b3276603e221..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.s b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.s
deleted file mode 100644
index 296ec6b294ba..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_inv_low.s
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level in&version functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/* No carry */
-.macro _DBL R, i
-	movq	\i+0(\R), %rdx
-	addq	%rdx, \i+0(\R)
-	movq	\i+8(\R), %rdx
-	adcq	%rdx, \i+8(\R)
-	movq	\i+16(\R), %rdx
-	adcq	%rdx, \i+16(\R)
-	movq	\i+24(\R), %rdx
-	adcq	%rdx, \i+24(\R)
-	movq	\i+32(\R), %rdx
-	adcq	%rdx, \i+32(\R)
-	movq	\i+40(\R), %rdx
-	adcq	%rdx, \i+40(\R)
-	movq	\i+48(\R), %rdx
-	adcq	%rdx, \i+48(\R)
-	movq	\i+56(\R), %rdx
-	adcq	%rdx, \i+56(\R)
-.endm
-
-.global fp_invn_asm
-
-/**
- * rdi = x1, rsi = a
- */
-fp_invn_asm:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-	subq 	$256, %rsp
-
-	/* v = p. */
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-	/* rsp[0..7] = u = a. */
-	movq	0(%rsi),%rax
-	movq	%rax,0(%rsp)
-	movq	8(%rsi),%rax
-	movq	%rax,8(%rsp)
-	movq	16(%rsi),%rax
-	movq	%rax,16(%rsp)
-	movq	24(%rsi),%rax
-	movq	%rax,24(%rsp)
-	movq	32(%rsi),%rax
-	movq	%rax,32(%rsp)
-	movq	40(%rsi),%rax
-	movq	%rax,40(%rsp)
-	movq	48(%rsi),%rax
-	movq	%rax,48(%rsp)
-	movq	56(%rsi),%rax
-	movq	%rax,56(%rsp)
-	xorq	%rax, %rax
-
-	/* rsp[7..15] = x1 = 1. */
-	movq	$1,64(%rsp)
-	movq	$0,72(%rsp)
-	movq	$0,80(%rsp)
-	movq	$0,88(%rsp)
-	movq	$0,96(%rsp)
-	movq	$0,104(%rsp)
-	movq	$0,112(%rsp)
-	movq	$0,120(%rsp)
-
-	/* rsp[16..23] = x2 = 0. */
-	movq	$0,128(%rsp)
-	movq	$0,136(%rsp)
-	movq	$0,144(%rsp)
-	movq	$0,152(%rsp)
-	movq	$0,160(%rsp)
-	movq	$0,168(%rsp)
-	movq	$0,176(%rsp)
-	movq	$0,184(%rsp)
-
-loop:
-	movq	%r8,%rdx
-	orq		%r9,%rdx
-	orq		%r10,%rdx
-	orq		%r11,%rdx
-	orq		%r12,%rdx
-	orq		%r13,%rdx
-	orq		%r14,%rdx
-	orq		%r15,%rdx
-	jz		end
-
-	inc		%rax
-	test	$1, %r8
-	jnz 	v_odd
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	/* fp_dbln_low(x1). */
-	_DBL 	%rsp, 64
-	jmp 	loop
-v_odd:
-	movq	0(%rsp),%rdx
-	test	$1, %rdx
-	jnz 	u_odd
-
-	/* fp_rsh1_low(u). */
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	/* fp_dbln_low(x2). */
-	_DBL	%rsp, 128
-	jmp 	loop
-u_odd:
-	subq	0(%rsp), %r8
-	sbbq	8(%rsp), %r9
-	sbbq	16(%rsp), %r10
-	sbbq	24(%rsp), %r11
-	sbbq	32(%rsp), %r12
-	sbbq	40(%rsp), %r13
-	sbbq	48(%rsp), %r14
-	sbbq	56(%rsp), %r15
-	jc 		cmp_lt
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	movq	64(%rsp), %rdx
-	addq	%rdx, 128(%rsp)
-	movq	72(%rsp), %rdx
-	adcq	%rdx, 136(%rsp)
-	movq	80(%rsp), %rdx
-	adcq	%rdx, 144(%rsp)
-	movq	88(%rsp), %rdx
-	adcq	%rdx, 152(%rsp)
-	movq	96(%rsp), %rdx
-	adcq	%rdx, 160(%rsp)
-	movq	104(%rsp), %rdx
-	adcq	%rdx, 168(%rsp)
-	movq	112(%rsp), %rdx
-	adcq	%rdx, 176(%rsp)
-	movq	120(%rsp), %rdx
-	adcq	%rdx, 184(%rsp)
-
-	_DBL 	%rsp, 64
-	jmp 	loop
-cmp_lt:
-	addq	0(%rsp), %r8
-	adcq	8(%rsp), %r9
-	adcq	16(%rsp), %r10
-	adcq	24(%rsp), %r11
-	adcq	32(%rsp), %r12
-	adcq	40(%rsp), %r13
-	adcq	48(%rsp), %r14
-	adcq	56(%rsp), %r15
-
-	subq	%r8, 0(%rsp)
-	sbbq	%r9, 8(%rsp)
-	sbbq	%r10, 16(%rsp)
-	sbbq	%r11, 24(%rsp)
-	sbbq	%r12, 32(%rsp)
-	sbbq	%r13, 40(%rsp)
-	sbbq	%r14, 48(%rsp)
-	sbbq	%r15, 56(%rsp)
-
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	movq	128(%rsp), %rdx
-	addq	%rdx, 64(%rsp)
-	movq	136(%rsp), %rdx
-	adcq	%rdx, 72(%rsp)
-	movq	144(%rsp), %rdx
-	adcq	%rdx, 80(%rsp)
-	movq	152(%rsp), %rdx
-	adcq	%rdx, 88(%rsp)
-	movq	160(%rsp), %rdx
-	adcq	%rdx, 96(%rsp)
-	movq	168(%rsp), %rdx
-	adcq	%rdx, 104(%rsp)
-	movq	176(%rsp), %rdx
-	adcq	%rdx, 112(%rsp)
-	movq	184(%rsp), %rdx
-	adcq	%rdx, 120(%rsp)
-
-	_DBL 	%rsp, 128
-	jmp 	loop
-end:
-	movq	64(%rsp), %r9
-	movq	%r9, 0(%rdi)
-	movq	72(%rsp), %r9
-	movq	%r9, 8(%rdi)
-	movq	80(%rsp), %r9
-	movq	%r9, 16(%rdi)
-	movq	88(%rsp), %r9
-	movq	%r9, 24(%rdi)
-	movq	96(%rsp), %r9
-	movq	%r9, 32(%rdi)
-	movq	104(%rsp), %r9
-	movq	%r9, 40(%rdi)
-	movq	112(%rsp), %r9
-	movq	%r9, 48(%rdi)
-	movq	120(%rsp), %r9
-	movq	%r9, 56(%rdi)
-exit:
-	addq 	$256, %rsp
-	pop		%rbx
-	pop		%rbp
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.c
deleted file mode 100644
index 283dd2167baa..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @version $Id: relic_fp_mul_low.c 683 2011-03-10 23:51:23Z dfaranha $
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.s
deleted file mode 100644
index a934a77c498e..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global fp_muln_low
-.global fp_mulm_low
-
-fp_muln_low:
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-fp_mulm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$128, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$128, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.c
deleted file mode 100644
index 0bf759769a48..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t _r[2 * RLC_FP_DIGS], r[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, b0, d0, b1, d1;
-	dig_t carry;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	carry = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			if (sform[i] > 0) {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		if (sform[0] > 0) {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-
-		dv_copy(_r, _q, first);
-		if (b0 > 0) {
-			_r[first - 1] &= RLC_MASK(b0);
-		}
-		carry = fp_addn_low(r, r, _r);
-		if (carry) {
-			fp_subn_low(r, r, m);
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.s
deleted file mode 100644
index ff721bae25a2..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global fp_rdcn_low
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-fp_rdcn_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.c
deleted file mode 100644
index f240db5f4325..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.s
deleted file mode 100644
index e72f36029df4..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_shift_low.s
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-.text
-.global fp_rsh1_low
-.global fp_lsh1_low
-
-fp_rsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	movq	56(%rsi), %rsi
-	shrd	$1, %r9, %r8
-	shrd	$1, %r10, %r9
-	shrd	$1, %r11, %r10
-	shrd	$1, %rax, %r11
-	shrd	$1, %rcx, %rax
-	shrd	$1, %rdx, %rcx
-	shrd	$1, %rsi, %rdx
-	shr		$1, %rsi
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	movq	%rsi,56(%rdi)
-	ret
-
-fp_lsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	movq	56(%rsi), %rsi
-	shld	$1, %rdx, %rsi
-	shld	$1, %rcx, %rdx
-	shld	$1, %rax, %rcx
-	shld	$1, %r11, %rax
-	shld	$1, %r10, %r11
-	shld	$1, %r9, %r10
-	shld	$1, %r8, %r9
-	shl		$1, %r8
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	movq	%rsi,56(%rdi)
-	xorq	%rax, %rax
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_sqr_low.c
deleted file mode 100644
index f0c879cd5045..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-455/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-4l/CMakeLists.txt
deleted file mode 100755
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/macro.s
deleted file mode 100755
index c6f836230bc1..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/macro.s
+++ /dev/null
@@ -1,536 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @ingroup fp
- */
-
-#if FP_PRIME == 254
-
-#define P0 $0xA700000000000013
-#define P1 $0x6121000000000013
-#define P2 $0xBA344D8000000008
-#define P3 $0x2523648240000001
-#define U0 $0x08435E50D79435E5
-
-#elif FP_PRIME == 255
-
-#define P0 $0xFFFFFFFFFFFFFFED
-#define P1 $0xFFFFFFFFFFFFFFFF
-#define P2 $0xFFFFFFFFFFFFFFFF
-#define P3 $0x7FFFFFFFFFFFFFFF
-#define U0 $0x86BCA1AF286BCA1B
-
-#endif
-
-#define NP40 $0xC000000000000000
-#define NP41 $0xE9C0000000000004
-#define NP42 $0x1848400000000004
-#define NP43 $0x6E8D136000000002
-#define NP44 $0x0948D92090000000
-
-#define NP20 $0x8000000000000000         // N*p/2
-#define NP21 $0xD380000000000009
-#define NP22 $0x3090800000000009
-#define NP23 $0xDD1A26C000000004
-#define NP24 $0x1291B24120000000
-
-#if defined(__APPLE__)
-#define cdecl(S) _PREFIX(,S)
-#else
-#define cdecl(S) S
-#endif
-
-.text
-
-.macro ADD1_STEP i, j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1_STEP "(\i + 1)", \j
-	.endif
-.endm
-
-.macro ADDN_STEP i, j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN_STEP "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUB1_STEP i, j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1_STEP "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUBN_STEP i, j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN_STEP "(\i + 1)", \j
-	.endif
-.endm
-
-.macro DBLN_STEP i, j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN_STEP "(\i + 1)", \j
-	.endif
-.endm
-
-#if FP_PRIME == 254
-
-/* Montgomery reduction, comba, optimized for BN254 */
-.macro FP_RDCN_LOW C, A
-	xorq	%r10, %r10
-	movq	U0, %rcx
-// i=0
-	movq	0(\A), %r8
-	movq	%r8, %rax
-	mulq	%rcx         // v*U0
-	movq	%rax, %r14
-	movq	P0, %r11
-	mulq	%r11          // z0*m0
-	addq	%rax,%r8
-	movq	P1, %r12
-	adcq	8(\A),%rdx
-    movq    %rdx,%r9
-    adcq    $0,%r10
-// i=1, j=0
-	movq	%r14, %rax
-	mulq	%r12          // z0*m1
-	addq	%rax,%r9
-	movq	%r9, %rax
-	adcq	%rdx,%r10
-
-	mulq	%rcx          // v*U0
-	movq	%rax, 8(\A)
-	xorq    %r8,%r8
-	mulq	%r11          // z1*m0
-	addq	%rax,%r9
-	movq	P2, %r13
-	adcq	%rdx,%r10
-	adcq	$0,%r8
-// i=2, j=0,1
-	movq	%r14, %rax
-	mulq	%r13         // z0*m2
-	addq	16(\A),%r10
-	adcq	$0,%r8
-
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-
-    xorq    %r9,%r9
-	movq	8(\A), %rax
-	mulq	%r12         // z1*m1
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-	adcq	$0,%r9
-	movq	%r10, %rax
-	mulq	%rcx         // v*U0
-	movq	%rax, 16(\A)
-	mulq	%r11         // z2*m0
-	addq	%rax,%r10
-	movq	%r14, %rax
-	adcq	%rdx,%r8
-	movq	P3, %r14
-	adcq	$0,%r9
-// i=3, j=0,1,2
-	mulq	%r14           // z0*m3
-	addq    24(\A),%r8
-	adcq	$0,%r9
-
-	addq	%rax,%r8
-	adcq	%rdx,%r9
-
-	movq	8(\A), %rax
-	mulq	%r13           // z1*m2
-	addq	%rax,%r8
-	movq	16(\A), %rax
-	adcq	%rdx,%r9
-
-	xorq	%r10, %r10
-	mulq	%r12           // z2*m1
-	addq	%rax,%r8
-	movq	%r8, %rax
-	adcq	%rdx,%r9
-	adcq	$0,%r10
-
-	mulq	%rcx           // v*U0
-	movq    %rax, 24(\A)
-	mulq    %r11           // z3*m0
-	addq	%rax,%r8
-	adcq	%rdx,%r9
-	adcq	$0,%r10
-// loop 2
-// i=4, j=1,2,3
-	movq	8(\A), %rax
-	mulq	%r14           // z1*m3
-	addq	32(\A),%r9
-	adcq	$0,%r10
-
-	addq	%rax,%r9
-	adcq	%rdx,%r10
-
-	movq	16(\A), %rax
-	mulq	%r13           // z2*m2
-	addq	%rax,%r9
-
-	adcq	%rdx,%r10
-	xorq	%r8, %r8
-	movq	24(\A), %rax
-
-	mulq	%r12           // z3*m1
-	addq	%rax,%r9
-	adcq	%rdx,%r10
-	movq	%r9,%r12       // Z0
-	adcq	$0,%r8
-// i=5, j=2,3
-	xorq	%r11, %r11
-	movq	16(\A), %rax
-	mulq	%r14           // z2*m3
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-
-	movq	24(\A), %rax
-	mulq	%r13           // z3*m2
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-
-	addq	40(\A),%r10
-	movq	%r10,%r13      // Z1
-	adcq	$0,%r8
-// i=6, j=3
-	movq	24(\A), %rax
-	mulq	%r14           // z3*m3
-	addq	%rax,%r8
-	adcq	%rdx,%r11
-
-	addq	48(\A),%r8
-	movq	%r8,%r14       // Z2
-	adcq	$0,%r11
-
-	addq	56(\A),%r11
-	movq	%r11,%rcx      // Z3
-
-	movq	P0,%rax
-	subq	%rax,%r9
-	movq	P1,%rax
-	sbbq	%rax,%r10
-	movq	P2,%rax
-	sbbq	%rax,%r8
-	movq	P3,%rax
-	sbbq	%rax,%r11
-	cmovnc	%r9,%r12
-	movq	%r12,0(\C)
-	cmovnc	%r10,%r13
-	movq	%r13,8(\C)
-	cmovnc	%r8,%r14
-	movq	%r14,16(\C)
-	cmovnc	%r11,%rcx
-	movq	%rcx,24(\C)
-.endm
-
-#else
-
-/* Montgomery reduction, comba, optimized for BN254 */
-.macro FP_RDCN_LOW C, A
-	xorq	%r10, %r10
-	movq	U0, %rcx
-// i=0
-	movq	0(\A), %r8
-	movq	%r8, %rax
-	mulq	%rcx         // v*U0
-	movq	%rax, %r14
-	movq	P0, %r11
-	mulq	%r11          // z0*m0
-	addq	%rax,%r8
-	movq	P1, %r12
-	adcq	8(\A),%rdx
-    movq    %rdx,%r9
-    adcq    $0,%r10
-// i=1, j=0
-	movq	%r14, %rax
-	mulq	%r12          // z0*m1
-	addq	%rax,%r9
-	movq	%r9, %rax
-	adcq	%rdx,%r10
-
-	mulq	%rcx          // v*U0
-	movq	%rax, 8(\A)
-	xorq    %r8,%r8
-	mulq	%r11          // z1*m0
-	addq	%rax,%r9
-	movq	P2, %r13
-	adcq	%rdx,%r10
-	adcq	$0,%r8
-// i=2, j=0,1
-	movq	%r14, %rax
-	mulq	%r13         // z0*m2
-	addq	16(\A),%r10
-	adcq	$0,%r8
-
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-
-    xorq    %r9,%r9
-	movq	8(\A), %rax
-	mulq	%r12         // z1*m1
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-	adcq	$0,%r9
-	movq	%r10, %rax
-	mulq	%rcx         // v*U0
-	movq	%rax, 16(\A)
-	mulq	%r11         // z2*m0
-	addq	%rax,%r10
-	movq	%r14, %rax
-	adcq	%rdx,%r8
-	movq	P3, %r14
-	adcq	$0,%r9
-// i=3, j=0,1,2
-	mulq	%r14           // z0*m3
-	addq    24(\A),%r8
-	adcq	$0,%r9
-
-	xorq	%r10, %r10
-	addq	%rax,%r8
-	adcq	%rdx,%r9
-    adcq	$0,%r10
-
-	movq	8(\A), %rax
-	mulq	%r13           // z1*m2
-	addq	%rax,%r8
-	movq	16(\A), %rax
-	adcq	%rdx,%r9
-    adcq	$0,%r10
-
-	mulq	%r12           // z2*m1
-	addq	%rax,%r8
-	movq	%r8, %rax
-	adcq	%rdx,%r9
-	adcq	$0,%r10
-
-	mulq	%rcx           // v*U0
-	movq    %rax, 24(\A)
-	mulq    %r11           // z3*m0
-	addq	%rax,%r8
-	adcq	%rdx,%r9
-	adcq	$0,%r10
-// loop 2
-// i=4, j=1,2,3
-	movq	8(\A), %rax
-	mulq	%r14           // z1*m3
-	addq	32(\A),%r9
-	adcq	$0,%r10
-
-	xorq	%r8, %r8
-	addq	%rax,%r9
-	adcq	%rdx,%r10
-    adcq	$0,%r8
-
-	movq	16(\A), %rax
-	mulq	%r13           // z2*m2
-	addq	%rax,%r9
-	adcq	%rdx,%r10
-    adcq	$0,%r8
-	movq	24(\A), %rax
-
-	mulq	%r12           // z3*m1
-	addq	%rax,%r9
-	adcq	%rdx,%r10
-	movq	%r9,%r12       // Z0
-	adcq	$0,%r8
-// i=5, j=2,3
-	xorq	%r11, %r11
-	movq	16(\A), %rax
-	mulq	%r14           // z2*m3
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-    adcq	$0,%r11
-
-	movq	24(\A), %rax
-	mulq	%r13           // z3*m2
-	addq	%rax,%r10
-	adcq	%rdx,%r8
-    adcq	$0,%r11
-
-	addq	40(\A),%r10
-	movq	%r10,%r13      // Z1
-	adcq	$0,%r8
-// i=6, j=3
-	movq	24(\A), %rax
-	mulq	%r14           // z3*m3
-	addq	%rax,%r8
-	adcq	%rdx,%r11
-
-	addq	48(\A),%r8
-	movq	%r8,%r14       // Z2
-	adcq	$0,%r11
-
-	addq	56(\A),%r11
-	movq	%r11,%rcx      // Z3
-
-	movq	P0,%rax
-	subq	%rax,%r9
-	movq	P1,%rax
-	sbbq	%rax,%r10
-	movq	P2,%rax
-	sbbq	%rax,%r8
-	movq	P3,%rax
-	sbbq	%rax,%r11
-	cmovnc	%r9,%r12
-	movq	%r12,0(\C)
-	cmovnc	%r10,%r13
-	movq	%r13,8(\C)
-	cmovnc	%r8,%r14
-	movq	%r14,16(\C)
-	cmovnc	%r11,%rcx
-	movq	%rcx,24(\C)
-.endm
-
-#endif
-
-.macro FP_MULN_LOW C, R0, R1, R2, A0, A1, A2, A3, B0, B1, B2, B3
-	movq \A0,%rax
-	mulq \B0
-	movq %rax,0(\C)
-	movq %rdx,\R0
-
-	movq \A0,%rax
-	mulq \B1
-	addq %rax,\R0
-	movq %rdx,\R1
-	adcq $0,\R1
-
-	xorq \R2,\R2
-	movq \A1,%rax
-	mulq \B0
-	addq %rax,\R0
-	movq \R0,8(\C)
-	adcq %rdx,\R1
-	adcq $0,\R2
-
-	movq \A0,%rax
-	mulq \B2
-	addq %rax,\R1
-	adcq %rdx,\R2
-	//adcq $0,\R0
-
-	xorq \R0,\R0
-	movq \A1,%rax
-	mulq \B1
-	addq %rax,\R1
-	adcq %rdx,\R2
-	adcq $0,\R0
-
-	movq \A2,%rax
-	mulq \B0
-	addq %rax,\R1
-	movq \R1,16(\C)
-	adcq %rdx,\R2
-	adcq $0,\R0
-
-	//xorq \R1,\R1
-	movq \A0,%rax
-	mulq \B3
-	addq %rax,\R2
-	adcq %rdx,\R0
-	//adcq $0,\R1
-
-	xorq \R1,\R1
-	movq \A1,%rax
-	mulq \B2
-	addq %rax,\R2
-	adcq %rdx,\R0
-	adcq $0,\R1
-
-	movq \A2,%rax
-	mulq \B1
-	addq %rax,\R2
-	adcq %rdx,\R0
-	adcq $0,\R1
-
-	movq \A3,%rax
-	mulq \B0
-	addq %rax,\R2
-	movq \R2,24(\C)
-	adcq %rdx,\R0
-	adcq $0,\R1
-
-	movq \A1,%rax
-	mulq \B3
-	addq %rax,\R0
-	adcq %rdx,\R1
-	//adcq $0,\R2
-
-	xorq \R2,\R2
-	movq \A2,%rax
-	mulq \B2
-	addq %rax,\R0
-	adcq %rdx,\R1
-	adcq $0,\R2
-
-	movq \A3,%rax
-	mulq \B1
-	addq %rax,\R0
-	movq \R0,32(\C)
-	adcq %rdx,\R1
-	adcq $0,\R2
-
-	movq \A2,%rax
-	mulq \B3
-	addq %rax,\R1
-	adcq %rdx,\R2
-
-    xorq \R0,\R0
-	movq \A3,%rax
-	mulq \B2
-	addq %rax,\R1
-	movq \R1,40(\C)
-	adcq %rdx,\R2
-	adcq $0,\R0
-
-	movq \A3,%rax
-	mulq \B3
-	addq %rax,\R2
-	movq \R2,48(\C)
-	adcq %rdx,\R0
-	movq \R0,56(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_add_low.s
deleted file mode 100755
index ab2ae7fa353a..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_add_low.s
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_add1_low)
-.global cdecl(fp_addn_low)
-.global cdecl(fp_addm_low)
-.global cdecl(fp_addd_low)
-.global cdecl(fp_addc_low)
-.global cdecl(fp_sub1_low)
-.global cdecl(fp_subn_low)
-.global cdecl(fp_subm_low)
-.global cdecl(fp_subc_low)
-.global cdecl(fp_subd_low)
-.global cdecl(fp_negm_low)
-.global cdecl(fp_dbln_low)
-.global cdecl(fp_dblm_low)
-.global cdecl(fp_hlvm_low)
-.global cdecl(fp_hlvd_low)
-
-/*
- * Function: fp_add1_low
- * Inputs: rdi = c, rsi = a, rdx = digit
- * Output: rax
- */
-cdecl(fp_add1_low):
-    xorq	%rax, %rax
-	movq	0(%rsi), %r10
-	addq	%rdx, %r10
-	movq	%r10, 0(%rdi)
-
-	ADD1_STEP 1, (RLC_FP_DIGS - 1)
-
-    adcq    $0, %rax
-
-	ret
-
-/*
- * Function: fp_addn_low
- * Inputs: rdi = c, rsi = a, rdx = b
- * Output: rax
- */
-cdecl(fp_addn_low):
-    xorq	%rax, %rax
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11, 0(%rdi)
-
-	ADDN_STEP 1, (RLC_FP_DIGS - 1)
-
-	adcq    $0, %rax
-
-	ret
-
-/*
- * Function: fp_addm_low
- * Inputs: rdi = c, rsi = a, rdx = b
- * Output: (a+b) mod p
- */
-cdecl(fp_addm_low):
-	push	%r12
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	8(%rdx), %r9
-	adcq	8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-
-	xorq	%rax, %rax
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %rdx
-	movq	P3, %r12
-	sbbq	%r12, %rsi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	xorq	%rax, %rax
-	pop		%r12
-	ret
-
-cdecl(fp_addd_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11, 0(%rdi)
-
-	ADDN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addc_low):
-	push    %r12
-	push    %r13
-	push    %r14
-	movq    0(%rsi), %r8
-	addq    0(%rdx), %r8
-	movq    %r8,0(%rdi)
-	movq    8(%rsi), %r8
-	adcq    8(%rdx), %r8
-	movq    %r8,8(%rdi)
-	movq    16(%rsi), %r8
-	adcq    16(%rdx), %r8
-	movq    %r8,16(%rdi)
-	movq    24(%rsi), %r8
-	adcq    24(%rdx), %r8
-	movq    %r8,24(%rdi)
-	movq    32(%rsi), %r8
-	adcq    32(%rdx), %r8
-	movq    %r8,%r12
-	movq    40(%rsi), %r9
-	adcq    40(%rdx), %r9
-	movq    %r9,%r13
-	movq    48(%rsi), %r10
-	adcq    48(%rdx), %r10
-	movq    %r10,%r14
-	movq    56(%rsi), %r11
-	adcq    56(%rdx), %r11
-	movq    %r11,%rcx
-
-	movq    P0,%rax
-	subq    %rax,%r8
-	movq    P1,%rax
-	sbbq    %rax,%r9
-	movq    P2,%rax
-	sbbq    %rax,%r10
-	movq    P3,%rax
-	sbbq    %rax,%r11
-	cmovc   %r12, %r8
-	cmovc   %r13, %r9
-	cmovc   %r14, %r10
-	cmovc   %rcx, %r11
-	movq    %r8,32(%rdi)
-	movq    %r9,40(%rdi)
-	movq    %r10,48(%rdi)
-	movq    %r11,56(%rdi)
-
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-/*
- * Function: fp_sub1_low
- * Inputs: rdi = c, rsi = a, rdx = digit
- * Output: rax
- */
-cdecl(fp_sub1_low):
-	movq	0(%rsi),%r10
-	subq	%rdx, %r10
-	movq	%r10,0(%rdi)
-
-	SUB1_STEP 1, (RLC_FP_DIGS - 1)
-
-	ret
-
-/*
- * Function: fp_subn_low
- * Inputs: rdi = c, rsi = a, rdx = b
- * Output: rax
- */
-cdecl(fp_subn_low):
-	xorq	%rax, %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11, 0(%rdi)
-
-	SUBN_STEP 1, (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-cdecl(fp_subm_low):
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8,0(%rdi)
-
-	movq	8(%rsi), %r9
-	sbbq	8(%rdx), %r9
-	movq	%r9,8(%rdi)
-	movq	16(%rsi), %r10
-	sbbq	16(%rdx), %r10
-	movq	%r10,16(%rdi)
-	movq	24(%rsi), %r11
-	sbbq	24(%rdx), %r11
-	movq	%r11,24(%rdi)
-
-	movq	$0, %rdx
-	movq	$0, %rsi
-	movq	P0,%r8
-	movq	P1,%r9
-	movq	P2,%r10
-	movq	P3,%r11
-	cmovc	%r8, %rax
-	cmovc	%r9, %rcx
-	cmovc	%r10, %rdx
-	cmovc	%r11, %rsi
-	addq	%rax,0(%rdi)
-	adcq	%rcx,8(%rdi)
-	adcq	%rdx,16(%rdi)
-	adcq	%rsi,24(%rdi)
-	ret
-
-cdecl(fp_subc_low):
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8, 0(%rdi)
-
-	SUBN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %rsi
-	movq	$0, %rdx
-	movq    P0,%r8
-	movq    P1,%r9
-	movq    P2,%r10
-	movq    P3,%r11
-	cmovc   %r8, %rax
-	cmovc   %r9, %rsi
-	cmovc   %r10, %rcx
-	cmovc   %r11, %rdx
-	addq    %rax,32(%rdi)
-	adcq    %rsi,40(%rdi)
-	adcq    %rcx,48(%rdi)
-	adcq    %rdx,56(%rdi)
-
-	ret
-
-cdecl(fp_subd_low):
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_negm_low):
-    xorq    %rax, %rax
-    mov     P0, %rcx
-    mov     P1, %r9
-    mov     P2, %r10
-    mov     P3, %r11
-    subq 	0(%rsi) , %rcx
-    sbbq 	8(%rsi) , %r9
-    sbbq 	16(%rsi) , %r10
-    sbbq 	24(%rsi) , %r11
-
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    test    %r8, %r8
-
-    cmovnz 	%rcx, %rax
-    movq 	%rax, 0(%rdi)
-    cmovnz 	%r9, %rax
-    movq 	%rax, 8(%rdi)
-    cmovnz 	%r10, %rax
-    movq 	%rax, 16(%rdi)
-    cmovnz 	%r11, %rax
-    movq 	%rax, 24(%rdi)
-
-    ret
-
-cdecl(fp_dbln_low):
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	%r8, 0(%rdi)
-
-	DBLN_STEP 1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-cdecl(fp_dblm_low):
-	push	%r12
-	xorq	%rax,%rax
-	xorq	%rdx,%rdx
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	8(%rsi), %r9
-	adcq	%r9, %r9
-	movq	16(%rsi), %r10
-	adcq	%r10, %r10
-	movq	24(%rsi), %r11
-	adcq	%r11, %r11
-	adcq	%rax,%rax
-
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %rdx
-	movq	P3, %r12
-	sbbq	%r12, %rsi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	xorq	%rax, %rax
-	pop		%r12
-	ret
-
-cdecl(fp_hlvm_low):
-	xorq	%rdx, %rdx
-	movq	P0, %r8
-	movq	P1, %r9
-	movq	P2, %r10
-	movq	P3, %r11
-  	movq 	0(%rsi),%rcx
-  	test 	$1,%rcx
-	cmovz	%rdx,%r8
-	cmovz	%rdx,%r9
-	cmovz	%rdx,%r10
-	cmovz	%rdx,%r11
-
-	addq	%rcx, %r8
-	movq	8(%rsi), %rdx
-	adcq	%rdx, %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx, %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx, %r11
-
-	shrd    $1, %r9, %r8
-  	movq 	%r8,0(%rdi)
-	shrd    $1, %r10, %r9
-  	movq 	%r9,8(%rdi)
-	shrd    $1, %r11, %r10
-  	movq 	%r10,16(%rdi)
-	shr     $1, %r11
-  	movq 	%r11,24(%rdi)
-	ret
-
-cdecl(fp_hlvd_low):
-	xorq	%rdx, %rdx
-	movq	P0, %r8
-	movq	P1, %r9
-	movq	P2, %r10
-	movq	P3, %r11
-  	movq 	0(%rsi),%rcx
-  	test 	$1,%rcx
-	cmovz	%rdx,%r8
-	cmovz	%rdx,%r9
-	cmovz	%rdx,%r10
-	cmovz	%rdx,%r11
-
-	addq	%rcx, %r8
-	movq	8(%rsi), %rdx
-	adcq	%rdx, %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx, %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx, %r11
-	movq	32(%rsi), %rax
-	adcq	$0, %rax
-	movq	40(%rsi), %rcx
-	adcq	$0, %rcx
-	movq	48(%rsi), %rdx
-	adcq	$0, %rdx
-	movq	56(%rsi), %rsi
-	adcq	$0, %rsi
-
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-  	movq 	%r8,0(%rdi)
-	shrd    $1, %rax, %r11
-  	movq 	%r9,8(%rdi)
-	shrd    $1, %rcx, %rax
-  	movq 	%r10,16(%rdi)
-	shrd    $1, %rdx, %rcx
-  	movq 	%r11,24(%rdi)
-	shrd    $1, %rsi, %rdx
-  	movq 	%rax,32(%rdi)
-	shr 	$1, %rsi
-  	movq 	%rcx,40(%rdi)
-  	movq 	%rdx,48(%rdi)
-  	movq 	%rsi,56(%rdi)
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_inv_low.c
deleted file mode 100644
index b3276603e221..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_inv_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.c
deleted file mode 100755
index b3947218fd45..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "gmp.h"
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.s
deleted file mode 100755
index 28df1244d5d7..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_mul_low.s
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "macro.s"
-
-.text
-.global cdecl(fp_muln_low)
-.global cdecl(fp_mulm_low)
-
-cdecl(fp_mulm_low):
-	push %r12
-	push %r13
-	push %r14
-	subq $64, %rsp
-
-	movq %rdx,%rcx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 0(%rsi), 8(%rsi), 16(%rsi), 24(%rsi), 0(%rcx), 8(%rcx), 16(%rcx), 24(%rcx)
-
-	FP_RDCN_LOW %rdi, %rsp
-
-	addq $64, %rsp
-	pop %r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp_muln_low):
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, 0(%rsi), 8(%rsi), 16(%rsi), 24(%rsi), 0(%rcx), 8(%rcx), 16(%rcx), 24(%rcx)
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.c
deleted file mode 100755
index 7c2e2936de46..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] ^ sform[i]) >= 0) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] ^ sform[0]) >= 0) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_add(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.s
deleted file mode 100755
index 2aa0f87f1d10..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-.global cdecl(fp_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-
-cdecl(fp_rdcn_low):
-	push %r12
-	push %r13
-	push %r14
-
-	FP_RDCN_LOW %rdi, %rsi
-
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.c
deleted file mode 100755
index 19f67ecaff7f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.s
deleted file mode 100755
index 1ecfc09e9a80..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_shift_low.s
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-.global cdecl(fp_rsh1_low)
-.global cdecl(fp_lsh1_low)
-
-cdecl(fp_rsh1_low):
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	shrd	$1, %r9, %r8
-	shrd	$1, %r10, %r9
-	shrd	$1, %r11, %r10
-	shr	$1, %r11
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	ret
-
-cdecl(fp_lsh1_low):
-        movq    0(%rsi), %r8
-        movq    8(%rsi), %r9
-        movq    16(%rsi), %r10
-        movq    24(%rsi), %r11
-        shld    $1, %r10, %r11
-        shld    $1, %r9, %r10
-        shld    $1, %r8, %r9
-        shl     $1, %r8
-        movq    %r8,0(%rdi)
-        movq    %r9,8(%rdi)
-        movq    %r10,16(%rdi)
-        movq    %r11,24(%rdi)
-        xorq    %rax, %rax
-        ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.c
deleted file mode 100755
index 9f5e0e09780c..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	dig_t rlc_align t[2 * RLC_FP_DIGS];
-
-	fp_sqrn_low(t, a);
-	fp_rdc(c, t);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.s
deleted file mode 100755
index 46475b8a7fa7..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fp_sqr_low.s
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.text
-.global cdecl(fp_sqrn_low)
-
-/*
- * Function: fp_sqrn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp_sqrn_low):
-	xorq %r10,%r10
-	movq 0(%rsi),%rax
-	mulq 8(%rsi)
-	addq %rax,%rax
-	movq %rax,%r8
-	adcq %rdx,%rdx
-	movq %rdx,%r9
-	adcq $0,%r10
-
-	movq 0(%rsi),%rax
-	mulq %rax
-	movq %rax,0(%rdi)
-	addq %rdx,%r8
-	movq %r8,8(%rdi)
-	adcq $0,%r9
-	adcq $0,%r10
-
-	xorq %rcx,%rcx
-	movq 0(%rsi),%rax
-	mulq 16(%rsi)
-	addq %rax,%rax
-	movq %rax,%r8
-	adcq %rdx,%rdx
-	movq %rdx,%r11
-	adcq $0,%rcx
-
-	movq 8(%rsi),%rax
-	mulq 8(%rsi)
-	addq %rax,%r8
-	adcq %rdx,%r11
-	adcq $0,%rcx
-
-	movq 0(%rsi),%rax
-	mulq 24(%rsi)
-	addq %r9,%r8
-	movq %r8,16(%rdi)
-	adcq %r10,%r11
-	adcq $0,%rcx
-	movq %rax,%r8
-	movq %rdx,%r10
-
-	xorq %r9,%r9
-	movq 8(%rsi),%rax
-	mulq 16(%rsi)
-	addq %rax,%r8
-	adcq %rdx,%r10
-	adcq $0,%r9
-	addq %r8,%r8
-	adcq %r10,%r10
-	adcq %r9,%r9
-
-	movq 8(%rsi),%rax
-	mulq 24(%rsi)
-	addq %r11,%r8
-	movq %r8,24(%rdi)
-	adcq %rcx,%r10
-	adcq $0,%r9
-	xorq %rcx,%rcx
-	addq %rax,%rax
-	movq %rax,%r8
-	adcq %rdx,%rdx
-	movq %rdx,%r11
-	adcq $0,%rcx
-
-	movq 16(%rsi),%rax
-	mulq 16(%rsi)
-	addq %r10,%r8
-	adcq %r11,%r9
-	adcq $0,%rcx
-	addq %rax,%r8
-	movq %r8,32(%rdi)
-	adcq %rdx,%r9
-	adcq $0,%rcx
-
-	xorq %r11,%r11
-	movq 16(%rsi),%rax
-	mulq 24(%rsi)
-	addq %rax,%rax
-	adcq %rdx,%rdx
-	adcq $0,%r11
-	addq %rax,%r9
-	movq %r9,40(%rdi)
-	adcq %rdx,%rcx
-	adcq $0,%r11
-
-	movq 24(%rsi),%rax
-	mulq %rax
-	addq %rax,%rcx
-	movq %rcx,48(%rdi)
-	adcq %rdx,%r11
-	movq %r11,56(%rdi)
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.c
deleted file mode 100755
index fb99892ed64f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field addition functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_addn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-	fp_addn_low(c[2], a[2], b[2]);
-}
-
-void fp3_addm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addm_low(c[0], a[0], b[0]);
-	fp_addm_low(c[1], a[1], b[1]);
-	fp_addm_low(c[2], a[2], b[2]);
-}
-
-void fp3_addd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-	fp_addd_low(c[2], a[2], b[2]);
-}
-
-void fp3_addc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-	fp_addc_low(c[2], a[2], b[2]);
-}
-
-void fp3_subn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-	fp_subn_low(c[2], a[2], b[2]);
-}
-
-void fp3_subm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subm_low(c[0], a[0], b[0]);
-	fp_subm_low(c[1], a[1], b[1]);
-	fp_subm_low(c[2], a[2], b[2]);
-}
-
-void fp3_subd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-	fp_subd_low(c[2], a[2], b[2]);
-}
-
-void fp3_subc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-	fp_subc_low(c[2], a[2], b[2]);
-}
-
-void fp3_dbln_low(fp3_t c, fp3_t a) {
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-	fp_dbln_low(c[2], a[2]);
-}
-
-void fp3_dblm_low(fp3_t c, fp3_t a) {
-	fp_dblm_low(c[0], a[0]);
-	fp_dblm_low(c[1], a[1]);
-	fp_dblm_low(c[2], a[2]);
-}
-
-void fp3_nord_low(dv3_t c, dv3_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_copy(t, a[0], 2 * RLC_FP_DIGS);
-		dv_copy(c[0], a[2], 2 * RLC_FP_DIGS);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_addc_low(c[0], c[0], a[2]);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(c[0], c[0], a[2]);
-		}
-		dv_copy(c[2], a[1], 2 * RLC_FP_DIGS);
-		dv_copy(c[1], t, 2 * RLC_FP_DIGS);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.s
deleted file mode 100755
index 62b93c7896ba..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_add_low.s
+++ /dev/null
@@ -1,913 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp2_addn_low)
-.global cdecl(fp2_addm_low)
-.global cdecl(fp2_addd_low)
-.global cdecl(fp2_addc_low)
-.global cdecl(fp2_addc_low)
-.global cdecl(fp2_subn_low)
-.global cdecl(fp2_subm_low)
-.global cdecl(fp2_subd_low)
-.global cdecl(fp2_subc_low)
-.global cdecl(fp2_dbln_low)
-.global cdecl(fp2_dblm_low)
-.global cdecl(fp2_norm_low)
-.global cdecl(fp2_nord_low)
-.global cdecl(fp2_norh_low)
-.global cdecl(fp2_hlvm_low)
-
-/*
- * Function: fp2_addn_low
- * Inputs: rdi = c, rsi = a, rdx = b
- * Output: rax
- */
-cdecl(fp2_addn_low):
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	ADDN_STEP 1, (RLC_FP_DIGS - 1)
-
-	addq	$(8*RLC_FP_DIGS), %rdx
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	ADDN_STEP 1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp2_addm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	8(%rdx), %r9
-	adcq	8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-
-	xorq	%rax, %rax
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %r13
-	movq 	%r11, %r14
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %r13
-	movq	P3, %r12
-	sbbq	%r12, %r14
-
-	cmovnc	%rax, %r8
-	movq	%r8,0(%rdi)
-	cmovnc	%rcx, %r9
-	movq	%r9,8(%rdi)
-	cmovnc	%r13, %r10
-	movq	%r10,16(%rdi)
-	cmovnc	%r14, %r11
-	movq	%r11,24(%rdi)
-
-	addq	$(8*RLC_FP_DIGS), %rdx
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	8(%rdx), %r9
-	adcq	8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-
-	xorq	%rax, %rax
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %r13
-	movq 	%r11, %r14
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %r13
-	movq	P3, %r12
-	sbbq	%r12, %r14
-
-	cmovnc	%rax, %r8
-	movq	%r8,0(%rdi)
-	cmovnc	%rcx, %r9
-	movq	%r9,8(%rdi)
-	cmovnc	%r13, %r10
-	movq	%r10,16(%rdi)
-	cmovnc	%r14, %r11
-	movq	%r11,24(%rdi)
-
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_addd_low):
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	ADDN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	addq	$(8*RLC_DV_DIGS), %rdx
-	addq	$(8*RLC_DV_DIGS), %rsi
-	addq	$(8*RLC_DV_DIGS), %rdi
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	ADDN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp2_addc_low):
-	push    %r12
-	push    %r13
-	push    %r14
-	movq    0(%rsi), %r8
-	addq    0(%rdx), %r8
-	movq    %r8,0(%rdi)
-	movq    8(%rsi), %r8
-	adcq    8(%rdx), %r8
-	movq    %r8,8(%rdi)
-	movq    16(%rsi), %r8
-	adcq    16(%rdx), %r8
-	movq    %r8,16(%rdi)
-	movq    24(%rsi), %r8
-	adcq    24(%rdx), %r8
-	movq    %r8,24(%rdi)
-	movq    32(%rsi), %r8
-	adcq    32(%rdx), %r8
-	movq    %r8,%r12
-	movq    40(%rsi), %r9
-	adcq    40(%rdx), %r9
-	movq    %r9,%r13
-	movq    48(%rsi), %r10
-	adcq    48(%rdx), %r10
-	movq    %r10,%r14
-	movq    56(%rsi), %r11
-	adcq    56(%rdx), %r11
-	movq    %r11,%rcx
-
-	movq    P0,%rax
-	subq    %rax,%r8
-	movq    P1,%rax
-	sbbq    %rax,%r9
-	movq    P2,%rax
-	sbbq    %rax,%r10
-	movq    P3,%rax
-	sbbq    %rax,%r11
-	cmovc   %r12, %r8
-	movq    %r8,32(%rdi)
-	cmovc   %r13, %r9
-	movq    %r9,40(%rdi)
-	cmovc   %r14, %r10
-	movq    %r10,48(%rdi)
-	cmovc   %rcx, %r11
-	movq    %r11,56(%rdi)
-
-	addq	$(8*RLC_DV_DIGS), %rdx
-	addq	$(8*RLC_DV_DIGS), %rsi
-	addq	$(8*RLC_DV_DIGS), %rdi
-
-	movq    0(%rsi), %r8
-	addq    0(%rdx), %r8
-	movq    %r8,0(%rdi)
-	movq    8(%rsi), %r8
-	adcq    8(%rdx), %r8
-	movq    %r8,8(%rdi)
-	movq    16(%rsi), %r8
-	adcq    16(%rdx), %r8
-	movq    %r8,16(%rdi)
-	movq    24(%rsi), %r8
-	adcq    24(%rdx), %r8
-	movq    %r8,24(%rdi)
-	movq    32(%rsi), %r8
-	adcq    32(%rdx), %r8
-	movq    %r8,%r12
-	movq    40(%rsi), %r9
-	adcq    40(%rdx), %r9
-	movq    %r9,%r13
-	movq    48(%rsi), %r10
-	adcq    48(%rdx), %r10
-	movq    %r10,%r14
-	movq    56(%rsi), %r11
-	adcq    56(%rdx), %r11
-	movq    %r11,%rcx
-
-	movq    P0,%rax
-	subq    %rax,%r8
-	movq    P1,%rax
-	sbbq    %rax,%r9
-	movq    P2,%rax
-	sbbq    %rax,%r10
-	movq    P3,%rax
-	sbbq    %rax,%r11
-	cmovc   %r12, %r8
-	movq    %r8,32(%rdi)
-	cmovc   %r13, %r9
-	movq    %r9,40(%rdi)
-	cmovc   %r14, %r10
-	movq    %r10,48(%rdi)
-	cmovc   %rcx, %r11
-	movq    %r11,56(%rdi)
-
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_subn_low):
-	push	%r12
-	push	%r13
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8,0(%rdi)
-	movq	8(%rsi), %r9
-	sbbq	8(%rdx), %r9
-	movq	%r9,8(%rdi)
-	movq	16(%rsi), %r10
-	sbbq	16(%rdx), %r10
-	movq	%r10,16(%rdi)
-	movq	24(%rsi), %r11
-	sbbq	24(%rdx), %r11
-	movq	%r11,24(%rdi)
-
-	movq	$0, %r12
-	movq	$0, %r13
-	movq	P0,%r8
-	movq	P1,%r9
-	movq	P2,%r10
-	movq	P3,%r11
-	cmovc	%r8, %rax
-	cmovc	%r9, %rcx
-	cmovc	%r10, %r12
-	cmovc	%r11, %r13
-	addq	%rax,0(%rdi)
-	adcq	%rcx,8(%rdi)
-	adcq	%r12,16(%rdi)
-	adcq	%r13,24(%rdi)
-
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	addq	$(8*RLC_FP_DIGS), %rdx
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8,0(%rdi)
-	movq	8(%rsi), %r9
-	sbbq	8(%rdx), %r9
-	movq	%r9,8(%rdi)
-	movq	16(%rsi), %r10
-	sbbq	16(%rdx), %r10
-	movq	%r10,16(%rdi)
-	movq	24(%rsi), %r11
-	sbbq	24(%rdx), %r11
-	movq	%r11,24(%rdi)
-
-	movq	$0, %r12
-	movq	$0, %r13
-	movq	P0,%r8
-	movq	P1,%r9
-	movq	P2,%r10
-	movq	P3,%r11
-	cmovc	%r8, %rax
-	cmovc	%r9, %rcx
-	cmovc	%r10, %r12
-	cmovc	%r11, %r13
-	addq	%rax,0(%rdi)
-	adcq	%rcx,8(%rdi)
-	adcq	%r12,16(%rdi)
-	adcq	%r13,24(%rdi)
-
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_subm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	8(%rsi), %r9
-	sbbq	8(%rdx), %r9
-	movq	16(%rsi), %r10
-	sbbq	16(%rdx), %r10
-	movq	24(%rsi), %r11
-	sbbq	24(%rdx), %r11
-
-	movq	$0, %r13
-	movq	$0, %r14
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-	addq	%rax, %r8
-	movq	%r8, 0(%rdi)
-	adcq	%rcx, %r9
-	movq	%r9, 8(%rdi)
-	adcq	%r13, %r10
-	movq	%r10, 16(%rdi)
-	adcq	%r14, %r11
-	movq	%r11, 24(%rdi)
-
-	addq	$(8*RLC_FP_DIGS), %rdx
-	movq	$0, %r13
-	addq	$(8*RLC_FP_DIGS), %rsi
-	movq	$0, %r14
-	addq	$(8*RLC_FP_DIGS), %rdi
-
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	8(%rsi), %r9
-	sbbq	8(%rdx), %r9
-	movq	16(%rsi), %r10
-	sbbq	16(%rdx), %r10
-	movq	24(%rsi), %r11
-	sbbq	24(%rdx), %r11
-
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-	addq	%rax, %r8
-	movq	%r8, 0(%rdi)
-	adcq	%rcx, %r9
-	movq	%r9, 8(%rdi)
-	adcq	%r13, %r10
-	movq	%r10, 16(%rdi)
-	adcq	%r14, %r11
-	movq	%r11, 24(%rdi)
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_subd_low):
-	movq	0(%rdx), %r8
-	subq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	addq	$(8*RLC_DV_DIGS), %rdx
-	addq	$(8*RLC_DV_DIGS), %rsi
-	addq	$(8*RLC_DV_DIGS), %rdi
-
-	movq	0(%rdx), %r8
-	addq	0(%rsi), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN_STEP 1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp2_subc_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-	movq    8(%rsi), %r9
-	sbbq    8(%rdx), %r9
-	movq	%r9, 8(%rdi)
-	movq    16(%rsi), %r10
-	sbbq    16(%rdx), %r10
-	movq	%r10, 16(%rdi)
-	movq    24(%rsi), %r11
-	sbbq    24(%rdx), %r11
-	movq	%r11, 24(%rdi)
-	movq    32(%rsi), %r8
-	sbbq    32(%rdx), %r8
-	movq    40(%rsi), %r9
-	sbbq    40(%rdx), %r9
-	movq    48(%rsi), %r10
-	sbbq    48(%rdx), %r10
-	movq    56(%rsi), %r11
-	sbbq    56(%rdx), %r11
-
-	movq	$0, %r13
-	movq	$0, %r14
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-	addq	%rax, %r8
-	movq	%r8, 32(%rdi)
-	adcq	%rcx, %r9
-	movq	%r9, 40(%rdi)
-	adcq	%r13, %r10
-	movq	%r10, 48(%rdi)
-	adcq	%r14, %r11
-	movq	%r11, 56(%rdi)
-
-	addq	$(8*RLC_DV_DIGS), %rdx
-	addq	$(8*RLC_DV_DIGS), %rsi
-	addq	$(8*RLC_DV_DIGS), %rdi
-
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-	movq    8(%rsi), %r9
-	sbbq    8(%rdx), %r9
-	movq	%r9, 8(%rdi)
-	movq    16(%rsi), %r10
-	sbbq    16(%rdx), %r10
-	movq	%r10, 16(%rdi)
-	movq    24(%rsi), %r11
-	sbbq    24(%rdx), %r11
-	movq	%r11, 24(%rdi)
-	movq    32(%rsi), %r8
-	sbbq    32(%rdx), %r8
-	movq    40(%rsi), %r9
-	sbbq    40(%rdx), %r9
-	movq    48(%rsi), %r10
-	sbbq    48(%rdx), %r10
-	movq    56(%rsi), %r11
-	sbbq    56(%rdx), %r11
-
-	movq	$0, %r13
-	movq	$0, %r14
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-	addq	%rax, %r8
-	movq	%r8, 32(%rdi)
-	adcq	%rcx, %r9
-	movq	%r9, 40(%rdi)
-	adcq	%r13, %r10
-	movq	%r10, 48(%rdi)
-	adcq	%r14, %r11
-	movq	%r11, 56(%rdi)
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_dbln_low):
-	movq	0(%rdx), %r8
-	addq	%r8, %r8
-	movq	%r8, 0(%rdi)
-
-	DBLN_STEP 1, (RLC_FP_DIGS - 1)
-
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-	movq	0(%rdx), %r8
-	addq	%r8, %r8
-	movq	%r8, 0(%rdi)
-
-	DBLN_STEP 1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp2_dblm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	8(%rsi), %r9
-	adcq	%r9, %r9
-	movq	16(%rsi), %r10
-	adcq	%r10, %r10
-	movq	24(%rsi), %r11
-	adcq	%r11, %r11
-	adcq	%rax,%rax
-
-	xorq	%rax, %rax
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %r13
-	movq 	%r11, %r14
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %r13
-	movq	P3, %r12
-	sbbq	%r12, %r14
-
-	cmovnc	%rax, %r8
-	movq	%r8,0(%rdi)
-	cmovnc	%rcx, %r9
-	movq	%r9,8(%rdi)
-	cmovnc	%r13, %r10
-	movq	%r10,16(%rdi)
-	cmovnc	%r14, %r11
-	movq	%r11,24(%rdi)
-
-	xorq	%rax,%rax
-	xorq	%rdx,%rdx
-	addq	$(8*RLC_FP_DIGS), %rdx
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	8(%rsi), %r9
-	adcq	%r9, %r9
-	movq	16(%rsi), %r10
-	adcq	%r10, %r10
-	movq	24(%rsi), %r11
-	adcq	%r11, %r11
-	adcq	%rax,%rax
-
-	xorq	%rax, %rax
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %r13
-	movq 	%r11, %r14
-
-	movq	P0, %r12
-	subq	%r12, %rax
-	movq	P1, %r12
-	sbbq	%r12, %rcx
-	movq	P2, %r12
-	sbbq	%r12, %r13
-	movq	P3, %r12
-	sbbq	%r12, %r14
-
-	cmovnc	%rax, %r8
-	movq	%r8,0(%rdi)
-	cmovnc	%rcx, %r9
-	movq	%r9,8(%rdi)
-	cmovnc	%r13, %r10
-	movq	%r10,16(%rdi)
-	cmovnc	%r14, %r11
-	movq	%r11,24(%rdi)
-
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp2_norm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsi), %r8
-	subq	8*RLC_FP_DIGS(%rsi), %r8
-	movq	8(%rsi), %r9
-	sbbq	8*RLC_FP_DIGS+8(%rsi), %r9
-	movq	16(%rsi), %r10
-	sbbq	8*RLC_FP_DIGS+16(%rsi), %r10
-	movq	24(%rsi), %r11
-	sbbq	8*RLC_FP_DIGS+24(%rsi), %r11
-
-	movq	$0, %r13
-	movq	$0, %r14
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-
-	addq	%r8, %rax
-	adcq	%r9, %rcx
-	adcq	%r10, %r13
-	adcq	%r11, %r14
-
-	movq	0(%rsi), %r8
-	addq	8*RLC_FP_DIGS(%rsi), %r8
-	movq	8(%rsi), %r9
-	adcq	8*RLC_FP_DIGS+8(%rsi), %r9
-	movq	16(%rsi), %r10
-	adcq	8*RLC_FP_DIGS+16(%rsi), %r10
-	movq	24(%rsi), %r11
-	adcq	8*RLC_FP_DIGS+24(%rsi), %r11
-
-    movq	%rax, 0(%rdi)
-    movq	%rcx, 8(%rdi)
-    movq	%r13, 16(%rdi)
-    movq	%r14, 24(%rdi)
-
-	movq 	%r8, %rax
-	movq 	%r9, %rcx
-	movq 	%r10, %r12
-	movq 	%r11, %r13
-
-	movq	P0, %rdx
-	subq	%rdx, %rax
-	movq	P1, %rdx
-	sbbq	%rdx, %rcx
-	movq	P2, %rdx
-	sbbq	%rdx, %r12
-	movq	P3, %rdx
-	sbbq	%rdx, %r13
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%r12, %r10
-	cmovnc	%r13, %r11
-
-	movq	%r8, 8*RLC_FP_DIGS(%rdi)
-	movq	%r9, 8*RLC_FP_DIGS+8(%rdi)
-	movq	%r10, 8*RLC_FP_DIGS+16(%rdi)
-	movq	%r11, 8*RLC_FP_DIGS+24(%rdi)
-	pop	%r14
-	pop	%r13
-	pop	%r12
-
-	ret
-
-cdecl(fp2_nord_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	xorq    %rax, %rax
-	xorq    %rcx, %rcx
-	movq	0(%rsi), %r8
-	subq	8*RLC_DV_DIGS(%rsi), %r8
-	movq	%r8, 0(%rdi)
-	movq	8(%rsi), %r8
-	sbbq	8*RLC_DV_DIGS+8(%rsi), %r8
-	movq	%r8, 8(%rdi)
-	movq	16(%rsi), %r8
-	sbbq	8*RLC_DV_DIGS+16(%rsi), %r8
-	movq	%r8, 16(%rdi)
-	movq	24(%rsi), %r8
-	sbbq	8*RLC_DV_DIGS+24(%rsi), %r8
-	movq	%r8, 24(%rdi)
-	movq	32(%rsi), %r8
-	sbbq	8*RLC_DV_DIGS+32(%rsi), %r8
-	movq	40(%rsi), %r9
-	sbbq	8*RLC_DV_DIGS+40(%rsi), %r9
-	movq	48(%rsi), %r10
-	sbbq	8*RLC_DV_DIGS+48(%rsi), %r10
-	movq	56(%rsi), %r11
-	sbbq	8*RLC_DV_DIGS+56(%rsi), %r11
-
-	movq	$0, %r13
-	movq	$0, %r14
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %r13
-	movq	P3, %r12
-	cmovc 	%r12, %r14
-	addq	%rax, %r8
-	movq	%r8, 32(%rdi)
-	adcq	%rcx, %r9
-	movq	%r9, 40(%rdi)
-	adcq	%r13, %r10
-	movq	%r10, 48(%rdi)
-	adcq	%r14, %r11
-	movq	%r11, 56(%rdi)
-
-	xorq    %rax, %rax
-	movq    0(%rsi), %r8
-	addq    8*RLC_DV_DIGS(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS(%rdi)
-	movq    8(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+8(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+8(%rdi)
-	movq    16(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+16(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+16(%rdi)
-	movq    24(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+24(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+24(%rdi)
-	movq    32(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+32(%rsi), %r8
-	movq    %r8, %r12
-	movq    40(%rsi), %r9
-	adcq    8*RLC_DV_DIGS+40(%rsi), %r9
-	movq    %r9, %rax
-	movq    48(%rsi), %r10
-	adcq    8*RLC_DV_DIGS+48(%rsi), %r10
-	movq    %r10, %rcx
-	movq    56(%rsi), %r11
-	adcq    8*RLC_DV_DIGS+56(%rsi), %r11
-	movq    %r11, %rdx
-
-	movq    P0, %rsi
-	subq    %rsi, %r8
-	movq    P1, %rsi
-	sbbq    %rsi, %r9
-	movq    P2, %rsi
-	sbbq    %rsi, %r10
-	movq    P3, %rsi
-	sbbq    %rsi, %r11
-	cmovc   %r12, %r8
-	cmovc   %rax, %r9
-	cmovc   %rcx, %r10
-	cmovc   %rdx, %r11
-	movq    %r8, 8*RLC_DV_DIGS+32(%rdi)
-	movq    %r9, 8*RLC_DV_DIGS+40(%rdi)
-	movq    %r10, 8*RLC_DV_DIGS+48(%rdi)
-	movq    %r11, 8*RLC_DV_DIGS+56(%rdi)
-	xorq    %rax, %rax
-	pop	%r14
-	pop	%r13
-	pop	%r12
-
-	ret
-
-cdecl(fp2_norh_low):
-	movq    0(%rsi), %r8
-	addq    8*RLC_DV_DIGS(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS(%rdi)
-	movq    8(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+8(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+8(%rdi)
-	movq    16(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+16(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+16(%rdi)
-	movq    24(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+24(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+24(%rdi)
-	movq    32(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+32(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+32(%rdi)
-	movq    40(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+40(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+40(%rdi)
-	movq    48(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+48(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+48(%rdi)
-	movq    56(%rsi), %r8
-	adcq    8*RLC_DV_DIGS+56(%rsi), %r8
-	movq    %r8, 8*RLC_DV_DIGS+56(%rdi)
-
-	movq    NP20, %rax
-	movq    NP21, %r8
-	movq    NP22, %r9
-	movq    NP23, %r10
-	movq    NP24, %r11
-	movq    24(%rsi), %rcx
-	addq    %rcx, %rax
-	movq    32(%rsi), %rcx
-	adcq    %rcx, %r8
-	movq    40(%rsi), %rcx
-	adcq    %rcx, %r9
-	movq    48(%rsi), %rcx
-	adcq    %rcx, %r10
-	movq    56(%rsi), %rcx
-	adcq    %rcx, %r11
-
-	movq    0(%rsi), %rcx
-	subq    8*RLC_DV_DIGS(%rsi), %rcx
-	movq    %rcx, 0(%rdi)
-	movq    8(%rsi), %rcx
-	sbbq    8*RLC_DV_DIGS+8(%rsi), %rcx
-	movq    %rcx, 8(%rdi)
-	movq    16(%rsi), %rcx
-	sbbq    8*RLC_DV_DIGS+16(%rsi), %rcx
-	movq    %rcx, 16(%rdi)
-	sbbq    8*RLC_DV_DIGS+24(%rsi), %rax
-	movq    %rax, 24(%rdi)
-	sbbq    8*RLC_DV_DIGS+32(%rsi), %r8
-	movq    %r8, 32(%rdi)
-	sbbq    8*RLC_DV_DIGS+40(%rsi), %r9
-	movq    %r9, 40(%rdi)
-	sbbq    8*RLC_DV_DIGS+48(%rsi), %r10
-	movq    %r10, 48(%rdi)
-	sbbq    8*RLC_DV_DIGS+56(%rsi), %r11
-	movq    %r11, 56(%rdi)
-
-	ret
-
-cdecl(fp2_hlvm_low):
-	xorq	%rdx, %rdx
-	movq	P0, %r8
-	movq	P1, %r9
-	movq	P2, %r10
-	movq	P3, %r11
-	movq 	0(%rsi),%rcx
-	test 	$1,%rcx
-	cmovz	%rdx,%r8
-	cmovz	%rdx,%r9
-	cmovz	%rdx,%r10
-	cmovz	%rdx,%r11
-
-	addq	%rcx, %r8
-	movq	8(%rsi), %rdx
-	adcq	%rdx, %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx, %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx, %r11
-
-	shrd    $1, %r9, %r8
-	movq 	%r8,0(%rdi)
-	shrd    $1, %r10, %r9
-	movq 	%r9,8(%rdi)
-	shrd    $1, %r11, %r10
-	movq 	%r10,16(%rdi)
-	shr     $1, %r11
-	movq 	%r11,24(%rdi)
-
-	addq	$(8*RLC_FP_DIGS), %rsi
-	addq	$(8*RLC_FP_DIGS), %rdi
-
-	xorq	%rdx, %rdx
-	movq	P0, %r8
-	movq	P1, %r9
-	movq	P2, %r10
-	movq	P3, %r11
-	movq 	0(%rsi),%rcx
-	test 	$1,%rcx
-	cmovz	%rdx,%r8
-	cmovz	%rdx,%r9
-	cmovz	%rdx,%r10
-	cmovz	%rdx,%r11
-
-	addq	%rcx, %r8
-	movq	8(%rsi), %rdx
-	adcq	%rdx, %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx, %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx, %r11
-
-	shrd    $1, %r9, %r8
-	movq 	%r8,0(%rdi)
-	shrd    $1, %r10, %r9
-	movq 	%r9,8(%rdi)
-	shrd    $1, %r11, %r10
-	movq 	%r10,16(%rdi)
-	shr     $1, %r11
-	movq 	%r11,24(%rdi)
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.c
deleted file mode 100755
index 0b76c5ae7b32..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field multiplication functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_muln_low(dv3_t c, fp3_t a, fp3_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS], t3[2 * RLC_FP_DIGS];
-	rlc_align dig_t t4[2 * RLC_FP_DIGS], t5[2 * RLC_FP_DIGS], t6[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 * b_0, t1 = a_1 * b_1, t2 = a_2 * b_2. */
-	fp_muln_low(t0, a[0], b[0]);
-	fp_muln_low(t1, a[1], b[1]);
-	fp_muln_low(t2, a[2], b[2]);
-
-	/* t3 = (a_1 + a_2) * (b_1 + b_2). */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[1], a[2]);
-	fp_addn_low(t4, b[1], b[2]);
-#else
-	fp_addm_low(t3, a[1], a[2]);
-	fp_addm_low(t4, b[1], b[2]);
-#endif
-	fp_muln_low(t5, t3, t4);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t1, t2);
-#else
-	fp_addc_low(t6, t1, t2);
-#endif
-	fp_subc_low(t4, t5, t6);
-	fp_addc_low(c[0], t0, t4);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t4);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t4);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t4, a[0], a[1]);
-	fp_addn_low(t5, b[0], b[1]);
-#else
-	fp_addm_low(t4, a[0], a[1]);
-	fp_addm_low(t5, b[0], b[1]);
-#endif
-	fp_muln_low(t6, t4, t5);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t4, t0, t1);
-#else
-	fp_addc_low(t4, t0, t1);
-#endif
-	fp_subc_low(t4, t6, t4);
-	fp_addc_low(c[1], t4, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t5, a[0], a[2]);
-	fp_addn_low(t6, b[0], b[2]);
-#else
-	fp_addm_low(t5, a[0], a[2]);
-	fp_addm_low(t6, b[0], b[2]);
-#endif
-	fp_muln_low(t4, t5, t6);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t0, t2);
-#else
-	fp_addc_low(t6, t0, t2);
-#endif
-	fp_subc_low(t5, t4, t6);
-	fp_addc_low(c[2], t5, t1);
-}
-
-void fp3_mulm_low(fp3_t c, fp3_t a, fp3_t b) {
-	dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_muln_low(t, a, b);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.s
deleted file mode 100755
index 3940d983f0ca..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_mul_low.s
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.global cdecl(fp2_mulm_low)
-.global cdecl(fp2_muln_low)
-.global cdecl(fp2_mulc_low)
-
-/*
- * Function: fp2_mulm_low
- * Inputs: rdi = c, rsi = a, rcx = b
- * Output: c = a * b
- */
-cdecl(fp2_mulm_low):
-	push %r12
-	push %r13
-	push %r14
-	push %r15
-	push %rbx
-	push %rbp
-
-	subq $256, %rsp
-	movq %rdx, %rcx
-
-	/* rsp[0..7] = t0 = a0 * b0. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 0(%rsi), 8(%rsi), 16(%rsi), 24(%rsi), 0(%rcx), 8(%rcx), 16(%rcx), 24(%rcx)
-
-	addq $64, %rsp
-	/* rsp[8..15] = t4 = a1 * b1. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 32(%rsi), 40(%rsi), 48(%rsi), 56(%rsi), 32(%rcx), 40(%rcx), 48(%rcx), 56(%rcx)
-
-	/* t2 = (r11, r10, r9, r8) = a0 + a1. */
-	movq	0(%rsi), %r8
-	addq	32(%rsi), %r8
-	movq	8(%rsi), %r9
-	adcq	40(%rsi), %r9
-	movq	16(%rsi), %r10
-	adcq	48(%rsi), %r10
-	movq	24(%rsi), %r11
-	adcq	56(%rsi), %r11
-
-	/* t1 = (r15, r14, r3, r12) = b0 + b1. */
-	movq	0(%rcx), %r12
-	addq	32(%rcx), %r12
-	movq	8(%rcx), %r13
-	adcq	40(%rcx), %r13
-	movq	16(%rcx), %r14
-	adcq	48(%rcx), %r14
-	movq	24(%rcx), %r15
-	adcq	56(%rcx), %r15
-
-	addq $64, %rsp
-	/* rsp[16..23] = t3 = (a0 + a1) * (b0 + b1). */
-	FP_MULN_LOW %rsp, %rbx, %rbp, %rcx, %r8, %r9, %r10, %r11, %r12, %r13, %r14, %r15
-	subq $128, %rsp
-
-	/* rsp[24..31] = t2 = t0 + t4 = (a0 * b0) + (a1 * b1). */
-	xorq	%rdx, %rdx
-	xorq	%rsi, %rsi
-	movq	0(%rsp), %r8
-	addq	64(%rsp), %r8
-	movq	%r8, 192(%rsp)
-	.irp i, 8, 16, 24, 32, 40, 48, 56
-		movq	\i(%rsp), %r8
-		adcq	(64+\i)(%rsp), %r8
-		movq	%r8, (192+\i)(%rsp)
-	.endr
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsp), %r8
-	subq	64(%rsp), %r8
-	movq	%r8, 0(%rsp)
-	.irp i, 8, 16, 24
-		movq	\i(%rsp), %r8
-		sbbq	(64+\i)(%rsp), %r8
-		movq	%r8, \i(%rsp)
-	.endr
-	movq    32(%rsp), %r8
-	sbbq    96(%rsp), %r8
-	movq    40(%rsp), %r9
-	sbbq    104(%rsp), %r9
-	movq    48(%rsp), %r10
-	sbbq    112(%rsp), %r10
-	movq    56(%rsp), %r11
-	sbbq    120(%rsp), %r11
-
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %rdx
-	movq	P3, %r12
-	cmovc 	%r12, %rsi
-    addq	%rax, %r8
-	movq	%r8, 32(%rsp)
-    adcq	%rcx, %r9
-	movq	%r9, 40(%rsp)
-    adcq	%rdx, %r10
-	movq	%r10, 48(%rsp)
-    adcq	%rsi, %r11
-	movq	%r11, 56(%rsp)
-
-	FP_RDCN_LOW %rdi, %rsp
-	/* rsp[0..8] = t4 = t3 - t2. */
-	movq	128(%rsp), %r8
-	subq	192(%rsp), %r8
-	movq	%r8, 0(%rsp)
-	.irp i, 8, 16, 24, 32, 40, 48, 56
-		movq	(128+\i)(%rsp), %r8
-		sbbq	(192+\i)(%rsp), %r8
-		movq	%r8, \i(%rsp)
-	.endr
-
-	addq $(RLC_FP_DIGS * 8), %rdi
-	FP_RDCN_LOW %rdi, %rsp
-
-	addq $256, %rsp
-	pop %rbp
-	pop %rbx
-	pop %r15
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
-
-/*
- * Function: fp2_muln_low
- * Inputs: rdi = c, rsi = a, rcx = b
- * Output: c = a * b
- */
-cdecl(fp2_muln_low):
-	push %r12
-	push %r13
-	push %r14
-	push %r15
-	push %rbx
-	push %rbp
-
-	subq $256, %rsp
-	movq %rdx, %rcx
-
-	/* rsp[0..7] = t0 = a0 * b0. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 0(%rsi), 8(%rsi), 16(%rsi), 24(%rsi), 0(%rcx), 8(%rcx), 16(%rcx), 24(%rcx)
-
-	addq $64, %rsp
-	/* rsp[8..15] = t4 = a1 * b1. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 32(%rsi), 40(%rsi), 48(%rsi), 56(%rsi), 32(%rcx), 40(%rcx), 48(%rcx), 56(%rcx)
-
-	/* t2 = (r11, r10, r9, r8) = a0 + a1. */
-	movq	0(%rsi), %r8
-	addq	32(%rsi), %r8
-	movq	8(%rsi), %r9
-	adcq	40(%rsi), %r9
-	movq	16(%rsi), %r10
-	adcq	48(%rsi), %r10
-	movq	24(%rsi), %r11
-	adcq	56(%rsi), %r11
-
-	/* t1 = (r15, r14, r3, r12) = b0 + b1. */
-	movq	0(%rcx), %r12
-	addq	32(%rcx), %r12
-	movq	8(%rcx), %r13
-	adcq	40(%rcx), %r13
-	movq	16(%rcx), %r14
-	adcq	48(%rcx), %r14
-	movq	24(%rcx), %r15
-	adcq	56(%rcx), %r15
-
-	addq $64, %rsp
-	/* rsp[16..23] = t3 = (a0 + a1) * (b0 + b1). */
-	FP_MULN_LOW %rsp, %rbx, %rbp, %rcx, %r8, %r9, %r10, %r11, %r12, %r13, %r14, %r15
-	subq $128, %rsp
-
-	/* rsp[24..31] = t2 = t0 + t4 = (a0 * b0) + (a1 * b1) */
-	xorq	%rdx, %rdx
-	xorq	%rsi, %rsi
-	movq	0(%rsp), %r8
-	addq	64(%rsp), %r8
-	movq	8(%rsp), %r9
-	adcq	72(%rsp), %r9
-	movq	16(%rsp), %r10
-	adcq	80(%rsp), %r10
-	movq	24(%rsp), %r11
-	adcq	88(%rsp), %r11
-	movq	32(%rsp), %r12
-	adcq	96(%rsp), %r12
-	movq	40(%rsp), %r13
-	adcq	104(%rsp), %r13
-	movq	48(%rsp), %r14
-	adcq	112(%rsp), %r14
-	movq	56(%rsp), %r15
-	adcq	120(%rsp), %r15
-
-	/* rsp[0..8] = t4 = t3 - t2 */
-	movq	128(%rsp), %rcx
-	subq	%r8, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS(%rdi)
-	movq	136(%rsp), %rcx
-	sbbq	%r9, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+8(%rdi)
-	movq	144(%rsp), %rcx
-	sbbq	%r10, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+16(%rdi)
-	movq	152(%rsp), %rcx
-	sbbq	%r11, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+24(%rdi)
-	movq	160(%rsp), %rcx
-	sbbq	%r12, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+32(%rdi)
-	movq	168(%rsp), %rcx
-	sbbq	%r13, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+40(%rdi)
-	movq	176(%rsp), %rcx
-	sbbq	%r14, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+48(%rdi)
-	movq	184(%rsp), %rcx
-	sbbq	%r15, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+56(%rdi)
-	xorq	%rax,%rax
-	xorq	%rcx,%rcx
-	movq	0(%rsp), %r8
-	subq	64(%rsp), %r8
-	movq	%r8, 0(%rdi)
-	.irp i, 8, 16, 24
-		movq	\i(%rsp), %r8
-		sbbq	(64+\i)(%rsp), %r8
-		movq	%r8, \i(%rdi)
-	.endr
-	movq    32(%rsp), %r8
-	sbbq    96(%rsp), %r8
-	movq    40(%rsp), %r9
-	sbbq    104(%rsp), %r9
-	movq    48(%rsp), %r10
-	sbbq    112(%rsp), %r10
-	movq    56(%rsp), %r11
-	sbbq    120(%rsp), %r11
-
-	movq	P0, %r12
-	cmovc 	%r12, %rax
-	movq	P1, %r12
-	cmovc 	%r12, %rcx
-	movq	P2, %r12
-	cmovc 	%r12, %rdx
-	movq	P3, %r12
-	cmovc 	%r12, %rsi
-    addq	%rax, %r8
-	movq	%r8, 32(%rdi)
-    adcq	%rcx, %r9
-	movq	%r9, 40(%rdi)
-    adcq	%rdx, %r10
-	movq	%r10, 48(%rdi)
-    adcq	%rsi, %r11
-	movq	%r11, 56(%rdi)
-
-	addq $256, %rsp
-	pop %rbp
-	pop %rbx
-	pop %r15
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
-
-cdecl(fp2_mulc_low):
-	push %r12
-	push %r13
-	push %r14
-	push %r15
-	push %rbx
-	push %rbp
-
-	subq $256, %rsp
-	movq %rdx, %rcx
-
-	/* rsp[0..7] = t0 = a0 * b0. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 0(%rsi), 8(%rsi), 16(%rsi), 24(%rsi), 0(%rcx), 8(%rcx), 16(%rcx), 24(%rcx)
-
-	addq $64, %rsp
-	/* rsp[8..15] = t4 = a1 * b1 */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 32(%rsi), 40(%rsi), 48(%rsi), 56(%rsi), 32(%rcx), 40(%rcx), 48(%rcx), 56(%rcx)
-
-	/* t2 = (r11, r10, r9, r8) = a0 + a1 */
-	movq	0(%rsi), %r8
-	addq	32(%rsi), %r8
-	movq	8(%rsi), %r9
-	adcq	40(%rsi), %r9
-	movq	16(%rsi), %r10
-	adcq	48(%rsi), %r10
-	movq	24(%rsi), %r11
-	adcq	56(%rsi), %r11
-
-	// t1 = (r15, r14, r3, r12) = b0 + b1
-	movq	0(%rcx), %r12
-	addq	32(%rcx), %r12
-	movq	8(%rcx), %r13
-	adcq	40(%rcx), %r13
-	movq	16(%rcx), %r14
-	adcq	48(%rcx), %r14
-	movq	24(%rcx), %r15
-	adcq	56(%rcx), %r15
-
-	addq $64, %rsp
-	/* rsp[16..23] = t3 = (a0 + a1) * (b0 + b1) */
-	FP_MULN_LOW %rsp, %rbx, %rbp, %rcx, %r8, %r9, %r10, %r11, %r12, %r13, %r14, %r15
-	subq $128, %rsp
-
-	movq	0(%rsp), %r8
-	addq	64(%rsp), %r8
-	movq	8(%rsp), %r9
-	adcq	72(%rsp), %r9
-	movq	16(%rsp), %r10
-	adcq	80(%rsp), %r10
-	movq	24(%rsp), %r11
-	adcq	88(%rsp), %r11
-	movq	32(%rsp), %r12
-	adcq	96(%rsp), %r12
-	movq	40(%rsp), %r13
-	adcq	104(%rsp), %r13
-	movq	48(%rsp), %r14
-	adcq	112(%rsp), %r14
-	movq	56(%rsp), %r15
-	adcq	120(%rsp), %r15
-
-	/* rsp[0..8] = t4 = t3 - t2 */
-	movq	128(%rsp), %rcx
-	subq	%r8, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS(%rdi)
-	movq	136(%rsp), %rcx
-	sbbq	%r9, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+8(%rdi)
-	movq	144(%rsp), %rcx
-	sbbq	%r10, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+16(%rdi)
-	movq	152(%rsp), %rcx
-	sbbq	%r11, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+24(%rdi)
-	movq	160(%rsp), %rcx
-	sbbq	%r12, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+32(%rdi)
-	movq	168(%rsp), %rcx
-	sbbq	%r13, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+40(%rdi)
-	movq	176(%rsp), %rcx
-	sbbq	%r14, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+48(%rdi)
-	movq	184(%rsp), %rcx
-	sbbq	%r15, %rcx
-	movq	%rcx, 8*RLC_DV_DIGS+56(%rdi)
-
-	/* rsp[0..8] = t1 = (a0 * a1) + u^2 * (a1 * b1) */
-	movq    NP40, %rax
-	movq    NP41, %r8
-	movq    NP42, %r9
-	movq    NP43, %r10
-	movq    NP44, %r11
-	movq    24(%rsp), %rcx
-	addq    %rcx, %rax
-	movq    32(%rsp), %rcx
-	adcq    %rcx, %r8
-	movq    40(%rsp), %rcx
-	adcq    %rcx, %r9
-	movq    48(%rsp), %rcx
-	adcq    %rcx, %r10
-	movq    56(%rsp), %rcx
-	adcq    %rcx, %r11
-
-	movq    0(%rsp), %rcx
-	subq    64(%rsp), %rcx
-	movq    %rcx, 0(%rdi)
-	movq    8(%rsp), %rcx
-	sbbq    72(%rsp), %rcx
-	movq    %rcx, 8(%rdi)
-	movq    16(%rsp), %rcx
-	sbbq    80(%rsp), %rcx
-   	movq    %rcx, 16(%rdi)
-	sbbq    88(%rsp), %rax
-	movq    %rax, 24(%rdi)
-	sbbq    96(%rsp), %r8
-	movq    %r8, 32(%rdi)
-	sbbq    104(%rsp), %r9
-	movq    %r9, 40(%rdi)
-	sbbq    112(%rsp), %r10
-	movq    %r10, 48(%rdi)
-	sbbq    120(%rsp), %r11
-	movq    %r11, 56(%rdi)
-
-	addq $256, %rsp
-	pop %rbp
-	pop %rbx
-	pop %r15
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.c
deleted file mode 100755
index a34c1cf51975..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field modular reduction functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_rdcn_low(fp3_t c, dv3_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-	fp_rdcn_low(c[2], a[2]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.s
deleted file mode 100755
index ccb332f241df..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_rdc_low.s
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.global cdecl(fp2_rdcn_low)
-
-cdecl(fp2_rdcn_low):
-	push %r12
-	push %r13
-	push %r14
-
-	FP_RDCN_LOW %rdi, %rsi
-	addq $(8*RLC_FP_DIGS), %rdi
-	addq $(8*RLC_DV_DIGS), %rsi
-	FP_RDCN_LOW %rdi, %rsi
-
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.c
deleted file mode 100755
index 8529c109361c..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field squaring functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_sqrn_low(dv3_t c, fp3_t a) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-	rlc_align dig_t t3[2 * RLC_FP_DIGS], t4[2 * RLC_FP_DIGS];
-
-	/* t0 = a_0^2. */
-	fp_sqrn_low(t0, a[0]);
-
-	/* t1 = 2 * a_1 * a_2. */
-#ifdef RLC_FP_ROOM
-	fp_dbln_low(t2, a[1]);
-#else
-	fp_dblm_low(t2, a[1]);
-#endif
-
-	fp_muln_low(t1, t2, a[2]);
-
-	/* t3 = (a_0 + a_2 + a_1)^2, t4 = (a_0 + a_2 - a_1)^2. */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[0], a[2]);
-	fp_addn_low(t4, t3, a[1]);
-#else
-	fp_addm_low(t3, a[0], a[2]);
-	fp_addm_low(t4, t3, a[1]);
-#endif
-	fp_subm_low(t2, t3, a[1]);
-	fp_sqrn_low(t3, t4);
-	fp_sqrn_low(t4, t2);
-
-	/* t2 = a_2^2. */
-	fp_sqrn_low(t2, a[2]);
-
-	/* t4 = (t4 + t3)/2. */
-#ifdef RLC_FP_ROOM
-	fp_addd_low(t4, t4, t3);
-#else
-	fp_addc_low(t4, t4, t3);
-#endif
-	fp_hlvd_low(t4, t4);
-
-	/* t3 = t3 - t4 - t1. */
-	fp_subc_low(t3, t3, t4);
-	fp_subc_low(t3, t3, t1);
-
-	/* c_2 = t4 - t0 - t2. */
-	fp_subc_low(c[2], t4, t0);
-	fp_subc_low(c[2], c[2], t2);
-
-	/* c_0 = t0 + t1 * B. */
-	fp_addc_low(c[0], t0, t1);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t1);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t1);
-	}
-
-	/* c_1 = t3 + t2 * B. */
-	fp_addc_low(c[1], t3, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-}
-
-void fp3_sqrm_low(fp3_t c, fp3_t a) {
-	dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_sqrn_low(t, a);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.s b/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.s
deleted file mode 100755
index 2d9291d8ea31..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-4l/relic_fpx_sqr_low.s
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.global cdecl(fp2_sqrn_low)
-.global cdecl(fp2_sqrm_low)
-
-/*
- * Function: fp2_sqrm_low
- * Inputs: rdi = c, rsi = a
- * Output: c = a * a
- */
-cdecl(fp2_sqrm_low):
-	push %r12
-	push %r13
-	push %r14
-	push %r15
-
-	subq $96, %rsp
-
-	/* rsp[8..15] = t0 = a0 + a1. */
-	movq	0(%rsi), %r8
-	addq	32(%rsi), %r8
-	movq	%r8, 64(%rsp)
-	movq	8(%rsi), %r9
-	adcq	40(%rsi), %r9
-	movq	%r9, 72(%rsp)
-	movq	16(%rsi), %r10
-	adcq	48(%rsi), %r10
-	movq	%r10, 80(%rsp)
-	movq	24(%rsi), %r11
-	adcq	56(%rsi), %r11
-	movq	%r11, 88(%rsp)
-
-	/* (r15, r14, r3, r12) = t1 = a0 - a1. */
-	movq	0(%rsi), %r12
-	subq	32(%rsi), %r12
-	movq	$0, %rax            ////////try it on ib (w/o interleaving)
-	movq	8(%rsi), %r13
-	sbbq	40(%rsi), %r13
-	movq	$0, %rcx
-	movq	16(%rsi), %r14
-	sbbq	48(%rsi), %r14
-	movq	$0, %rdx
-	movq	24(%rsi), %r15
-	sbbq	56(%rsi), %r15
-	movq	$0, %r11
-
-	movq	P0,%r8
-	cmovc	%r8, %rax
-	movq	P1,%r9
-	cmovc	%r9, %rcx
-	movq	P2,%r8
-	cmovc	%r8, %rdx
-	movq	P3,%r9
-	cmovc	%r9, %r11
-
-	addq	%rax,%r12
-	adcq	%rcx,%r13
-	adcq	%rdx,%r14
-	adcq	%r11,%r15
-
-	/* c0 = a0^2 + b_0^2 * u^2. */
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, 64(%rsp), 72(%rsp), 80(%rsp), 88(%rsp), %r12, %r13, %r14, %r15
-
-	/* (r11, r10, r9, r8) = t2 = 2 * a0. */
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	%r8, 64(%rsp)
-	movq	8(%rsi), %r9
-	adcq	%r9, %r9
-	movq	%r9, 72(%rsp)
-	movq	16(%rsi), %r10
-	adcq	%r10, %r10
-	movq	%r10, 80(%rsp)
-	movq	24(%rsi), %r11
-	adcq	%r11, %r11
-	movq	%r11, 88(%rsp)
-
-	FP_RDCN_LOW %rdi, %rsp
-
-	FP_MULN_LOW %rsp, %r12, %r13, %r14, 64(%rsp), 72(%rsp), 80(%rsp), 88(%rsp), 32(%rsi), 40(%rsi), 48(%rsi), 56(%rsi)
-	addq	$(8 * RLC_FP_DIGS), %rdi
-	FP_RDCN_LOW %rdi, %rsp
-
-	addq $96, %rsp
-
-	pop %r15
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
-
-cdecl(fp2_sqrn_low):
-	push %r12
-	push %r13
-	push %r14
-	push %r15
-
-	subq $96, %rsp
-
-	/* rsp[8..15] = t0 = a0 + a1. */
-	movq	0(%rsi), %r8
-	movq	%r8, %r12
-	addq	32(%rsi), %r8
-	movq	%r8, 64(%rsp)
-	movq	8(%rsi), %r9
-	movq	%r9, %r13
-	adcq	40(%rsi), %r9
-	movq	%r9, 72(%rsp)
-	movq	16(%rsi), %r10
-	movq	%r10, %r14
-	adcq	48(%rsi), %r10
-	movq	%r10, 80(%rsp)
-	movq	24(%rsi), %r11
-	movq	%r11, %r15
-	adcq	56(%rsi), %r11
-	movq	%r11, 88(%rsp)
-
-	/* (r15, r14, r3, r12) = t1 = a0 - a1. */
-	subq	32(%rsi), %r12
-	sbbq	40(%rsi), %r13
-	sbbq	48(%rsi), %r14
-	sbbq	56(%rsi), %r15
-
-	movq	$0, %rax
-	movq	$0, %rcx
-	movq	$0, %rdx
-	movq	$0, %r11
-	movq	P0,%r8
-	cmovc	%r8, %rax
-	movq	P1,%r9
-	cmovc	%r9, %rcx
-	movq	P2,%r8
-	cmovc	%r8, %rdx
-	movq	P3,%r9
-	cmovc	%r9, %r11
-
-	addq	%rax,%r12
-	adcq	%rcx,%r13
-	adcq	%rdx,%r14
-	adcq	%r11,%r15
-
-	/* c0 = a0^2 + b_0^2 * u^2. */
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, 64(%rsp), 72(%rsp), 80(%rsp), 88(%rsp), %r12, %r13, %r14, %r15
-
-	/* (r11, r10, r9, r8) = t2 = 2 * a0. */
-	movq	0(%rsi), %r8
-	addq	%r8, %r8
-	movq	%r8, 64(%rsp)
-	movq	8(%rsi), %r9
-	adcq	%r9, %r9
-	movq	%r9, 72(%rsp)
-	movq	16(%rsi), %r10
-	adcq	%r10, %r10
-	movq	%r10, 80(%rsp)
-	movq	24(%rsi), %r11
-	adcq	%r11, %r11
-	movq	%r11, 88(%rsp)
-
-	addq	$(8*RLC_DV_DIGS), %rdi
-	FP_MULN_LOW %rdi, %r12, %r13, %r14, 64(%rsp), 72(%rsp), 80(%rsp), 88(%rsp), 32(%rsi), 40(%rsi), 48(%rsi), 56(%rsi)
-
-	addq $96, %rsp
-
-	pop %r15
-	pop %r14
-	pop %r13
-	pop %r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-544/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-544/macro.s
deleted file mode 100644
index 5e3189a1139e..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/macro.s
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#define P0 0x45a58c1085e14411
-#define P1 0x39a5cd02c6f4b6b6
-#define P2 0x9b3a84fa363bcd25
-#define P3 0x049031ae4ca1d271
-#define P4 0xf33e58fe66943943
-#define P5 0xc15b47aa5aa84626
-#define P6 0xc05e7cc0373d9b1a
-#define P7 0x9299f1c803ddd5d7
-#define P8 0x00000000bb9dfd54
-#define U0 0x9935f6572883d30f
-
-#define _P0 0x85E1441100000000
-#define _P1 0xC6F4B6B645A58C10
-#define _P2 0x363BCD2539A5CD02
-#define _P3 0x4CA1D2719B3A84FA
-#define _P4 0x66943943049031AE
-#define _P5 0x5AA84626F33E58FE
-#define _P6 0x373D9B1AC15B47AA
-#define _P7 0x03DDD5D7C05E7CC0
-#define _P8 0xBB9DFD549299F1C8
-
-#if defined(__APPLE__)
-#define cdecl(S) _PREFIX(,S)
-#else
-#define cdecl(S) S
-#endif
-
-.text
-
-.macro ADD1 i, j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro ADDN i, j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUB1 i, j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUBN i, j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro DBLN i, j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 7, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 8, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	1, 8, 1, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	2, 8, 2, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	3, 8, 3, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	4, 8, 4, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	5, 8, 5, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	6, 8, 6, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	7, 8, 7, \C, \R2, \R0, \R1, \A, \B
-
-	movq	64(\A),%rax
-	mulq	64(\B)
-	addq	%rax  ,\R0
-	movq	\R0   ,128(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 7, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	1, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	2, 8, \R1, \R2, \R0, \A, \P
-	RDCN1	3, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	4, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	5, 8, \R1, \R2, \R0, \A, \P
-	RDCN1	6, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	7, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	8, 8, \R1, \R2, \R0, \A, \P
-	movq	\R2, 136(\A)
-
-	movq	72(\A), %r11
-	movq	80(\A), %r12
-	movq	88(\A), %r13
-	movq	96(\A), %r14
-	movq	104(\A), %r15
-	movq	112(\A), %rcx
-	movq	120(\A), %rbp
-	movq	128(\A), %rdx
-	movq	136(\A), %r8
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-	sbbq	p7(%rip), %rdx
-	sbbq	p8(%rip), %r8
-
-	cmovc	72(\A), %r11
-	cmovc	80(\A), %r12
-	cmovc	88(\A), %r13
-	cmovc	96(\A), %r14
-	cmovc	104(\A), %r15
-	cmovc	112(\A), %rcx
-	cmovc	120(\A), %rbp
-	cmovc	128(\A), %rdx
-	cmovc	136(\A), %r8
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-	movq	%rdx,56(\C)
-	movq	%r8, 64(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_add_low.s
deleted file mode 100644
index b531d1ac767c..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_add_low.s
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-p7: .quad P7
-p8: .quad P8
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-.global p7
-.global p8
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-.hidden p7
-.hidden p8
-
-_p0: .quad _P0
-_p1: .quad _P1
-_p2: .quad _P2
-_p3: .quad _P3
-_p4: .quad _P4
-_p5: .quad _P5
-_p6: .quad _P6
-_p7: .quad _P7
-_p8: .quad _P8
-
-.global _p0
-.global _p1
-.global _p2
-.global _p3
-.global _p4
-.global _p5
-.global _p6
-.global _p7
-.global _p8
-
-.hidden _p0
-.hidden _p1
-.hidden _p2
-.hidden _p3
-.hidden _p4
-.hidden _p5
-.hidden _p6
-.hidden _p7
-.hidden _p8
-
-.text
-
-.global cdecl(fp_add1_low)
-.global cdecl(fp_addn_low)
-.global cdecl(fp_addm_low)
-.global cdecl(fp_addd_low)
-.global cdecl(fp_addc_low)
-.global cdecl(fp_sub1_low)
-.global cdecl(fp_subn_low)
-.global cdecl(fp_subm_low)
-.global cdecl(fp_subd_low)
-.global cdecl(fp_subc_low)
-.global cdecl(fp_negm_low)
-.global cdecl(fp_dbln_low)
-.global cdecl(fp_dblm_low)
-.global cdecl(fp_hlvm_low)
-.global cdecl(fp_hlvd_low)
-
-cdecl(fp_add1_low):
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addn_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-cdecl(fp_addm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-	movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-	movq	56(%rdx), %r15
-	adcq	56(%rsi), %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rdx), %rax
-	adcq	64(%rsi), %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-	movq	40(%rdi), %r15
-
-	pop		%rdi
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	pop		%rdi
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_addd_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (2 * RLC_FP_DIGS - 2)
-
-	ret
-
-cdecl(fp_addc_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1, (RLC_FP_DIGS - 2)
-
-	movq     64(%rsi), %r8
-	adcq     64(%rdx), %r8
-	movq     72(%rsi), %r9
-	adcq     72(%rdx), %r9
-	movq     80(%rsi), %r10
-	adcq     80(%rdx), %r10
-	movq     88(%rsi), %r11
-	adcq     88(%rdx), %r11
-	movq     96(%rsi), %r12
-	adcq     96(%rdx), %r12
-	movq    104(%rsi), %r13
-	adcq    104(%rdx), %r13
-	movq    112(%rsi), %r14
-	adcq    112(%rdx), %r14
-	movq    120(%rsi), %r15
-	adcq    120(%rdx), %r15
-	movq	%r15    , 64(%rdi)
-	movq	%r15    , 72(%rdi)
-	movq	128(%rdx), %rax
-	adcq	128(%rsi), %rax
-	movq	%rax    , 80(%rdi)
-	movq	%rax    , 88(%rdi)
-    movq    $0      , 96(%rdi)
-    adcq    $0      , 96(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	_p0(%rip), %rax
-	sbbq	_p1(%rip), %rcx
-	sbbq	_p2(%rip), %rdx
-	sbbq	_p3(%rip), %rsi
-	sbbq	_p4(%rip), %rbx
-	sbbq	_p5(%rip), %rbp
-	sbbq	_p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	72(%rdi), %r15
-	sbbq	_p7(%rip), %r15
-	movq	%r15, 72(%rdi)
-	movq	88(%rdi), %r15
-	sbbq	_p8(%rip), %r15
-	movq	%r15, 88(%rdi)
-    movq	96(%rdi), %r15
-	sbbq	$0, %r15
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-	movq	64(%rdi), %r15
-	movq	80(%rdi), %rax
-	cmovnc	72(%rdi), %r15
-	cmovnc	88(%rdi), %rax
-
-	movq	%r8 , 64(%rdi)
-	movq	%r9 , 72(%rdi)
-	movq	%r10, 80(%rdi)
-	movq	%r11, 88(%rdi)
-	movq	%r12, 96(%rdi)
-	movq	%r13, 104(%rdi)
-	movq	%r14, 112(%rdi)
-	movq	%r15, 120(%rdi)
-	movq	%rax, 128(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_sub1_low):
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_subn_low):
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 	1, (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-cdecl(fp_subm_low):
-	pushq	%r12
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1, (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-	movq	$0, %r12
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-	cmovc	p7(%rip), %rsi
-	cmovc	p8(%rip), %r12
-
-	addq	%rax,  0(%rdi)
-	adcq	%rcx,  8(%rdi)
-	adcq	%r8,  16(%rdi)
-	adcq	%r9,  24(%rdi)
-	adcq	%r10, 32(%rdi)
-	adcq	%r11, 40(%rdi)
-	adcq	%rdx, 48(%rdi)
-	adcq	%rsi, 56(%rdi)
-	adcq	%r12, 64(%rdi)
-
-	pop		%r12
-	ret
-
-cdecl(fp_subd_low):
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 2)
-
-	ret
-
-cdecl(fp_subc_low):
-	push	%r12
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 2)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-	movq	$0, %r12
-
-	cmovc	_p0(%rip), %rax
-	cmovc	_p1(%rip), %rcx
-	cmovc	_p2(%rip), %r8
-	cmovc	_p3(%rip), %r9
-	cmovc	_p4(%rip), %r10
-	cmovc	_p5(%rip), %r11
-	cmovc	_p6(%rip), %rsi
-	cmovc	_p7(%rip), %rdx
-	cmovc	_p8(%rip), %r12
-
-	addq	%rax,  64(%rdi)
-	adcq	%rcx,  72(%rdi)
-	adcq	%r8,   80(%rdi)
-	adcq	%r9,   88(%rdi)
-	adcq	%r10,  96(%rdi)
-	adcq	%r11, 104(%rdi)
-	adcq	%rsi, 112(%rdi)
-	adcq	%rdx, 120(%rdi)
-	adcq	%r12, 128(%rdi)
-
-	pop		%r12
-	ret
-
-cdecl(fp_negm_low):
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    or 	    56(%rsi), %r8
-    or 	    64(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-	sbbq 	48(%rsi), %r8
-	movq 	%r8     , 48(%rdi)
-    cmovnz 	p7(%rip), %r8
-	sbbq 	56(%rsi), %r8
-	movq 	%r8     , 56(%rdi)
-    cmovnz 	p8(%rip), %r8
-	sbbq 	64(%rsi), %r8
-	movq 	%r8     , 64(%rdi)
-  	ret
-
-cdecl(fp_dbln_low):
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-cdecl(fp_dblm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-	movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-	movq	56(%rsi), %r15
-	adcq	%r15    , %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rsi), %rax
-	adcq	%rax    , %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-	movq	72(%rsi), %rcx
-	adcq	%rcx    , %rcx
-	movq	%rcx    , 32(%rdi)
-	movq	%rcx    , 40(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-	movq	%r15, %rdi
-
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_hlvm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rbp
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rbp
-	cmovz	%rdx, %rbx
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-	movq	56(%rsi), %rdx
-	adcq	%rdx    , %r15
-	movq	64(%rsi), %rdx
-	adcq	%rdx    , %rbp
-
-	rcrq    $1, %rbp
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rbp, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop %rbx
-	pop	%rbp
-	pop	%r15
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp_hlvd_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rax
-
-  	movq 	$1     ,%rbp
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rbp
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rax
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	adcq	64(%rsi) , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-
-	push	%rbp
-
-	movq	104(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 104(%rdi)
-	movq	112(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 112(%rdi)
-	movq	120(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 120(%rdi)
-	movq	128(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 128(%rdi)
-
-	pop		%rbp
-
-	rcrq	$1, 128(%rdi)
-	rcrq	$1, 120(%rdi)
-	rcrq	$1, 112(%rdi)
-	rcrq	$1, 104(%rdi)
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.c
deleted file mode 100644
index c0731b9ff302..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "gmp.h"
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.s
deleted file mode 100644
index cdd3d2af5035..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_muln_low)
-.global cdecl(fp_mulm_low)
-
-cdecl(fp_muln_low):
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-cdecl(fp_mulm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$160, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$160, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.c
deleted file mode 100644
index 5c9a776c7a20..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] ^ sform[i]) >= 0) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] ^ sform[0]) >= 0) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_add(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.s
deleted file mode 100644
index 98b804e6df9f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_sqr_low.c
deleted file mode 100644
index c458e3a657b3..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_add_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_add_low.c
deleted file mode 100644
index 17a8a5af0ab5..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_add_low.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field addition functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_addn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-}
-
-void fp2_addm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_addm_low(c[0], a[0], b[0]);
-	fp_addm_low(c[1], a[1], b[1]);
-}
-
-void fp2_addd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-}
-
-void fp2_addc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-}
-
-void fp2_subn_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-}
-
-void fp2_subm_low(fp2_t c, fp2_t a, fp2_t b) {
-	fp_subm_low(c[0], a[0], b[0]);
-	fp_subm_low(c[1], a[1], b[1]);
-}
-
-void fp2_subd_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-}
-
-void fp2_subc_low(dv2_t c, dv2_t a, dv2_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-}
-
-void fp2_dbln_low(fp2_t c, fp2_t a) {
-	/* 2 * (a0 + a1 * u) = 2 * a0 + 2 * a1 * u. */
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-}
-
-void fp2_dblm_low(fp2_t c, fp2_t a) {
-	fp_dblm_low(c[0], a[0]);
-	fp_dblm_low(c[1], a[1]);
-}
-
-void fp2_norm_low(fp2_t c, fp2_t a) {
-	fp2_t t;
-
-	fp2_null(t);
-
-	RLC_TRY {
-		fp2_new(t);
-
-		fp_copy(t[0], a[0]);
-		fp_negm_low(c[0], a[1]);
-		fp_dblm_low(t[1], a[1]);
-		fp_dblm_low(t[1], t[1]);
-		fp_subm_low(c[0], c[0], t[1]);
-		fp_copy(c[1], t[0]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t);
-	}
-}
-
-void fp2_nord_low(dv2_t c, dv2_t a) {
-	dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-
-		/* If p = 1,5 mod 8, (i) is a QNR. */
-		dv_copy(t[0], a[0], 2 * RLC_FP_DIGS - 1);
-		dv_zero(t[1], RLC_FP_DIGS - 1);
-		fp_lshb_low(t[1] + RLC_FP_DIGS - 1, fp_prime_get(), 32);
-		fp_subc_low(c[0], t[1], a[1]);
-		fp_addc_low(t[1], a[1], a[1]);
-		fp_addc_low(t[1], t[1], t[1]);
-		fp_subc_low(c[0], c[0], t[1]);
-		dv_copy(c[1], t[0], 2 * RLC_FP_DIGS - 1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp2_norh_low(dv2_t c, dv2_t a) {
-	fp2_nord_low(c, a);
-}
-
-void fp3_addn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addn_low(c[0], a[0], b[0]);
-	fp_addn_low(c[1], a[1], b[1]);
-	fp_addn_low(c[2], a[2], b[2]);
-}
-
-void fp3_addm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_addm_low(c[0], a[0], b[0]);
-	fp_addm_low(c[1], a[1], b[1]);
-	fp_addm_low(c[2], a[2], b[2]);
-}
-
-void fp3_addd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addd_low(c[0], a[0], b[0]);
-	fp_addd_low(c[1], a[1], b[1]);
-	fp_addd_low(c[2], a[2], b[2]);
-}
-
-void fp3_addc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_addc_low(c[0], a[0], b[0]);
-	fp_addc_low(c[1], a[1], b[1]);
-	fp_addc_low(c[2], a[2], b[2]);
-}
-
-void fp3_subn_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subn_low(c[0], a[0], b[0]);
-	fp_subn_low(c[1], a[1], b[1]);
-	fp_subn_low(c[2], a[2], b[2]);
-}
-
-void fp3_subm_low(fp3_t c, fp3_t a, fp3_t b) {
-	fp_subm_low(c[0], a[0], b[0]);
-	fp_subm_low(c[1], a[1], b[1]);
-	fp_subm_low(c[2], a[2], b[2]);
-}
-
-void fp3_subd_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subd_low(c[0], a[0], b[0]);
-	fp_subd_low(c[1], a[1], b[1]);
-	fp_subd_low(c[2], a[2], b[2]);
-}
-
-void fp3_subc_low(dv3_t c, dv3_t a, dv3_t b) {
-	fp_subc_low(c[0], a[0], b[0]);
-	fp_subc_low(c[1], a[1], b[1]);
-	fp_subc_low(c[2], a[2], b[2]);
-}
-
-void fp3_dbln_low(fp3_t c, fp3_t a) {
-	fp_dbln_low(c[0], a[0]);
-	fp_dbln_low(c[1], a[1]);
-	fp_dbln_low(c[2], a[2]);
-}
-
-void fp3_dblm_low(fp3_t c, fp3_t a) {
-	fp_dblm_low(c[0], a[0]);
-	fp_dblm_low(c[1], a[1]);
-	fp_dblm_low(c[2], a[2]);
-}
-
-void fp3_nord_low(dv3_t c, dv3_t a) {
-	dv_t t;
-
-	dv_null(t);
-
-	RLC_TRY {
-		dv_new(t);
-		dv_copy(t, a[0], 2 * RLC_FP_DIGS - 1);
-		dv_copy(c[0], a[2], 2 * RLC_FP_DIGS - 1);
-		for (int i = 1; i < fp_prime_get_cnr(); i++) {
-			fp_addc_low(c[0], c[0], a[2]);
-		}
-		for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-			fp_subc_low(c[0], c[0], a[2]);
-		}
-		dv_copy(c[2], a[1], 2 * RLC_FP_DIGS - 1);
-		dv_copy(c[1], t, 2 * RLC_FP_DIGS - 1);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_mul_low.c
deleted file mode 100644
index 934e36148a5f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_mul_low.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field multiplication functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_bn_low.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_muln_low(dv2_t c, fp2_t a, fp2_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 + a_1, t1 = b_0 + b_1. */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t0, a[0], a[1]);
-	fp_addn_low(t1, b[0], b[1]);
-#else
-	fp_addm_low(t0, a[0], a[1]);
-	fp_addm_low(t1, b[0], b[1]);
-#endif
-	/* c_0 = a_0 * b_0, c_1 = a_1 * b_1. */
-	fp_muln_low(c[0], a[0], b[0]);
-	fp_muln_low(c[1], a[1], b[1]);
-
-	/* t2 = (a_0 + a_1) * (b_0 + b_1). */
-	fp_muln_low(t2, t0, t1);
-
-	/* t0 = (a_0 * b_0) + (a_1 * b_1). */
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t0, c[0], c[1]);
-#else
-	fp_addc_low(t0, c[0], c[1]);
-#endif
-	/* c_0 = (a_0 * b_0) + u^2 * (a_1 * b_1). */
-	fp_addc_low(t1, c[1], c[1]);
-	fp_addc_low(t1, t1, t1);
-	fp_subc_low(c[0], c[0], c[1]);
-	fp_subc_low(c[0], c[0], t1);
-
-	/* c_1 = t2 - t0. */
-#ifdef RLC_FP_ROOM
-	fp_subd_low(c[1], t2, t0);
-#else
-	fp_subc_low(c[1], t2, t0);
-#endif
-}
-
-void fp2_mulm_low(fp2_t c, fp2_t a, fp2_t b) {
-	rlc_align dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-		fp2_muln_low(t, a, b);
-		fp2_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp3_muln_low(dv3_t c, fp3_t a, fp3_t b) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS], t3[2 * RLC_FP_DIGS];
-	rlc_align dig_t t4[2 * RLC_FP_DIGS], t5[2 * RLC_FP_DIGS], t6[2 * RLC_FP_DIGS];
-
-	/* Karatsuba algorithm. */
-
-	/* t0 = a_0 * b_0, t1 = a_1 * b_1, t2 = a_2 * b_2. */
-	fp_muln_low(t0, a[0], b[0]);
-	fp_muln_low(t1, a[1], b[1]);
-	fp_muln_low(t2, a[2], b[2]);
-
-	/* t3 = (a_1 + a_2) * (b_1 + b_2). */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[1], a[2]);
-	fp_addn_low(t4, b[1], b[2]);
-#else
-	fp_addm_low(t3, a[1], a[2]);
-	fp_addm_low(t4, b[1], b[2]);
-#endif
-	fp_muln_low(t5, t3, t4);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t1, t2);
-#else
-	fp_addc_low(t6, t1, t2);
-#endif
-	fp_subc_low(t4, t5, t6);
-	fp_addc_low(c[0], t0, t4);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t4);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t4);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t4, a[0], a[1]);
-	fp_addn_low(t5, b[0], b[1]);
-#else
-	fp_addm_low(t4, a[0], a[1]);
-	fp_addm_low(t5, b[0], b[1]);
-#endif
-	fp_muln_low(t6, t4, t5);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t4, t0, t1);
-#else
-	fp_addc_low(t4, t0, t1);
-#endif
-	fp_subc_low(t4, t6, t4);
-	fp_addc_low(c[1], t4, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t5, a[0], a[2]);
-	fp_addn_low(t6, b[0], b[2]);
-#else
-	fp_addm_low(t5, a[0], a[2]);
-	fp_addm_low(t6, b[0], b[2]);
-#endif
-	fp_muln_low(t4, t5, t6);
-#ifdef RLC_FP_ROOM
-	fp_addc_low(t6, t0, t2);
-#else
-	fp_addc_low(t6, t0, t2);
-#endif
-	fp_subc_low(t5, t4, t6);
-	fp_addc_low(c[2], t5, t1);
-}
-
-void fp3_mulm_low(fp3_t c, fp3_t a, fp3_t b) {
-	dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_muln_low(t, a, b);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.c
deleted file mode 100644
index f0bd669cfb23..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field modular reduction functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_rdcn_low(fp3_t c, dv3_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-	fp_rdcn_low(c[2], a[2]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.s
deleted file mode 100644
index 4ba1d40bcbde..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_rdc_low.s
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp2_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp2_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-	addq $(8*RLC_FP_DIGS), %rdi
-	addq $(8*RLC_DV_DIGS), %rsi
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_sqr_low.c
deleted file mode 100644
index 9410fbf3c08d..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-544/relic_fpx_sqr_low.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field squaring functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp2_sqrn_low(dv2_t c, fp2_t a) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-
-	/* t0 = (a0 + a1). */
-#if RLC_FP_ROOM
-	fp_addn_low(t0, a[0], a[1]);
-#else
-	fp_addm_low(t0, a[0], a[1]);
-#endif
-
-	/* t1 = (a0 - a1). */
-	fp_subm_low(t1, a[0], a[1]);
-
-	/* t1 = a0 - a1 * u^2. */
-	fp_dblm_low(t2, a[1]);
-	fp_dblm_low(t2, t2);
-	fp_subm_low(t1, t1, t2);
-
-	/* c1 = a0 * a1. */
-	fp_muln_low(c[1], a[0], a[1]);
-	/* c0 = a0^2 + a_1^2 * u^2. */
-	fp_muln_low(c[0], t0, t1);
-
-	/* c1 = 2 * a0 * a1. */
-#if RLC_FP_ROOM
-	fp_addd_low(c[1], c[1], c[1]);
-	fp_addd_low(t2, c[1], c[1]);
-	fp_addd_low(c[0], c[0], t2);
-#else
-	fp_addc_low(c[1], c[1], c[1]);
-	fp_addc_low(t2, c[1], c[1]);
-	fp_addc_low(c[0], c[0], t2);
-#endif
-	/* c = c0 + c1 * u. */
-}
-
-void fp2_sqrm_low(fp2_t c, fp2_t a) {
-	rlc_align dv2_t t;
-
-	dv2_null(t);
-
-	RLC_TRY {
-		dv2_new(t);
-		fp2_sqrn_low(t, a);
-		fp2_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv2_free(t);
-	}
-}
-
-void fp3_sqrn_low(dv3_t c, fp3_t a) {
-	rlc_align dig_t t0[2 * RLC_FP_DIGS], t1[2 * RLC_FP_DIGS], t2[2 * RLC_FP_DIGS];
-	rlc_align dig_t t3[2 * RLC_FP_DIGS], t4[2 * RLC_FP_DIGS];
-
-	/* t0 = a_0^2. */
-	fp_sqrn_low(t0, a[0]);
-
-	/* t1 = 2 * a_1 * a_2. */
-#ifdef RLC_FP_ROOM
-	fp_dbln_low(t2, a[1]);
-#else
-	fp_dblm_low(t2, a[1]);
-#endif
-
-	fp_muln_low(t1, t2, a[2]);
-
-	/* t3 = (a_0 + a_2 + a_1)^2, t4 = (a_0 + a_2 - a_1)^2. */
-#ifdef RLC_FP_ROOM
-	fp_addn_low(t3, a[0], a[2]);
-	fp_addn_low(t4, t3, a[1]);
-#else
-	fp_addm_low(t3, a[0], a[2]);
-	fp_addm_low(t4, t3, a[1]);
-#endif
-	fp_subm_low(t2, t3, a[1]);
-	fp_sqrn_low(t3, t4);
-	fp_sqrn_low(t4, t2);
-
-	/* t2 = a_2^2. */
-	fp_sqrn_low(t2, a[2]);
-
-	/* t4 = (t4 + t3)/2. */
-#ifdef RLC_FP_ROOM
-	fp_addd_low(t4, t4, t3);
-#else
-	fp_addc_low(t4, t4, t3);
-#endif
-	fp_hlvd_low(t4, t4);
-
-	/* t3 = t3 - t4 - t1. */
-	fp_subc_low(t3, t3, t4);
-	fp_subc_low(t3, t3, t1);
-
-	/* c_2 = t4 - t0 - t2. */
-	fp_subc_low(c[2], t4, t0);
-	fp_subc_low(c[2], c[2], t2);
-
-	/* c_0 = t0 + t1 * B. */
-	fp_addc_low(c[0], t0, t1);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[0], c[0], t1);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[0], c[0], t1);
-	}
-
-	/* c_1 = t3 + t2 * B. */
-	fp_addc_low(c[1], t3, t2);
-	for (int i = 1; i < fp_prime_get_cnr(); i++) {
-		fp_addc_low(c[1], c[1], t2);
-	}
-	for (int i = 0; i >= fp_prime_get_cnr(); i--) {
-		fp_subc_low(c[1], c[1], t2);
-	}
-}
-
-void fp3_sqrm_low(fp3_t c, fp3_t a) {
-	rlc_align dv3_t t;
-
-	dv3_null(t);
-
-	RLC_TRY {
-		dv3_new(t);
-		fp3_sqrn_low(t, a);
-		fp3_rdcn_low(c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		dv3_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-638/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-638/macro.s
deleted file mode 100644
index 1a34106ce8ae..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/macro.s
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#ifdef FP_QNRES
-#define P0	0xAAAAAAAABEAB000B
-#define P1	0xEAF3FF000AAAAAAA
-#define P2	0xAAAAAAAAAAAAAA93
-#define P3	0x00000AC79600D2AB
-#define P4	0x5C75D6C2AB000000
-#define P5	0x3955555555529C00
-#define P6	0x00631BBD42171501
-#define P7	0xFC01DCDE95D40000
-#define P8	0xE80015554DD25DB0
-#define P9	0x3CB868653D300B3F
-#define U0	0xFAD7AB621D14745D
-#else
-#define P0	0x0000000000000067
-#define P1	0xFFFFFFFFFFFFECE0
-#define P2	0x0000004C80015ACD
-#define P3	0xFFFFF51FFFF4EB80
-#define P4	0xC00086520021E55B
-#define P5	0xFFFDD0E00008DE55
-#define P6	0x3FFF94870000D52F
-#define P7	0xFFFFF942D000165E
-#define P8	0x7FFFFFB8000001D3
-#define P9	0x23FFFFFDC000000D
-#define U0	0x254813E22CBCE4A9
-#endif
-
-#if defined(__APPLE__)
-#define cdecl(S) _PREFIX(,S)
-#else
-#define cdecl(S) S
-#endif
-
-.text
-
-.macro ADD1 i, j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro ADDN i, j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUB1 i, j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUBN i, j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro DBLN i, j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 7, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 8, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 9, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	1, 9, 1, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	2, 9, 2, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	3, 9, 3, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	4, 9, 4, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	5, 9, 5, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	6, 9, 6, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	7, 9, 7, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	8, 9, 8, \C, \R1, \R2, \R0, \A, \B
-
-	movq	72(\A),%rax
-	mulq	72(\B)
-	addq	%rax  ,\R2
-	movq	\R2   ,144(\C)
-	adcq	%rdx  ,\R0
-	movq	\R0   ,152(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 7, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 8, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 9, \R0, \R1, \R2, \A, \P
-	RDCN1	1, 9, \R1, \R2, \R0, \A, \P
-	RDCN1	2, 9, \R2, \R0, \R1, \A, \P
-	RDCN1	3, 9, \R0, \R1, \R2, \A, \P
-	RDCN1	4, 9, \R1, \R2, \R0, \A, \P
-	RDCN1	5, 9, \R2, \R0, \R1, \A, \P
-	RDCN1	6, 9, \R0, \R1, \R2, \A, \P
-	RDCN1	7, 9, \R1, \R2, \R0, \A, \P
-	RDCN1	8, 9, \R2, \R0, \R1, \A, \P
-	RDCN1	9, 9, \R0, \R1, \R2, \A, \P
-	addq	152(\A), \R1
-	movq	\R1, 152(\A)
-
-	movq	80(\A), %r11
-	movq	88(\A), %r12
-	movq	96(\A), %r13
-	movq	104(\A), %r14
-	movq	112(\A), %r15
-	movq	120(\A), %rcx
-	movq	128(\A), %rbp
-	movq	136(\A), %rdx
-	movq	144(\A), %r8
-	movq	152(\A), %r9
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-	sbbq	p7(%rip), %rdx
-	sbbq	p8(%rip), %r8
-	sbbq	p9(%rip), %r9
-
-	cmovc	80(\A), %r11
-	cmovc	88(\A), %r12
-	cmovc	96(\A), %r13
-	cmovc	104(\A), %r14
-	cmovc	112(\A), %r15
-	cmovc	120(\A), %rcx
-	cmovc	128(\A), %rbp
-	cmovc	136(\A), %rdx
-	cmovc	144(\A), %r8
-	cmovc	152(\A), %r9
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-	movq	%rdx,56(\C)
-	movq	%r8,64(\C)
-	movq	%r9,72(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_add_low.s
deleted file mode 100644
index 3905176d3e51..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_add_low.s
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-p7: .quad P7
-p8: .quad P8
-p9: .quad P9
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-.global p7
-.global p8
-.global p9
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-.hidden p7
-.hidden p8
-.hidden p9
-
-.text
-
-.global cdecl(fp_add1_low)
-.global cdecl(fp_addn_low)
-.global cdecl(fp_addm_low)
-.global cdecl(fp_addd_low)
-.global cdecl(fp_addc_low)
-.global cdecl(fp_sub1_low)
-.global cdecl(fp_subn_low)
-.global cdecl(fp_subm_low)
-.global cdecl(fp_subd_low)
-.global cdecl(fp_subc_low)
-.global cdecl(fp_negm_low)
-.global cdecl(fp_dbln_low)
-.global cdecl(fp_dblm_low)
-.global cdecl(fp_hlvm_low)
-.global cdecl(fp_hlvd_low)
-
-cdecl(fp_add1_low):
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addn_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-cdecl(fp_addm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-	movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-	movq	56(%rdx), %r15
-	adcq	56(%rsi), %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rdx), %rax
-	adcq	64(%rsi), %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-	movq	72(%rdx), %rcx
-	adcq	72(%rsi), %rcx
-	movq	%rcx    , 32(%rdi)
-	movq	%rcx    , 40(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-	movq	40(%rdi), %r15
-	sbbq	p9(%rip), %r15
-	movq	%r15, 40(%rdi)
-
-	pop		%rdi
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	pop		%rdi
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-	cmovnc  40(%rdi), %rcx
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	movq	%rcx, 72(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_addd_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addc_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1, (RLC_FP_DIGS - 1)
-
-	movq     80(%rsi), %r8
-	adcq     80(%rdx), %r8
-	movq     88(%rsi), %r9
-	adcq     88(%rdx), %r9
-	movq     96(%rsi), %r10
-	adcq     96(%rdx), %r10
-	movq    104(%rsi), %r11
-	adcq    104(%rdx), %r11
-	movq    112(%rsi), %r12
-	adcq    112(%rdx), %r12
-	movq    120(%rsi), %r13
-	adcq    120(%rdx), %r13
-	movq    128(%rsi), %r14
-	adcq    128(%rdx), %r14
-	movq    136(%rsi), %r15
-	adcq    136(%rdx), %r15
-	movq	%r15    , 80(%rdi)
-	movq	%r15    , 88(%rdi)
-	movq	144(%rdx), %rax
-	adcq	144(%rsi), %rax
-	movq	%rax    , 96(%rdi)
-	movq	%rax    , 104(%rdi)
-	movq	152(%rdx), %rcx
-	adcq	152(%rsi), %rcx
-	movq	%rcx    , 112(%rdi)
-	movq	%rcx    , 120(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	88(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 88(%rdi)
-	movq	104(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 104(%rdi)
-	movq	120(%rdi), %r15
-	sbbq	p9(%rip), %r15
-	movq	%r15, 120(%rdi)
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-	movq	80(%rdi), %r15
-	movq	96(%rdi), %rax
-	movq	112(%rdi), %rcx
-	cmovnc	88(%rdi), %r15
-	cmovnc  104(%rdi), %rax
-	cmovnc  120(%rdi), %rcx
-
-	movq	%r8 , 80(%rdi)
-	movq	%r9 , 88(%rdi)
-	movq	%r10, 96(%rdi)
-	movq	%r11, 104(%rdi)
-	movq	%r12, 112(%rdi)
-	movq	%r13, 120(%rdi)
-	movq	%r14, 128(%rdi)
-	movq	%r15, 136(%rdi)
-	movq	%rax, 144(%rdi)
-	movq	%rcx, 152(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_sub1_low):
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_subn_low):
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 	1, (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-cdecl(fp_subm_low):
-	pushq	%r12
-	pushq	%r13
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1, (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-	movq	$0, %r12
-	movq	$0, %r13
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-	cmovc	p7(%rip), %rsi
-	cmovc	p8(%rip), %r12
-	cmovc	p9(%rip), %r13
-
-	addq	%rax,  0(%rdi)
-	adcq	%rcx,  8(%rdi)
-	adcq	%r8,  16(%rdi)
-	adcq	%r9,  24(%rdi)
-	adcq	%r10, 32(%rdi)
-	adcq	%r11, 40(%rdi)
-	adcq	%rdx, 48(%rdi)
-	adcq	%rsi, 56(%rdi)
-	adcq	%r12, 64(%rdi)
-	adcq	%r13, 72(%rdi)
-
-	pop		%r13
-	pop		%r12
-	ret
-
-cdecl(fp_subd_low):
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_subc_low):
-	push	%r12
-	push	%r13
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-	movq	$0, %r12
-	movq	$0, %r13
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rsi
-	cmovc	p7(%rip), %rdx
-	cmovc	p8(%rip), %r12
-	cmovc	p9(%rip), %r13
-
-	addq	%rax,  80(%rdi)
-	adcq	%rcx,  88(%rdi)
-	adcq	%r8,   96(%rdi)
-	adcq	%r9,  104(%rdi)
-	adcq	%r10, 112(%rdi)
-	adcq	%r11, 120(%rdi)
-	adcq	%rsi, 128(%rdi)
-	adcq	%rdx, 136(%rdi)
-	adcq	%r12, 144(%rdi)
-	adcq	%r13, 152(%rdi)
-
-	pop		%r13
-	pop		%r12
-	ret
-
-cdecl(fp_negm_low):
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    or 	    56(%rsi), %r8
-    or 	    64(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-	sbbq 	48(%rsi), %r8
-	movq 	%r8     , 48(%rdi)
-    cmovnz 	p7(%rip), %r8
-	sbbq 	56(%rsi), %r8
-	movq 	%r8     , 56(%rdi)
-    cmovnz 	p8(%rip), %r8
-	sbbq 	64(%rsi), %r8
-	movq 	%r8     , 64(%rdi)
-    cmovnz 	p9(%rip), %r8
-	sbbq 	72(%rsi), %r8
-	movq 	%r8     , 72(%rdi)
-  	ret
-
-cdecl(fp_dbln_low):
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-cdecl(fp_dblm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-	movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-	movq	56(%rsi), %r15
-	adcq	%r15    , %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rsi), %rax
-	adcq	%rax    , %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-	movq	72(%rsi), %rcx
-	adcq	%rcx    , %rcx
-	movq	%rcx    , 32(%rdi)
-	movq	%rcx    , 40(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-	movq	%r15, %rdi
-
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-	movq	40(%rdi), %r15
-	sbbq	p9(%rip), %r15
-	movq	%r15, 40(%rdi)
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-	cmovnc  40(%rdi), %rcx
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	movq	%rcx, 72(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_hlvm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rbp
-	movq	$P9, %rbx
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rbp
-	cmovz	%rdx, %rbx
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-	movq	56(%rsi), %rdx
-	adcq	%rdx    , %r15
-	movq	64(%rsi), %rdx
-	adcq	%rdx    , %rbp
-	mov	72(%rsi), %rdx
-	adcq	%rdx    ,%rbx
-
-	rcrq	$1, %rbx
-	rcrq    $1, %rbp
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rbp, 64(%rdi)
-	movq	%rbx, 72(%rdi)
-	xorq	%rax, %rax
-
-	pop     %rbx
-	pop	%rbp
-	pop	%r15
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp_hlvd_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rax
-	movq	$P9, %rbx
-
-  	movq 	$1     ,%rbp
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rbp
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rax
-	cmovz	%rdx, %rbx
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	adcq	64(%rsi) , %rax
-	adcq	72(%rsi) , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-
-	push	%rbp
-
-	movq	104(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 104(%rdi)
-	movq	112(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 112(%rdi)
-	movq	120(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 120(%rdi)
-	movq	128(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 128(%rdi)
-	movq	136(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 136(%rdi)
-	movq	144(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 144(%rdi)
-	movq	152(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 152(%rdi)
-
-	pop		%rbp
-
-	rcrq	$1, 152(%rdi)
-	rcrq	$1, 144(%rdi)
-	rcrq	$1, 136(%rdi)
-	rcrq	$1, 128(%rdi)
-	rcrq	$1, 120(%rdi)
-	rcrq	$1, 112(%rdi)
-	rcrq	$1, 104(%rdi)
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.c
deleted file mode 100644
index 4d5e493d53b1..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "gmp.h"
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.s
deleted file mode 100644
index 1650e30a6f14..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_muln_low)
-.global cdecl(fp_mulm_low)
-
-cdecl(fp_muln_low):
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-cdecl(fp_mulm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$160, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$160, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.c
deleted file mode 100644
index 620678a139e8..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] ^ sform[i]) >= 0) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] ^ sform[0]) >= 0) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_add(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.s
deleted file mode 100644
index 4e8e69b71ed5..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_sqr_low.c
deleted file mode 100644
index f0c879cd5045..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.c
deleted file mode 100755
index 536c40ca8c3a..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field modular reduction functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_rdcn_low(fp3_t c, dv3_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-	fp_rdcn_low(c[2], a[2]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.s
deleted file mode 100644
index 8a3c436ff27b..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-638/relic_fpx_rdc_low.s
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp2_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp2_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-	addq $(8*RLC_FP_DIGS), %rdi
-	addq $(8*RLC_DV_DIGS), %rsi
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-6l/CMakeLists.txt
deleted file mode 100755
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-6l/macro.s
deleted file mode 100644
index e477e69ede3e..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/macro.s
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#if FP_PRIME == 381
-#define P0	0xB9FEFFFFFFFFAAAB
-#define P1	0x1EABFFFEB153FFFF
-#define P2	0x6730D2A0F6B0F624
-#define P3	0x64774B84F38512BF
-#define P4	0x4B1BA7B6434BACD7
-#define P5	0x1A0111EA397FE69A
-#define U0	0x89F3FFFCFFFCFFFD
-#elif FP_PRIME == 382
-#define P0	0x004E000000000013
-#define P1	0x09480097801382BE
-#define P2	0xA6E58DBE43002A06
-#define P3	0x6F82CEFBE47879BB
-#define P4	0x2D996CC179C6D166
-#define P5	0x24009015183F9489
-#define U0	0xDF615E50D79435E5
-#elif FP_PRIME == 383
-#define P0	0xDA371D6485AAB0AB
-#define P1	0x7A8C3F298A64852B
-#define P2	0xAC31B801696124F4
-#define P3	0xA0AD462CF365A511
-#define P4	0xA06DADC41FEA9284
-#define P5	0x5565569564AB6EB5
-#define U0	0x69BC0571073435FD
-#endif
-
-.text
-
-.macro ADD1 i j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro ADDN i j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUB1 i j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUBN i j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro DBLN i j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	1, 5, 1, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	2, 5, 2, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	3, 5, 3, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	4, 5, 4, \C, \R2, \R0, \R1, \A, \B
-
-	movq	40(\A),%rax
-	mulq	40(\B)
-	addq	%rax  ,\R0
-	movq	\R0   ,80(\C)
-	adcq	%rdx  ,\R1
-	movq	\R1   ,88(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN1	1, 5, \R0, \R1, \R2, \A, \P
-	RDCN1	2, 5, \R1, \R2, \R0, \A, \P
-	RDCN1	3, 5, \R2, \R0, \R1, \A, \P
-	RDCN1	4, 5, \R0, \R1, \R2, \A, \P
-	RDCN1	5, 5, \R1, \R2, \R0, \A, \P
-	addq	8*11(\A), \R2
-	movq	\R2, 8*11(\A)
-
-	movq	48(\A), %r11
-	movq	56(\A), %r12
-	movq	64(\A), %r13
-	movq	72(\A), %r14
-	movq	80(\A), %r15
-	movq	88(\A), %rcx
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-
-	cmovc	48(\A), %r11
-	cmovc	56(\A), %r12
-	cmovc	64(\A), %r13
-	cmovc	72(\A), %r14
-	cmovc	80(\A), %r15
-	cmovc	88(\A), %rcx
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_add_low.s
deleted file mode 100644
index d49e8438f7d0..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_add_low.s
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-
-#if OPSYS != WINDOWS
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-
-#endif
-
-.text
-
-.global fp_add1_low
-.global fp_addn_low
-.global fp_addm_low
-.global fp_addd_low
-.global fp_addc_low
-.global fp_sub1_low
-.global fp_subn_low
-.global fp_subm_low
-.global fp_subd_low
-.global fp_subc_low
-.global fp_negm_low
-.global fp_dbln_low
-.global fp_dblm_low
-.global fp_hlvm_low
-.global fp_hlvd_low
-
-fp_add1_low:
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1 1 (RLC_FP_DIGS - 1)
-	xorq	%rax, %rax
-
-	ret
-
-fp_addn_low:
-	xorq	%rax, %rax
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (RLC_FP_DIGS - 1)
-
-	adcq    $0, %rax
-
-	ret
-
-bn_incp_low:
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1 1 (RLC_FP_DIGS)
-	xorq	%rax, %rax
-
-	ret
-
-.global bn_addp_low
-bn_addp_low:
-	xorq	%rax, %rax
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (RLC_FP_DIGS)
-
-	adcq    $0, %rax
-
-	ret
-
-fp_addm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_addd_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addc_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1 (RLC_FP_DIGS - 1)
-
-	movq     48(%rsi), %r8
-	adcq     48(%rdx), %r8
-	movq     56(%rsi), %r9
-	adcq     56(%rdx), %r9
-	movq     64(%rsi), %r10
-	adcq     64(%rdx), %r10
-	movq     72(%rsi), %r11
-	adcq     72(%rdx), %r11
-	movq     80(%rsi), %r12
-	adcq     80(%rdx), %r12
-	movq     88(%rsi), %r13
-	adcq     88(%rdx), %r13
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-
-	movq	%r8 , 48(%rdi)
-	movq	%r9 , 56(%rdi)
-	movq	%r10, 64(%rdi)
-	movq	%r11, 72(%rdi)
-	movq	%r12, 80(%rdi)
-	movq	%r13, 88(%rdi)
-	xorq	%rax, %rax
-
-	pop	%r13
-	pop	%r12
-	pop	%rbp
-	pop	%rbx
-	ret
-
-fp_sub1_low:
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1 (RLC_FP_DIGS - 1)
-	xorq	%rax, %rax
-
-	ret
-
-fp_subn_low:
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 1 (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-fp_subm_low:
-    push	%rbx
-    push	%rbp
-    push	%r12
-    push	%r13
-
-    movq	 0(%rsi), %r8
-    subq	 0(%rdx), %r8
-    movq	 8(%rsi), %r9
-    sbbq	 8(%rdx), %r9
-    movq	16(%rsi), %r10
-    sbbq	16(%rdx), %r10
-    movq	24(%rsi), %r11
-    sbbq	24(%rdx), %r11
-    movq	32(%rsi), %r12
-    sbbq	32(%rdx), %r12
-    movq	40(%rsi), %r13
-    sbbq	40(%rdx), %r13
-
-    movq 	$0, %rax
-    movq 	$0, %rcx
-    movq 	$0, %rdx
-    movq 	$0, %rsi
-    movq	$0, %rbx
-    movq	$0, %rbp
-
-    cmovc	p0(%rip), %rax
-    cmovc	p1(%rip), %rcx
-    cmovc	p2(%rip), %rdx
-    cmovc	p3(%rip), %rsi
-    cmovc	p4(%rip), %rbx
-    cmovc	p5(%rip), %rbp
-
-    addq	%rax, %r8
-    adcq	%rcx, %r9
-    adcq	%rdx, %r10
-    adcq	%rsi, %r11
-    adcq	%rbx, %r12
-    adcq	%rbp, %r13
-
-    movq	%r8 ,  0(%rdi)
-    movq	%r9 ,  8(%rdi)
-    movq	%r10, 16(%rdi)
-    movq	%r11, 24(%rdi)
-    movq	%r12, 32(%rdi)
-    movq	%r13, 40(%rdi)
-
-    pop		%r13
-    pop		%r12
-    pop		%rbp
-    pop		%rbx
-    ret
-
-fp_subd_low:
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subc_low:
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-
-	addq	%rax, 48(%rdi)
-	adcq	%rcx, 56(%rdi)
-	adcq	%r8,  64(%rdi)
-	adcq	%r9,  72(%rdi)
-	adcq	%r10, 80(%rdi)
-	adcq	%r11, 88(%rdi)
-
-	ret
-
-fp_negm_low:
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-  	ret
-
-fp_dbln_low:
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-fp_dblm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	xorq	%rax, %rax
-
-	pop	%r13
-	pop	%r12
-	pop	%rbp
-	pop	%rbx
-	ret
-
-fp_hlvm_low:
-	push	%r12
-	push	%r13
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r13
-	pop		%r12
-	ret
-
-fp_hlvd_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	movq	48(%rsi) , %r14
-	adcq	$0       , %r14
-	movq	56(%rsi) , %r15
-	adcq	$0       , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_inv_low.c
deleted file mode 100644
index b3276603e221..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_inv_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.c
deleted file mode 100644
index badc7665e1c0..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.s
deleted file mode 100644
index 20e20f6505fe..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_mul_low.s
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @version $Id: relic_fp_mul_low.c 683 2011-03-10 23:51:23Z dfaranha $
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global fp_muln_low
-.global fp_mulm_low
-
-fp_muln_low:
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-fp_mulm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$96, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$96, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.c
deleted file mode 100644
index 0bf759769a48..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t _r[2 * RLC_FP_DIGS], r[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, b0, d0, b1, d1;
-	dig_t carry;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	carry = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			if (sform[i] > 0) {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		if (sform[0] > 0) {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-
-		dv_copy(_r, _q, first);
-		if (b0 > 0) {
-			_r[first - 1] &= RLC_MASK(b0);
-		}
-		carry = fp_addn_low(r, r, _r);
-		if (carry) {
-			fp_subn_low(r, r, m);
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.s
deleted file mode 100644
index 04df8c0a5958..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global fp_rdcn_low
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-fp_rdcn_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.c
deleted file mode 100644
index f240db5f4325..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.s
deleted file mode 100644
index 26dacc6fd455..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_shift_low.s
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-.text
-.global fp_rsh1_low
-.global fp_lsh1_low
-
-fp_rsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	shrd	$1, %r9, %r8
-	shrd	$1, %r10, %r9
-	shrd	$1, %r11, %r10
-	shrd	$1, %rax, %r11
-	shrd	$1, %rcx, %rax
-	shr	    $1, %rcx
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	ret
-
-fp_lsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	shld	$1, %rax, %rcx
-	shld	$1, %r11, %rax
-	shld	$1, %r10, %r11
-	shld	$1, %r9, %r10
-	shld	$1, %r8, %r9
-	shl     $1, %r8
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	xorq	%rax, %rax
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_sqr_low.c
deleted file mode 100644
index f0c879cd5045..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-6l/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2017 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-8l/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/macro.s
deleted file mode 100644
index af7492df8788..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/macro.s
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-#if FP_PRIME == 511
-#define P0	0x84DD401C8E4AB001
-#define P1	0x98707BD8B8D7F1F5
-#define P2	0x9BF81D9D036E1774
-#define P3	0xF876F2BD37381003
-#define P4	0x441981CA1F41B974
-#define P5	0x82C290A0001383DF
-#define P6	0x0000031F8F000000
-#define P7	0x4000000000156000
-#define U0	0xDF085042554AAFFF
-#else
-#define P0	0xA13D118DB8BFD2AB
-#define P1	0xEE63BD076E8D9300
-#define P2	0xCFCB5C6071BAD3D2
-#define P3	0x626E85BF7C18A0F0
-#define P4	0x32EA0103E01090BB
-#define P5	0xCB8AC8495D187E8C
-#define P6	0xFCEDF2B4F9C0ECF6
-#define P7	0x155556FFFF39CA9B
-#define U0	0x6EFA1180A5FE67FD
-#endif
-
-.text
-
-.macro ADD1 i j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro ADDN i j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUB1 i j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)" \j
-	.endif
-.endm
-
-.macro SUBN i j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro DBLN i j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)" \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 7, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	1, 7, 1, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	2, 7, 2, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	3, 7, 3, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	4, 7, 4, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	5, 7, 5, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	6, 7, 6, \C, \R0, \R1, \R2, \A, \B
-
-	movq	56(\A),%rax
-	mulq	56(\B)
-	addq	%rax  ,\R1
-	movq	\R1   ,112(\C)
-	adcq	%rdx  ,\R2
-	movq	\R2   ,120(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	1, 7, \R2, \R0, \R1, \A, \P
-	RDCN1	2, 7, \R0, \R1, \R2, \A, \P
-	RDCN1	3, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	4, 7, \R2, \R0, \R1, \A, \P
-	RDCN1	5, 7, \R0, \R1, \R2, \A, \P
-	RDCN1	6, 7, \R1, \R2, \R0, \A, \P
-	RDCN1	7, 7, \R2, \R0, \R1, \A, \P
-	addq	8*15(\A), \R0
-	movq	\R0, 120(\A)
-
-	movq	64(\A), %r11
-	movq	72(\A), %r12
-	movq	80(\A), %r13
-	movq	88(\A), %r14
-	movq	96(\A), %r15
-	movq	104(\A), %rcx
-	movq	112(\A), %rbp
-	movq	120(\A), %rdx
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-	sbbq	p7(%rip), %rdx
-
-	cmovc	64(\A), %r11
-	cmovc	72(\A), %r12
-	cmovc	80(\A), %r13
-	cmovc	88(\A), %r14
-	cmovc	96(\A), %r15
-	cmovc	104(\A), %rcx
-	cmovc	112(\A), %rbp
-	cmovc	120(\A), %rdx
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-	movq	%rdx,56(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_add_low.s
deleted file mode 100644
index ded7cb8e3601..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_add_low.s
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-p7: .quad P7
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-.global p7
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-.hidden p7
-
-.text
-
-.global fp_add1_low
-.global fp_addn_low
-.global fp_addm_low
-.global fp_addd_low
-.global fp_addc_low
-.global fp_sub1_low
-.global fp_subn_low
-.global fp_subm_low
-.global fp_subd_low
-.global fp_subc_low
-.global fp_negm_low
-.global fp_dbln_low
-.global fp_dblm_low
-.global fp_hlvm_low
-.global fp_hlvd_low
-
-fp_add1_low:
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1 1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addn_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-fp_addm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-	movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-	movq	56(%rdx), %r15
-	adcq	56(%rsi), %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-
-	movq	8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_addd_low:
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_addc_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1 (RLC_FP_DIGS - 1)
-
-	movq     64(%rsi), %r8
-	adcq     64(%rdx), %r8
-	movq     72(%rsi), %r9
-	adcq     72(%rdx), %r9
-	movq     80(%rsi), %r10
-	adcq     80(%rdx), %r10
-	movq     88(%rsi), %r11
-	adcq     88(%rdx), %r11
-	movq     96(%rsi), %r12
-	adcq     96(%rdx), %r12
-	movq    104(%rsi), %r13
-	adcq    104(%rdx), %r13
-	movq    112(%rsi), %r14
-	adcq    112(%rdx), %r14
-	movq    120(%rsi), %r15
-	adcq    120(%rdx), %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-	mov		8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  64(%rdi)
-	movq	%r9 ,  72(%rdi)
-	movq	%r10,  80(%rdi)
-	movq	%r11,  88(%rdi)
-	movq	%r12,  96(%rdi)
-	movq	%r13, 104(%rdi)
-	movq	%r14, 112(%rdi)
-	movq	%r15, 120(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_sub1_low:
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1 (RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subn_low:
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 1 (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-fp_subm_low:
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1 (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-	cmovc	p7(%rip), %rsi
-
-    addq	%rax,  0(%rdi)
-    adcq	%rcx,  8(%rdi)
-    adcq	%r8,  16(%rdi)
-    adcq	%r9,  24(%rdi)
-    adcq	%r10, 32(%rdi)
-    adcq	%r11, 40(%rdi)
-    adcq	%rdx, 48(%rdi)
-    adcq	%rsi, 56(%rdi)
-
-	ret
-
-fp_subd_low:
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-fp_subc_low:
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1 (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rsi
-	cmovc	p7(%rip), %rdx
-
-    addq	%rax,  64(%rdi)
-    adcq	%rcx,  72(%rdi)
-    adcq	%r8,   80(%rdi)
-    adcq	%r9,   88(%rdi)
-    adcq	%r10,  96(%rdi)
-    adcq	%r11, 104(%rdi)
-    adcq	%rsi, 112(%rdi)
-    adcq	%rdx, 120(%rdi)
-
-	ret
-
-fp_negm_low:
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    or 	    56(%rsi), %r8
-    test    %r8, %r8
-	cmovnz 	p0(%rip), %r8
-	subq 	0(%rsi) , %r8
-	movq 	%r8     , 0(%rdi)
-	cmovnz 	p1(%rip), %r8
-	sbbq 	8(%rsi) , %r8
-	movq 	%r8     , 8(%rdi)
-	cmovnz 	p2(%rip), %r8
-	sbbq 	16(%rsi), %r8
-	movq 	%r8     , 16(%rdi)
-	cmovnz 	p3(%rip), %r8
-	sbbq 	24(%rsi), %r8
-	movq 	%r8     , 24(%rdi)
-	cmovnz 	p4(%rip), %r8
-	sbbq 	32(%rsi), %r8
-	movq 	%r8     , 32(%rdi)
-	cmovnz 	p5(%rip), %r8
-	sbbq 	40(%rsi), %r8
-	movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-	sbbq 	48(%rsi), %r8
-	movq 	%r8     , 48(%rdi)
-    cmovnz 	p7(%rip), %r8
-	sbbq 	56(%rsi), %r8
-	movq 	%r8     , 56(%rdi)
-  	ret
-
-fp_dbln_low:
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 1 (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-fp_dblm_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	subq	$16, %rsp
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-	movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-	movq	56(%rsi), %r15
-	adcq	%r15    , %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-	movq	%r15, 0(%rsp)
-	movq	%r15, 8(%rsp)
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-	sbbq	p7(%rip), %r15
-	movq	%r15, 0(%rsp)
-	movq	8(%rsp), %r15
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	cmovnc	0(%rsp), %r15
-
-	addq	$16, %rsp
-	pop		%rdi
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-fp_hlvm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-	movq	56(%rsi), %rdx
-	adcq	%rdx    , %r15
-
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
-/*
-fp_hlvd_low2:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-	movq	%rsp, b0
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-	movq	104(%rsi), %rsi
-	adcq	$0       , %rsi
-	movq	112(%rsi), %rsi
-	adcq	$0       , %rsi
-	movq	120(%rsi), %rsp
-	adcq	$0       , %rsp
-
-	rcrq	$1, %rdi
-  	rcrq 	$1, %rsp
-  	rcrq	$1, %rsi
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	xchgq	b0  , %rsp
-	movq	%rdi, b1
-	pop		%rdi
-
-	xchgq	b1  , %rsp
-  	movq 	%rsp, 120(%rdi)
-	xchgq	b0  , %rsp
-  	movq	%rsp, 112(%rdi)
-	xchgq	b1  , %rsp
-  	movq 	%rsi, 104(%rdi)
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-*/
-fp_hlvd_low:
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	movq	64(%rsi) , %rax
-	adcq	$0       , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-
-	push	%rbp
-
-	movq	104(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 104(%rdi)
-	movq	112(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 112(%rdi)
-	movq	120(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 120(%rdi)
-
-	pop		%rbp
-
-	rcrq	$1, 120(%rdi)
-	rcrq	$1, 112(%rdi)
-	rcrq	$1, 104(%rdi)
-  	rcrq	$1, %rbp
-  	rcrq 	$1, %rdx
-  	rcrq 	$1, %rcx
-  	rcrq 	$1, %rbx
-  	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-  	movq 	%rbp, 96(%rdi)
-  	movq 	%rdx, 88(%rdi)
-  	movq 	%rcx, 80(%rdi)
-  	movq 	%rbx, 72(%rdi)
-  	movq 	%rax, 64(%rdi)
-  	movq 	%r15, 56(%rdi)
-  	movq 	%r14, 48(%rdi)
-  	movq 	%r13, 40(%rdi)
-  	movq 	%r12, 32(%rdi)
-  	movq 	%r11, 24(%rdi)
-  	movq 	%r10, 16(%rdi)
-  	movq 	%r9 ,  8(%rdi)
-  	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.c
deleted file mode 100644
index 6d56114bbe79..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level inversion functions.
- *
- * @&version $Id$
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	mp_size_t cn;
-	rlc_align dig_t s[RLC_FP_DIGS], t[2 * RLC_FP_DIGS], u[RLC_FP_DIGS + 1];
-
-#if FP_RDC == MONTY
-	dv_zero(t + RLC_FP_DIGS, RLC_FP_DIGS);
-	dv_copy(t, a, RLC_FP_DIGS);
-	fp_rdcn_low(u, t);
-#else
-	fp_copy(u, a);
-#endif
-
-	dv_copy(s, fp_prime_get(), RLC_FP_DIGS);
-
-	mpn_gcdext(t, c, &cn, u, RLC_FP_DIGS, s, RLC_FP_DIGS);
-	if (cn < 0) {
-		dv_zero(c - cn, RLC_FP_DIGS + cn);
-		mpn_sub_n(c, fp_prime_get(), c, RLC_FP_DIGS);
-	} else {
-		dv_zero(c + cn, RLC_FP_DIGS - cn);
-	}
-
-#if FP_RDC == MONTY
-	dv_zero(t, RLC_FP_DIGS);
-	dv_copy(t + RLC_FP_DIGS, c, RLC_FP_DIGS);
-	mpn_tdiv_qr(u, c, 0, t, 2 * RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.s
deleted file mode 100644
index 2be825dfd809..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_inv_low.s
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level in&version functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/* No carry */
-.macro _DBL R, i
-	movq	\i+0(\R), %rdx
-	addq	%rdx, \i+0(\R)
-	movq	\i+8(\R), %rdx
-	adcq	%rdx, \i+8(\R)
-	movq	\i+16(\R), %rdx
-	adcq	%rdx, \i+16(\R)
-	movq	\i+24(\R), %rdx
-	adcq	%rdx, \i+24(\R)
-	movq	\i+32(\R), %rdx
-	adcq	%rdx, \i+32(\R)
-	movq	\i+40(\R), %rdx
-	adcq	%rdx, \i+40(\R)
-	movq	\i+48(\R), %rdx
-	adcq	%rdx, \i+48(\R)
-	movq	\i+56(\R), %rdx
-	adcq	%rdx, \i+56(\R)
-.endm
-
-.global fp_invn_asm
-
-/**
- * rdi = x1, rsi = a
- */
-fp_invn_asm:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-	subq 	$256, %rsp
-
-	/* v = p. */
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-
-	/* rsp[0..7] = u = a. */
-	movq	0(%rsi),%rax
-	movq	%rax,0(%rsp)
-	movq	8(%rsi),%rax
-	movq	%rax,8(%rsp)
-	movq	16(%rsi),%rax
-	movq	%rax,16(%rsp)
-	movq	24(%rsi),%rax
-	movq	%rax,24(%rsp)
-	movq	32(%rsi),%rax
-	movq	%rax,32(%rsp)
-	movq	40(%rsi),%rax
-	movq	%rax,40(%rsp)
-	movq	48(%rsi),%rax
-	movq	%rax,48(%rsp)
-	movq	56(%rsi),%rax
-	movq	%rax,56(%rsp)
-	xorq	%rax, %rax
-
-	/* rsp[7..15] = x1 = 1. */
-	movq	$1,64(%rsp)
-	movq	$0,72(%rsp)
-	movq	$0,80(%rsp)
-	movq	$0,88(%rsp)
-	movq	$0,96(%rsp)
-	movq	$0,104(%rsp)
-	movq	$0,112(%rsp)
-	movq	$0,120(%rsp)
-
-	/* rsp[16..23] = x2 = 0. */
-	movq	$0,128(%rsp)
-	movq	$0,136(%rsp)
-	movq	$0,144(%rsp)
-	movq	$0,152(%rsp)
-	movq	$0,160(%rsp)
-	movq	$0,168(%rsp)
-	movq	$0,176(%rsp)
-	movq	$0,184(%rsp)
-
-loop:
-	movq	%r8,%rdx
-	orq		%r9,%rdx
-	orq		%r10,%rdx
-	orq		%r11,%rdx
-	orq		%r12,%rdx
-	orq		%r13,%rdx
-	orq		%r14,%rdx
-	orq		%r15,%rdx
-	jz		end
-
-	inc		%rax
-	test	$1, %r8
-	jnz 	v_odd
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	/* fp_dbln_low(x1). */
-	_DBL 	%rsp, 64
-	jmp 	loop
-v_odd:
-	movq	0(%rsp),%rdx
-	test	$1, %rdx
-	jnz 	u_odd
-
-	/* fp_rsh1_low(u). */
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	/* fp_dbln_low(x2). */
-	_DBL	%rsp, 128
-	jmp 	loop
-u_odd:
-	subq	0(%rsp), %r8
-	sbbq	8(%rsp), %r9
-	sbbq	16(%rsp), %r10
-	sbbq	24(%rsp), %r11
-	sbbq	32(%rsp), %r12
-	sbbq	40(%rsp), %r13
-	sbbq	48(%rsp), %r14
-	sbbq	56(%rsp), %r15
-	jc 		cmp_lt
-
-	/* fp_rsh1_low(v). */
-	shrd    $1, %r9, %r8
-	shrd    $1, %r10, %r9
-	shrd    $1, %r11, %r10
-	shrd    $1, %r12, %r11
-	shrd    $1, %r13, %r12
-	shrd    $1, %r14, %r13
-	shrd    $1, %r15, %r14
-	shr		$1, %r15
-
-	movq	64(%rsp), %rdx
-	addq	%rdx, 128(%rsp)
-	movq	72(%rsp), %rdx
-	adcq	%rdx, 136(%rsp)
-	movq	80(%rsp), %rdx
-	adcq	%rdx, 144(%rsp)
-	movq	88(%rsp), %rdx
-	adcq	%rdx, 152(%rsp)
-	movq	96(%rsp), %rdx
-	adcq	%rdx, 160(%rsp)
-	movq	104(%rsp), %rdx
-	adcq	%rdx, 168(%rsp)
-	movq	112(%rsp), %rdx
-	adcq	%rdx, 176(%rsp)
-	movq	120(%rsp), %rdx
-	adcq	%rdx, 184(%rsp)
-
-	_DBL 	%rsp, 64
-	jmp 	loop
-cmp_lt:
-	addq	0(%rsp), %r8
-	adcq	8(%rsp), %r9
-	adcq	16(%rsp), %r10
-	adcq	24(%rsp), %r11
-	adcq	32(%rsp), %r12
-	adcq	40(%rsp), %r13
-	adcq	48(%rsp), %r14
-	adcq	56(%rsp), %r15
-
-	subq	%r8, 0(%rsp)
-	sbbq	%r9, 8(%rsp)
-	sbbq	%r10, 16(%rsp)
-	sbbq	%r11, 24(%rsp)
-	sbbq	%r12, 32(%rsp)
-	sbbq	%r13, 40(%rsp)
-	sbbq	%r14, 48(%rsp)
-	sbbq	%r15, 56(%rsp)
-
-	movq	8(%rsp), %rdx
-	shrd    $1, %rdx, 0(%rsp)
-	movq	16(%rsp), %rdx
-	shrd    $1, %rdx, 8(%rsp)
-	movq	24(%rsp), %rdx
-	shrd    $1, %rdx, 16(%rsp)
-	movq	32(%rsp), %rdx
-	shrd    $1, %rdx, 24(%rsp)
-	movq	40(%rsp), %rdx
-	shrd    $1, %rdx, 32(%rsp)
-	movq	48(%rsp), %rdx
-	shrd    $1, %rdx, 40(%rsp)
-	movq	56(%rsp), %rdx
-	shrd    $1, %rdx, 48(%rsp)
-	shr		$1, %rdx
-	movq	%rdx, 56(%rsp)
-
-	movq	128(%rsp), %rdx
-	addq	%rdx, 64(%rsp)
-	movq	136(%rsp), %rdx
-	adcq	%rdx, 72(%rsp)
-	movq	144(%rsp), %rdx
-	adcq	%rdx, 80(%rsp)
-	movq	152(%rsp), %rdx
-	adcq	%rdx, 88(%rsp)
-	movq	160(%rsp), %rdx
-	adcq	%rdx, 96(%rsp)
-	movq	168(%rsp), %rdx
-	adcq	%rdx, 104(%rsp)
-	movq	176(%rsp), %rdx
-	adcq	%rdx, 112(%rsp)
-	movq	184(%rsp), %rdx
-	adcq	%rdx, 120(%rsp)
-
-	_DBL 	%rsp, 128
-	jmp 	loop
-end:
-	movq	64(%rsp), %r9
-	movq	%r9, 0(%rdi)
-	movq	72(%rsp), %r9
-	movq	%r9, 8(%rdi)
-	movq	80(%rsp), %r9
-	movq	%r9, 16(%rdi)
-	movq	88(%rsp), %r9
-	movq	%r9, 24(%rdi)
-	movq	96(%rsp), %r9
-	movq	%r9, 32(%rdi)
-	movq	104(%rsp), %r9
-	movq	%r9, 40(%rdi)
-	movq	112(%rsp), %r9
-	movq	%r9, 48(%rdi)
-	movq	120(%rsp), %r9
-	movq	%r9, 56(%rdi)
-exit:
-	addq 	$256, %rsp
-	pop		%rbx
-	pop		%rbp
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.c
deleted file mode 100644
index 128d98834319..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @version $Id: relic_fp_mul_low.c 683 2011-03-10 23:51:23Z dfaranha $
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.s
deleted file mode 100644
index ed9660ea6f14..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global fp_muln_low
-.global fp_mulm_low
-
-fp_muln_low:
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-fp_mulm_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$128, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$128, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.c
deleted file mode 100644
index 154942d35935..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS];
-	rlc_align dig_t _r[2 * RLC_FP_DIGS], r[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, b0, d0, b1, d1;
-	dig_t carry;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	carry = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			if (sform[i] > 0) {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		if (sform[0] > 0) {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-
-		dv_copy(_r, _q, first);
-		if (b0 > 0) {
-			_r[first - 1] &= RLC_MASK(b0);
-		}
-		carry = fp_addn_low(r, r, _r);
-		if (carry) {
-			fp_subn_low(r, r, m);
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.s
deleted file mode 100644
index 22f6feeef1a2..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global fp_rdcn_low
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-fp_rdcn_low:
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.c b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.c
deleted file mode 100644
index 483de745b0c9..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field shifting functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_lshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_lshift(c, a, RLC_FP_DIGS, bits);
-}
-
-dig_t fp_rshb_low(dig_t *c, const dig_t *a, int bits) {
-	return mpn_rshift(c, a, RLC_FP_DIGS, bits);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.s b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.s
deleted file mode 100644
index bbc09fd22350..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_shift_low.s
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-
-.text
-.global fp_rsh1_low
-.global fp_lsh1_low
-
-fp_rsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	movq	56(%rsi), %rsi
-	shrd	$1, %r9, %r8
-	shrd	$1, %r10, %r9
-	shrd	$1, %r11, %r10
-	shrd	$1, %rax, %r11
-	shrd	$1, %rcx, %rax
-	shrd	$1, %rdx, %rcx
-	shrd	$1, %rsi, %rdx
-	shr		$1, %rsi
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	movq	%rsi,56(%rdi)
-	ret
-
-fp_lsh1_low:
-	movq	0(%rsi), %r8
-	movq	8(%rsi), %r9
-	movq	16(%rsi), %r10
-	movq	24(%rsi), %r11
-	movq	32(%rsi), %rax
-	movq	40(%rsi), %rcx
-	movq	48(%rsi), %rdx
-	movq	56(%rsi), %rsi
-	shld	$1, %rdx, %rsi
-	shld	$1, %rcx, %rdx
-	shld	$1, %rax, %rcx
-	shld	$1, %r11, %rax
-	shld	$1, %r10, %r11
-	shld	$1, %r9, %r10
-	shld	$1, %r8, %r9
-	shl		$1, %r8
-	movq	%r8,0(%rdi)
-	movq	%r9,8(%rdi)
-	movq	%r10,16(%rdi)
-	movq	%r11,24(%rdi)
-	movq	%rax,32(%rdi)
-	movq	%rcx,40(%rdi)
-	movq	%rdx,48(%rdi)
-	movq	%rsi,56(%rdi)
-	xorq	%rax, %rax
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_sqr_low.c
deleted file mode 100644
index c458e3a657b3..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-8l/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-asm-9l/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/macro.s b/src/dashbls/depends/relic/src/low/x64-asm-9l/macro.s
deleted file mode 100644
index 53ef1e00190e..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/macro.s
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of low-level prime field multiplication.
- *
- * @version $Id: relic_fp_add_low.c 88 2009-09-06 21:27:19Z dfaranha $
- * @ingroup fp
- */
-#if FP_PRIME == 575
-#define P0	0xF1E5CEF00AD97EFB
-#define P1	0x86CBB9BA813C985D
-#define P2	0x52064509AC3491BF
-#define P3	0x5E1D4944218EA2D8
-#define P4	0x7514F41A6C701871
-#define P5	0x22696C9FB7A0951F
-#define P6	0x6137D053AA030071
-#define P7	0x392BFDD23348B6A2
-#define P8	0x553D402AE2D5E4BC
-#define U0	0x5A2DD38E5D1B23CD
-#elif FP_PRIME == 569
-#define P0	0xBBD3F32002E191D3
-#define P1	0x2DC3A7B07CECAA81
-#define P2	0x19DB69EB4976E975
-#define P3	0x1D2ECA8F0498A59D
-#define P4	0x28081F9DC91FAF54
-#define P5	0xD2649EBC650544C3
-#define P6	0xFE3BB690BDCF4F4B
-#define P7	0x2C99CC114CD71608
-#define P8	0x011B4A027E91038F
-#define U0	0xBBF153EF2B9A11A5
-#endif
-
-#if defined(__APPLE__)
-#define cdecl(S) _PREFIX(,S)
-#else
-#define cdecl(S) S
-#endif
-
-.text
-
-.macro ADD1 i, j
-	movq	8*\i(%rsi), %r10
-	adcq	$0, %r10
-	movq	%r10, 8*\i(%rdi)
-	.if \i - \j
-		ADD1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro ADDN i, j
-	movq	8*\i(%rdx), %r11
-	adcq	8*\i(%rsi), %r11
-	movq	%r11, 8*\i(%rdi)
-	.if \i - \j
-		ADDN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUB1 i, j
-	movq	8*\i(%rsi),%r10
-	sbbq	$0, %r10
-	movq	%r10,8*\i(%rdi)
-	.if \i - \j
-		SUB1 "(\i + 1)", \j
-	.endif
-.endm
-
-.macro SUBN i, j
-	movq	8*\i(%rsi), %r8
-	sbbq	8*\i(%rdx), %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		SUBN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro DBLN i, j
-	movq	8*\i(%rsi), %r8
-	adcq	%r8, %r8
-	movq	%r8, 8*\i(%rdi)
-	.if \i - \j
-		DBLN "(\i + 1)", \j
-	.endif
-.endm
-
-.macro MULN i, j, k, C, R0, R1, R2, A, B
-	.if \j > \k
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-		MULN	"(\i + 1)", "(\j - 1)", \k, \C, \R0, \R1, \R2, \A, \B
-	.else
-		movq	8*\i(\A), %rax
-		mulq	8*\j(\B)
-		addq	%rax    , \R0
-		movq	\R0     , 8*(\i+\j)(\C)
-		adcq	%rdx    , \R1
-		adcq	$0      , \R2
-	.endif
-.endm
-
-.macro FP_MULN_LOW C, R0, R1, R2, A, B
-	movq 	0(\A),%rax
-	mulq 	0(\B)
-	movq 	%rax ,0(\C)
-	movq 	%rdx ,\R0
-
-	xorq 	\R1,\R1
-	xorq 	\R2,\R2
-	MULN 	0, 1, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 2, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 3, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 4, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 5, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	0, 6, 0, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	0, 7, 0, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	0, 8, 0, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	1, 8, 1, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	2, 8, 2, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	3, 8, 3, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	4, 8, 4, \C, \R2, \R0, \R1, \A, \B
-	xorq 	\R2,\R2
-	MULN	5, 8, 5, \C, \R0, \R1, \R2, \A, \B
-	xorq 	\R0,\R0
-	MULN	6, 8, 6, \C, \R1, \R2, \R0, \A, \B
-	xorq 	\R1,\R1
-	MULN	7, 8, 7, \C, \R2, \R0, \R1, \A, \B
-
-	movq	64(\A),%rax
-	mulq	64(\B)
-	addq	%rax  ,\R0
-	movq	\R0   ,128(\C)
-	adcq	%rdx  ,\R1
-	movq	\R1   ,136(\C)
-.endm
-
-.macro _RDCN0 i, j, k, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > 1
-		_RDCN0 "(\i + 1)", "(\j - 1)", \k, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, %rax
-		mulq	%rcx
-		movq	%rax, 8*\k(\A)
-		mulq	0(\P)
-		addq	%rax , \R0
-		adcq	%rdx , \R1
-		adcq	$0   , \R2
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN0 i, j, R0, R1, R2, A, P
-	_RDCN0	\i, \j, \j, \R0, \R1, \R2, \A, \P
-.endm
-
-.macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-	movq	8*\i(\A), %rax
-	mulq	8*\j(\P)
-	addq	%rax, \R0
-	adcq	%rdx, \R1
-	adcq	$0, \R2
-	.if \j > \l
-		_RDCN1 "(\i + 1)", "(\j - 1)", \k, \l, \R0, \R1, \R2, \A, \P
-	.else
-		addq	8*\k(\A), \R0
-		adcq	$0, \R1
-		adcq	$0, \R2
-		movq	\R0, 8*\k(\A)
-		xorq	\R0, \R0
-	.endif
-.endm
-
-.macro RDCN1 i, j, R0, R1, R2, A, P
-	_RDCN1	\i, \j, "(\i + \j)", \i, \R0, \R1, \R2, \A, \P
-.endm
-
-// r8, r9, r10, r11, r12, r13, r14, r15, rbp, rbx, rsp, //rsi, rdi, //rax, rcx, rdx
-.macro FP_RDCN_LOW C, R0, R1, R2, A, P
-	xorq	\R1, \R1
-	movq	$U0, %rcx
-
-	movq	0(\A), \R0
-	movq	\R0  , %rax
-	mulq	%rcx
-	movq	%rax , 0(\A)
-	mulq	0(\P)
-	addq	%rax , \R0
-	adcq	%rdx , \R1
-	xorq    \R2  , \R2
-	xorq    \R0  , \R0
-
-	RDCN0	0, 1, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 2, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 3, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 4, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 5, \R2, \R0, \R1, \A, \P
-	RDCN0	0, 6, \R0, \R1, \R2, \A, \P
-	RDCN0	0, 7, \R1, \R2, \R0, \A, \P
-	RDCN0	0, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	1, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	2, 8, \R1, \R2, \R0, \A, \P
-	RDCN1	3, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	4, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	5, 8, \R1, \R2, \R0, \A, \P
-	RDCN1	6, 8, \R2, \R0, \R1, \A, \P
-	RDCN1	7, 8, \R0, \R1, \R2, \A, \P
-	RDCN1	8, 8, \R1, \R2, \R0, \A, \P
-	addq	136(\A), \R2
-	movq	\R2, 136(\A)
-
-	movq	72(\A), %r11
-	movq	80(\A), %r12
-	movq	88(\A), %r13
-	movq	96(\A), %r14
-	movq	104(\A), %r15
-	movq	112(\A), %rcx
-	movq	120(\A), %rbp
-	movq	128(\A), %rdx
-	movq	136(\A), %r8
-
-	subq	p0(%rip), %r11
-	sbbq	p1(%rip), %r12
-	sbbq	p2(%rip), %r13
-	sbbq	p3(%rip), %r14
-	sbbq	p4(%rip), %r15
-	sbbq	p5(%rip), %rcx
-	sbbq	p6(%rip), %rbp
-	sbbq	p7(%rip), %rdx
-	sbbq	p8(%rip), %r8
-
-	cmovc	72(\A), %r11
-	cmovc	80(\A), %r12
-	cmovc	88(\A), %r13
-	cmovc	96(\A), %r14
-	cmovc	104(\A), %r15
-	cmovc	112(\A), %rcx
-	cmovc	120(\A), %rbp
-	cmovc	128(\A), %rdx
-	cmovc	136(\A), %r8
-	movq	%r11,0(\C)
-	movq	%r12,8(\C)
-	movq	%r13,16(\C)
-	movq	%r14,24(\C)
-	movq	%r15,32(\C)
-	movq	%rcx,40(\C)
-	movq	%rbp,48(\C)
-	movq	%rdx,56(\C)
-	movq	%r8, 64(\C)
-.endm
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_add_low.s b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_add_low.s
deleted file mode 100644
index 8dc4734b8507..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_add_low.s
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-#include "relic_fp_low.h"
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "macro.s"
-
-.data
-
-p0: .quad P0
-p1: .quad P1
-p2: .quad P2
-p3: .quad P3
-p4: .quad P4
-p5: .quad P5
-p6: .quad P6
-p7: .quad P7
-p8: .quad P8
-
-.global p0
-.global p1
-.global p2
-.global p3
-.global p4
-.global p5
-.global p6
-.global p7
-.global p8
-
-.hidden p0
-.hidden p1
-.hidden p2
-.hidden p3
-.hidden p4
-.hidden p5
-.hidden p6
-.hidden p7
-.hidden p8
-
-.text
-
-.global cdecl(fp_add1_low)
-.global cdecl(fp_addn_low)
-.global cdecl(fp_addm_low)
-.global cdecl(fp_addd_low)
-.global cdecl(fp_addc_low)
-.global cdecl(fp_sub1_low)
-.global cdecl(fp_subn_low)
-.global cdecl(fp_subm_low)
-.global cdecl(fp_subd_low)
-.global cdecl(fp_subc_low)
-.global cdecl(fp_negm_low)
-.global cdecl(fp_dbln_low)
-.global cdecl(fp_dblm_low)
-.global cdecl(fp_hlvm_low)
-.global cdecl(fp_hlvd_low)
-
-cdecl(fp_add1_low):
-	movq	0(%rsi), %r10
-	addq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	ADD1	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addn_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax, %rax
-
-	ret
-
-cdecl(fp_addm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	 0(%rdx), %r8
-	addq	 0(%rsi), %r8
-	movq	 8(%rdx), %r9
-	adcq	 8(%rsi), %r9
-	movq	16(%rdx), %r10
-	adcq	16(%rsi), %r10
-	movq	24(%rdx), %r11
-	adcq	24(%rsi), %r11
-	movq	32(%rdx), %r12
-	adcq	32(%rsi), %r12
-	movq	40(%rdx), %r13
-	adcq	40(%rsi), %r13
-	movq	48(%rdx), %r14
-	adcq	48(%rsi), %r14
-	movq	56(%rdx), %r15
-	adcq	56(%rsi), %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rdx), %rax
-	adcq	64(%rsi), %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-	movq	40(%rdi), %r15
-
-	pop		%rdi
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-	pop		%rdi
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_addd_low):
-	movq	0(%rdx), %r11
-	addq	0(%rsi), %r11
-	movq	%r11   , 0(%rdi)
-
-	ADDN 	1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_addc_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	movq	0(%rsi), %r8
-	addq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	ADDN	1, (RLC_FP_DIGS - 1)
-
-	movq     72(%rsi), %r8
-	adcq     72(%rdx), %r8
-	movq     80(%rsi), %r9
-	adcq     80(%rdx), %r9
-	movq     88(%rsi), %r10
-	adcq     88(%rdx), %r10
-	movq     96(%rsi), %r11
-	adcq     96(%rdx), %r11
-	movq    104(%rsi), %r12
-	adcq    104(%rdx), %r12
-	movq    112(%rsi), %r13
-	adcq    112(%rdx), %r13
-	movq    120(%rsi), %r14
-	adcq    120(%rdx), %r14
-	movq    128(%rsi), %r15
-	adcq    128(%rdx), %r15
-	movq	%r15    , 72(%rdi)
-	movq	%r15    , 80(%rdi)
-	movq	136(%rdx), %rax
-	adcq	136(%rsi), %rax
-	movq	%rax    , 88(%rdi)
-	movq	%rax    , 96(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-
-	movq	%r15, %rdi
-	movq	80(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 80(%rdi)
-	movq	96(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 96(%rdi)
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-	movq	72(%rdi), %r15
-	movq	88(%rdi), %rax
-	cmovnc	80(%rdi), %r15
-	cmovnc	96(%rdi), %rax
-
-	movq	%r8 , 72(%rdi)
-	movq	%r9 , 80(%rdi)
-	movq	%r10, 88(%rdi)
-	movq	%r11, 96(%rdi)
-	movq	%r12, 104(%rdi)
-	movq	%r13, 112(%rdi)
-	movq	%r14, 120(%rdi)
-	movq	%r15, 128(%rdi)
-	movq	%rax, 136(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_sub1_low):
-	movq	0(%rsi), %r10
-	subq	%rdx   , %r10
-	movq	%r10   , 0(%rdi)
-
-	SUB1 	1, (RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_subn_low):
-	xorq	%rax   , %rax
-	movq	0(%rsi), %r11
-	subq	0(%rdx), %r11
-	movq	%r11   , 0(%rdi)
-
-	SUBN 	1, (RLC_FP_DIGS - 1)
-
-	adcq	$0, %rax
-
-	ret
-
-cdecl(fp_subm_low):
-	pushq	%r12
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8    , 0(%rdi)
-
-	SUBN	1, (RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rdx
-	movq	$0, %rsi
-	movq	$0, %r12
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rdx
-	cmovc	p7(%rip), %rsi
-	cmovc	p8(%rip), %r12
-
-	addq	%rax,  0(%rdi)
-	adcq	%rcx,  8(%rdi)
-	adcq	%r8,  16(%rdi)
-	adcq	%r9,  24(%rdi)
-	adcq	%r10, 32(%rdi)
-	adcq	%r11, 40(%rdi)
-	adcq	%rdx, 48(%rdi)
-	adcq	%rsi, 56(%rdi)
-	adcq	%r12, 64(%rdi)
-
-	pop		%r12
-	ret
-
-cdecl(fp_subd_low):
-	movq	0(%rsi), %r8
-	subq	0(%rdx), %r8
-	movq	%r8, 0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 1)
-
-	ret
-
-cdecl(fp_subc_low):
-	push	%r12
-	xorq    %rax,%rax
-	xorq    %rcx,%rcx
-
-	movq    0(%rsi), %r8
-	subq    0(%rdx), %r8
-	movq    %r8,     0(%rdi)
-
-	SUBN 	1, (2 * RLC_FP_DIGS - 1)
-
-	movq	$0, %r8
-	movq	$0, %r9
-	movq	$0, %r10
-	movq	$0, %r11
-	movq	$0, %rsi
-	movq	$0, %rdx
-	movq	$0, %r12
-
-	cmovc	p0(%rip), %rax
-	cmovc	p1(%rip), %rcx
-	cmovc	p2(%rip), %r8
-	cmovc	p3(%rip), %r9
-	cmovc	p4(%rip), %r10
-	cmovc	p5(%rip), %r11
-	cmovc	p6(%rip), %rsi
-	cmovc	p7(%rip), %rdx
-	cmovc	p8(%rip), %r12
-
-	addq	%rax,  72(%rdi)
-	adcq	%rcx,  80(%rdi)
-	adcq	%r8,   88(%rdi)
-	adcq	%r9,   96(%rdi)
-	adcq	%r10, 104(%rdi)
-	adcq	%r11, 112(%rdi)
-	adcq	%rsi, 120(%rdi)
-	adcq	%rdx, 128(%rdi)
-	adcq	%r12, 136(%rdi)
-
-	pop		%r12
-	ret
-
-cdecl(fp_negm_low):
-    movq    0(%rsi) , %r8
-    or 	    8(%rsi) , %r8
-    or 	    16(%rsi), %r8
-    or 	    24(%rsi), %r8
-    or 	    32(%rsi), %r8
-    or 	    40(%rsi), %r8
-    or 	    48(%rsi), %r8
-    or 	    56(%rsi), %r8
-    or 	    64(%rsi), %r8
-    test    %r8, %r8
-    cmovnz 	p0(%rip), %r8
-    subq 	0(%rsi) , %r8
-    movq 	%r8     , 0(%rdi)
-    cmovnz 	p1(%rip), %r8
-    sbbq 	8(%rsi) , %r8
-    movq 	%r8     , 8(%rdi)
-    cmovnz 	p2(%rip), %r8
-    sbbq 	16(%rsi), %r8
-    movq 	%r8     , 16(%rdi)
-    cmovnz 	p3(%rip), %r8
-    sbbq 	24(%rsi), %r8
-    movq 	%r8     , 24(%rdi)
-    cmovnz 	p4(%rip), %r8
-    sbbq 	32(%rsi), %r8
-    movq 	%r8     , 32(%rdi)
-    cmovnz 	p5(%rip), %r8
-    sbbq 	40(%rsi), %r8
-    movq 	%r8     , 40(%rdi)
-    cmovnz 	p6(%rip), %r8
-    sbbq 	48(%rsi), %r8
-    movq 	%r8     , 48(%rdi)
-    cmovnz 	p7(%rip), %r8
-    sbbq 	56(%rsi), %r8
-    movq 	%r8     , 56(%rdi)
-    cmovnz 	p8(%rip), %r8
-    sbbq 	64(%rsi), %r8
-    movq 	%r8     , 64(%rdi)
-    ret
-
-cdecl(fp_dbln_low):
-	movq	0(%rsi), %r8
-	addq	%r8    , %r8
-	movq	%r8    , 0(%rdi)
-
-	DBLN 	1, (RLC_FP_DIGS - 1)
-
-	xorq	%rax,%rax
-	ret
-
-cdecl(fp_dblm_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rdi
-
-	xorq	%rax, %rax
-	xorq	%rcx, %rcx
-	xorq	%rdx, %rdx
-
-	movq	0(%rsi) , %r8
-	addq	%r8     , %r8
-	movq	8(%rsi) , %r9
-	adcq	%r9     , %r9
-	movq	16(%rsi), %r10
-	adcq	%r10    , %r10
-	movq	24(%rsi), %r11
-	adcq	%r11    , %r11
-	movq	32(%rsi), %r12
-	adcq	%r12    , %r12
-	movq	40(%rsi), %r13
-	adcq	%r13    , %r13
-	movq	48(%rsi), %r14
-	adcq	%r14    , %r14
-	movq	56(%rsi), %r15
-	adcq	%r15    , %r15
-	movq	%r15    , 0(%rdi)
-	movq	%r15    , 8(%rdi)
-	movq	64(%rsi), %rax
-	adcq	%rax    , %rax
-	movq	%rax    , 16(%rdi)
-	movq	%rax    , 24(%rdi)
-	movq	72(%rsi), %rcx
-	adcq	%rcx    , %rcx
-	movq	%rcx    , 32(%rdi)
-	movq	%rcx    , 40(%rdi)
-
-	movq	%rdi, %r15
-
-	movq 	%r8 , %rax
-	movq 	%r9 , %rcx
-	movq 	%r10, %rdx
-	movq 	%r11, %rsi
-	movq	%r12, %rbx
-	movq	%r13, %rbp
-	movq	%r14, %rdi
-
-	subq	p0(%rip), %rax
-	sbbq	p1(%rip), %rcx
-	sbbq	p2(%rip), %rdx
-	sbbq	p3(%rip), %rsi
-	sbbq	p4(%rip), %rbx
-	sbbq	p5(%rip), %rbp
-	sbbq	p6(%rip), %rdi
-
-	push	%rdi
-	movq	%r15, %rdi
-
-	movq	8(%rdi), %r15
-	sbbq	p7(%rip), %r15
-	movq	%r15, 8(%rdi)
-	movq	24(%rdi), %r15
-	sbbq	p8(%rip), %r15
-	movq	%r15, 24(%rdi)
-
-	pop		%rdi
-
-	cmovnc	%rax, %r8
-	cmovnc	%rcx, %r9
-	cmovnc	%rdx, %r10
-	cmovnc	%rsi, %r11
-	cmovnc	%rbx, %r12
-	cmovnc	%rbp, %r13
-	cmovnc	%rdi, %r14
-
-	pop		%rdi
-
-	movq	0(%rdi), %r15
-	movq	16(%rdi), %rax
-	movq	32(%rdi), %rcx
-	cmovnc	8(%rdi), %r15
-	cmovnc  24(%rdi), %rax
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rax, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
-
-cdecl(fp_hlvm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push	%rbp
-	push	%rbx
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rbp
-
-  	movq 	$1     ,%rax
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rax
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rbp
-	cmovz	%rdx, %rbx
-
-	addq	%rcx    , %r8
-	movq	8(%rsi) , %rdx
-	adcq	%rdx    , %r9
-	movq	16(%rsi), %rdx
-	adcq	%rdx    , %r10
-	movq	24(%rsi), %rdx
-	adcq	%rdx    , %r11
-	movq	32(%rsi), %rdx
-	adcq	%rdx    , %r12
-	movq	40(%rsi), %rdx
-	adcq	%rdx    , %r13
-	movq	48(%rsi), %rdx
-	adcq	%rdx    , %r14
-	movq	56(%rsi), %rdx
-	adcq	%rdx    , %r15
-	movq	64(%rsi), %rdx
-	adcq	%rdx    , %rbp
-
-	rcrq    $1, %rbp
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-  	rcrq 	$1, %r11
-  	rcrq 	$1, %r10
-  	rcrq 	$1, %r9
-  	rcrq 	$1, %r8
-
-	movq	%r8 ,  0(%rdi)
-	movq	%r9 ,  8(%rdi)
-	movq	%r10, 16(%rdi)
-	movq	%r11, 24(%rdi)
-	movq	%r12, 32(%rdi)
-	movq	%r13, 40(%rdi)
-	movq	%r14, 48(%rdi)
-	movq	%r15, 56(%rdi)
-	movq	%rbp, 64(%rdi)
-	xorq	%rax, %rax
-
-	pop %rbx
-	pop	%rbp
-	pop	%r15
-	pop	%r14
-	pop	%r13
-	pop	%r12
-	ret
-
-cdecl(fp_hlvd_low):
-	push	%rbx
-	push	%rbp
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
-	xorq	%rdx, %rdx
-
-	movq	$P0, %r8
-	movq	$P1, %r9
-	movq	$P2, %r10
-	movq	$P3, %r11
-	movq	$P4, %r12
-	movq	$P5, %r13
-	movq	$P6, %r14
-	movq	$P7, %r15
-	movq	$P8, %rax
-
-  	movq 	$1     ,%rbp
-  	movq 	0(%rsi),%rcx
-  	andq 	%rcx   ,%rbp
-
-	cmovz	%rdx, %r8
-	cmovz	%rdx, %r9
-	cmovz	%rdx, %r10
-	cmovz	%rdx, %r11
-	cmovz	%rdx, %r12
-	cmovz	%rdx, %r13
-	cmovz	%rdx, %r14
-	cmovz	%rdx, %r15
-	cmovz	%rdx, %rax
-
-	addq	%rcx     , %r8
-	adcq	8(%rsi)  , %r9
-	adcq	16(%rsi) , %r10
-	adcq	24(%rsi) , %r11
-	adcq	32(%rsi) , %r12
-	adcq	40(%rsi) , %r13
-	adcq	48(%rsi) , %r14
-	adcq	56(%rsi) , %r15
-	adcq	64(%rsi) , %rax
-	movq	72(%rsi) , %rbx
-	adcq	$0       , %rbx
-	movq	80(%rsi) , %rcx
-	adcq	$0       , %rcx
-	movq	88(%rsi) , %rdx
-	adcq	$0       , %rdx
-	movq	96(%rsi) , %rbp
-	adcq	$0       , %rbp
-
-	push	%rbp
-
-	movq	104(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 104(%rdi)
-	movq	112(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 112(%rdi)
-	movq	120(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 120(%rdi)
-	movq	128(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 128(%rdi)
-	movq	136(%rsi), %rbp
-	adcq	$0       , %rbp
-	movq	%rbp     , 136(%rdi)
-
-	pop		%rbp
-
-	rcrq	$1, 136(%rdi)
-	rcrq	$1, 128(%rdi)
-	rcrq	$1, 120(%rdi)
-	rcrq	$1, 112(%rdi)
-	rcrq	$1, 104(%rdi)
-	rcrq	$1, %rbp
-	rcrq 	$1, %rdx
-	rcrq 	$1, %rcx
-	rcrq 	$1, %rbx
-	rcrq 	$1, %rax
-	rcrq 	$1, %r15
-	rcrq 	$1, %r14
-	rcrq 	$1, %r13
-	rcrq 	$1, %r12
-	rcrq 	$1, %r11
-	rcrq 	$1, %r10
-	rcrq 	$1, %r9
-	rcrq 	$1, %r8
-
-	movq 	%rbp, 96(%rdi)
-	movq 	%rdx, 88(%rdi)
-	movq 	%rcx, 80(%rdi)
-	movq 	%rbx, 72(%rdi)
-	movq 	%rax, 64(%rdi)
-	movq 	%r15, 56(%rdi)
-	movq 	%r14, 48(%rdi)
-	movq 	%r13, 40(%rdi)
-	movq 	%r12, 32(%rdi)
-	movq 	%r11, 24(%rdi)
-	movq 	%r10, 16(%rdi)
-	movq 	%r9 ,  8(%rdi)
-	movq 	%r8 ,  0(%rdi)
-
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	pop		%rbp
-	pop		%rbx
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.c
deleted file mode 100644
index c0731b9ff302..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "gmp.h"
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.s b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.s
deleted file mode 100644
index cdd3d2af5035..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_mul_low.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_muln_low)
-.global cdecl(fp_mulm_low)
-
-cdecl(fp_muln_low):
-	movq %rdx,%rcx
-	FP_MULN_LOW %rdi, %r8, %r9, %r10, %rsi, %rcx
-	ret
-
-cdecl(fp_mulm_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	subq 	$160, %rsp
-
-	movq 	%rdx,%rcx
-	leaq 	p0(%rip), %rbx
-
-	FP_MULN_LOW %rsp, %r8, %r9, %r10, %rsi, %rcx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsp, %rbx
-
-	addq	$160, %rsp
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.c
deleted file mode 100644
index 5c9a776c7a20..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field modular reduction functions.
- *
- * @ingroup fp
- */
-
-#include "relic_core.h"
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_bn_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_rdcs_low(dig_t *c, const dig_t *a, const dig_t *m) {
-	rlc_align dig_t q[2 * RLC_FP_DIGS], _q[2 * RLC_FP_DIGS], t[2 * RLC_FP_DIGS], r[RLC_FP_DIGS];
-	const int *sform;
-	int len, first, i, j, k, b0, d0, b1, d1;
-
-	sform = fp_prime_get_sps(&len);
-
-	RLC_RIP(b0, d0, sform[len - 1]);
-	first = (d0) + (b0 == 0 ? 0 : 1);
-
-	/* q = floor(a/b^k) */
-	dv_zero(q, 2 * RLC_FP_DIGS);
-	dv_rshd(q, a, 2 * RLC_FP_DIGS, d0);
-	if (b0 > 0) {
-		bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-	}
-
-	/* r = a - qb^k. */
-	dv_copy(r, a, first);
-	if (b0 > 0) {
-		r[first - 1] &= RLC_MASK(b0);
-	}
-
-	k = 0;
-	while (!fp_is_zero(q)) {
-		dv_zero(_q, 2 * RLC_FP_DIGS);
-		for (i = len - 2; i > 0; i--) {
-			j = (sform[i] < 0 ? -sform[i] : sform[i]);
-			RLC_RIP(b1, d1, j);
-			dv_zero(t, 2 * RLC_FP_DIGS);
-			dv_lshd(t, q, RLC_FP_DIGS, d1);
-			if (b1 > 0) {
-				bn_lshb_low(t, t, 2 * RLC_FP_DIGS, b1);
-			}
-			/* Check if these two have the same sign. */
-			if ((sform[len - 2] ^ sform[i]) >= 0) {
-				bn_addn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			} else {
-				bn_subn_low(_q, _q, t, 2 * RLC_FP_DIGS);
-			}
-		}
-		/* Check if these two have the same sign. */
-		if ((sform[len - 2] ^ sform[0]) >= 0) {
-			bn_addn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		} else {
-			bn_subn_low(_q, _q, q, 2 * RLC_FP_DIGS);
-		}
-		dv_rshd(q, _q, 2 * RLC_FP_DIGS, d0);
-		if (b0 > 0) {
-			bn_rshb_low(q, q, 2 * RLC_FP_DIGS, b0);
-		}
-		if (b0 > 0) {
-			_q[first - 1] &= RLC_MASK(b0);
-		}
-		if (sform[len - 2] < 0) {
-			fp_add(r, r, _q);
-		} else {
-			if (k++ % 2 == 0) {
-				if (fp_subn_low(r, r, _q)) {
-					fp_addn_low(r, r, m);
-				}
-			} else {
-				fp_addn_low(r, r, _q);
-			}
-		}
-	}
-	while (dv_cmp(r, m, RLC_FP_DIGS) != RLC_LT) {
-		fp_subn_low(r, r, m);
-	}
-	fp_copy(c, r);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.s
deleted file mode 100644
index 98b804e6df9f..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_rdc_low.s
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_fp_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_sqr_low.c
deleted file mode 100644
index c458e3a657b3..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @version $Id: relic_fp_sqr_low.c 677 2011-03-05 22:19:43Z dfaranha $
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	fp_muln_low(c, a, a);
-}
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fp_mulm_low(c, a, a);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.c b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.c
deleted file mode 100644
index f0bd669cfb23..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level extension field modular reduction functions.
- *
- * @ingroup fpx
- */
-
-#include "relic_core.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp3_rdcn_low(fp3_t c, dv3_t a) {
-#if FP_RDC == MONTY
-	fp_rdcn_low(c[0], a[0]);
-	fp_rdcn_low(c[1], a[1]);
-	fp_rdcn_low(c[2], a[2]);
-#else
-	fp_rdc(c[0], a[0]);
-	fp_rdc(c[1], a[1]);
-	fp_rdc(c[2], a[2]);
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.s b/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.s
deleted file mode 100644
index 4ba1d40bcbde..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-asm-9l/relic_fpx_rdc_low.s
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field modular reduction.
- *
- * @ingroup fp
- */
-
-#include "relic_dv_low.h"
-
-#include "macro.s"
-
-.text
-
-.global cdecl(fp2_rdcn_low)
-
-/*
- * Function: fp_rdcn_low
- * Inputs: rdi = c, rsi = a
- * Output: rax
- */
-cdecl(fp2_rdcn_low):
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-	push 	%rbx
-	push	%rbp
-	leaq 	p0(%rip), %rbx
-
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-	addq $(8*RLC_FP_DIGS), %rdi
-	addq $(8*RLC_DV_DIGS), %rsi
-	FP_RDCN_LOW %rdi, %r8, %r9, %r10, %rsi, %rbx
-
-	pop		%rbp
-	pop		%rbx
-	pop		%r15
-	pop		%r14
-	pop		%r13
-	pop		%r12
-	ret
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/CMakeLists.txt b/src/dashbls/depends/relic/src/low/x64-fiat-381/CMakeLists.txt
deleted file mode 100644
index ecca66b65fec..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(INHERIT "gmp")
-include(../cmake/gmp.cmake)
-if(GMP_FOUND)
-	include_directories(${GMP_INCLUDE_DIR})
-	set(ARITH_LIBS ${GMP_LIBRARIES})
-endif(GMP_FOUND)
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/bls12_381_q_64.c b/src/dashbls/depends/relic/src/low/x64-fiat-381/bls12_381_q_64.c
deleted file mode 100644
index c8092eefaf93..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/bls12_381_q_64.c
+++ /dev/null
@@ -1,2920 +0,0 @@
-/* Autogenerated */
-/* curve description: test */
-/* requested operations: (all) */
-/* m = 0x1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab (from "0x1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab") */
-/* machine_wordsize = 64 (from "64") */
-/*                                                                    */
-/* NOTE: In addition to the bounds specified above each function, all */
-/*   functions synthesized for this Montgomery arithmetic require the */
-/*   input to be strictly less than the prime modulus (m), and also   */
-/*   require the input to be in the unique saturated representation.  */
-/*   All functions also ensure that these two properties are true of  */
-/*   return values.                                                   */
-
-#include <stdint.h>
-typedef unsigned char fiat_bls12_381_q_uint1;
-typedef signed char fiat_bls12_381_q_int1;
-typedef signed __int128 fiat_bls12_381_q_int128;
-typedef unsigned __int128 fiat_bls12_381_q_uint128;
-
-#if (-1 & 3) != 3
-#error "This code only works on a two's complement system"
-#endif
-
-
-/*
- * The function fiat_bls12_381_q_addcarryx_u64 is an addition with carry.
- * Postconditions:
- *   out1 = (arg1 + arg2 + arg3) mod 2^64
- *   out2 = ⌊(arg1 + arg2 + arg3) / 2^64⌋
- *
- * Input Bounds:
- *   arg1: [0x0 ~> 0x1]
- *   arg2: [0x0 ~> 0xffffffffffffffff]
- *   arg3: [0x0 ~> 0xffffffffffffffff]
- * Output Bounds:
- *   out1: [0x0 ~> 0xffffffffffffffff]
- *   out2: [0x0 ~> 0x1]
- */
-static void fiat_bls12_381_q_addcarryx_u64(uint64_t* out1, fiat_bls12_381_q_uint1* out2, fiat_bls12_381_q_uint1 arg1, uint64_t arg2, uint64_t arg3) {
-  fiat_bls12_381_q_uint128 x1 = ((arg1 + (fiat_bls12_381_q_uint128)arg2) + arg3);
-  uint64_t x2 = (uint64_t)(x1 & UINT64_C(0xffffffffffffffff));
-  fiat_bls12_381_q_uint1 x3 = (fiat_bls12_381_q_uint1)(x1 >> 64);
-  *out1 = x2;
-  *out2 = x3;
-}
-
-/*
- * The function fiat_bls12_381_q_subborrowx_u64 is a subtraction with borrow.
- * Postconditions:
- *   out1 = (-arg1 + arg2 + -arg3) mod 2^64
- *   out2 = -⌊(-arg1 + arg2 + -arg3) / 2^64⌋
- *
- * Input Bounds:
- *   arg1: [0x0 ~> 0x1]
- *   arg2: [0x0 ~> 0xffffffffffffffff]
- *   arg3: [0x0 ~> 0xffffffffffffffff]
- * Output Bounds:
- *   out1: [0x0 ~> 0xffffffffffffffff]
- *   out2: [0x0 ~> 0x1]
- */
-static void fiat_bls12_381_q_subborrowx_u64(uint64_t* out1, fiat_bls12_381_q_uint1* out2, fiat_bls12_381_q_uint1 arg1, uint64_t arg2, uint64_t arg3) {
-  fiat_bls12_381_q_int128 x1 = ((arg2 - (fiat_bls12_381_q_int128)arg1) - arg3);
-  fiat_bls12_381_q_int1 x2 = (fiat_bls12_381_q_int1)(x1 >> 64);
-  uint64_t x3 = (uint64_t)(x1 & UINT64_C(0xffffffffffffffff));
-  *out1 = x3;
-  *out2 = (fiat_bls12_381_q_uint1)(0x0 - x2);
-}
-
-/*
- * The function fiat_bls12_381_q_mulx_u64 is a multiplication, returning the full double-width result.
- * Postconditions:
- *   out1 = (arg1 * arg2) mod 2^64
- *   out2 = ⌊arg1 * arg2 / 2^64⌋
- *
- * Input Bounds:
- *   arg1: [0x0 ~> 0xffffffffffffffff]
- *   arg2: [0x0 ~> 0xffffffffffffffff]
- * Output Bounds:
- *   out1: [0x0 ~> 0xffffffffffffffff]
- *   out2: [0x0 ~> 0xffffffffffffffff]
- */
-static void fiat_bls12_381_q_mulx_u64(uint64_t* out1, uint64_t* out2, uint64_t arg1, uint64_t arg2) {
-  fiat_bls12_381_q_uint128 x1 = ((fiat_bls12_381_q_uint128)arg1 * arg2);
-  uint64_t x2 = (uint64_t)(x1 & UINT64_C(0xffffffffffffffff));
-  uint64_t x3 = (uint64_t)(x1 >> 64);
-  *out1 = x2;
-  *out2 = x3;
-}
-
-/*
- * The function fiat_bls12_381_q_cmovznz_u64 is a single-word conditional move.
- * Postconditions:
- *   out1 = (if arg1 = 0 then arg2 else arg3)
- *
- * Input Bounds:
- *   arg1: [0x0 ~> 0x1]
- *   arg2: [0x0 ~> 0xffffffffffffffff]
- *   arg3: [0x0 ~> 0xffffffffffffffff]
- * Output Bounds:
- *   out1: [0x0 ~> 0xffffffffffffffff]
- */
-static void fiat_bls12_381_q_cmovznz_u64(uint64_t* out1, fiat_bls12_381_q_uint1 arg1, uint64_t arg2, uint64_t arg3) {
-  fiat_bls12_381_q_uint1 x1 = (!(!arg1));
-  uint64_t x2 = ((fiat_bls12_381_q_int1)(0x0 - x1) & UINT64_C(0xffffffffffffffff));
-  uint64_t x3 = ((x2 & arg3) | ((~x2) & arg2));
-  *out1 = x3;
-}
-
-/*
- * The function fiat_bls12_381_q_mul multiplies two field elements in the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- *   0 ≤ eval arg2 < m
- * Postconditions:
- *   eval (from_montgomery out1) mod m = (eval (from_montgomery arg1) * eval (from_montgomery arg2)) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- *   arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64_t arg2[6]) {
-  uint64_t x1 = (arg1[1]);
-  uint64_t x2 = (arg1[2]);
-  uint64_t x3 = (arg1[3]);
-  uint64_t x4 = (arg1[4]);
-  uint64_t x5 = (arg1[5]);
-  uint64_t x6 = (arg1[0]);
-  uint64_t x7;
-  uint64_t x8;
-  fiat_bls12_381_q_mulx_u64(&x7, &x8, x6, (arg2[5]));
-  uint64_t x9;
-  uint64_t x10;
-  fiat_bls12_381_q_mulx_u64(&x9, &x10, x6, (arg2[4]));
-  uint64_t x11;
-  uint64_t x12;
-  fiat_bls12_381_q_mulx_u64(&x11, &x12, x6, (arg2[3]));
-  uint64_t x13;
-  uint64_t x14;
-  fiat_bls12_381_q_mulx_u64(&x13, &x14, x6, (arg2[2]));
-  uint64_t x15;
-  uint64_t x16;
-  fiat_bls12_381_q_mulx_u64(&x15, &x16, x6, (arg2[1]));
-  uint64_t x17;
-  uint64_t x18;
-  fiat_bls12_381_q_mulx_u64(&x17, &x18, x6, (arg2[0]));
-  uint64_t x19;
-  fiat_bls12_381_q_uint1 x20;
-  fiat_bls12_381_q_addcarryx_u64(&x19, &x20, 0x0, x18, x15);
-  uint64_t x21;
-  fiat_bls12_381_q_uint1 x22;
-  fiat_bls12_381_q_addcarryx_u64(&x21, &x22, x20, x16, x13);
-  uint64_t x23;
-  fiat_bls12_381_q_uint1 x24;
-  fiat_bls12_381_q_addcarryx_u64(&x23, &x24, x22, x14, x11);
-  uint64_t x25;
-  fiat_bls12_381_q_uint1 x26;
-  fiat_bls12_381_q_addcarryx_u64(&x25, &x26, x24, x12, x9);
-  uint64_t x27;
-  fiat_bls12_381_q_uint1 x28;
-  fiat_bls12_381_q_addcarryx_u64(&x27, &x28, x26, x10, x7);
-  uint64_t x29;
-  fiat_bls12_381_q_uint1 x30;
-  fiat_bls12_381_q_addcarryx_u64(&x29, &x30, x28, x8, 0x0);
-  uint64_t x31;
-  uint64_t x32;
-  fiat_bls12_381_q_mulx_u64(&x31, &x32, x17, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x33;
-  uint64_t x34;
-  fiat_bls12_381_q_mulx_u64(&x33, &x34, x31, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x35;
-  uint64_t x36;
-  fiat_bls12_381_q_mulx_u64(&x35, &x36, x31, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x37;
-  uint64_t x38;
-  fiat_bls12_381_q_mulx_u64(&x37, &x38, x31, UINT64_C(0x64774b84f38512bf));
-  uint64_t x39;
-  uint64_t x40;
-  fiat_bls12_381_q_mulx_u64(&x39, &x40, x31, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x41;
-  uint64_t x42;
-  fiat_bls12_381_q_mulx_u64(&x41, &x42, x31, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x43;
-  uint64_t x44;
-  fiat_bls12_381_q_mulx_u64(&x43, &x44, x31, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x45;
-  fiat_bls12_381_q_uint1 x46;
-  fiat_bls12_381_q_addcarryx_u64(&x45, &x46, 0x0, x44, x41);
-  uint64_t x47;
-  fiat_bls12_381_q_uint1 x48;
-  fiat_bls12_381_q_addcarryx_u64(&x47, &x48, x46, x42, x39);
-  uint64_t x49;
-  fiat_bls12_381_q_uint1 x50;
-  fiat_bls12_381_q_addcarryx_u64(&x49, &x50, x48, x40, x37);
-  uint64_t x51;
-  fiat_bls12_381_q_uint1 x52;
-  fiat_bls12_381_q_addcarryx_u64(&x51, &x52, x50, x38, x35);
-  uint64_t x53;
-  fiat_bls12_381_q_uint1 x54;
-  fiat_bls12_381_q_addcarryx_u64(&x53, &x54, x52, x36, x33);
-  uint64_t x55;
-  fiat_bls12_381_q_uint1 x56;
-  fiat_bls12_381_q_addcarryx_u64(&x55, &x56, x54, x34, 0x0);
-  uint64_t x57;
-  fiat_bls12_381_q_uint1 x58;
-  fiat_bls12_381_q_addcarryx_u64(&x57, &x58, 0x0, x17, x43);
-  uint64_t x59;
-  fiat_bls12_381_q_uint1 x60;
-  fiat_bls12_381_q_addcarryx_u64(&x59, &x60, x58, x19, x45);
-  uint64_t x61;
-  fiat_bls12_381_q_uint1 x62;
-  fiat_bls12_381_q_addcarryx_u64(&x61, &x62, x60, x21, x47);
-  uint64_t x63;
-  fiat_bls12_381_q_uint1 x64;
-  fiat_bls12_381_q_addcarryx_u64(&x63, &x64, x62, x23, x49);
-  uint64_t x65;
-  fiat_bls12_381_q_uint1 x66;
-  fiat_bls12_381_q_addcarryx_u64(&x65, &x66, x64, x25, x51);
-  uint64_t x67;
-  fiat_bls12_381_q_uint1 x68;
-  fiat_bls12_381_q_addcarryx_u64(&x67, &x68, x66, x27, x53);
-  uint64_t x69;
-  fiat_bls12_381_q_uint1 x70;
-  fiat_bls12_381_q_addcarryx_u64(&x69, &x70, x68, x29, x55);
-  uint64_t x71;
-  fiat_bls12_381_q_uint1 x72;
-  fiat_bls12_381_q_addcarryx_u64(&x71, &x72, x70, 0x0, 0x0);
-  uint64_t x73;
-  uint64_t x74;
-  fiat_bls12_381_q_mulx_u64(&x73, &x74, x1, (arg2[5]));
-  uint64_t x75;
-  uint64_t x76;
-  fiat_bls12_381_q_mulx_u64(&x75, &x76, x1, (arg2[4]));
-  uint64_t x77;
-  uint64_t x78;
-  fiat_bls12_381_q_mulx_u64(&x77, &x78, x1, (arg2[3]));
-  uint64_t x79;
-  uint64_t x80;
-  fiat_bls12_381_q_mulx_u64(&x79, &x80, x1, (arg2[2]));
-  uint64_t x81;
-  uint64_t x82;
-  fiat_bls12_381_q_mulx_u64(&x81, &x82, x1, (arg2[1]));
-  uint64_t x83;
-  uint64_t x84;
-  fiat_bls12_381_q_mulx_u64(&x83, &x84, x1, (arg2[0]));
-  uint64_t x85;
-  fiat_bls12_381_q_uint1 x86;
-  fiat_bls12_381_q_addcarryx_u64(&x85, &x86, 0x0, x84, x81);
-  uint64_t x87;
-  fiat_bls12_381_q_uint1 x88;
-  fiat_bls12_381_q_addcarryx_u64(&x87, &x88, x86, x82, x79);
-  uint64_t x89;
-  fiat_bls12_381_q_uint1 x90;
-  fiat_bls12_381_q_addcarryx_u64(&x89, &x90, x88, x80, x77);
-  uint64_t x91;
-  fiat_bls12_381_q_uint1 x92;
-  fiat_bls12_381_q_addcarryx_u64(&x91, &x92, x90, x78, x75);
-  uint64_t x93;
-  fiat_bls12_381_q_uint1 x94;
-  fiat_bls12_381_q_addcarryx_u64(&x93, &x94, x92, x76, x73);
-  uint64_t x95;
-  fiat_bls12_381_q_uint1 x96;
-  fiat_bls12_381_q_addcarryx_u64(&x95, &x96, x94, x74, 0x0);
-  uint64_t x97;
-  fiat_bls12_381_q_uint1 x98;
-  fiat_bls12_381_q_addcarryx_u64(&x97, &x98, 0x0, x59, x83);
-  uint64_t x99;
-  fiat_bls12_381_q_uint1 x100;
-  fiat_bls12_381_q_addcarryx_u64(&x99, &x100, x98, x61, x85);
-  uint64_t x101;
-  fiat_bls12_381_q_uint1 x102;
-  fiat_bls12_381_q_addcarryx_u64(&x101, &x102, x100, x63, x87);
-  uint64_t x103;
-  fiat_bls12_381_q_uint1 x104;
-  fiat_bls12_381_q_addcarryx_u64(&x103, &x104, x102, x65, x89);
-  uint64_t x105;
-  fiat_bls12_381_q_uint1 x106;
-  fiat_bls12_381_q_addcarryx_u64(&x105, &x106, x104, x67, x91);
-  uint64_t x107;
-  fiat_bls12_381_q_uint1 x108;
-  fiat_bls12_381_q_addcarryx_u64(&x107, &x108, x106, x69, x93);
-  uint64_t x109;
-  fiat_bls12_381_q_uint1 x110;
-  fiat_bls12_381_q_addcarryx_u64(&x109, &x110, x108, (fiat_bls12_381_q_uint1)x71, x95);
-  uint64_t x111;
-  uint64_t x112;
-  fiat_bls12_381_q_mulx_u64(&x111, &x112, x97, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x113;
-  uint64_t x114;
-  fiat_bls12_381_q_mulx_u64(&x113, &x114, x111, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x115;
-  uint64_t x116;
-  fiat_bls12_381_q_mulx_u64(&x115, &x116, x111, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x117;
-  uint64_t x118;
-  fiat_bls12_381_q_mulx_u64(&x117, &x118, x111, UINT64_C(0x64774b84f38512bf));
-  uint64_t x119;
-  uint64_t x120;
-  fiat_bls12_381_q_mulx_u64(&x119, &x120, x111, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x121;
-  uint64_t x122;
-  fiat_bls12_381_q_mulx_u64(&x121, &x122, x111, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x123;
-  uint64_t x124;
-  fiat_bls12_381_q_mulx_u64(&x123, &x124, x111, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x125;
-  fiat_bls12_381_q_uint1 x126;
-  fiat_bls12_381_q_addcarryx_u64(&x125, &x126, 0x0, x124, x121);
-  uint64_t x127;
-  fiat_bls12_381_q_uint1 x128;
-  fiat_bls12_381_q_addcarryx_u64(&x127, &x128, x126, x122, x119);
-  uint64_t x129;
-  fiat_bls12_381_q_uint1 x130;
-  fiat_bls12_381_q_addcarryx_u64(&x129, &x130, x128, x120, x117);
-  uint64_t x131;
-  fiat_bls12_381_q_uint1 x132;
-  fiat_bls12_381_q_addcarryx_u64(&x131, &x132, x130, x118, x115);
-  uint64_t x133;
-  fiat_bls12_381_q_uint1 x134;
-  fiat_bls12_381_q_addcarryx_u64(&x133, &x134, x132, x116, x113);
-  uint64_t x135;
-  fiat_bls12_381_q_uint1 x136;
-  fiat_bls12_381_q_addcarryx_u64(&x135, &x136, x134, x114, 0x0);
-  uint64_t x137;
-  fiat_bls12_381_q_uint1 x138;
-  fiat_bls12_381_q_addcarryx_u64(&x137, &x138, 0x0, x97, x123);
-  uint64_t x139;
-  fiat_bls12_381_q_uint1 x140;
-  fiat_bls12_381_q_addcarryx_u64(&x139, &x140, x138, x99, x125);
-  uint64_t x141;
-  fiat_bls12_381_q_uint1 x142;
-  fiat_bls12_381_q_addcarryx_u64(&x141, &x142, x140, x101, x127);
-  uint64_t x143;
-  fiat_bls12_381_q_uint1 x144;
-  fiat_bls12_381_q_addcarryx_u64(&x143, &x144, x142, x103, x129);
-  uint64_t x145;
-  fiat_bls12_381_q_uint1 x146;
-  fiat_bls12_381_q_addcarryx_u64(&x145, &x146, x144, x105, x131);
-  uint64_t x147;
-  fiat_bls12_381_q_uint1 x148;
-  fiat_bls12_381_q_addcarryx_u64(&x147, &x148, x146, x107, x133);
-  uint64_t x149;
-  fiat_bls12_381_q_uint1 x150;
-  fiat_bls12_381_q_addcarryx_u64(&x149, &x150, x148, x109, x135);
-  uint64_t x151;
-  fiat_bls12_381_q_uint1 x152;
-  fiat_bls12_381_q_addcarryx_u64(&x151, &x152, x150, x110, 0x0);
-  uint64_t x153;
-  uint64_t x154;
-  fiat_bls12_381_q_mulx_u64(&x153, &x154, x2, (arg2[5]));
-  uint64_t x155;
-  uint64_t x156;
-  fiat_bls12_381_q_mulx_u64(&x155, &x156, x2, (arg2[4]));
-  uint64_t x157;
-  uint64_t x158;
-  fiat_bls12_381_q_mulx_u64(&x157, &x158, x2, (arg2[3]));
-  uint64_t x159;
-  uint64_t x160;
-  fiat_bls12_381_q_mulx_u64(&x159, &x160, x2, (arg2[2]));
-  uint64_t x161;
-  uint64_t x162;
-  fiat_bls12_381_q_mulx_u64(&x161, &x162, x2, (arg2[1]));
-  uint64_t x163;
-  uint64_t x164;
-  fiat_bls12_381_q_mulx_u64(&x163, &x164, x2, (arg2[0]));
-  uint64_t x165;
-  fiat_bls12_381_q_uint1 x166;
-  fiat_bls12_381_q_addcarryx_u64(&x165, &x166, 0x0, x164, x161);
-  uint64_t x167;
-  fiat_bls12_381_q_uint1 x168;
-  fiat_bls12_381_q_addcarryx_u64(&x167, &x168, x166, x162, x159);
-  uint64_t x169;
-  fiat_bls12_381_q_uint1 x170;
-  fiat_bls12_381_q_addcarryx_u64(&x169, &x170, x168, x160, x157);
-  uint64_t x171;
-  fiat_bls12_381_q_uint1 x172;
-  fiat_bls12_381_q_addcarryx_u64(&x171, &x172, x170, x158, x155);
-  uint64_t x173;
-  fiat_bls12_381_q_uint1 x174;
-  fiat_bls12_381_q_addcarryx_u64(&x173, &x174, x172, x156, x153);
-  uint64_t x175;
-  fiat_bls12_381_q_uint1 x176;
-  fiat_bls12_381_q_addcarryx_u64(&x175, &x176, x174, x154, 0x0);
-  uint64_t x177;
-  fiat_bls12_381_q_uint1 x178;
-  fiat_bls12_381_q_addcarryx_u64(&x177, &x178, 0x0, x139, x163);
-  uint64_t x179;
-  fiat_bls12_381_q_uint1 x180;
-  fiat_bls12_381_q_addcarryx_u64(&x179, &x180, x178, x141, x165);
-  uint64_t x181;
-  fiat_bls12_381_q_uint1 x182;
-  fiat_bls12_381_q_addcarryx_u64(&x181, &x182, x180, x143, x167);
-  uint64_t x183;
-  fiat_bls12_381_q_uint1 x184;
-  fiat_bls12_381_q_addcarryx_u64(&x183, &x184, x182, x145, x169);
-  uint64_t x185;
-  fiat_bls12_381_q_uint1 x186;
-  fiat_bls12_381_q_addcarryx_u64(&x185, &x186, x184, x147, x171);
-  uint64_t x187;
-  fiat_bls12_381_q_uint1 x188;
-  fiat_bls12_381_q_addcarryx_u64(&x187, &x188, x186, x149, x173);
-  uint64_t x189;
-  fiat_bls12_381_q_uint1 x190;
-  fiat_bls12_381_q_addcarryx_u64(&x189, &x190, x188, x151, x175);
-  uint64_t x191;
-  uint64_t x192;
-  fiat_bls12_381_q_mulx_u64(&x191, &x192, x177, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x193;
-  uint64_t x194;
-  fiat_bls12_381_q_mulx_u64(&x193, &x194, x191, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x195;
-  uint64_t x196;
-  fiat_bls12_381_q_mulx_u64(&x195, &x196, x191, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x197;
-  uint64_t x198;
-  fiat_bls12_381_q_mulx_u64(&x197, &x198, x191, UINT64_C(0x64774b84f38512bf));
-  uint64_t x199;
-  uint64_t x200;
-  fiat_bls12_381_q_mulx_u64(&x199, &x200, x191, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x201;
-  uint64_t x202;
-  fiat_bls12_381_q_mulx_u64(&x201, &x202, x191, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x203;
-  uint64_t x204;
-  fiat_bls12_381_q_mulx_u64(&x203, &x204, x191, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x205;
-  fiat_bls12_381_q_uint1 x206;
-  fiat_bls12_381_q_addcarryx_u64(&x205, &x206, 0x0, x204, x201);
-  uint64_t x207;
-  fiat_bls12_381_q_uint1 x208;
-  fiat_bls12_381_q_addcarryx_u64(&x207, &x208, x206, x202, x199);
-  uint64_t x209;
-  fiat_bls12_381_q_uint1 x210;
-  fiat_bls12_381_q_addcarryx_u64(&x209, &x210, x208, x200, x197);
-  uint64_t x211;
-  fiat_bls12_381_q_uint1 x212;
-  fiat_bls12_381_q_addcarryx_u64(&x211, &x212, x210, x198, x195);
-  uint64_t x213;
-  fiat_bls12_381_q_uint1 x214;
-  fiat_bls12_381_q_addcarryx_u64(&x213, &x214, x212, x196, x193);
-  uint64_t x215;
-  fiat_bls12_381_q_uint1 x216;
-  fiat_bls12_381_q_addcarryx_u64(&x215, &x216, x214, x194, 0x0);
-  uint64_t x217;
-  fiat_bls12_381_q_uint1 x218;
-  fiat_bls12_381_q_addcarryx_u64(&x217, &x218, 0x0, x177, x203);
-  uint64_t x219;
-  fiat_bls12_381_q_uint1 x220;
-  fiat_bls12_381_q_addcarryx_u64(&x219, &x220, x218, x179, x205);
-  uint64_t x221;
-  fiat_bls12_381_q_uint1 x222;
-  fiat_bls12_381_q_addcarryx_u64(&x221, &x222, x220, x181, x207);
-  uint64_t x223;
-  fiat_bls12_381_q_uint1 x224;
-  fiat_bls12_381_q_addcarryx_u64(&x223, &x224, x222, x183, x209);
-  uint64_t x225;
-  fiat_bls12_381_q_uint1 x226;
-  fiat_bls12_381_q_addcarryx_u64(&x225, &x226, x224, x185, x211);
-  uint64_t x227;
-  fiat_bls12_381_q_uint1 x228;
-  fiat_bls12_381_q_addcarryx_u64(&x227, &x228, x226, x187, x213);
-  uint64_t x229;
-  fiat_bls12_381_q_uint1 x230;
-  fiat_bls12_381_q_addcarryx_u64(&x229, &x230, x228, x189, x215);
-  uint64_t x231;
-  fiat_bls12_381_q_uint1 x232;
-  fiat_bls12_381_q_addcarryx_u64(&x231, &x232, x230, x190, 0x0);
-  uint64_t x233;
-  uint64_t x234;
-  fiat_bls12_381_q_mulx_u64(&x233, &x234, x3, (arg2[5]));
-  uint64_t x235;
-  uint64_t x236;
-  fiat_bls12_381_q_mulx_u64(&x235, &x236, x3, (arg2[4]));
-  uint64_t x237;
-  uint64_t x238;
-  fiat_bls12_381_q_mulx_u64(&x237, &x238, x3, (arg2[3]));
-  uint64_t x239;
-  uint64_t x240;
-  fiat_bls12_381_q_mulx_u64(&x239, &x240, x3, (arg2[2]));
-  uint64_t x241;
-  uint64_t x242;
-  fiat_bls12_381_q_mulx_u64(&x241, &x242, x3, (arg2[1]));
-  uint64_t x243;
-  uint64_t x244;
-  fiat_bls12_381_q_mulx_u64(&x243, &x244, x3, (arg2[0]));
-  uint64_t x245;
-  fiat_bls12_381_q_uint1 x246;
-  fiat_bls12_381_q_addcarryx_u64(&x245, &x246, 0x0, x244, x241);
-  uint64_t x247;
-  fiat_bls12_381_q_uint1 x248;
-  fiat_bls12_381_q_addcarryx_u64(&x247, &x248, x246, x242, x239);
-  uint64_t x249;
-  fiat_bls12_381_q_uint1 x250;
-  fiat_bls12_381_q_addcarryx_u64(&x249, &x250, x248, x240, x237);
-  uint64_t x251;
-  fiat_bls12_381_q_uint1 x252;
-  fiat_bls12_381_q_addcarryx_u64(&x251, &x252, x250, x238, x235);
-  uint64_t x253;
-  fiat_bls12_381_q_uint1 x254;
-  fiat_bls12_381_q_addcarryx_u64(&x253, &x254, x252, x236, x233);
-  uint64_t x255;
-  fiat_bls12_381_q_uint1 x256;
-  fiat_bls12_381_q_addcarryx_u64(&x255, &x256, x254, x234, 0x0);
-  uint64_t x257;
-  fiat_bls12_381_q_uint1 x258;
-  fiat_bls12_381_q_addcarryx_u64(&x257, &x258, 0x0, x219, x243);
-  uint64_t x259;
-  fiat_bls12_381_q_uint1 x260;
-  fiat_bls12_381_q_addcarryx_u64(&x259, &x260, x258, x221, x245);
-  uint64_t x261;
-  fiat_bls12_381_q_uint1 x262;
-  fiat_bls12_381_q_addcarryx_u64(&x261, &x262, x260, x223, x247);
-  uint64_t x263;
-  fiat_bls12_381_q_uint1 x264;
-  fiat_bls12_381_q_addcarryx_u64(&x263, &x264, x262, x225, x249);
-  uint64_t x265;
-  fiat_bls12_381_q_uint1 x266;
-  fiat_bls12_381_q_addcarryx_u64(&x265, &x266, x264, x227, x251);
-  uint64_t x267;
-  fiat_bls12_381_q_uint1 x268;
-  fiat_bls12_381_q_addcarryx_u64(&x267, &x268, x266, x229, x253);
-  uint64_t x269;
-  fiat_bls12_381_q_uint1 x270;
-  fiat_bls12_381_q_addcarryx_u64(&x269, &x270, x268, x231, x255);
-  uint64_t x271;
-  uint64_t x272;
-  fiat_bls12_381_q_mulx_u64(&x271, &x272, x257, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x273;
-  uint64_t x274;
-  fiat_bls12_381_q_mulx_u64(&x273, &x274, x271, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x275;
-  uint64_t x276;
-  fiat_bls12_381_q_mulx_u64(&x275, &x276, x271, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x277;
-  uint64_t x278;
-  fiat_bls12_381_q_mulx_u64(&x277, &x278, x271, UINT64_C(0x64774b84f38512bf));
-  uint64_t x279;
-  uint64_t x280;
-  fiat_bls12_381_q_mulx_u64(&x279, &x280, x271, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x281;
-  uint64_t x282;
-  fiat_bls12_381_q_mulx_u64(&x281, &x282, x271, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x283;
-  uint64_t x284;
-  fiat_bls12_381_q_mulx_u64(&x283, &x284, x271, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x285;
-  fiat_bls12_381_q_uint1 x286;
-  fiat_bls12_381_q_addcarryx_u64(&x285, &x286, 0x0, x284, x281);
-  uint64_t x287;
-  fiat_bls12_381_q_uint1 x288;
-  fiat_bls12_381_q_addcarryx_u64(&x287, &x288, x286, x282, x279);
-  uint64_t x289;
-  fiat_bls12_381_q_uint1 x290;
-  fiat_bls12_381_q_addcarryx_u64(&x289, &x290, x288, x280, x277);
-  uint64_t x291;
-  fiat_bls12_381_q_uint1 x292;
-  fiat_bls12_381_q_addcarryx_u64(&x291, &x292, x290, x278, x275);
-  uint64_t x293;
-  fiat_bls12_381_q_uint1 x294;
-  fiat_bls12_381_q_addcarryx_u64(&x293, &x294, x292, x276, x273);
-  uint64_t x295;
-  fiat_bls12_381_q_uint1 x296;
-  fiat_bls12_381_q_addcarryx_u64(&x295, &x296, x294, x274, 0x0);
-  uint64_t x297;
-  fiat_bls12_381_q_uint1 x298;
-  fiat_bls12_381_q_addcarryx_u64(&x297, &x298, 0x0, x257, x283);
-  uint64_t x299;
-  fiat_bls12_381_q_uint1 x300;
-  fiat_bls12_381_q_addcarryx_u64(&x299, &x300, x298, x259, x285);
-  uint64_t x301;
-  fiat_bls12_381_q_uint1 x302;
-  fiat_bls12_381_q_addcarryx_u64(&x301, &x302, x300, x261, x287);
-  uint64_t x303;
-  fiat_bls12_381_q_uint1 x304;
-  fiat_bls12_381_q_addcarryx_u64(&x303, &x304, x302, x263, x289);
-  uint64_t x305;
-  fiat_bls12_381_q_uint1 x306;
-  fiat_bls12_381_q_addcarryx_u64(&x305, &x306, x304, x265, x291);
-  uint64_t x307;
-  fiat_bls12_381_q_uint1 x308;
-  fiat_bls12_381_q_addcarryx_u64(&x307, &x308, x306, x267, x293);
-  uint64_t x309;
-  fiat_bls12_381_q_uint1 x310;
-  fiat_bls12_381_q_addcarryx_u64(&x309, &x310, x308, x269, x295);
-  uint64_t x311;
-  fiat_bls12_381_q_uint1 x312;
-  fiat_bls12_381_q_addcarryx_u64(&x311, &x312, x310, x270, 0x0);
-  uint64_t x313;
-  uint64_t x314;
-  fiat_bls12_381_q_mulx_u64(&x313, &x314, x4, (arg2[5]));
-  uint64_t x315;
-  uint64_t x316;
-  fiat_bls12_381_q_mulx_u64(&x315, &x316, x4, (arg2[4]));
-  uint64_t x317;
-  uint64_t x318;
-  fiat_bls12_381_q_mulx_u64(&x317, &x318, x4, (arg2[3]));
-  uint64_t x319;
-  uint64_t x320;
-  fiat_bls12_381_q_mulx_u64(&x319, &x320, x4, (arg2[2]));
-  uint64_t x321;
-  uint64_t x322;
-  fiat_bls12_381_q_mulx_u64(&x321, &x322, x4, (arg2[1]));
-  uint64_t x323;
-  uint64_t x324;
-  fiat_bls12_381_q_mulx_u64(&x323, &x324, x4, (arg2[0]));
-  uint64_t x325;
-  fiat_bls12_381_q_uint1 x326;
-  fiat_bls12_381_q_addcarryx_u64(&x325, &x326, 0x0, x324, x321);
-  uint64_t x327;
-  fiat_bls12_381_q_uint1 x328;
-  fiat_bls12_381_q_addcarryx_u64(&x327, &x328, x326, x322, x319);
-  uint64_t x329;
-  fiat_bls12_381_q_uint1 x330;
-  fiat_bls12_381_q_addcarryx_u64(&x329, &x330, x328, x320, x317);
-  uint64_t x331;
-  fiat_bls12_381_q_uint1 x332;
-  fiat_bls12_381_q_addcarryx_u64(&x331, &x332, x330, x318, x315);
-  uint64_t x333;
-  fiat_bls12_381_q_uint1 x334;
-  fiat_bls12_381_q_addcarryx_u64(&x333, &x334, x332, x316, x313);
-  uint64_t x335;
-  fiat_bls12_381_q_uint1 x336;
-  fiat_bls12_381_q_addcarryx_u64(&x335, &x336, x334, x314, 0x0);
-  uint64_t x337;
-  fiat_bls12_381_q_uint1 x338;
-  fiat_bls12_381_q_addcarryx_u64(&x337, &x338, 0x0, x299, x323);
-  uint64_t x339;
-  fiat_bls12_381_q_uint1 x340;
-  fiat_bls12_381_q_addcarryx_u64(&x339, &x340, x338, x301, x325);
-  uint64_t x341;
-  fiat_bls12_381_q_uint1 x342;
-  fiat_bls12_381_q_addcarryx_u64(&x341, &x342, x340, x303, x327);
-  uint64_t x343;
-  fiat_bls12_381_q_uint1 x344;
-  fiat_bls12_381_q_addcarryx_u64(&x343, &x344, x342, x305, x329);
-  uint64_t x345;
-  fiat_bls12_381_q_uint1 x346;
-  fiat_bls12_381_q_addcarryx_u64(&x345, &x346, x344, x307, x331);
-  uint64_t x347;
-  fiat_bls12_381_q_uint1 x348;
-  fiat_bls12_381_q_addcarryx_u64(&x347, &x348, x346, x309, x333);
-  uint64_t x349;
-  fiat_bls12_381_q_uint1 x350;
-  fiat_bls12_381_q_addcarryx_u64(&x349, &x350, x348, x311, x335);
-  uint64_t x351;
-  uint64_t x352;
-  fiat_bls12_381_q_mulx_u64(&x351, &x352, x337, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x353;
-  uint64_t x354;
-  fiat_bls12_381_q_mulx_u64(&x353, &x354, x351, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x355;
-  uint64_t x356;
-  fiat_bls12_381_q_mulx_u64(&x355, &x356, x351, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x357;
-  uint64_t x358;
-  fiat_bls12_381_q_mulx_u64(&x357, &x358, x351, UINT64_C(0x64774b84f38512bf));
-  uint64_t x359;
-  uint64_t x360;
-  fiat_bls12_381_q_mulx_u64(&x359, &x360, x351, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x361;
-  uint64_t x362;
-  fiat_bls12_381_q_mulx_u64(&x361, &x362, x351, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x363;
-  uint64_t x364;
-  fiat_bls12_381_q_mulx_u64(&x363, &x364, x351, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x365;
-  fiat_bls12_381_q_uint1 x366;
-  fiat_bls12_381_q_addcarryx_u64(&x365, &x366, 0x0, x364, x361);
-  uint64_t x367;
-  fiat_bls12_381_q_uint1 x368;
-  fiat_bls12_381_q_addcarryx_u64(&x367, &x368, x366, x362, x359);
-  uint64_t x369;
-  fiat_bls12_381_q_uint1 x370;
-  fiat_bls12_381_q_addcarryx_u64(&x369, &x370, x368, x360, x357);
-  uint64_t x371;
-  fiat_bls12_381_q_uint1 x372;
-  fiat_bls12_381_q_addcarryx_u64(&x371, &x372, x370, x358, x355);
-  uint64_t x373;
-  fiat_bls12_381_q_uint1 x374;
-  fiat_bls12_381_q_addcarryx_u64(&x373, &x374, x372, x356, x353);
-  uint64_t x375;
-  fiat_bls12_381_q_uint1 x376;
-  fiat_bls12_381_q_addcarryx_u64(&x375, &x376, x374, x354, 0x0);
-  uint64_t x377;
-  fiat_bls12_381_q_uint1 x378;
-  fiat_bls12_381_q_addcarryx_u64(&x377, &x378, 0x0, x337, x363);
-  uint64_t x379;
-  fiat_bls12_381_q_uint1 x380;
-  fiat_bls12_381_q_addcarryx_u64(&x379, &x380, x378, x339, x365);
-  uint64_t x381;
-  fiat_bls12_381_q_uint1 x382;
-  fiat_bls12_381_q_addcarryx_u64(&x381, &x382, x380, x341, x367);
-  uint64_t x383;
-  fiat_bls12_381_q_uint1 x384;
-  fiat_bls12_381_q_addcarryx_u64(&x383, &x384, x382, x343, x369);
-  uint64_t x385;
-  fiat_bls12_381_q_uint1 x386;
-  fiat_bls12_381_q_addcarryx_u64(&x385, &x386, x384, x345, x371);
-  uint64_t x387;
-  fiat_bls12_381_q_uint1 x388;
-  fiat_bls12_381_q_addcarryx_u64(&x387, &x388, x386, x347, x373);
-  uint64_t x389;
-  fiat_bls12_381_q_uint1 x390;
-  fiat_bls12_381_q_addcarryx_u64(&x389, &x390, x388, x349, x375);
-  uint64_t x391;
-  fiat_bls12_381_q_uint1 x392;
-  fiat_bls12_381_q_addcarryx_u64(&x391, &x392, x390, x350, 0x0);
-  uint64_t x393;
-  uint64_t x394;
-  fiat_bls12_381_q_mulx_u64(&x393, &x394, x5, (arg2[5]));
-  uint64_t x395;
-  uint64_t x396;
-  fiat_bls12_381_q_mulx_u64(&x395, &x396, x5, (arg2[4]));
-  uint64_t x397;
-  uint64_t x398;
-  fiat_bls12_381_q_mulx_u64(&x397, &x398, x5, (arg2[3]));
-  uint64_t x399;
-  uint64_t x400;
-  fiat_bls12_381_q_mulx_u64(&x399, &x400, x5, (arg2[2]));
-  uint64_t x401;
-  uint64_t x402;
-  fiat_bls12_381_q_mulx_u64(&x401, &x402, x5, (arg2[1]));
-  uint64_t x403;
-  uint64_t x404;
-  fiat_bls12_381_q_mulx_u64(&x403, &x404, x5, (arg2[0]));
-  uint64_t x405;
-  fiat_bls12_381_q_uint1 x406;
-  fiat_bls12_381_q_addcarryx_u64(&x405, &x406, 0x0, x404, x401);
-  uint64_t x407;
-  fiat_bls12_381_q_uint1 x408;
-  fiat_bls12_381_q_addcarryx_u64(&x407, &x408, x406, x402, x399);
-  uint64_t x409;
-  fiat_bls12_381_q_uint1 x410;
-  fiat_bls12_381_q_addcarryx_u64(&x409, &x410, x408, x400, x397);
-  uint64_t x411;
-  fiat_bls12_381_q_uint1 x412;
-  fiat_bls12_381_q_addcarryx_u64(&x411, &x412, x410, x398, x395);
-  uint64_t x413;
-  fiat_bls12_381_q_uint1 x414;
-  fiat_bls12_381_q_addcarryx_u64(&x413, &x414, x412, x396, x393);
-  uint64_t x415;
-  fiat_bls12_381_q_uint1 x416;
-  fiat_bls12_381_q_addcarryx_u64(&x415, &x416, x414, x394, 0x0);
-  uint64_t x417;
-  fiat_bls12_381_q_uint1 x418;
-  fiat_bls12_381_q_addcarryx_u64(&x417, &x418, 0x0, x379, x403);
-  uint64_t x419;
-  fiat_bls12_381_q_uint1 x420;
-  fiat_bls12_381_q_addcarryx_u64(&x419, &x420, x418, x381, x405);
-  uint64_t x421;
-  fiat_bls12_381_q_uint1 x422;
-  fiat_bls12_381_q_addcarryx_u64(&x421, &x422, x420, x383, x407);
-  uint64_t x423;
-  fiat_bls12_381_q_uint1 x424;
-  fiat_bls12_381_q_addcarryx_u64(&x423, &x424, x422, x385, x409);
-  uint64_t x425;
-  fiat_bls12_381_q_uint1 x426;
-  fiat_bls12_381_q_addcarryx_u64(&x425, &x426, x424, x387, x411);
-  uint64_t x427;
-  fiat_bls12_381_q_uint1 x428;
-  fiat_bls12_381_q_addcarryx_u64(&x427, &x428, x426, x389, x413);
-  uint64_t x429;
-  fiat_bls12_381_q_uint1 x430;
-  fiat_bls12_381_q_addcarryx_u64(&x429, &x430, x428, x391, x415);
-  uint64_t x431;
-  uint64_t x432;
-  fiat_bls12_381_q_mulx_u64(&x431, &x432, x417, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x433;
-  uint64_t x434;
-  fiat_bls12_381_q_mulx_u64(&x433, &x434, x431, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x435;
-  uint64_t x436;
-  fiat_bls12_381_q_mulx_u64(&x435, &x436, x431, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x437;
-  uint64_t x438;
-  fiat_bls12_381_q_mulx_u64(&x437, &x438, x431, UINT64_C(0x64774b84f38512bf));
-  uint64_t x439;
-  uint64_t x440;
-  fiat_bls12_381_q_mulx_u64(&x439, &x440, x431, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x441;
-  uint64_t x442;
-  fiat_bls12_381_q_mulx_u64(&x441, &x442, x431, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x443;
-  uint64_t x444;
-  fiat_bls12_381_q_mulx_u64(&x443, &x444, x431, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x445;
-  fiat_bls12_381_q_uint1 x446;
-  fiat_bls12_381_q_addcarryx_u64(&x445, &x446, 0x0, x444, x441);
-  uint64_t x447;
-  fiat_bls12_381_q_uint1 x448;
-  fiat_bls12_381_q_addcarryx_u64(&x447, &x448, x446, x442, x439);
-  uint64_t x449;
-  fiat_bls12_381_q_uint1 x450;
-  fiat_bls12_381_q_addcarryx_u64(&x449, &x450, x448, x440, x437);
-  uint64_t x451;
-  fiat_bls12_381_q_uint1 x452;
-  fiat_bls12_381_q_addcarryx_u64(&x451, &x452, x450, x438, x435);
-  uint64_t x453;
-  fiat_bls12_381_q_uint1 x454;
-  fiat_bls12_381_q_addcarryx_u64(&x453, &x454, x452, x436, x433);
-  uint64_t x455;
-  fiat_bls12_381_q_uint1 x456;
-  fiat_bls12_381_q_addcarryx_u64(&x455, &x456, x454, x434, 0x0);
-  uint64_t x457;
-  fiat_bls12_381_q_uint1 x458;
-  fiat_bls12_381_q_addcarryx_u64(&x457, &x458, 0x0, x417, x443);
-  uint64_t x459;
-  fiat_bls12_381_q_uint1 x460;
-  fiat_bls12_381_q_addcarryx_u64(&x459, &x460, x458, x419, x445);
-  uint64_t x461;
-  fiat_bls12_381_q_uint1 x462;
-  fiat_bls12_381_q_addcarryx_u64(&x461, &x462, x460, x421, x447);
-  uint64_t x463;
-  fiat_bls12_381_q_uint1 x464;
-  fiat_bls12_381_q_addcarryx_u64(&x463, &x464, x462, x423, x449);
-  uint64_t x465;
-  fiat_bls12_381_q_uint1 x466;
-  fiat_bls12_381_q_addcarryx_u64(&x465, &x466, x464, x425, x451);
-  uint64_t x467;
-  fiat_bls12_381_q_uint1 x468;
-  fiat_bls12_381_q_addcarryx_u64(&x467, &x468, x466, x427, x453);
-  uint64_t x469;
-  fiat_bls12_381_q_uint1 x470;
-  fiat_bls12_381_q_addcarryx_u64(&x469, &x470, x468, x429, x455);
-  uint64_t x471;
-  fiat_bls12_381_q_uint1 x472;
-  fiat_bls12_381_q_addcarryx_u64(&x471, &x472, x470, x430, 0x0);
-  uint64_t x473;
-  fiat_bls12_381_q_uint1 x474;
-  fiat_bls12_381_q_subborrowx_u64(&x473, &x474, 0x0, x459, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x475;
-  fiat_bls12_381_q_uint1 x476;
-  fiat_bls12_381_q_subborrowx_u64(&x475, &x476, x474, x461, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x477;
-  fiat_bls12_381_q_uint1 x478;
-  fiat_bls12_381_q_subborrowx_u64(&x477, &x478, x476, x463, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x479;
-  fiat_bls12_381_q_uint1 x480;
-  fiat_bls12_381_q_subborrowx_u64(&x479, &x480, x478, x465, UINT64_C(0x64774b84f38512bf));
-  uint64_t x481;
-  fiat_bls12_381_q_uint1 x482;
-  fiat_bls12_381_q_subborrowx_u64(&x481, &x482, x480, x467, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x483;
-  fiat_bls12_381_q_uint1 x484;
-  fiat_bls12_381_q_subborrowx_u64(&x483, &x484, x482, x469, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x485;
-  fiat_bls12_381_q_uint1 x486;
-  fiat_bls12_381_q_subborrowx_u64(&x485, &x486, x484, x471, 0x0);
-  uint64_t x487;
-  fiat_bls12_381_q_cmovznz_u64(&x487, x486, x473, x459);
-  uint64_t x488;
-  fiat_bls12_381_q_cmovznz_u64(&x488, x486, x475, x461);
-  uint64_t x489;
-  fiat_bls12_381_q_cmovznz_u64(&x489, x486, x477, x463);
-  uint64_t x490;
-  fiat_bls12_381_q_cmovznz_u64(&x490, x486, x479, x465);
-  uint64_t x491;
-  fiat_bls12_381_q_cmovznz_u64(&x491, x486, x481, x467);
-  uint64_t x492;
-  fiat_bls12_381_q_cmovznz_u64(&x492, x486, x483, x469);
-  out1[0] = x487;
-  out1[1] = x488;
-  out1[2] = x489;
-  out1[3] = x490;
-  out1[4] = x491;
-  out1[5] = x492;
-}
-
-/*
- * The function fiat_bls12_381_q_square squares a field element in the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- * Postconditions:
- *   eval (from_montgomery out1) mod m = (eval (from_montgomery arg1) * eval (from_montgomery arg1)) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_square(uint64_t out1[6], const uint64_t arg1[6]) {
-  uint64_t x1 = (arg1[1]);
-  uint64_t x2 = (arg1[2]);
-  uint64_t x3 = (arg1[3]);
-  uint64_t x4 = (arg1[4]);
-  uint64_t x5 = (arg1[5]);
-  uint64_t x6 = (arg1[0]);
-  uint64_t x7;
-  uint64_t x8;
-  fiat_bls12_381_q_mulx_u64(&x7, &x8, x6, (arg1[5]));
-  uint64_t x9;
-  uint64_t x10;
-  fiat_bls12_381_q_mulx_u64(&x9, &x10, x6, (arg1[4]));
-  uint64_t x11;
-  uint64_t x12;
-  fiat_bls12_381_q_mulx_u64(&x11, &x12, x6, (arg1[3]));
-  uint64_t x13;
-  uint64_t x14;
-  fiat_bls12_381_q_mulx_u64(&x13, &x14, x6, (arg1[2]));
-  uint64_t x15;
-  uint64_t x16;
-  fiat_bls12_381_q_mulx_u64(&x15, &x16, x6, (arg1[1]));
-  uint64_t x17;
-  uint64_t x18;
-  fiat_bls12_381_q_mulx_u64(&x17, &x18, x6, (arg1[0]));
-  uint64_t x19;
-  fiat_bls12_381_q_uint1 x20;
-  fiat_bls12_381_q_addcarryx_u64(&x19, &x20, 0x0, x18, x15);
-  uint64_t x21;
-  fiat_bls12_381_q_uint1 x22;
-  fiat_bls12_381_q_addcarryx_u64(&x21, &x22, x20, x16, x13);
-  uint64_t x23;
-  fiat_bls12_381_q_uint1 x24;
-  fiat_bls12_381_q_addcarryx_u64(&x23, &x24, x22, x14, x11);
-  uint64_t x25;
-  fiat_bls12_381_q_uint1 x26;
-  fiat_bls12_381_q_addcarryx_u64(&x25, &x26, x24, x12, x9);
-  uint64_t x27;
-  fiat_bls12_381_q_uint1 x28;
-  fiat_bls12_381_q_addcarryx_u64(&x27, &x28, x26, x10, x7);
-  uint64_t x29;
-  fiat_bls12_381_q_uint1 x30;
-  fiat_bls12_381_q_addcarryx_u64(&x29, &x30, x28, x8, 0x0);
-  uint64_t x31;
-  uint64_t x32;
-  fiat_bls12_381_q_mulx_u64(&x31, &x32, x17, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x33;
-  uint64_t x34;
-  fiat_bls12_381_q_mulx_u64(&x33, &x34, x31, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x35;
-  uint64_t x36;
-  fiat_bls12_381_q_mulx_u64(&x35, &x36, x31, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x37;
-  uint64_t x38;
-  fiat_bls12_381_q_mulx_u64(&x37, &x38, x31, UINT64_C(0x64774b84f38512bf));
-  uint64_t x39;
-  uint64_t x40;
-  fiat_bls12_381_q_mulx_u64(&x39, &x40, x31, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x41;
-  uint64_t x42;
-  fiat_bls12_381_q_mulx_u64(&x41, &x42, x31, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x43;
-  uint64_t x44;
-  fiat_bls12_381_q_mulx_u64(&x43, &x44, x31, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x45;
-  fiat_bls12_381_q_uint1 x46;
-  fiat_bls12_381_q_addcarryx_u64(&x45, &x46, 0x0, x44, x41);
-  uint64_t x47;
-  fiat_bls12_381_q_uint1 x48;
-  fiat_bls12_381_q_addcarryx_u64(&x47, &x48, x46, x42, x39);
-  uint64_t x49;
-  fiat_bls12_381_q_uint1 x50;
-  fiat_bls12_381_q_addcarryx_u64(&x49, &x50, x48, x40, x37);
-  uint64_t x51;
-  fiat_bls12_381_q_uint1 x52;
-  fiat_bls12_381_q_addcarryx_u64(&x51, &x52, x50, x38, x35);
-  uint64_t x53;
-  fiat_bls12_381_q_uint1 x54;
-  fiat_bls12_381_q_addcarryx_u64(&x53, &x54, x52, x36, x33);
-  uint64_t x55;
-  fiat_bls12_381_q_uint1 x56;
-  fiat_bls12_381_q_addcarryx_u64(&x55, &x56, x54, x34, 0x0);
-  uint64_t x57;
-  fiat_bls12_381_q_uint1 x58;
-  fiat_bls12_381_q_addcarryx_u64(&x57, &x58, 0x0, x17, x43);
-  uint64_t x59;
-  fiat_bls12_381_q_uint1 x60;
-  fiat_bls12_381_q_addcarryx_u64(&x59, &x60, x58, x19, x45);
-  uint64_t x61;
-  fiat_bls12_381_q_uint1 x62;
-  fiat_bls12_381_q_addcarryx_u64(&x61, &x62, x60, x21, x47);
-  uint64_t x63;
-  fiat_bls12_381_q_uint1 x64;
-  fiat_bls12_381_q_addcarryx_u64(&x63, &x64, x62, x23, x49);
-  uint64_t x65;
-  fiat_bls12_381_q_uint1 x66;
-  fiat_bls12_381_q_addcarryx_u64(&x65, &x66, x64, x25, x51);
-  uint64_t x67;
-  fiat_bls12_381_q_uint1 x68;
-  fiat_bls12_381_q_addcarryx_u64(&x67, &x68, x66, x27, x53);
-  uint64_t x69;
-  fiat_bls12_381_q_uint1 x70;
-  fiat_bls12_381_q_addcarryx_u64(&x69, &x70, x68, x29, x55);
-  uint64_t x71;
-  fiat_bls12_381_q_uint1 x72;
-  fiat_bls12_381_q_addcarryx_u64(&x71, &x72, x70, 0x0, 0x0);
-  uint64_t x73;
-  uint64_t x74;
-  fiat_bls12_381_q_mulx_u64(&x73, &x74, x1, (arg1[5]));
-  uint64_t x75;
-  uint64_t x76;
-  fiat_bls12_381_q_mulx_u64(&x75, &x76, x1, (arg1[4]));
-  uint64_t x77;
-  uint64_t x78;
-  fiat_bls12_381_q_mulx_u64(&x77, &x78, x1, (arg1[3]));
-  uint64_t x79;
-  uint64_t x80;
-  fiat_bls12_381_q_mulx_u64(&x79, &x80, x1, (arg1[2]));
-  uint64_t x81;
-  uint64_t x82;
-  fiat_bls12_381_q_mulx_u64(&x81, &x82, x1, (arg1[1]));
-  uint64_t x83;
-  uint64_t x84;
-  fiat_bls12_381_q_mulx_u64(&x83, &x84, x1, (arg1[0]));
-  uint64_t x85;
-  fiat_bls12_381_q_uint1 x86;
-  fiat_bls12_381_q_addcarryx_u64(&x85, &x86, 0x0, x84, x81);
-  uint64_t x87;
-  fiat_bls12_381_q_uint1 x88;
-  fiat_bls12_381_q_addcarryx_u64(&x87, &x88, x86, x82, x79);
-  uint64_t x89;
-  fiat_bls12_381_q_uint1 x90;
-  fiat_bls12_381_q_addcarryx_u64(&x89, &x90, x88, x80, x77);
-  uint64_t x91;
-  fiat_bls12_381_q_uint1 x92;
-  fiat_bls12_381_q_addcarryx_u64(&x91, &x92, x90, x78, x75);
-  uint64_t x93;
-  fiat_bls12_381_q_uint1 x94;
-  fiat_bls12_381_q_addcarryx_u64(&x93, &x94, x92, x76, x73);
-  uint64_t x95;
-  fiat_bls12_381_q_uint1 x96;
-  fiat_bls12_381_q_addcarryx_u64(&x95, &x96, x94, x74, 0x0);
-  uint64_t x97;
-  fiat_bls12_381_q_uint1 x98;
-  fiat_bls12_381_q_addcarryx_u64(&x97, &x98, 0x0, x59, x83);
-  uint64_t x99;
-  fiat_bls12_381_q_uint1 x100;
-  fiat_bls12_381_q_addcarryx_u64(&x99, &x100, x98, x61, x85);
-  uint64_t x101;
-  fiat_bls12_381_q_uint1 x102;
-  fiat_bls12_381_q_addcarryx_u64(&x101, &x102, x100, x63, x87);
-  uint64_t x103;
-  fiat_bls12_381_q_uint1 x104;
-  fiat_bls12_381_q_addcarryx_u64(&x103, &x104, x102, x65, x89);
-  uint64_t x105;
-  fiat_bls12_381_q_uint1 x106;
-  fiat_bls12_381_q_addcarryx_u64(&x105, &x106, x104, x67, x91);
-  uint64_t x107;
-  fiat_bls12_381_q_uint1 x108;
-  fiat_bls12_381_q_addcarryx_u64(&x107, &x108, x106, x69, x93);
-  uint64_t x109;
-  fiat_bls12_381_q_uint1 x110;
-  fiat_bls12_381_q_addcarryx_u64(&x109, &x110, x108, (fiat_bls12_381_q_uint1)x71, x95);
-  uint64_t x111;
-  uint64_t x112;
-  fiat_bls12_381_q_mulx_u64(&x111, &x112, x97, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x113;
-  uint64_t x114;
-  fiat_bls12_381_q_mulx_u64(&x113, &x114, x111, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x115;
-  uint64_t x116;
-  fiat_bls12_381_q_mulx_u64(&x115, &x116, x111, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x117;
-  uint64_t x118;
-  fiat_bls12_381_q_mulx_u64(&x117, &x118, x111, UINT64_C(0x64774b84f38512bf));
-  uint64_t x119;
-  uint64_t x120;
-  fiat_bls12_381_q_mulx_u64(&x119, &x120, x111, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x121;
-  uint64_t x122;
-  fiat_bls12_381_q_mulx_u64(&x121, &x122, x111, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x123;
-  uint64_t x124;
-  fiat_bls12_381_q_mulx_u64(&x123, &x124, x111, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x125;
-  fiat_bls12_381_q_uint1 x126;
-  fiat_bls12_381_q_addcarryx_u64(&x125, &x126, 0x0, x124, x121);
-  uint64_t x127;
-  fiat_bls12_381_q_uint1 x128;
-  fiat_bls12_381_q_addcarryx_u64(&x127, &x128, x126, x122, x119);
-  uint64_t x129;
-  fiat_bls12_381_q_uint1 x130;
-  fiat_bls12_381_q_addcarryx_u64(&x129, &x130, x128, x120, x117);
-  uint64_t x131;
-  fiat_bls12_381_q_uint1 x132;
-  fiat_bls12_381_q_addcarryx_u64(&x131, &x132, x130, x118, x115);
-  uint64_t x133;
-  fiat_bls12_381_q_uint1 x134;
-  fiat_bls12_381_q_addcarryx_u64(&x133, &x134, x132, x116, x113);
-  uint64_t x135;
-  fiat_bls12_381_q_uint1 x136;
-  fiat_bls12_381_q_addcarryx_u64(&x135, &x136, x134, x114, 0x0);
-  uint64_t x137;
-  fiat_bls12_381_q_uint1 x138;
-  fiat_bls12_381_q_addcarryx_u64(&x137, &x138, 0x0, x97, x123);
-  uint64_t x139;
-  fiat_bls12_381_q_uint1 x140;
-  fiat_bls12_381_q_addcarryx_u64(&x139, &x140, x138, x99, x125);
-  uint64_t x141;
-  fiat_bls12_381_q_uint1 x142;
-  fiat_bls12_381_q_addcarryx_u64(&x141, &x142, x140, x101, x127);
-  uint64_t x143;
-  fiat_bls12_381_q_uint1 x144;
-  fiat_bls12_381_q_addcarryx_u64(&x143, &x144, x142, x103, x129);
-  uint64_t x145;
-  fiat_bls12_381_q_uint1 x146;
-  fiat_bls12_381_q_addcarryx_u64(&x145, &x146, x144, x105, x131);
-  uint64_t x147;
-  fiat_bls12_381_q_uint1 x148;
-  fiat_bls12_381_q_addcarryx_u64(&x147, &x148, x146, x107, x133);
-  uint64_t x149;
-  fiat_bls12_381_q_uint1 x150;
-  fiat_bls12_381_q_addcarryx_u64(&x149, &x150, x148, x109, x135);
-  uint64_t x151;
-  fiat_bls12_381_q_uint1 x152;
-  fiat_bls12_381_q_addcarryx_u64(&x151, &x152, x150, x110, 0x0);
-  uint64_t x153;
-  uint64_t x154;
-  fiat_bls12_381_q_mulx_u64(&x153, &x154, x2, (arg1[5]));
-  uint64_t x155;
-  uint64_t x156;
-  fiat_bls12_381_q_mulx_u64(&x155, &x156, x2, (arg1[4]));
-  uint64_t x157;
-  uint64_t x158;
-  fiat_bls12_381_q_mulx_u64(&x157, &x158, x2, (arg1[3]));
-  uint64_t x159;
-  uint64_t x160;
-  fiat_bls12_381_q_mulx_u64(&x159, &x160, x2, (arg1[2]));
-  uint64_t x161;
-  uint64_t x162;
-  fiat_bls12_381_q_mulx_u64(&x161, &x162, x2, (arg1[1]));
-  uint64_t x163;
-  uint64_t x164;
-  fiat_bls12_381_q_mulx_u64(&x163, &x164, x2, (arg1[0]));
-  uint64_t x165;
-  fiat_bls12_381_q_uint1 x166;
-  fiat_bls12_381_q_addcarryx_u64(&x165, &x166, 0x0, x164, x161);
-  uint64_t x167;
-  fiat_bls12_381_q_uint1 x168;
-  fiat_bls12_381_q_addcarryx_u64(&x167, &x168, x166, x162, x159);
-  uint64_t x169;
-  fiat_bls12_381_q_uint1 x170;
-  fiat_bls12_381_q_addcarryx_u64(&x169, &x170, x168, x160, x157);
-  uint64_t x171;
-  fiat_bls12_381_q_uint1 x172;
-  fiat_bls12_381_q_addcarryx_u64(&x171, &x172, x170, x158, x155);
-  uint64_t x173;
-  fiat_bls12_381_q_uint1 x174;
-  fiat_bls12_381_q_addcarryx_u64(&x173, &x174, x172, x156, x153);
-  uint64_t x175;
-  fiat_bls12_381_q_uint1 x176;
-  fiat_bls12_381_q_addcarryx_u64(&x175, &x176, x174, x154, 0x0);
-  uint64_t x177;
-  fiat_bls12_381_q_uint1 x178;
-  fiat_bls12_381_q_addcarryx_u64(&x177, &x178, 0x0, x139, x163);
-  uint64_t x179;
-  fiat_bls12_381_q_uint1 x180;
-  fiat_bls12_381_q_addcarryx_u64(&x179, &x180, x178, x141, x165);
-  uint64_t x181;
-  fiat_bls12_381_q_uint1 x182;
-  fiat_bls12_381_q_addcarryx_u64(&x181, &x182, x180, x143, x167);
-  uint64_t x183;
-  fiat_bls12_381_q_uint1 x184;
-  fiat_bls12_381_q_addcarryx_u64(&x183, &x184, x182, x145, x169);
-  uint64_t x185;
-  fiat_bls12_381_q_uint1 x186;
-  fiat_bls12_381_q_addcarryx_u64(&x185, &x186, x184, x147, x171);
-  uint64_t x187;
-  fiat_bls12_381_q_uint1 x188;
-  fiat_bls12_381_q_addcarryx_u64(&x187, &x188, x186, x149, x173);
-  uint64_t x189;
-  fiat_bls12_381_q_uint1 x190;
-  fiat_bls12_381_q_addcarryx_u64(&x189, &x190, x188, x151, x175);
-  uint64_t x191;
-  uint64_t x192;
-  fiat_bls12_381_q_mulx_u64(&x191, &x192, x177, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x193;
-  uint64_t x194;
-  fiat_bls12_381_q_mulx_u64(&x193, &x194, x191, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x195;
-  uint64_t x196;
-  fiat_bls12_381_q_mulx_u64(&x195, &x196, x191, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x197;
-  uint64_t x198;
-  fiat_bls12_381_q_mulx_u64(&x197, &x198, x191, UINT64_C(0x64774b84f38512bf));
-  uint64_t x199;
-  uint64_t x200;
-  fiat_bls12_381_q_mulx_u64(&x199, &x200, x191, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x201;
-  uint64_t x202;
-  fiat_bls12_381_q_mulx_u64(&x201, &x202, x191, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x203;
-  uint64_t x204;
-  fiat_bls12_381_q_mulx_u64(&x203, &x204, x191, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x205;
-  fiat_bls12_381_q_uint1 x206;
-  fiat_bls12_381_q_addcarryx_u64(&x205, &x206, 0x0, x204, x201);
-  uint64_t x207;
-  fiat_bls12_381_q_uint1 x208;
-  fiat_bls12_381_q_addcarryx_u64(&x207, &x208, x206, x202, x199);
-  uint64_t x209;
-  fiat_bls12_381_q_uint1 x210;
-  fiat_bls12_381_q_addcarryx_u64(&x209, &x210, x208, x200, x197);
-  uint64_t x211;
-  fiat_bls12_381_q_uint1 x212;
-  fiat_bls12_381_q_addcarryx_u64(&x211, &x212, x210, x198, x195);
-  uint64_t x213;
-  fiat_bls12_381_q_uint1 x214;
-  fiat_bls12_381_q_addcarryx_u64(&x213, &x214, x212, x196, x193);
-  uint64_t x215;
-  fiat_bls12_381_q_uint1 x216;
-  fiat_bls12_381_q_addcarryx_u64(&x215, &x216, x214, x194, 0x0);
-  uint64_t x217;
-  fiat_bls12_381_q_uint1 x218;
-  fiat_bls12_381_q_addcarryx_u64(&x217, &x218, 0x0, x177, x203);
-  uint64_t x219;
-  fiat_bls12_381_q_uint1 x220;
-  fiat_bls12_381_q_addcarryx_u64(&x219, &x220, x218, x179, x205);
-  uint64_t x221;
-  fiat_bls12_381_q_uint1 x222;
-  fiat_bls12_381_q_addcarryx_u64(&x221, &x222, x220, x181, x207);
-  uint64_t x223;
-  fiat_bls12_381_q_uint1 x224;
-  fiat_bls12_381_q_addcarryx_u64(&x223, &x224, x222, x183, x209);
-  uint64_t x225;
-  fiat_bls12_381_q_uint1 x226;
-  fiat_bls12_381_q_addcarryx_u64(&x225, &x226, x224, x185, x211);
-  uint64_t x227;
-  fiat_bls12_381_q_uint1 x228;
-  fiat_bls12_381_q_addcarryx_u64(&x227, &x228, x226, x187, x213);
-  uint64_t x229;
-  fiat_bls12_381_q_uint1 x230;
-  fiat_bls12_381_q_addcarryx_u64(&x229, &x230, x228, x189, x215);
-  uint64_t x231;
-  fiat_bls12_381_q_uint1 x232;
-  fiat_bls12_381_q_addcarryx_u64(&x231, &x232, x230, x190, 0x0);
-  uint64_t x233;
-  uint64_t x234;
-  fiat_bls12_381_q_mulx_u64(&x233, &x234, x3, (arg1[5]));
-  uint64_t x235;
-  uint64_t x236;
-  fiat_bls12_381_q_mulx_u64(&x235, &x236, x3, (arg1[4]));
-  uint64_t x237;
-  uint64_t x238;
-  fiat_bls12_381_q_mulx_u64(&x237, &x238, x3, (arg1[3]));
-  uint64_t x239;
-  uint64_t x240;
-  fiat_bls12_381_q_mulx_u64(&x239, &x240, x3, (arg1[2]));
-  uint64_t x241;
-  uint64_t x242;
-  fiat_bls12_381_q_mulx_u64(&x241, &x242, x3, (arg1[1]));
-  uint64_t x243;
-  uint64_t x244;
-  fiat_bls12_381_q_mulx_u64(&x243, &x244, x3, (arg1[0]));
-  uint64_t x245;
-  fiat_bls12_381_q_uint1 x246;
-  fiat_bls12_381_q_addcarryx_u64(&x245, &x246, 0x0, x244, x241);
-  uint64_t x247;
-  fiat_bls12_381_q_uint1 x248;
-  fiat_bls12_381_q_addcarryx_u64(&x247, &x248, x246, x242, x239);
-  uint64_t x249;
-  fiat_bls12_381_q_uint1 x250;
-  fiat_bls12_381_q_addcarryx_u64(&x249, &x250, x248, x240, x237);
-  uint64_t x251;
-  fiat_bls12_381_q_uint1 x252;
-  fiat_bls12_381_q_addcarryx_u64(&x251, &x252, x250, x238, x235);
-  uint64_t x253;
-  fiat_bls12_381_q_uint1 x254;
-  fiat_bls12_381_q_addcarryx_u64(&x253, &x254, x252, x236, x233);
-  uint64_t x255;
-  fiat_bls12_381_q_uint1 x256;
-  fiat_bls12_381_q_addcarryx_u64(&x255, &x256, x254, x234, 0x0);
-  uint64_t x257;
-  fiat_bls12_381_q_uint1 x258;
-  fiat_bls12_381_q_addcarryx_u64(&x257, &x258, 0x0, x219, x243);
-  uint64_t x259;
-  fiat_bls12_381_q_uint1 x260;
-  fiat_bls12_381_q_addcarryx_u64(&x259, &x260, x258, x221, x245);
-  uint64_t x261;
-  fiat_bls12_381_q_uint1 x262;
-  fiat_bls12_381_q_addcarryx_u64(&x261, &x262, x260, x223, x247);
-  uint64_t x263;
-  fiat_bls12_381_q_uint1 x264;
-  fiat_bls12_381_q_addcarryx_u64(&x263, &x264, x262, x225, x249);
-  uint64_t x265;
-  fiat_bls12_381_q_uint1 x266;
-  fiat_bls12_381_q_addcarryx_u64(&x265, &x266, x264, x227, x251);
-  uint64_t x267;
-  fiat_bls12_381_q_uint1 x268;
-  fiat_bls12_381_q_addcarryx_u64(&x267, &x268, x266, x229, x253);
-  uint64_t x269;
-  fiat_bls12_381_q_uint1 x270;
-  fiat_bls12_381_q_addcarryx_u64(&x269, &x270, x268, x231, x255);
-  uint64_t x271;
-  uint64_t x272;
-  fiat_bls12_381_q_mulx_u64(&x271, &x272, x257, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x273;
-  uint64_t x274;
-  fiat_bls12_381_q_mulx_u64(&x273, &x274, x271, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x275;
-  uint64_t x276;
-  fiat_bls12_381_q_mulx_u64(&x275, &x276, x271, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x277;
-  uint64_t x278;
-  fiat_bls12_381_q_mulx_u64(&x277, &x278, x271, UINT64_C(0x64774b84f38512bf));
-  uint64_t x279;
-  uint64_t x280;
-  fiat_bls12_381_q_mulx_u64(&x279, &x280, x271, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x281;
-  uint64_t x282;
-  fiat_bls12_381_q_mulx_u64(&x281, &x282, x271, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x283;
-  uint64_t x284;
-  fiat_bls12_381_q_mulx_u64(&x283, &x284, x271, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x285;
-  fiat_bls12_381_q_uint1 x286;
-  fiat_bls12_381_q_addcarryx_u64(&x285, &x286, 0x0, x284, x281);
-  uint64_t x287;
-  fiat_bls12_381_q_uint1 x288;
-  fiat_bls12_381_q_addcarryx_u64(&x287, &x288, x286, x282, x279);
-  uint64_t x289;
-  fiat_bls12_381_q_uint1 x290;
-  fiat_bls12_381_q_addcarryx_u64(&x289, &x290, x288, x280, x277);
-  uint64_t x291;
-  fiat_bls12_381_q_uint1 x292;
-  fiat_bls12_381_q_addcarryx_u64(&x291, &x292, x290, x278, x275);
-  uint64_t x293;
-  fiat_bls12_381_q_uint1 x294;
-  fiat_bls12_381_q_addcarryx_u64(&x293, &x294, x292, x276, x273);
-  uint64_t x295;
-  fiat_bls12_381_q_uint1 x296;
-  fiat_bls12_381_q_addcarryx_u64(&x295, &x296, x294, x274, 0x0);
-  uint64_t x297;
-  fiat_bls12_381_q_uint1 x298;
-  fiat_bls12_381_q_addcarryx_u64(&x297, &x298, 0x0, x257, x283);
-  uint64_t x299;
-  fiat_bls12_381_q_uint1 x300;
-  fiat_bls12_381_q_addcarryx_u64(&x299, &x300, x298, x259, x285);
-  uint64_t x301;
-  fiat_bls12_381_q_uint1 x302;
-  fiat_bls12_381_q_addcarryx_u64(&x301, &x302, x300, x261, x287);
-  uint64_t x303;
-  fiat_bls12_381_q_uint1 x304;
-  fiat_bls12_381_q_addcarryx_u64(&x303, &x304, x302, x263, x289);
-  uint64_t x305;
-  fiat_bls12_381_q_uint1 x306;
-  fiat_bls12_381_q_addcarryx_u64(&x305, &x306, x304, x265, x291);
-  uint64_t x307;
-  fiat_bls12_381_q_uint1 x308;
-  fiat_bls12_381_q_addcarryx_u64(&x307, &x308, x306, x267, x293);
-  uint64_t x309;
-  fiat_bls12_381_q_uint1 x310;
-  fiat_bls12_381_q_addcarryx_u64(&x309, &x310, x308, x269, x295);
-  uint64_t x311;
-  fiat_bls12_381_q_uint1 x312;
-  fiat_bls12_381_q_addcarryx_u64(&x311, &x312, x310, x270, 0x0);
-  uint64_t x313;
-  uint64_t x314;
-  fiat_bls12_381_q_mulx_u64(&x313, &x314, x4, (arg1[5]));
-  uint64_t x315;
-  uint64_t x316;
-  fiat_bls12_381_q_mulx_u64(&x315, &x316, x4, (arg1[4]));
-  uint64_t x317;
-  uint64_t x318;
-  fiat_bls12_381_q_mulx_u64(&x317, &x318, x4, (arg1[3]));
-  uint64_t x319;
-  uint64_t x320;
-  fiat_bls12_381_q_mulx_u64(&x319, &x320, x4, (arg1[2]));
-  uint64_t x321;
-  uint64_t x322;
-  fiat_bls12_381_q_mulx_u64(&x321, &x322, x4, (arg1[1]));
-  uint64_t x323;
-  uint64_t x324;
-  fiat_bls12_381_q_mulx_u64(&x323, &x324, x4, (arg1[0]));
-  uint64_t x325;
-  fiat_bls12_381_q_uint1 x326;
-  fiat_bls12_381_q_addcarryx_u64(&x325, &x326, 0x0, x324, x321);
-  uint64_t x327;
-  fiat_bls12_381_q_uint1 x328;
-  fiat_bls12_381_q_addcarryx_u64(&x327, &x328, x326, x322, x319);
-  uint64_t x329;
-  fiat_bls12_381_q_uint1 x330;
-  fiat_bls12_381_q_addcarryx_u64(&x329, &x330, x328, x320, x317);
-  uint64_t x331;
-  fiat_bls12_381_q_uint1 x332;
-  fiat_bls12_381_q_addcarryx_u64(&x331, &x332, x330, x318, x315);
-  uint64_t x333;
-  fiat_bls12_381_q_uint1 x334;
-  fiat_bls12_381_q_addcarryx_u64(&x333, &x334, x332, x316, x313);
-  uint64_t x335;
-  fiat_bls12_381_q_uint1 x336;
-  fiat_bls12_381_q_addcarryx_u64(&x335, &x336, x334, x314, 0x0);
-  uint64_t x337;
-  fiat_bls12_381_q_uint1 x338;
-  fiat_bls12_381_q_addcarryx_u64(&x337, &x338, 0x0, x299, x323);
-  uint64_t x339;
-  fiat_bls12_381_q_uint1 x340;
-  fiat_bls12_381_q_addcarryx_u64(&x339, &x340, x338, x301, x325);
-  uint64_t x341;
-  fiat_bls12_381_q_uint1 x342;
-  fiat_bls12_381_q_addcarryx_u64(&x341, &x342, x340, x303, x327);
-  uint64_t x343;
-  fiat_bls12_381_q_uint1 x344;
-  fiat_bls12_381_q_addcarryx_u64(&x343, &x344, x342, x305, x329);
-  uint64_t x345;
-  fiat_bls12_381_q_uint1 x346;
-  fiat_bls12_381_q_addcarryx_u64(&x345, &x346, x344, x307, x331);
-  uint64_t x347;
-  fiat_bls12_381_q_uint1 x348;
-  fiat_bls12_381_q_addcarryx_u64(&x347, &x348, x346, x309, x333);
-  uint64_t x349;
-  fiat_bls12_381_q_uint1 x350;
-  fiat_bls12_381_q_addcarryx_u64(&x349, &x350, x348, x311, x335);
-  uint64_t x351;
-  uint64_t x352;
-  fiat_bls12_381_q_mulx_u64(&x351, &x352, x337, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x353;
-  uint64_t x354;
-  fiat_bls12_381_q_mulx_u64(&x353, &x354, x351, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x355;
-  uint64_t x356;
-  fiat_bls12_381_q_mulx_u64(&x355, &x356, x351, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x357;
-  uint64_t x358;
-  fiat_bls12_381_q_mulx_u64(&x357, &x358, x351, UINT64_C(0x64774b84f38512bf));
-  uint64_t x359;
-  uint64_t x360;
-  fiat_bls12_381_q_mulx_u64(&x359, &x360, x351, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x361;
-  uint64_t x362;
-  fiat_bls12_381_q_mulx_u64(&x361, &x362, x351, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x363;
-  uint64_t x364;
-  fiat_bls12_381_q_mulx_u64(&x363, &x364, x351, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x365;
-  fiat_bls12_381_q_uint1 x366;
-  fiat_bls12_381_q_addcarryx_u64(&x365, &x366, 0x0, x364, x361);
-  uint64_t x367;
-  fiat_bls12_381_q_uint1 x368;
-  fiat_bls12_381_q_addcarryx_u64(&x367, &x368, x366, x362, x359);
-  uint64_t x369;
-  fiat_bls12_381_q_uint1 x370;
-  fiat_bls12_381_q_addcarryx_u64(&x369, &x370, x368, x360, x357);
-  uint64_t x371;
-  fiat_bls12_381_q_uint1 x372;
-  fiat_bls12_381_q_addcarryx_u64(&x371, &x372, x370, x358, x355);
-  uint64_t x373;
-  fiat_bls12_381_q_uint1 x374;
-  fiat_bls12_381_q_addcarryx_u64(&x373, &x374, x372, x356, x353);
-  uint64_t x375;
-  fiat_bls12_381_q_uint1 x376;
-  fiat_bls12_381_q_addcarryx_u64(&x375, &x376, x374, x354, 0x0);
-  uint64_t x377;
-  fiat_bls12_381_q_uint1 x378;
-  fiat_bls12_381_q_addcarryx_u64(&x377, &x378, 0x0, x337, x363);
-  uint64_t x379;
-  fiat_bls12_381_q_uint1 x380;
-  fiat_bls12_381_q_addcarryx_u64(&x379, &x380, x378, x339, x365);
-  uint64_t x381;
-  fiat_bls12_381_q_uint1 x382;
-  fiat_bls12_381_q_addcarryx_u64(&x381, &x382, x380, x341, x367);
-  uint64_t x383;
-  fiat_bls12_381_q_uint1 x384;
-  fiat_bls12_381_q_addcarryx_u64(&x383, &x384, x382, x343, x369);
-  uint64_t x385;
-  fiat_bls12_381_q_uint1 x386;
-  fiat_bls12_381_q_addcarryx_u64(&x385, &x386, x384, x345, x371);
-  uint64_t x387;
-  fiat_bls12_381_q_uint1 x388;
-  fiat_bls12_381_q_addcarryx_u64(&x387, &x388, x386, x347, x373);
-  uint64_t x389;
-  fiat_bls12_381_q_uint1 x390;
-  fiat_bls12_381_q_addcarryx_u64(&x389, &x390, x388, x349, x375);
-  uint64_t x391;
-  fiat_bls12_381_q_uint1 x392;
-  fiat_bls12_381_q_addcarryx_u64(&x391, &x392, x390, x350, 0x0);
-  uint64_t x393;
-  uint64_t x394;
-  fiat_bls12_381_q_mulx_u64(&x393, &x394, x5, (arg1[5]));
-  uint64_t x395;
-  uint64_t x396;
-  fiat_bls12_381_q_mulx_u64(&x395, &x396, x5, (arg1[4]));
-  uint64_t x397;
-  uint64_t x398;
-  fiat_bls12_381_q_mulx_u64(&x397, &x398, x5, (arg1[3]));
-  uint64_t x399;
-  uint64_t x400;
-  fiat_bls12_381_q_mulx_u64(&x399, &x400, x5, (arg1[2]));
-  uint64_t x401;
-  uint64_t x402;
-  fiat_bls12_381_q_mulx_u64(&x401, &x402, x5, (arg1[1]));
-  uint64_t x403;
-  uint64_t x404;
-  fiat_bls12_381_q_mulx_u64(&x403, &x404, x5, (arg1[0]));
-  uint64_t x405;
-  fiat_bls12_381_q_uint1 x406;
-  fiat_bls12_381_q_addcarryx_u64(&x405, &x406, 0x0, x404, x401);
-  uint64_t x407;
-  fiat_bls12_381_q_uint1 x408;
-  fiat_bls12_381_q_addcarryx_u64(&x407, &x408, x406, x402, x399);
-  uint64_t x409;
-  fiat_bls12_381_q_uint1 x410;
-  fiat_bls12_381_q_addcarryx_u64(&x409, &x410, x408, x400, x397);
-  uint64_t x411;
-  fiat_bls12_381_q_uint1 x412;
-  fiat_bls12_381_q_addcarryx_u64(&x411, &x412, x410, x398, x395);
-  uint64_t x413;
-  fiat_bls12_381_q_uint1 x414;
-  fiat_bls12_381_q_addcarryx_u64(&x413, &x414, x412, x396, x393);
-  uint64_t x415;
-  fiat_bls12_381_q_uint1 x416;
-  fiat_bls12_381_q_addcarryx_u64(&x415, &x416, x414, x394, 0x0);
-  uint64_t x417;
-  fiat_bls12_381_q_uint1 x418;
-  fiat_bls12_381_q_addcarryx_u64(&x417, &x418, 0x0, x379, x403);
-  uint64_t x419;
-  fiat_bls12_381_q_uint1 x420;
-  fiat_bls12_381_q_addcarryx_u64(&x419, &x420, x418, x381, x405);
-  uint64_t x421;
-  fiat_bls12_381_q_uint1 x422;
-  fiat_bls12_381_q_addcarryx_u64(&x421, &x422, x420, x383, x407);
-  uint64_t x423;
-  fiat_bls12_381_q_uint1 x424;
-  fiat_bls12_381_q_addcarryx_u64(&x423, &x424, x422, x385, x409);
-  uint64_t x425;
-  fiat_bls12_381_q_uint1 x426;
-  fiat_bls12_381_q_addcarryx_u64(&x425, &x426, x424, x387, x411);
-  uint64_t x427;
-  fiat_bls12_381_q_uint1 x428;
-  fiat_bls12_381_q_addcarryx_u64(&x427, &x428, x426, x389, x413);
-  uint64_t x429;
-  fiat_bls12_381_q_uint1 x430;
-  fiat_bls12_381_q_addcarryx_u64(&x429, &x430, x428, x391, x415);
-  uint64_t x431;
-  uint64_t x432;
-  fiat_bls12_381_q_mulx_u64(&x431, &x432, x417, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x433;
-  uint64_t x434;
-  fiat_bls12_381_q_mulx_u64(&x433, &x434, x431, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x435;
-  uint64_t x436;
-  fiat_bls12_381_q_mulx_u64(&x435, &x436, x431, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x437;
-  uint64_t x438;
-  fiat_bls12_381_q_mulx_u64(&x437, &x438, x431, UINT64_C(0x64774b84f38512bf));
-  uint64_t x439;
-  uint64_t x440;
-  fiat_bls12_381_q_mulx_u64(&x439, &x440, x431, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x441;
-  uint64_t x442;
-  fiat_bls12_381_q_mulx_u64(&x441, &x442, x431, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x443;
-  uint64_t x444;
-  fiat_bls12_381_q_mulx_u64(&x443, &x444, x431, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x445;
-  fiat_bls12_381_q_uint1 x446;
-  fiat_bls12_381_q_addcarryx_u64(&x445, &x446, 0x0, x444, x441);
-  uint64_t x447;
-  fiat_bls12_381_q_uint1 x448;
-  fiat_bls12_381_q_addcarryx_u64(&x447, &x448, x446, x442, x439);
-  uint64_t x449;
-  fiat_bls12_381_q_uint1 x450;
-  fiat_bls12_381_q_addcarryx_u64(&x449, &x450, x448, x440, x437);
-  uint64_t x451;
-  fiat_bls12_381_q_uint1 x452;
-  fiat_bls12_381_q_addcarryx_u64(&x451, &x452, x450, x438, x435);
-  uint64_t x453;
-  fiat_bls12_381_q_uint1 x454;
-  fiat_bls12_381_q_addcarryx_u64(&x453, &x454, x452, x436, x433);
-  uint64_t x455;
-  fiat_bls12_381_q_uint1 x456;
-  fiat_bls12_381_q_addcarryx_u64(&x455, &x456, x454, x434, 0x0);
-  uint64_t x457;
-  fiat_bls12_381_q_uint1 x458;
-  fiat_bls12_381_q_addcarryx_u64(&x457, &x458, 0x0, x417, x443);
-  uint64_t x459;
-  fiat_bls12_381_q_uint1 x460;
-  fiat_bls12_381_q_addcarryx_u64(&x459, &x460, x458, x419, x445);
-  uint64_t x461;
-  fiat_bls12_381_q_uint1 x462;
-  fiat_bls12_381_q_addcarryx_u64(&x461, &x462, x460, x421, x447);
-  uint64_t x463;
-  fiat_bls12_381_q_uint1 x464;
-  fiat_bls12_381_q_addcarryx_u64(&x463, &x464, x462, x423, x449);
-  uint64_t x465;
-  fiat_bls12_381_q_uint1 x466;
-  fiat_bls12_381_q_addcarryx_u64(&x465, &x466, x464, x425, x451);
-  uint64_t x467;
-  fiat_bls12_381_q_uint1 x468;
-  fiat_bls12_381_q_addcarryx_u64(&x467, &x468, x466, x427, x453);
-  uint64_t x469;
-  fiat_bls12_381_q_uint1 x470;
-  fiat_bls12_381_q_addcarryx_u64(&x469, &x470, x468, x429, x455);
-  uint64_t x471;
-  fiat_bls12_381_q_uint1 x472;
-  fiat_bls12_381_q_addcarryx_u64(&x471, &x472, x470, x430, 0x0);
-  uint64_t x473;
-  fiat_bls12_381_q_uint1 x474;
-  fiat_bls12_381_q_subborrowx_u64(&x473, &x474, 0x0, x459, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x475;
-  fiat_bls12_381_q_uint1 x476;
-  fiat_bls12_381_q_subborrowx_u64(&x475, &x476, x474, x461, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x477;
-  fiat_bls12_381_q_uint1 x478;
-  fiat_bls12_381_q_subborrowx_u64(&x477, &x478, x476, x463, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x479;
-  fiat_bls12_381_q_uint1 x480;
-  fiat_bls12_381_q_subborrowx_u64(&x479, &x480, x478, x465, UINT64_C(0x64774b84f38512bf));
-  uint64_t x481;
-  fiat_bls12_381_q_uint1 x482;
-  fiat_bls12_381_q_subborrowx_u64(&x481, &x482, x480, x467, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x483;
-  fiat_bls12_381_q_uint1 x484;
-  fiat_bls12_381_q_subborrowx_u64(&x483, &x484, x482, x469, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x485;
-  fiat_bls12_381_q_uint1 x486;
-  fiat_bls12_381_q_subborrowx_u64(&x485, &x486, x484, x471, 0x0);
-  uint64_t x487;
-  fiat_bls12_381_q_cmovznz_u64(&x487, x486, x473, x459);
-  uint64_t x488;
-  fiat_bls12_381_q_cmovznz_u64(&x488, x486, x475, x461);
-  uint64_t x489;
-  fiat_bls12_381_q_cmovznz_u64(&x489, x486, x477, x463);
-  uint64_t x490;
-  fiat_bls12_381_q_cmovznz_u64(&x490, x486, x479, x465);
-  uint64_t x491;
-  fiat_bls12_381_q_cmovznz_u64(&x491, x486, x481, x467);
-  uint64_t x492;
-  fiat_bls12_381_q_cmovznz_u64(&x492, x486, x483, x469);
-  out1[0] = x487;
-  out1[1] = x488;
-  out1[2] = x489;
-  out1[3] = x490;
-  out1[4] = x491;
-  out1[5] = x492;
-}
-
-/*
- * The function fiat_bls12_381_q_add adds two field elements in the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- *   0 ≤ eval arg2 < m
- * Postconditions:
- *   eval (from_montgomery out1) mod m = (eval (from_montgomery arg1) + eval (from_montgomery arg2)) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- *   arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_add(uint64_t out1[6], const uint64_t arg1[6], const uint64_t arg2[6]) {
-  uint64_t x1;
-  fiat_bls12_381_q_uint1 x2;
-  fiat_bls12_381_q_addcarryx_u64(&x1, &x2, 0x0, (arg1[0]), (arg2[0]));
-  uint64_t x3;
-  fiat_bls12_381_q_uint1 x4;
-  fiat_bls12_381_q_addcarryx_u64(&x3, &x4, x2, (arg1[1]), (arg2[1]));
-  uint64_t x5;
-  fiat_bls12_381_q_uint1 x6;
-  fiat_bls12_381_q_addcarryx_u64(&x5, &x6, x4, (arg1[2]), (arg2[2]));
-  uint64_t x7;
-  fiat_bls12_381_q_uint1 x8;
-  fiat_bls12_381_q_addcarryx_u64(&x7, &x8, x6, (arg1[3]), (arg2[3]));
-  uint64_t x9;
-  fiat_bls12_381_q_uint1 x10;
-  fiat_bls12_381_q_addcarryx_u64(&x9, &x10, x8, (arg1[4]), (arg2[4]));
-  uint64_t x11;
-  fiat_bls12_381_q_uint1 x12;
-  fiat_bls12_381_q_addcarryx_u64(&x11, &x12, x10, (arg1[5]), (arg2[5]));
-  uint64_t x13;
-  fiat_bls12_381_q_uint1 x14;
-  fiat_bls12_381_q_subborrowx_u64(&x13, &x14, 0x0, x1, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x15;
-  fiat_bls12_381_q_uint1 x16;
-  fiat_bls12_381_q_subborrowx_u64(&x15, &x16, x14, x3, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x17;
-  fiat_bls12_381_q_uint1 x18;
-  fiat_bls12_381_q_subborrowx_u64(&x17, &x18, x16, x5, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x19;
-  fiat_bls12_381_q_uint1 x20;
-  fiat_bls12_381_q_subborrowx_u64(&x19, &x20, x18, x7, UINT64_C(0x64774b84f38512bf));
-  uint64_t x21;
-  fiat_bls12_381_q_uint1 x22;
-  fiat_bls12_381_q_subborrowx_u64(&x21, &x22, x20, x9, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x23;
-  fiat_bls12_381_q_uint1 x24;
-  fiat_bls12_381_q_subborrowx_u64(&x23, &x24, x22, x11, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x25;
-  fiat_bls12_381_q_uint1 x26;
-  fiat_bls12_381_q_subborrowx_u64(&x25, &x26, x24, x12, 0x0);
-  uint64_t x27;
-  fiat_bls12_381_q_cmovznz_u64(&x27, x26, x13, x1);
-  uint64_t x28;
-  fiat_bls12_381_q_cmovznz_u64(&x28, x26, x15, x3);
-  uint64_t x29;
-  fiat_bls12_381_q_cmovznz_u64(&x29, x26, x17, x5);
-  uint64_t x30;
-  fiat_bls12_381_q_cmovznz_u64(&x30, x26, x19, x7);
-  uint64_t x31;
-  fiat_bls12_381_q_cmovznz_u64(&x31, x26, x21, x9);
-  uint64_t x32;
-  fiat_bls12_381_q_cmovznz_u64(&x32, x26, x23, x11);
-  out1[0] = x27;
-  out1[1] = x28;
-  out1[2] = x29;
-  out1[3] = x30;
-  out1[4] = x31;
-  out1[5] = x32;
-}
-
-/*
- * The function fiat_bls12_381_q_sub subtracts two field elements in the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- *   0 ≤ eval arg2 < m
- * Postconditions:
- *   eval (from_montgomery out1) mod m = (eval (from_montgomery arg1) - eval (from_montgomery arg2)) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- *   arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_sub(uint64_t out1[6], const uint64_t arg1[6], const uint64_t arg2[6]) {
-  uint64_t x1;
-  fiat_bls12_381_q_uint1 x2;
-  fiat_bls12_381_q_subborrowx_u64(&x1, &x2, 0x0, (arg1[0]), (arg2[0]));
-  uint64_t x3;
-  fiat_bls12_381_q_uint1 x4;
-  fiat_bls12_381_q_subborrowx_u64(&x3, &x4, x2, (arg1[1]), (arg2[1]));
-  uint64_t x5;
-  fiat_bls12_381_q_uint1 x6;
-  fiat_bls12_381_q_subborrowx_u64(&x5, &x6, x4, (arg1[2]), (arg2[2]));
-  uint64_t x7;
-  fiat_bls12_381_q_uint1 x8;
-  fiat_bls12_381_q_subborrowx_u64(&x7, &x8, x6, (arg1[3]), (arg2[3]));
-  uint64_t x9;
-  fiat_bls12_381_q_uint1 x10;
-  fiat_bls12_381_q_subborrowx_u64(&x9, &x10, x8, (arg1[4]), (arg2[4]));
-  uint64_t x11;
-  fiat_bls12_381_q_uint1 x12;
-  fiat_bls12_381_q_subborrowx_u64(&x11, &x12, x10, (arg1[5]), (arg2[5]));
-  uint64_t x13;
-  fiat_bls12_381_q_cmovznz_u64(&x13, x12, 0x0, UINT64_C(0xffffffffffffffff));
-  uint64_t x14;
-  fiat_bls12_381_q_uint1 x15;
-  fiat_bls12_381_q_addcarryx_u64(&x14, &x15, 0x0, x1, (x13 & UINT64_C(0xb9feffffffffaaab)));
-  uint64_t x16;
-  fiat_bls12_381_q_uint1 x17;
-  fiat_bls12_381_q_addcarryx_u64(&x16, &x17, x15, x3, (x13 & UINT64_C(0x1eabfffeb153ffff)));
-  uint64_t x18;
-  fiat_bls12_381_q_uint1 x19;
-  fiat_bls12_381_q_addcarryx_u64(&x18, &x19, x17, x5, (x13 & UINT64_C(0x6730d2a0f6b0f624)));
-  uint64_t x20;
-  fiat_bls12_381_q_uint1 x21;
-  fiat_bls12_381_q_addcarryx_u64(&x20, &x21, x19, x7, (x13 & UINT64_C(0x64774b84f38512bf)));
-  uint64_t x22;
-  fiat_bls12_381_q_uint1 x23;
-  fiat_bls12_381_q_addcarryx_u64(&x22, &x23, x21, x9, (x13 & UINT64_C(0x4b1ba7b6434bacd7)));
-  uint64_t x24;
-  fiat_bls12_381_q_uint1 x25;
-  fiat_bls12_381_q_addcarryx_u64(&x24, &x25, x23, x11, (x13 & UINT64_C(0x1a0111ea397fe69a)));
-  out1[0] = x14;
-  out1[1] = x16;
-  out1[2] = x18;
-  out1[3] = x20;
-  out1[4] = x22;
-  out1[5] = x24;
-}
-
-/*
- * The function fiat_bls12_381_q_opp negates a field element in the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- * Postconditions:
- *   eval (from_montgomery out1) mod m = -eval (from_montgomery arg1) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_opp(uint64_t out1[6], const uint64_t arg1[6]) {
-  uint64_t x1;
-  fiat_bls12_381_q_uint1 x2;
-  fiat_bls12_381_q_subborrowx_u64(&x1, &x2, 0x0, 0x0, (arg1[0]));
-  uint64_t x3;
-  fiat_bls12_381_q_uint1 x4;
-  fiat_bls12_381_q_subborrowx_u64(&x3, &x4, x2, 0x0, (arg1[1]));
-  uint64_t x5;
-  fiat_bls12_381_q_uint1 x6;
-  fiat_bls12_381_q_subborrowx_u64(&x5, &x6, x4, 0x0, (arg1[2]));
-  uint64_t x7;
-  fiat_bls12_381_q_uint1 x8;
-  fiat_bls12_381_q_subborrowx_u64(&x7, &x8, x6, 0x0, (arg1[3]));
-  uint64_t x9;
-  fiat_bls12_381_q_uint1 x10;
-  fiat_bls12_381_q_subborrowx_u64(&x9, &x10, x8, 0x0, (arg1[4]));
-  uint64_t x11;
-  fiat_bls12_381_q_uint1 x12;
-  fiat_bls12_381_q_subborrowx_u64(&x11, &x12, x10, 0x0, (arg1[5]));
-  uint64_t x13;
-  fiat_bls12_381_q_cmovznz_u64(&x13, x12, 0x0, UINT64_C(0xffffffffffffffff));
-  uint64_t x14;
-  fiat_bls12_381_q_uint1 x15;
-  fiat_bls12_381_q_addcarryx_u64(&x14, &x15, 0x0, x1, (x13 & UINT64_C(0xb9feffffffffaaab)));
-  uint64_t x16;
-  fiat_bls12_381_q_uint1 x17;
-  fiat_bls12_381_q_addcarryx_u64(&x16, &x17, x15, x3, (x13 & UINT64_C(0x1eabfffeb153ffff)));
-  uint64_t x18;
-  fiat_bls12_381_q_uint1 x19;
-  fiat_bls12_381_q_addcarryx_u64(&x18, &x19, x17, x5, (x13 & UINT64_C(0x6730d2a0f6b0f624)));
-  uint64_t x20;
-  fiat_bls12_381_q_uint1 x21;
-  fiat_bls12_381_q_addcarryx_u64(&x20, &x21, x19, x7, (x13 & UINT64_C(0x64774b84f38512bf)));
-  uint64_t x22;
-  fiat_bls12_381_q_uint1 x23;
-  fiat_bls12_381_q_addcarryx_u64(&x22, &x23, x21, x9, (x13 & UINT64_C(0x4b1ba7b6434bacd7)));
-  uint64_t x24;
-  fiat_bls12_381_q_uint1 x25;
-  fiat_bls12_381_q_addcarryx_u64(&x24, &x25, x23, x11, (x13 & UINT64_C(0x1a0111ea397fe69a)));
-  out1[0] = x14;
-  out1[1] = x16;
-  out1[2] = x18;
-  out1[3] = x20;
-  out1[4] = x22;
-  out1[5] = x24;
-}
-
-/*
- * The function fiat_bls12_381_q_from_montgomery translates a field element out of the Montgomery domain.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- * Postconditions:
- *   eval out1 mod m = (eval arg1 * ((2^64)⁻¹ mod m)^6) mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_from_montgomery(uint64_t out1[6], const uint64_t arg1[6]) {
-  uint64_t x1 = (arg1[0]);
-  uint64_t x2;
-  uint64_t x3;
-  fiat_bls12_381_q_mulx_u64(&x2, &x3, x1, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x4;
-  uint64_t x5;
-  fiat_bls12_381_q_mulx_u64(&x4, &x5, x2, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x6;
-  uint64_t x7;
-  fiat_bls12_381_q_mulx_u64(&x6, &x7, x2, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x8;
-  uint64_t x9;
-  fiat_bls12_381_q_mulx_u64(&x8, &x9, x2, UINT64_C(0x64774b84f38512bf));
-  uint64_t x10;
-  uint64_t x11;
-  fiat_bls12_381_q_mulx_u64(&x10, &x11, x2, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x12;
-  uint64_t x13;
-  fiat_bls12_381_q_mulx_u64(&x12, &x13, x2, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x14;
-  uint64_t x15;
-  fiat_bls12_381_q_mulx_u64(&x14, &x15, x2, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x16;
-  fiat_bls12_381_q_uint1 x17;
-  fiat_bls12_381_q_addcarryx_u64(&x16, &x17, 0x0, x15, x12);
-  uint64_t x18;
-  fiat_bls12_381_q_uint1 x19;
-  fiat_bls12_381_q_addcarryx_u64(&x18, &x19, x17, x13, x10);
-  uint64_t x20;
-  fiat_bls12_381_q_uint1 x21;
-  fiat_bls12_381_q_addcarryx_u64(&x20, &x21, x19, x11, x8);
-  uint64_t x22;
-  fiat_bls12_381_q_uint1 x23;
-  fiat_bls12_381_q_addcarryx_u64(&x22, &x23, x21, x9, x6);
-  uint64_t x24;
-  fiat_bls12_381_q_uint1 x25;
-  fiat_bls12_381_q_addcarryx_u64(&x24, &x25, x23, x7, x4);
-  uint64_t x26;
-  fiat_bls12_381_q_uint1 x27;
-  fiat_bls12_381_q_addcarryx_u64(&x26, &x27, 0x0, x1, x14);
-  uint64_t x28;
-  fiat_bls12_381_q_uint1 x29;
-  fiat_bls12_381_q_addcarryx_u64(&x28, &x29, x27, 0x0, x16);
-  uint64_t x30;
-  fiat_bls12_381_q_uint1 x31;
-  fiat_bls12_381_q_addcarryx_u64(&x30, &x31, x29, 0x0, x18);
-  uint64_t x32;
-  fiat_bls12_381_q_uint1 x33;
-  fiat_bls12_381_q_addcarryx_u64(&x32, &x33, x31, 0x0, x20);
-  uint64_t x34;
-  fiat_bls12_381_q_uint1 x35;
-  fiat_bls12_381_q_addcarryx_u64(&x34, &x35, x33, 0x0, x22);
-  uint64_t x36;
-  fiat_bls12_381_q_uint1 x37;
-  fiat_bls12_381_q_addcarryx_u64(&x36, &x37, x35, 0x0, x24);
-  uint64_t x38;
-  fiat_bls12_381_q_uint1 x39;
-  fiat_bls12_381_q_addcarryx_u64(&x38, &x39, 0x0, x28, (arg1[1]));
-  uint64_t x40;
-  fiat_bls12_381_q_uint1 x41;
-  fiat_bls12_381_q_addcarryx_u64(&x40, &x41, x39, x30, 0x0);
-  uint64_t x42;
-  fiat_bls12_381_q_uint1 x43;
-  fiat_bls12_381_q_addcarryx_u64(&x42, &x43, x41, x32, 0x0);
-  uint64_t x44;
-  fiat_bls12_381_q_uint1 x45;
-  fiat_bls12_381_q_addcarryx_u64(&x44, &x45, x43, x34, 0x0);
-  uint64_t x46;
-  fiat_bls12_381_q_uint1 x47;
-  fiat_bls12_381_q_addcarryx_u64(&x46, &x47, x45, x36, 0x0);
-  uint64_t x48;
-  uint64_t x49;
-  fiat_bls12_381_q_mulx_u64(&x48, &x49, x38, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x50;
-  uint64_t x51;
-  fiat_bls12_381_q_mulx_u64(&x50, &x51, x48, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x52;
-  uint64_t x53;
-  fiat_bls12_381_q_mulx_u64(&x52, &x53, x48, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x54;
-  uint64_t x55;
-  fiat_bls12_381_q_mulx_u64(&x54, &x55, x48, UINT64_C(0x64774b84f38512bf));
-  uint64_t x56;
-  uint64_t x57;
-  fiat_bls12_381_q_mulx_u64(&x56, &x57, x48, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x58;
-  uint64_t x59;
-  fiat_bls12_381_q_mulx_u64(&x58, &x59, x48, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x60;
-  uint64_t x61;
-  fiat_bls12_381_q_mulx_u64(&x60, &x61, x48, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x62;
-  fiat_bls12_381_q_uint1 x63;
-  fiat_bls12_381_q_addcarryx_u64(&x62, &x63, 0x0, x61, x58);
-  uint64_t x64;
-  fiat_bls12_381_q_uint1 x65;
-  fiat_bls12_381_q_addcarryx_u64(&x64, &x65, x63, x59, x56);
-  uint64_t x66;
-  fiat_bls12_381_q_uint1 x67;
-  fiat_bls12_381_q_addcarryx_u64(&x66, &x67, x65, x57, x54);
-  uint64_t x68;
-  fiat_bls12_381_q_uint1 x69;
-  fiat_bls12_381_q_addcarryx_u64(&x68, &x69, x67, x55, x52);
-  uint64_t x70;
-  fiat_bls12_381_q_uint1 x71;
-  fiat_bls12_381_q_addcarryx_u64(&x70, &x71, x69, x53, x50);
-  uint64_t x72;
-  fiat_bls12_381_q_uint1 x73;
-  fiat_bls12_381_q_addcarryx_u64(&x72, &x73, 0x0, x38, x60);
-  uint64_t x74;
-  fiat_bls12_381_q_uint1 x75;
-  fiat_bls12_381_q_addcarryx_u64(&x74, &x75, x73, x40, x62);
-  uint64_t x76;
-  fiat_bls12_381_q_uint1 x77;
-  fiat_bls12_381_q_addcarryx_u64(&x76, &x77, x75, x42, x64);
-  uint64_t x78;
-  fiat_bls12_381_q_uint1 x79;
-  fiat_bls12_381_q_addcarryx_u64(&x78, &x79, x77, x44, x66);
-  uint64_t x80;
-  fiat_bls12_381_q_uint1 x81;
-  fiat_bls12_381_q_addcarryx_u64(&x80, &x81, x79, x46, x68);
-  uint64_t x82;
-  fiat_bls12_381_q_uint1 x83;
-  fiat_bls12_381_q_addcarryx_u64(&x82, &x83, x25, x5, 0x0);
-  uint64_t x84;
-  fiat_bls12_381_q_uint1 x85;
-  fiat_bls12_381_q_addcarryx_u64(&x84, &x85, x37, 0x0, x82);
-  uint64_t x86;
-  fiat_bls12_381_q_uint1 x87;
-  fiat_bls12_381_q_addcarryx_u64(&x86, &x87, x47, x84, 0x0);
-  uint64_t x88;
-  fiat_bls12_381_q_uint1 x89;
-  fiat_bls12_381_q_addcarryx_u64(&x88, &x89, x81, x86, x70);
-  uint64_t x90;
-  fiat_bls12_381_q_uint1 x91;
-  fiat_bls12_381_q_addcarryx_u64(&x90, &x91, 0x0, x74, (arg1[2]));
-  uint64_t x92;
-  fiat_bls12_381_q_uint1 x93;
-  fiat_bls12_381_q_addcarryx_u64(&x92, &x93, x91, x76, 0x0);
-  uint64_t x94;
-  fiat_bls12_381_q_uint1 x95;
-  fiat_bls12_381_q_addcarryx_u64(&x94, &x95, x93, x78, 0x0);
-  uint64_t x96;
-  fiat_bls12_381_q_uint1 x97;
-  fiat_bls12_381_q_addcarryx_u64(&x96, &x97, x95, x80, 0x0);
-  uint64_t x98;
-  fiat_bls12_381_q_uint1 x99;
-  fiat_bls12_381_q_addcarryx_u64(&x98, &x99, x97, x88, 0x0);
-  uint64_t x100;
-  uint64_t x101;
-  fiat_bls12_381_q_mulx_u64(&x100, &x101, x90, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x102;
-  uint64_t x103;
-  fiat_bls12_381_q_mulx_u64(&x102, &x103, x100, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x104;
-  uint64_t x105;
-  fiat_bls12_381_q_mulx_u64(&x104, &x105, x100, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x106;
-  uint64_t x107;
-  fiat_bls12_381_q_mulx_u64(&x106, &x107, x100, UINT64_C(0x64774b84f38512bf));
-  uint64_t x108;
-  uint64_t x109;
-  fiat_bls12_381_q_mulx_u64(&x108, &x109, x100, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x110;
-  uint64_t x111;
-  fiat_bls12_381_q_mulx_u64(&x110, &x111, x100, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x112;
-  uint64_t x113;
-  fiat_bls12_381_q_mulx_u64(&x112, &x113, x100, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x114;
-  fiat_bls12_381_q_uint1 x115;
-  fiat_bls12_381_q_addcarryx_u64(&x114, &x115, 0x0, x113, x110);
-  uint64_t x116;
-  fiat_bls12_381_q_uint1 x117;
-  fiat_bls12_381_q_addcarryx_u64(&x116, &x117, x115, x111, x108);
-  uint64_t x118;
-  fiat_bls12_381_q_uint1 x119;
-  fiat_bls12_381_q_addcarryx_u64(&x118, &x119, x117, x109, x106);
-  uint64_t x120;
-  fiat_bls12_381_q_uint1 x121;
-  fiat_bls12_381_q_addcarryx_u64(&x120, &x121, x119, x107, x104);
-  uint64_t x122;
-  fiat_bls12_381_q_uint1 x123;
-  fiat_bls12_381_q_addcarryx_u64(&x122, &x123, x121, x105, x102);
-  uint64_t x124;
-  fiat_bls12_381_q_uint1 x125;
-  fiat_bls12_381_q_addcarryx_u64(&x124, &x125, 0x0, x90, x112);
-  uint64_t x126;
-  fiat_bls12_381_q_uint1 x127;
-  fiat_bls12_381_q_addcarryx_u64(&x126, &x127, x125, x92, x114);
-  uint64_t x128;
-  fiat_bls12_381_q_uint1 x129;
-  fiat_bls12_381_q_addcarryx_u64(&x128, &x129, x127, x94, x116);
-  uint64_t x130;
-  fiat_bls12_381_q_uint1 x131;
-  fiat_bls12_381_q_addcarryx_u64(&x130, &x131, x129, x96, x118);
-  uint64_t x132;
-  fiat_bls12_381_q_uint1 x133;
-  fiat_bls12_381_q_addcarryx_u64(&x132, &x133, x131, x98, x120);
-  uint64_t x134;
-  fiat_bls12_381_q_uint1 x135;
-  fiat_bls12_381_q_addcarryx_u64(&x134, &x135, x71, x51, 0x0);
-  uint64_t x136;
-  fiat_bls12_381_q_uint1 x137;
-  fiat_bls12_381_q_addcarryx_u64(&x136, &x137, x89, 0x0, x134);
-  uint64_t x138;
-  fiat_bls12_381_q_uint1 x139;
-  fiat_bls12_381_q_addcarryx_u64(&x138, &x139, x99, x136, 0x0);
-  uint64_t x140;
-  fiat_bls12_381_q_uint1 x141;
-  fiat_bls12_381_q_addcarryx_u64(&x140, &x141, x133, x138, x122);
-  uint64_t x142;
-  fiat_bls12_381_q_uint1 x143;
-  fiat_bls12_381_q_addcarryx_u64(&x142, &x143, 0x0, x126, (arg1[3]));
-  uint64_t x144;
-  fiat_bls12_381_q_uint1 x145;
-  fiat_bls12_381_q_addcarryx_u64(&x144, &x145, x143, x128, 0x0);
-  uint64_t x146;
-  fiat_bls12_381_q_uint1 x147;
-  fiat_bls12_381_q_addcarryx_u64(&x146, &x147, x145, x130, 0x0);
-  uint64_t x148;
-  fiat_bls12_381_q_uint1 x149;
-  fiat_bls12_381_q_addcarryx_u64(&x148, &x149, x147, x132, 0x0);
-  uint64_t x150;
-  fiat_bls12_381_q_uint1 x151;
-  fiat_bls12_381_q_addcarryx_u64(&x150, &x151, x149, x140, 0x0);
-  uint64_t x152;
-  uint64_t x153;
-  fiat_bls12_381_q_mulx_u64(&x152, &x153, x142, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x154;
-  uint64_t x155;
-  fiat_bls12_381_q_mulx_u64(&x154, &x155, x152, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x156;
-  uint64_t x157;
-  fiat_bls12_381_q_mulx_u64(&x156, &x157, x152, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x158;
-  uint64_t x159;
-  fiat_bls12_381_q_mulx_u64(&x158, &x159, x152, UINT64_C(0x64774b84f38512bf));
-  uint64_t x160;
-  uint64_t x161;
-  fiat_bls12_381_q_mulx_u64(&x160, &x161, x152, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x162;
-  uint64_t x163;
-  fiat_bls12_381_q_mulx_u64(&x162, &x163, x152, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x164;
-  uint64_t x165;
-  fiat_bls12_381_q_mulx_u64(&x164, &x165, x152, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x166;
-  fiat_bls12_381_q_uint1 x167;
-  fiat_bls12_381_q_addcarryx_u64(&x166, &x167, 0x0, x165, x162);
-  uint64_t x168;
-  fiat_bls12_381_q_uint1 x169;
-  fiat_bls12_381_q_addcarryx_u64(&x168, &x169, x167, x163, x160);
-  uint64_t x170;
-  fiat_bls12_381_q_uint1 x171;
-  fiat_bls12_381_q_addcarryx_u64(&x170, &x171, x169, x161, x158);
-  uint64_t x172;
-  fiat_bls12_381_q_uint1 x173;
-  fiat_bls12_381_q_addcarryx_u64(&x172, &x173, x171, x159, x156);
-  uint64_t x174;
-  fiat_bls12_381_q_uint1 x175;
-  fiat_bls12_381_q_addcarryx_u64(&x174, &x175, x173, x157, x154);
-  uint64_t x176;
-  fiat_bls12_381_q_uint1 x177;
-  fiat_bls12_381_q_addcarryx_u64(&x176, &x177, 0x0, x142, x164);
-  uint64_t x178;
-  fiat_bls12_381_q_uint1 x179;
-  fiat_bls12_381_q_addcarryx_u64(&x178, &x179, x177, x144, x166);
-  uint64_t x180;
-  fiat_bls12_381_q_uint1 x181;
-  fiat_bls12_381_q_addcarryx_u64(&x180, &x181, x179, x146, x168);
-  uint64_t x182;
-  fiat_bls12_381_q_uint1 x183;
-  fiat_bls12_381_q_addcarryx_u64(&x182, &x183, x181, x148, x170);
-  uint64_t x184;
-  fiat_bls12_381_q_uint1 x185;
-  fiat_bls12_381_q_addcarryx_u64(&x184, &x185, x183, x150, x172);
-  uint64_t x186;
-  fiat_bls12_381_q_uint1 x187;
-  fiat_bls12_381_q_addcarryx_u64(&x186, &x187, x123, x103, 0x0);
-  uint64_t x188;
-  fiat_bls12_381_q_uint1 x189;
-  fiat_bls12_381_q_addcarryx_u64(&x188, &x189, x141, 0x0, x186);
-  uint64_t x190;
-  fiat_bls12_381_q_uint1 x191;
-  fiat_bls12_381_q_addcarryx_u64(&x190, &x191, x151, x188, 0x0);
-  uint64_t x192;
-  fiat_bls12_381_q_uint1 x193;
-  fiat_bls12_381_q_addcarryx_u64(&x192, &x193, x185, x190, x174);
-  uint64_t x194;
-  fiat_bls12_381_q_uint1 x195;
-  fiat_bls12_381_q_addcarryx_u64(&x194, &x195, 0x0, x178, (arg1[4]));
-  uint64_t x196;
-  fiat_bls12_381_q_uint1 x197;
-  fiat_bls12_381_q_addcarryx_u64(&x196, &x197, x195, x180, 0x0);
-  uint64_t x198;
-  fiat_bls12_381_q_uint1 x199;
-  fiat_bls12_381_q_addcarryx_u64(&x198, &x199, x197, x182, 0x0);
-  uint64_t x200;
-  fiat_bls12_381_q_uint1 x201;
-  fiat_bls12_381_q_addcarryx_u64(&x200, &x201, x199, x184, 0x0);
-  uint64_t x202;
-  fiat_bls12_381_q_uint1 x203;
-  fiat_bls12_381_q_addcarryx_u64(&x202, &x203, x201, x192, 0x0);
-  uint64_t x204;
-  uint64_t x205;
-  fiat_bls12_381_q_mulx_u64(&x204, &x205, x194, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x206;
-  uint64_t x207;
-  fiat_bls12_381_q_mulx_u64(&x206, &x207, x204, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x208;
-  uint64_t x209;
-  fiat_bls12_381_q_mulx_u64(&x208, &x209, x204, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x210;
-  uint64_t x211;
-  fiat_bls12_381_q_mulx_u64(&x210, &x211, x204, UINT64_C(0x64774b84f38512bf));
-  uint64_t x212;
-  uint64_t x213;
-  fiat_bls12_381_q_mulx_u64(&x212, &x213, x204, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x214;
-  uint64_t x215;
-  fiat_bls12_381_q_mulx_u64(&x214, &x215, x204, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x216;
-  uint64_t x217;
-  fiat_bls12_381_q_mulx_u64(&x216, &x217, x204, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x218;
-  fiat_bls12_381_q_uint1 x219;
-  fiat_bls12_381_q_addcarryx_u64(&x218, &x219, 0x0, x217, x214);
-  uint64_t x220;
-  fiat_bls12_381_q_uint1 x221;
-  fiat_bls12_381_q_addcarryx_u64(&x220, &x221, x219, x215, x212);
-  uint64_t x222;
-  fiat_bls12_381_q_uint1 x223;
-  fiat_bls12_381_q_addcarryx_u64(&x222, &x223, x221, x213, x210);
-  uint64_t x224;
-  fiat_bls12_381_q_uint1 x225;
-  fiat_bls12_381_q_addcarryx_u64(&x224, &x225, x223, x211, x208);
-  uint64_t x226;
-  fiat_bls12_381_q_uint1 x227;
-  fiat_bls12_381_q_addcarryx_u64(&x226, &x227, x225, x209, x206);
-  uint64_t x228;
-  fiat_bls12_381_q_uint1 x229;
-  fiat_bls12_381_q_addcarryx_u64(&x228, &x229, 0x0, x194, x216);
-  uint64_t x230;
-  fiat_bls12_381_q_uint1 x231;
-  fiat_bls12_381_q_addcarryx_u64(&x230, &x231, x229, x196, x218);
-  uint64_t x232;
-  fiat_bls12_381_q_uint1 x233;
-  fiat_bls12_381_q_addcarryx_u64(&x232, &x233, x231, x198, x220);
-  uint64_t x234;
-  fiat_bls12_381_q_uint1 x235;
-  fiat_bls12_381_q_addcarryx_u64(&x234, &x235, x233, x200, x222);
-  uint64_t x236;
-  fiat_bls12_381_q_uint1 x237;
-  fiat_bls12_381_q_addcarryx_u64(&x236, &x237, x235, x202, x224);
-  uint64_t x238;
-  fiat_bls12_381_q_uint1 x239;
-  fiat_bls12_381_q_addcarryx_u64(&x238, &x239, x175, x155, 0x0);
-  uint64_t x240;
-  fiat_bls12_381_q_uint1 x241;
-  fiat_bls12_381_q_addcarryx_u64(&x240, &x241, x193, 0x0, x238);
-  uint64_t x242;
-  fiat_bls12_381_q_uint1 x243;
-  fiat_bls12_381_q_addcarryx_u64(&x242, &x243, x203, x240, 0x0);
-  uint64_t x244;
-  fiat_bls12_381_q_uint1 x245;
-  fiat_bls12_381_q_addcarryx_u64(&x244, &x245, x237, x242, x226);
-  uint64_t x246;
-  fiat_bls12_381_q_uint1 x247;
-  fiat_bls12_381_q_addcarryx_u64(&x246, &x247, 0x0, x230, (arg1[5]));
-  uint64_t x248;
-  fiat_bls12_381_q_uint1 x249;
-  fiat_bls12_381_q_addcarryx_u64(&x248, &x249, x247, x232, 0x0);
-  uint64_t x250;
-  fiat_bls12_381_q_uint1 x251;
-  fiat_bls12_381_q_addcarryx_u64(&x250, &x251, x249, x234, 0x0);
-  uint64_t x252;
-  fiat_bls12_381_q_uint1 x253;
-  fiat_bls12_381_q_addcarryx_u64(&x252, &x253, x251, x236, 0x0);
-  uint64_t x254;
-  fiat_bls12_381_q_uint1 x255;
-  fiat_bls12_381_q_addcarryx_u64(&x254, &x255, x253, x244, 0x0);
-  uint64_t x256;
-  uint64_t x257;
-  fiat_bls12_381_q_mulx_u64(&x256, &x257, x246, UINT64_C(0x89f3fffcfffcfffd));
-  uint64_t x258;
-  uint64_t x259;
-  fiat_bls12_381_q_mulx_u64(&x258, &x259, x256, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x260;
-  uint64_t x261;
-  fiat_bls12_381_q_mulx_u64(&x260, &x261, x256, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x262;
-  uint64_t x263;
-  fiat_bls12_381_q_mulx_u64(&x262, &x263, x256, UINT64_C(0x64774b84f38512bf));
-  uint64_t x264;
-  uint64_t x265;
-  fiat_bls12_381_q_mulx_u64(&x264, &x265, x256, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x266;
-  uint64_t x267;
-  fiat_bls12_381_q_mulx_u64(&x266, &x267, x256, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x268;
-  uint64_t x269;
-  fiat_bls12_381_q_mulx_u64(&x268, &x269, x256, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x270;
-  fiat_bls12_381_q_uint1 x271;
-  fiat_bls12_381_q_addcarryx_u64(&x270, &x271, 0x0, x269, x266);
-  uint64_t x272;
-  fiat_bls12_381_q_uint1 x273;
-  fiat_bls12_381_q_addcarryx_u64(&x272, &x273, x271, x267, x264);
-  uint64_t x274;
-  fiat_bls12_381_q_uint1 x275;
-  fiat_bls12_381_q_addcarryx_u64(&x274, &x275, x273, x265, x262);
-  uint64_t x276;
-  fiat_bls12_381_q_uint1 x277;
-  fiat_bls12_381_q_addcarryx_u64(&x276, &x277, x275, x263, x260);
-  uint64_t x278;
-  fiat_bls12_381_q_uint1 x279;
-  fiat_bls12_381_q_addcarryx_u64(&x278, &x279, x277, x261, x258);
-  uint64_t x280;
-  fiat_bls12_381_q_uint1 x281;
-  fiat_bls12_381_q_addcarryx_u64(&x280, &x281, 0x0, x246, x268);
-  uint64_t x282;
-  fiat_bls12_381_q_uint1 x283;
-  fiat_bls12_381_q_addcarryx_u64(&x282, &x283, x281, x248, x270);
-  uint64_t x284;
-  fiat_bls12_381_q_uint1 x285;
-  fiat_bls12_381_q_addcarryx_u64(&x284, &x285, x283, x250, x272);
-  uint64_t x286;
-  fiat_bls12_381_q_uint1 x287;
-  fiat_bls12_381_q_addcarryx_u64(&x286, &x287, x285, x252, x274);
-  uint64_t x288;
-  fiat_bls12_381_q_uint1 x289;
-  fiat_bls12_381_q_addcarryx_u64(&x288, &x289, x287, x254, x276);
-  uint64_t x290;
-  fiat_bls12_381_q_uint1 x291;
-  fiat_bls12_381_q_addcarryx_u64(&x290, &x291, x227, x207, 0x0);
-  uint64_t x292;
-  fiat_bls12_381_q_uint1 x293;
-  fiat_bls12_381_q_addcarryx_u64(&x292, &x293, x245, 0x0, x290);
-  uint64_t x294;
-  fiat_bls12_381_q_uint1 x295;
-  fiat_bls12_381_q_addcarryx_u64(&x294, &x295, x255, x292, 0x0);
-  uint64_t x296;
-  fiat_bls12_381_q_uint1 x297;
-  fiat_bls12_381_q_addcarryx_u64(&x296, &x297, x289, x294, x278);
-  uint64_t x298;
-  fiat_bls12_381_q_uint1 x299;
-  fiat_bls12_381_q_addcarryx_u64(&x298, &x299, x279, x259, 0x0);
-  uint64_t x300;
-  fiat_bls12_381_q_uint1 x301;
-  fiat_bls12_381_q_addcarryx_u64(&x300, &x301, x297, 0x0, x298);
-  uint64_t x302;
-  fiat_bls12_381_q_uint1 x303;
-  fiat_bls12_381_q_subborrowx_u64(&x302, &x303, 0x0, x282, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x304;
-  fiat_bls12_381_q_uint1 x305;
-  fiat_bls12_381_q_subborrowx_u64(&x304, &x305, x303, x284, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x306;
-  fiat_bls12_381_q_uint1 x307;
-  fiat_bls12_381_q_subborrowx_u64(&x306, &x307, x305, x286, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x308;
-  fiat_bls12_381_q_uint1 x309;
-  fiat_bls12_381_q_subborrowx_u64(&x308, &x309, x307, x288, UINT64_C(0x64774b84f38512bf));
-  uint64_t x310;
-  fiat_bls12_381_q_uint1 x311;
-  fiat_bls12_381_q_subborrowx_u64(&x310, &x311, x309, x296, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x312;
-  fiat_bls12_381_q_uint1 x313;
-  fiat_bls12_381_q_subborrowx_u64(&x312, &x313, x311, x300, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x314;
-  fiat_bls12_381_q_uint1 x315;
-  fiat_bls12_381_q_subborrowx_u64(&x314, &x315, x313, 0x0, 0x0);
-  uint64_t x316;
-  fiat_bls12_381_q_cmovznz_u64(&x316, x315, x302, x282);
-  uint64_t x317;
-  fiat_bls12_381_q_cmovznz_u64(&x317, x315, x304, x284);
-  uint64_t x318;
-  fiat_bls12_381_q_cmovznz_u64(&x318, x315, x306, x286);
-  uint64_t x319;
-  fiat_bls12_381_q_cmovznz_u64(&x319, x315, x308, x288);
-  uint64_t x320;
-  fiat_bls12_381_q_cmovznz_u64(&x320, x315, x310, x296);
-  uint64_t x321;
-  fiat_bls12_381_q_cmovznz_u64(&x321, x315, x312, x300);
-  out1[0] = x316;
-  out1[1] = x317;
-  out1[2] = x318;
-  out1[3] = x319;
-  out1[4] = x320;
-  out1[5] = x321;
-}
-
-/*
- * The function fiat_bls12_381_q_nonzero outputs a single non-zero word if the input is non-zero and zero otherwise.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- * Postconditions:
- *   out1 = 0 ↔ eval (from_montgomery arg1) mod m = 0
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [0x0 ~> 0xffffffffffffffff]
- */
-static void fiat_bls12_381_q_nonzero(uint64_t* out1, const uint64_t arg1[6]) {
-  uint64_t x1 = ((arg1[0]) | ((arg1[1]) | ((arg1[2]) | ((arg1[3]) | ((arg1[4]) | ((arg1[5]) | (uint64_t)0x0))))));
-  *out1 = x1;
-}
-
-/*
- * The function fiat_bls12_381_q_selectznz is a multi-limb conditional select.
- * Postconditions:
- *   eval out1 = (if arg1 = 0 then eval arg2 else eval arg3)
- *
- * Input Bounds:
- *   arg1: [0x0 ~> 0x1]
- *   arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- *   arg3: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
- */
-static void fiat_bls12_381_q_selectznz(uint64_t out1[6], fiat_bls12_381_q_uint1 arg1, const uint64_t arg2[6], const uint64_t arg3[6]) {
-  uint64_t x1;
-  fiat_bls12_381_q_cmovznz_u64(&x1, arg1, (arg2[0]), (arg3[0]));
-  uint64_t x2;
-  fiat_bls12_381_q_cmovznz_u64(&x2, arg1, (arg2[1]), (arg3[1]));
-  uint64_t x3;
-  fiat_bls12_381_q_cmovznz_u64(&x3, arg1, (arg2[2]), (arg3[2]));
-  uint64_t x4;
-  fiat_bls12_381_q_cmovznz_u64(&x4, arg1, (arg2[3]), (arg3[3]));
-  uint64_t x5;
-  fiat_bls12_381_q_cmovznz_u64(&x5, arg1, (arg2[4]), (arg3[4]));
-  uint64_t x6;
-  fiat_bls12_381_q_cmovznz_u64(&x6, arg1, (arg2[5]), (arg3[5]));
-  out1[0] = x1;
-  out1[1] = x2;
-  out1[2] = x3;
-  out1[3] = x4;
-  out1[4] = x5;
-  out1[5] = x6;
-}
-
-/*
- * The function fiat_bls12_381_q_to_bytes serializes a field element in the Montgomery domain to bytes in little-endian order.
- * Preconditions:
- *   0 ≤ eval arg1 < m
- * Postconditions:
- *   out1 = map (λ x, ⌊((eval arg1 mod m) mod 2^(8 * (x + 1))) / 2^(8 * x)⌋) [0..47]
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0x1fffffffffffffff]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0x1f]]
- */
-static void fiat_bls12_381_q_to_bytes(uint8_t out1[48], const uint64_t arg1[6]) {
-  uint64_t x1 = (arg1[5]);
-  uint64_t x2 = (arg1[4]);
-  uint64_t x3 = (arg1[3]);
-  uint64_t x4 = (arg1[2]);
-  uint64_t x5 = (arg1[1]);
-  uint64_t x6 = (arg1[0]);
-  uint64_t x7 = (x6 >> 8);
-  uint8_t x8 = (uint8_t)(x6 & UINT8_C(0xff));
-  uint64_t x9 = (x7 >> 8);
-  uint8_t x10 = (uint8_t)(x7 & UINT8_C(0xff));
-  uint64_t x11 = (x9 >> 8);
-  uint8_t x12 = (uint8_t)(x9 & UINT8_C(0xff));
-  uint64_t x13 = (x11 >> 8);
-  uint8_t x14 = (uint8_t)(x11 & UINT8_C(0xff));
-  uint64_t x15 = (x13 >> 8);
-  uint8_t x16 = (uint8_t)(x13 & UINT8_C(0xff));
-  uint64_t x17 = (x15 >> 8);
-  uint8_t x18 = (uint8_t)(x15 & UINT8_C(0xff));
-  uint8_t x19 = (uint8_t)(x17 >> 8);
-  uint8_t x20 = (uint8_t)(x17 & UINT8_C(0xff));
-  uint8_t x21 = (uint8_t)(x19 & UINT8_C(0xff));
-  uint64_t x22 = (x5 >> 8);
-  uint8_t x23 = (uint8_t)(x5 & UINT8_C(0xff));
-  uint64_t x24 = (x22 >> 8);
-  uint8_t x25 = (uint8_t)(x22 & UINT8_C(0xff));
-  uint64_t x26 = (x24 >> 8);
-  uint8_t x27 = (uint8_t)(x24 & UINT8_C(0xff));
-  uint64_t x28 = (x26 >> 8);
-  uint8_t x29 = (uint8_t)(x26 & UINT8_C(0xff));
-  uint64_t x30 = (x28 >> 8);
-  uint8_t x31 = (uint8_t)(x28 & UINT8_C(0xff));
-  uint64_t x32 = (x30 >> 8);
-  uint8_t x33 = (uint8_t)(x30 & UINT8_C(0xff));
-  uint8_t x34 = (uint8_t)(x32 >> 8);
-  uint8_t x35 = (uint8_t)(x32 & UINT8_C(0xff));
-  uint8_t x36 = (uint8_t)(x34 & UINT8_C(0xff));
-  uint64_t x37 = (x4 >> 8);
-  uint8_t x38 = (uint8_t)(x4 & UINT8_C(0xff));
-  uint64_t x39 = (x37 >> 8);
-  uint8_t x40 = (uint8_t)(x37 & UINT8_C(0xff));
-  uint64_t x41 = (x39 >> 8);
-  uint8_t x42 = (uint8_t)(x39 & UINT8_C(0xff));
-  uint64_t x43 = (x41 >> 8);
-  uint8_t x44 = (uint8_t)(x41 & UINT8_C(0xff));
-  uint64_t x45 = (x43 >> 8);
-  uint8_t x46 = (uint8_t)(x43 & UINT8_C(0xff));
-  uint64_t x47 = (x45 >> 8);
-  uint8_t x48 = (uint8_t)(x45 & UINT8_C(0xff));
-  uint8_t x49 = (uint8_t)(x47 >> 8);
-  uint8_t x50 = (uint8_t)(x47 & UINT8_C(0xff));
-  uint8_t x51 = (uint8_t)(x49 & UINT8_C(0xff));
-  uint64_t x52 = (x3 >> 8);
-  uint8_t x53 = (uint8_t)(x3 & UINT8_C(0xff));
-  uint64_t x54 = (x52 >> 8);
-  uint8_t x55 = (uint8_t)(x52 & UINT8_C(0xff));
-  uint64_t x56 = (x54 >> 8);
-  uint8_t x57 = (uint8_t)(x54 & UINT8_C(0xff));
-  uint64_t x58 = (x56 >> 8);
-  uint8_t x59 = (uint8_t)(x56 & UINT8_C(0xff));
-  uint64_t x60 = (x58 >> 8);
-  uint8_t x61 = (uint8_t)(x58 & UINT8_C(0xff));
-  uint64_t x62 = (x60 >> 8);
-  uint8_t x63 = (uint8_t)(x60 & UINT8_C(0xff));
-  uint8_t x64 = (uint8_t)(x62 >> 8);
-  uint8_t x65 = (uint8_t)(x62 & UINT8_C(0xff));
-  uint8_t x66 = (uint8_t)(x64 & UINT8_C(0xff));
-  uint64_t x67 = (x2 >> 8);
-  uint8_t x68 = (uint8_t)(x2 & UINT8_C(0xff));
-  uint64_t x69 = (x67 >> 8);
-  uint8_t x70 = (uint8_t)(x67 & UINT8_C(0xff));
-  uint64_t x71 = (x69 >> 8);
-  uint8_t x72 = (uint8_t)(x69 & UINT8_C(0xff));
-  uint64_t x73 = (x71 >> 8);
-  uint8_t x74 = (uint8_t)(x71 & UINT8_C(0xff));
-  uint64_t x75 = (x73 >> 8);
-  uint8_t x76 = (uint8_t)(x73 & UINT8_C(0xff));
-  uint64_t x77 = (x75 >> 8);
-  uint8_t x78 = (uint8_t)(x75 & UINT8_C(0xff));
-  uint8_t x79 = (uint8_t)(x77 >> 8);
-  uint8_t x80 = (uint8_t)(x77 & UINT8_C(0xff));
-  uint8_t x81 = (uint8_t)(x79 & UINT8_C(0xff));
-  uint64_t x82 = (x1 >> 8);
-  uint8_t x83 = (uint8_t)(x1 & UINT8_C(0xff));
-  uint64_t x84 = (x82 >> 8);
-  uint8_t x85 = (uint8_t)(x82 & UINT8_C(0xff));
-  uint64_t x86 = (x84 >> 8);
-  uint8_t x87 = (uint8_t)(x84 & UINT8_C(0xff));
-  uint64_t x88 = (x86 >> 8);
-  uint8_t x89 = (uint8_t)(x86 & UINT8_C(0xff));
-  uint64_t x90 = (x88 >> 8);
-  uint8_t x91 = (uint8_t)(x88 & UINT8_C(0xff));
-  uint64_t x92 = (x90 >> 8);
-  uint8_t x93 = (uint8_t)(x90 & UINT8_C(0xff));
-  uint8_t x94 = (uint8_t)(x92 >> 8);
-  uint8_t x95 = (uint8_t)(x92 & UINT8_C(0xff));
-  out1[0] = x8;
-  out1[1] = x10;
-  out1[2] = x12;
-  out1[3] = x14;
-  out1[4] = x16;
-  out1[5] = x18;
-  out1[6] = x20;
-  out1[7] = x21;
-  out1[8] = x23;
-  out1[9] = x25;
-  out1[10] = x27;
-  out1[11] = x29;
-  out1[12] = x31;
-  out1[13] = x33;
-  out1[14] = x35;
-  out1[15] = x36;
-  out1[16] = x38;
-  out1[17] = x40;
-  out1[18] = x42;
-  out1[19] = x44;
-  out1[20] = x46;
-  out1[21] = x48;
-  out1[22] = x50;
-  out1[23] = x51;
-  out1[24] = x53;
-  out1[25] = x55;
-  out1[26] = x57;
-  out1[27] = x59;
-  out1[28] = x61;
-  out1[29] = x63;
-  out1[30] = x65;
-  out1[31] = x66;
-  out1[32] = x68;
-  out1[33] = x70;
-  out1[34] = x72;
-  out1[35] = x74;
-  out1[36] = x76;
-  out1[37] = x78;
-  out1[38] = x80;
-  out1[39] = x81;
-  out1[40] = x83;
-  out1[41] = x85;
-  out1[42] = x87;
-  out1[43] = x89;
-  out1[44] = x91;
-  out1[45] = x93;
-  out1[46] = x95;
-  out1[47] = x94;
-}
-
-/*
- * The function fiat_bls12_381_q_from_bytes deserializes a field element in the Montgomery domain from bytes in little-endian order.
- * Preconditions:
- *   0 ≤ bytes_eval arg1 < m
- * Postconditions:
- *   eval out1 mod m = bytes_eval arg1 mod m
- *   0 ≤ eval out1 < m
- *
- * Input Bounds:
- *   arg1: [[0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0xff], [0x0 ~> 0x1f]]
- * Output Bounds:
- *   out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0x1fffffffffffffff]]
- */
-static void fiat_bls12_381_q_from_bytes(uint64_t out1[6], const uint8_t arg1[48]) {
-  uint64_t x1 = ((uint64_t)(arg1[47]) << 56);
-  uint64_t x2 = ((uint64_t)(arg1[46]) << 48);
-  uint64_t x3 = ((uint64_t)(arg1[45]) << 40);
-  uint64_t x4 = ((uint64_t)(arg1[44]) << 32);
-  uint64_t x5 = ((uint64_t)(arg1[43]) << 24);
-  uint64_t x6 = ((uint64_t)(arg1[42]) << 16);
-  uint64_t x7 = ((uint64_t)(arg1[41]) << 8);
-  uint8_t x8 = (arg1[40]);
-  uint64_t x9 = ((uint64_t)(arg1[39]) << 56);
-  uint64_t x10 = ((uint64_t)(arg1[38]) << 48);
-  uint64_t x11 = ((uint64_t)(arg1[37]) << 40);
-  uint64_t x12 = ((uint64_t)(arg1[36]) << 32);
-  uint64_t x13 = ((uint64_t)(arg1[35]) << 24);
-  uint64_t x14 = ((uint64_t)(arg1[34]) << 16);
-  uint64_t x15 = ((uint64_t)(arg1[33]) << 8);
-  uint8_t x16 = (arg1[32]);
-  uint64_t x17 = ((uint64_t)(arg1[31]) << 56);
-  uint64_t x18 = ((uint64_t)(arg1[30]) << 48);
-  uint64_t x19 = ((uint64_t)(arg1[29]) << 40);
-  uint64_t x20 = ((uint64_t)(arg1[28]) << 32);
-  uint64_t x21 = ((uint64_t)(arg1[27]) << 24);
-  uint64_t x22 = ((uint64_t)(arg1[26]) << 16);
-  uint64_t x23 = ((uint64_t)(arg1[25]) << 8);
-  uint8_t x24 = (arg1[24]);
-  uint64_t x25 = ((uint64_t)(arg1[23]) << 56);
-  uint64_t x26 = ((uint64_t)(arg1[22]) << 48);
-  uint64_t x27 = ((uint64_t)(arg1[21]) << 40);
-  uint64_t x28 = ((uint64_t)(arg1[20]) << 32);
-  uint64_t x29 = ((uint64_t)(arg1[19]) << 24);
-  uint64_t x30 = ((uint64_t)(arg1[18]) << 16);
-  uint64_t x31 = ((uint64_t)(arg1[17]) << 8);
-  uint8_t x32 = (arg1[16]);
-  uint64_t x33 = ((uint64_t)(arg1[15]) << 56);
-  uint64_t x34 = ((uint64_t)(arg1[14]) << 48);
-  uint64_t x35 = ((uint64_t)(arg1[13]) << 40);
-  uint64_t x36 = ((uint64_t)(arg1[12]) << 32);
-  uint64_t x37 = ((uint64_t)(arg1[11]) << 24);
-  uint64_t x38 = ((uint64_t)(arg1[10]) << 16);
-  uint64_t x39 = ((uint64_t)(arg1[9]) << 8);
-  uint8_t x40 = (arg1[8]);
-  uint64_t x41 = ((uint64_t)(arg1[7]) << 56);
-  uint64_t x42 = ((uint64_t)(arg1[6]) << 48);
-  uint64_t x43 = ((uint64_t)(arg1[5]) << 40);
-  uint64_t x44 = ((uint64_t)(arg1[4]) << 32);
-  uint64_t x45 = ((uint64_t)(arg1[3]) << 24);
-  uint64_t x46 = ((uint64_t)(arg1[2]) << 16);
-  uint64_t x47 = ((uint64_t)(arg1[1]) << 8);
-  uint8_t x48 = (arg1[0]);
-  uint64_t x49 = (x48 + (x47 + (x46 + (x45 + (x44 + (x43 + (x42 + x41)))))));
-  uint64_t x50 = (x49 & UINT64_C(0xffffffffffffffff));
-  uint64_t x51 = (x8 + (x7 + (x6 + (x5 + (x4 + (x3 + (x2 + x1)))))));
-  uint64_t x52 = (x16 + (x15 + (x14 + (x13 + (x12 + (x11 + (x10 + x9)))))));
-  uint64_t x53 = (x24 + (x23 + (x22 + (x21 + (x20 + (x19 + (x18 + x17)))))));
-  uint64_t x54 = (x32 + (x31 + (x30 + (x29 + (x28 + (x27 + (x26 + x25)))))));
-  uint64_t x55 = (x40 + (x39 + (x38 + (x37 + (x36 + (x35 + (x34 + x33)))))));
-  uint64_t x56 = (x55 & UINT64_C(0xffffffffffffffff));
-  uint64_t x57 = (x54 & UINT64_C(0xffffffffffffffff));
-  uint64_t x58 = (x53 & UINT64_C(0xffffffffffffffff));
-  uint64_t x59 = (x52 & UINT64_C(0xffffffffffffffff));
-  out1[0] = x50;
-  out1[1] = x56;
-  out1[2] = x57;
-  out1[3] = x58;
-  out1[4] = x59;
-  out1[5] = x51;
-}
-
-static void fiat_bls12_381_q_divstep(uint64_t* out1, uint64_t out2[6], uint64_t out3[6], uint64_t out4[6], uint64_t out5[6], uint64_t arg1, const uint64_t arg2[6], const uint64_t arg3[6], const uint64_t arg4[6], const uint64_t arg5[6]) {
-  uint64_t x1;
-  fiat_bls12_381_q_uint1 x2;
-  fiat_bls12_381_q_addcarryx_u64(&x1, &x2, 0x0, (~arg1), 0x1);
-  fiat_bls12_381_q_uint1 x3 = (fiat_bls12_381_q_uint1)((fiat_bls12_381_q_uint1)((fiat_bls12_381_q_uint1)(x1 >> 63) & 0x1) & (fiat_bls12_381_q_uint1)((arg3[0]) & 0x1));
-  uint64_t x4;
-  fiat_bls12_381_q_uint1 x5;
-  fiat_bls12_381_q_addcarryx_u64(&x4, &x5, 0x0, (~arg1), 0x1);
-  uint64_t x6;
-  fiat_bls12_381_q_cmovznz_u64(&x6, x3, arg1, x4);
-  uint64_t x7;
-  fiat_bls12_381_q_cmovznz_u64(&x7, x3, (arg2[0]), (arg3[0]));
-  uint64_t x8;
-  fiat_bls12_381_q_cmovznz_u64(&x8, x3, (arg2[1]), (arg3[1]));
-  uint64_t x9;
-  fiat_bls12_381_q_cmovznz_u64(&x9, x3, (arg2[2]), (arg3[2]));
-  uint64_t x10;
-  fiat_bls12_381_q_cmovznz_u64(&x10, x3, (arg2[3]), (arg3[3]));
-  uint64_t x11;
-  fiat_bls12_381_q_cmovznz_u64(&x11, x3, (arg2[4]), (arg3[4]));
-  uint64_t x12;
-  fiat_bls12_381_q_cmovznz_u64(&x12, x3, (arg2[5]), (arg3[5]));
-  uint64_t x13;
-  fiat_bls12_381_q_uint1 x14;
-  fiat_bls12_381_q_addcarryx_u64(&x13, &x14, 0x0, 0x1, (~(arg2[0])));
-  uint64_t x15;
-  fiat_bls12_381_q_uint1 x16;
-  fiat_bls12_381_q_addcarryx_u64(&x15, &x16, x14, 0x0, (~(arg2[1])));
-  uint64_t x17;
-  fiat_bls12_381_q_uint1 x18;
-  fiat_bls12_381_q_addcarryx_u64(&x17, &x18, x16, 0x0, (~(arg2[2])));
-  uint64_t x19;
-  fiat_bls12_381_q_uint1 x20;
-  fiat_bls12_381_q_addcarryx_u64(&x19, &x20, x18, 0x0, (~(arg2[3])));
-  uint64_t x21;
-  fiat_bls12_381_q_uint1 x22;
-  fiat_bls12_381_q_addcarryx_u64(&x21, &x22, x20, 0x0, (~(arg2[4])));
-  uint64_t x23;
-  fiat_bls12_381_q_uint1 x24;
-  fiat_bls12_381_q_addcarryx_u64(&x23, &x24, x22, 0x0, (~(arg2[5])));
-  uint64_t x25;
-  fiat_bls12_381_q_cmovznz_u64(&x25, x3, (arg3[0]), x13);
-  uint64_t x26;
-  fiat_bls12_381_q_cmovznz_u64(&x26, x3, (arg3[1]), x15);
-  uint64_t x27;
-  fiat_bls12_381_q_cmovznz_u64(&x27, x3, (arg3[2]), x17);
-  uint64_t x28;
-  fiat_bls12_381_q_cmovznz_u64(&x28, x3, (arg3[3]), x19);
-  uint64_t x29;
-  fiat_bls12_381_q_cmovznz_u64(&x29, x3, (arg3[4]), x21);
-  uint64_t x30;
-  fiat_bls12_381_q_cmovznz_u64(&x30, x3, (arg3[5]), x23);
-  uint64_t x31;
-  fiat_bls12_381_q_cmovznz_u64(&x31, x3, (arg4[0]), (arg5[0]));
-  uint64_t x32;
-  fiat_bls12_381_q_cmovznz_u64(&x32, x3, (arg4[1]), (arg5[1]));
-  uint64_t x33;
-  fiat_bls12_381_q_cmovznz_u64(&x33, x3, (arg4[2]), (arg5[2]));
-  uint64_t x34;
-  fiat_bls12_381_q_cmovznz_u64(&x34, x3, (arg4[3]), (arg5[3]));
-  uint64_t x35;
-  fiat_bls12_381_q_cmovznz_u64(&x35, x3, (arg4[4]), (arg5[4]));
-  uint64_t x36;
-  fiat_bls12_381_q_cmovznz_u64(&x36, x3, (arg4[5]), (arg5[5]));
-  uint64_t x37;
-  fiat_bls12_381_q_uint1 x38;
-  fiat_bls12_381_q_addcarryx_u64(&x37, &x38, 0x0, x31, x31);
-  uint64_t x39;
-  fiat_bls12_381_q_uint1 x40;
-  fiat_bls12_381_q_addcarryx_u64(&x39, &x40, x38, x32, x32);
-  uint64_t x41;
-  fiat_bls12_381_q_uint1 x42;
-  fiat_bls12_381_q_addcarryx_u64(&x41, &x42, x40, x33, x33);
-  uint64_t x43;
-  fiat_bls12_381_q_uint1 x44;
-  fiat_bls12_381_q_addcarryx_u64(&x43, &x44, x42, x34, x34);
-  uint64_t x45;
-  fiat_bls12_381_q_uint1 x46;
-  fiat_bls12_381_q_addcarryx_u64(&x45, &x46, x44, x35, x35);
-  uint64_t x47;
-  fiat_bls12_381_q_uint1 x48;
-  fiat_bls12_381_q_addcarryx_u64(&x47, &x48, x46, x36, x36);
-  uint64_t x49;
-  fiat_bls12_381_q_uint1 x50;
-  fiat_bls12_381_q_subborrowx_u64(&x49, &x50, 0x0, x37, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x51;
-  fiat_bls12_381_q_uint1 x52;
-  fiat_bls12_381_q_subborrowx_u64(&x51, &x52, x50, x39, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x53;
-  fiat_bls12_381_q_uint1 x54;
-  fiat_bls12_381_q_subborrowx_u64(&x53, &x54, x52, x41, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x55;
-  fiat_bls12_381_q_uint1 x56;
-  fiat_bls12_381_q_subborrowx_u64(&x55, &x56, x54, x43, UINT64_C(0x64774b84f38512bf));
-  uint64_t x57;
-  fiat_bls12_381_q_uint1 x58;
-  fiat_bls12_381_q_subborrowx_u64(&x57, &x58, x56, x45, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x59;
-  fiat_bls12_381_q_uint1 x60;
-  fiat_bls12_381_q_subborrowx_u64(&x59, &x60, x58, x47, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x61;
-  fiat_bls12_381_q_uint1 x62;
-  fiat_bls12_381_q_subborrowx_u64(&x61, &x62, x60, x48, 0x0);
-  uint64_t x63;
-  fiat_bls12_381_q_cmovznz_u64(&x63, x62, x49, x37);
-  uint64_t x64;
-  fiat_bls12_381_q_cmovznz_u64(&x64, x62, x51, x39);
-  uint64_t x65;
-  fiat_bls12_381_q_cmovznz_u64(&x65, x62, x53, x41);
-  uint64_t x66;
-  fiat_bls12_381_q_cmovznz_u64(&x66, x62, x55, x43);
-  uint64_t x67;
-  fiat_bls12_381_q_cmovznz_u64(&x67, x62, x57, x45);
-  uint64_t x68;
-  fiat_bls12_381_q_cmovznz_u64(&x68, x62, x59, x47);
-  uint64_t x69 = (arg4[5]);
-  uint64_t x70 = (arg4[4]);
-  uint64_t x71 = (arg4[3]);
-  uint64_t x72 = (arg4[2]);
-  uint64_t x73 = (arg4[1]);
-  uint64_t x74 = (arg4[0]);
-  uint64_t x75;
-  fiat_bls12_381_q_uint1 x76;
-  fiat_bls12_381_q_subborrowx_u64(&x75, &x76, 0x0, 0x0, x74);
-  uint64_t x77;
-  fiat_bls12_381_q_uint1 x78;
-  fiat_bls12_381_q_subborrowx_u64(&x77, &x78, x76, 0x0, x73);
-  uint64_t x79;
-  fiat_bls12_381_q_uint1 x80;
-  fiat_bls12_381_q_subborrowx_u64(&x79, &x80, x78, 0x0, x72);
-  uint64_t x81;
-  fiat_bls12_381_q_uint1 x82;
-  fiat_bls12_381_q_subborrowx_u64(&x81, &x82, x80, 0x0, x71);
-  uint64_t x83;
-  fiat_bls12_381_q_uint1 x84;
-  fiat_bls12_381_q_subborrowx_u64(&x83, &x84, x82, 0x0, x70);
-  uint64_t x85;
-  fiat_bls12_381_q_uint1 x86;
-  fiat_bls12_381_q_subborrowx_u64(&x85, &x86, x84, 0x0, x69);
-  uint64_t x87;
-  fiat_bls12_381_q_cmovznz_u64(&x87, x86, 0x0, UINT64_C(0xffffffffffffffff));
-  uint64_t x88;
-  fiat_bls12_381_q_uint1 x89;
-  fiat_bls12_381_q_addcarryx_u64(&x88, &x89, 0x0, x75, (x87 & UINT64_C(0xb9feffffffffaaab)));
-  uint64_t x90;
-  fiat_bls12_381_q_uint1 x91;
-  fiat_bls12_381_q_addcarryx_u64(&x90, &x91, x89, x77, (x87 & UINT64_C(0x1eabfffeb153ffff)));
-  uint64_t x92;
-  fiat_bls12_381_q_uint1 x93;
-  fiat_bls12_381_q_addcarryx_u64(&x92, &x93, x91, x79, (x87 & UINT64_C(0x6730d2a0f6b0f624)));
-  uint64_t x94;
-  fiat_bls12_381_q_uint1 x95;
-  fiat_bls12_381_q_addcarryx_u64(&x94, &x95, x93, x81, (x87 & UINT64_C(0x64774b84f38512bf)));
-  uint64_t x96;
-  fiat_bls12_381_q_uint1 x97;
-  fiat_bls12_381_q_addcarryx_u64(&x96, &x97, x95, x83, (x87 & UINT64_C(0x4b1ba7b6434bacd7)));
-  uint64_t x98;
-  fiat_bls12_381_q_uint1 x99;
-  fiat_bls12_381_q_addcarryx_u64(&x98, &x99, x97, x85, (x87 & UINT64_C(0x1a0111ea397fe69a)));
-  uint64_t x100;
-  fiat_bls12_381_q_cmovznz_u64(&x100, x3, (arg5[0]), x88);
-  uint64_t x101;
-  fiat_bls12_381_q_cmovznz_u64(&x101, x3, (arg5[1]), x90);
-  uint64_t x102;
-  fiat_bls12_381_q_cmovznz_u64(&x102, x3, (arg5[2]), x92);
-  uint64_t x103;
-  fiat_bls12_381_q_cmovznz_u64(&x103, x3, (arg5[3]), x94);
-  uint64_t x104;
-  fiat_bls12_381_q_cmovznz_u64(&x104, x3, (arg5[4]), x96);
-  uint64_t x105;
-  fiat_bls12_381_q_cmovznz_u64(&x105, x3, (arg5[5]), x98);
-  fiat_bls12_381_q_uint1 x106 = (fiat_bls12_381_q_uint1)(x25 & 0x1);
-  uint64_t x107 = (uint64_t)((x6 + (fiat_bls12_381_q_uint128)0x1) & UINT64_C(0xffffffffffffffff));
-  uint64_t x108;
-  fiat_bls12_381_q_cmovznz_u64(&x108, x106, 0x0, x7);
-  uint64_t x109;
-  fiat_bls12_381_q_cmovznz_u64(&x109, x106, 0x0, x8);
-  uint64_t x110;
-  fiat_bls12_381_q_cmovznz_u64(&x110, x106, 0x0, x9);
-  uint64_t x111;
-  fiat_bls12_381_q_cmovznz_u64(&x111, x106, 0x0, x10);
-  uint64_t x112;
-  fiat_bls12_381_q_cmovznz_u64(&x112, x106, 0x0, x11);
-  uint64_t x113;
-  fiat_bls12_381_q_cmovznz_u64(&x113, x106, 0x0, x12);
-  uint64_t x114;
-  fiat_bls12_381_q_uint1 x115;
-  fiat_bls12_381_q_addcarryx_u64(&x114, &x115, 0x0, x25, x108);
-  uint64_t x116;
-  fiat_bls12_381_q_uint1 x117;
-  fiat_bls12_381_q_addcarryx_u64(&x116, &x117, x115, x26, x109);
-  uint64_t x118;
-  fiat_bls12_381_q_uint1 x119;
-  fiat_bls12_381_q_addcarryx_u64(&x118, &x119, x117, x27, x110);
-  uint64_t x120;
-  fiat_bls12_381_q_uint1 x121;
-  fiat_bls12_381_q_addcarryx_u64(&x120, &x121, x119, x28, x111);
-  uint64_t x122;
-  fiat_bls12_381_q_uint1 x123;
-  fiat_bls12_381_q_addcarryx_u64(&x122, &x123, x121, x29, x112);
-  uint64_t x124;
-  fiat_bls12_381_q_uint1 x125;
-  fiat_bls12_381_q_addcarryx_u64(&x124, &x125, x123, x30, x113);
-  uint64_t x126 = ((x114 >> 1) | ((x116 << 63) & UINT64_C(0xffffffffffffffff)));
-  uint64_t x127 = ((x116 >> 1) | ((x118 << 63) & UINT64_C(0xffffffffffffffff)));
-  uint64_t x128 = ((x118 >> 1) | ((x120 << 63) & UINT64_C(0xffffffffffffffff)));
-  uint64_t x129 = ((x120 >> 1) | ((x122 << 63) & UINT64_C(0xffffffffffffffff)));
-  uint64_t x130 = ((x122 >> 1) | ((x124 << 63) & UINT64_C(0xffffffffffffffff)));
-  uint64_t x131 = ((x124 & UINT64_C(0x8000000000000000)) | (x124 >> 1));
-  uint64_t x132;
-  fiat_bls12_381_q_cmovznz_u64(&x132, x106, 0x0, x31);
-  uint64_t x133;
-  fiat_bls12_381_q_cmovznz_u64(&x133, x106, 0x0, x32);
-  uint64_t x134;
-  fiat_bls12_381_q_cmovznz_u64(&x134, x106, 0x0, x33);
-  uint64_t x135;
-  fiat_bls12_381_q_cmovznz_u64(&x135, x106, 0x0, x34);
-  uint64_t x136;
-  fiat_bls12_381_q_cmovznz_u64(&x136, x106, 0x0, x35);
-  uint64_t x137;
-  fiat_bls12_381_q_cmovznz_u64(&x137, x106, 0x0, x36);
-  uint64_t x138;
-  fiat_bls12_381_q_uint1 x139;
-  fiat_bls12_381_q_addcarryx_u64(&x138, &x139, 0x0, x100, x132);
-  uint64_t x140;
-  fiat_bls12_381_q_uint1 x141;
-  fiat_bls12_381_q_addcarryx_u64(&x140, &x141, x139, x101, x133);
-  uint64_t x142;
-  fiat_bls12_381_q_uint1 x143;
-  fiat_bls12_381_q_addcarryx_u64(&x142, &x143, x141, x102, x134);
-  uint64_t x144;
-  fiat_bls12_381_q_uint1 x145;
-  fiat_bls12_381_q_addcarryx_u64(&x144, &x145, x143, x103, x135);
-  uint64_t x146;
-  fiat_bls12_381_q_uint1 x147;
-  fiat_bls12_381_q_addcarryx_u64(&x146, &x147, x145, x104, x136);
-  uint64_t x148;
-  fiat_bls12_381_q_uint1 x149;
-  fiat_bls12_381_q_addcarryx_u64(&x148, &x149, x147, x105, x137);
-  uint64_t x150;
-  fiat_bls12_381_q_uint1 x151;
-  fiat_bls12_381_q_subborrowx_u64(&x150, &x151, 0x0, x138, UINT64_C(0xb9feffffffffaaab));
-  uint64_t x152;
-  fiat_bls12_381_q_uint1 x153;
-  fiat_bls12_381_q_subborrowx_u64(&x152, &x153, x151, x140, UINT64_C(0x1eabfffeb153ffff));
-  uint64_t x154;
-  fiat_bls12_381_q_uint1 x155;
-  fiat_bls12_381_q_subborrowx_u64(&x154, &x155, x153, x142, UINT64_C(0x6730d2a0f6b0f624));
-  uint64_t x156;
-  fiat_bls12_381_q_uint1 x157;
-  fiat_bls12_381_q_subborrowx_u64(&x156, &x157, x155, x144, UINT64_C(0x64774b84f38512bf));
-  uint64_t x158;
-  fiat_bls12_381_q_uint1 x159;
-  fiat_bls12_381_q_subborrowx_u64(&x158, &x159, x157, x146, UINT64_C(0x4b1ba7b6434bacd7));
-  uint64_t x160;
-  fiat_bls12_381_q_uint1 x161;
-  fiat_bls12_381_q_subborrowx_u64(&x160, &x161, x159, x148, UINT64_C(0x1a0111ea397fe69a));
-  uint64_t x162;
-  fiat_bls12_381_q_uint1 x163;
-  fiat_bls12_381_q_subborrowx_u64(&x162, &x163, x161, x149, 0x0);
-  uint64_t x164;
-  fiat_bls12_381_q_cmovznz_u64(&x164, x163, x150, x138);
-  uint64_t x165;
-  fiat_bls12_381_q_cmovznz_u64(&x165, x163, x152, x140);
-  uint64_t x166;
-  fiat_bls12_381_q_cmovznz_u64(&x166, x163, x154, x142);
-  uint64_t x167;
-  fiat_bls12_381_q_cmovznz_u64(&x167, x163, x156, x144);
-  uint64_t x168;
-  fiat_bls12_381_q_cmovznz_u64(&x168, x163, x158, x146);
-  uint64_t x169;
-  fiat_bls12_381_q_cmovznz_u64(&x169, x163, x160, x148);
-  *out1 = x107;
-  out2[0] = x7;
-  out2[1] = x8;
-  out2[2] = x9;
-  out2[3] = x10;
-  out2[4] = x11;
-  out2[5] = x12;
-  out3[0] = x126;
-  out3[1] = x127;
-  out3[2] = x128;
-  out3[3] = x129;
-  out3[4] = x130;
-  out3[5] = x131;
-  out4[0] = x63;
-  out4[1] = x64;
-  out4[2] = x65;
-  out4[3] = x66;
-  out4[4] = x67;
-  out4[5] = x68;
-  out5[0] = x164;
-  out5[1] = x165;
-  out5[2] = x166;
-  out5[3] = x167;
-  out5[4] = x168;
-  out5[5] = x169;
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_add_low.c b/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_add_low.c
deleted file mode 100644
index 0c1e5c05b975..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_add_low.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (C) 2007-2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#include "bls12_381_q_64.c"
-
-dig_t fp_add1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_add_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_addn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_addm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_bls12_381_q_add(c, a, b);
-}
-
-dig_t fp_addd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_addc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	dig_t carry;
-
-	carry = mpn_add_n(c, a, b, 2 * RLC_FP_DIGS);
-
-	if (carry || dv_cmp(c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS) != RLC_LT) {
-		mpn_sub_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-dig_t fp_sub1_low(dig_t *c, const dig_t *a, const dig_t digit) {
-	return mpn_sub_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_subn_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, RLC_FP_DIGS);
-}
-
-void fp_subm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_bls12_381_q_sub(c, a, b);
-}
-
-dig_t fp_subd_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	return mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS);
-}
-
-void fp_subc_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	if (mpn_sub_n(c, a, b, 2 * RLC_FP_DIGS)) {
-		mpn_add_n(c + RLC_FP_DIGS, c + RLC_FP_DIGS, fp_prime_get(), RLC_FP_DIGS);
-	}
-}
-
-void fp_negm_low(dig_t *c, const dig_t *a) {
-	fiat_bls12_381_q_opp(c, a);
-}
-
-dig_t fp_dbln_low(dig_t *c, const dig_t *a) {
-	return mpn_add_n(c, a, a, RLC_FP_DIGS);
-}
-
-void fp_dblm_low(dig_t *c, const dig_t *a) {
-	dig_t carry = mpn_add_n(c, a, a, RLC_FP_DIGS);
-	if (carry || (dv_cmp(c, fp_prime_get(), RLC_FP_DIGS) != RLC_LT)) {
-		carry = fp_subn_low(c, c, fp_prime_get());
-	}
-}
-
-void fp_hlvm_low(dig_t *c, const dig_t *a) {
-    dig_t carry = 0;
-
-    if (a[0] & 1) {
-            carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-    } else {
-            dv_copy(c, a, RLC_FP_DIGS);
-    }
-    mpn_rshift(c, c, RLC_FP_DIGS, 1);
-    if (carry) {
-            c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-    }
-}
-
-void fp_hlvd_low(dig_t *c, const dig_t *a) {
-	dig_t carry = 0;
-
-	if (a[0] & 1) {
-		carry = mpn_add_n(c, a, fp_prime_get(), RLC_FP_DIGS);
-	} else {
-		dv_copy(c, a, RLC_FP_DIGS);
-	}
-
-	mpn_add_1(c + RLC_FP_DIGS, a + RLC_FP_DIGS, RLC_FP_DIGS, carry);
-
-	carry = mpn_rshift(c + RLC_FP_DIGS, c + RLC_FP_DIGS, RLC_FP_DIGS, 1);
-	mpn_rshift(c, c, RLC_FP_DIGS, 1);
-	if (carry) {
-		c[RLC_FP_DIGS - 1] ^= ((dig_t)1 << (RLC_DIG - 1));
-	}
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_inv_low.c b/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_inv_low.c
deleted file mode 100644
index c7adfa3cdeed..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_inv_low.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (C) 2007-2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field addition and subtraction
- * functions.
- *
- * @ingroup fp
- */
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                         */
-/*============================================================================*/
-
-#include "bls12_381_q_64.c"
-
-uint64_t one[] = { 0x760900000002FFFD, 0xEBF4000BC40C0002, 0x5F48985753C758BA,
-                   0x77CE585370525745, 0x5C071A97A256EC6D, 0x15F65EC3FA80E493 };
-uint64_t pre[] = { 0x58B20FBD4742924F, 0x60DC92E7F4C2F437, 0x3F4FAC6A70C73C60,
-                   0xED47D0696C7BF023, 0x2A13C3E0FD09A8CB, 0x1397424C770094FF };
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_invm_low(dig_t *c, const dig_t *a) {
-	/* Compute number of iteratios based on modulus size. */
-#if FP_PRIME < 46
-	int i, iterations = (49 * 381 + 80)/17;
-#else
-	int i, iterations = (49 * 381 + 57)/17;
-#endif
-
-	dig_t out1, out2[6], out3[6], out4[6], out5[6];
-	dig_t f[6] = { 0 }, g[6], h[6], v[6] = { 0 }, r[6], d = 1;
-
-	/* v = 0, f = p, r = 1 in Montgomery form */
-	dv_copy(r, one, RLC_FP_DIGS);
-	dv_copy(f, fp_prime_get(), RLC_FP_DIGS);
-	/* Convert a from Montgomery form. */
-	fiat_bls12_381_q_from_montgomery(g, a);
-
-	for (i = 0; i < iterations - (iterations % 2); i+=2) {
-		fiat_bls12_381_q_divstep(&out1,out2,out3,out4,out5,d,f,g,v,r);
-		fiat_bls12_381_q_divstep(&d,f,g,v,r,out1,out2,out3,out4,out5);
-    }
-    fiat_bls12_381_q_divstep(&out1,out2,out3,out4,out5,d,f,g,v,r);
-
-	fiat_bls12_381_q_opp(h, out4);
-	fiat_bls12_381_q_selectznz(v, out2[RLC_FP_DIGS - 1] >> 63, out4, h);
-	fiat_bls12_381_q_mul(c, v, pre);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_mul_low.c b/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_mul_low.c
deleted file mode 100644
index d1f8a8589f97..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_mul_low.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (C) 2007-2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the low-level prime field multiplication functions.
- *
- * @ingroup bn
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-dig_t fp_mula_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_addmul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-dig_t fp_mul1_low(dig_t *c, const dig_t *a, dig_t digit) {
-	return mpn_mul_1(c, a, RLC_FP_DIGS, digit);
-}
-
-void fp_muln_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	mpn_mul_n(c, a, b, RLC_FP_DIGS);
-}
-
-#include "bls12_381_q_64.c"
-
-void fp_mulm_low(dig_t *c, const dig_t *a, const dig_t *b) {
-	fiat_bls12_381_q_mul(c, a, b);
-}
diff --git a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_sqr_low.c b/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_sqr_low.c
deleted file mode 100644
index 0ad4f229b5e1..000000000000
--- a/src/dashbls/depends/relic/src/low/x64-fiat-381/relic_fp_sqr_low.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (C) 2007-2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of low-level prime field squaring functions.
- *
- * @ingroup fp
- */
-
-#include <gmp.h>
-
-#include "relic_fp.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void fp_sqrn_low(dig_t *c, const dig_t *a) {
-	mpn_mul_n(c, a, a, RLC_FP_DIGS);
-}
-
-#include "bls12_381_q_64.c"
-
-void fp_sqrm_low(dig_t *c, const dig_t *a) {
-	fiat_bls12_381_q_square(c, a);
-}
diff --git a/src/dashbls/depends/relic/src/md/blake2-impl.h b/src/dashbls/depends/relic/src/md/blake2-impl.h
deleted file mode 100644
index c1df82e0c95d..000000000000
--- a/src/dashbls/depends/relic/src/md/blake2-impl.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-
-   Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.  You may use this under the
-   terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
-   your option.  The terms of these licenses can be found at:
-
-   - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
-   - OpenSSL license   : https://www.openssl.org/source/license.html
-   - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
-
-   More information about the BLAKE2 hash function can be found at
-   https://blake2.net.
-*/
-#ifndef BLAKE2_IMPL_H
-#define BLAKE2_IMPL_H
-
-#include <stdint.h>
-#include <string.h>
-
-#if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
-  #if   defined(_MSC_VER)
-    #define BLAKE2_INLINE __inline
-  #elif defined(__GNUC__)
-    #define BLAKE2_INLINE __inline__
-  #else
-    #define BLAKE2_INLINE
-  #endif
-#else
-  #define BLAKE2_INLINE inline
-#endif
-
-static BLAKE2_INLINE uint32_t load32( const void *src )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  uint32_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
-#else
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint32_t )( p[0] ) <<  0) |
-         (( uint32_t )( p[1] ) <<  8) |
-         (( uint32_t )( p[2] ) << 16) |
-         (( uint32_t )( p[3] ) << 24) ;
-#endif
-}
-
-static BLAKE2_INLINE uint64_t load64( const void *src )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  uint64_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
-#else
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint64_t )( p[0] ) <<  0) |
-         (( uint64_t )( p[1] ) <<  8) |
-         (( uint64_t )( p[2] ) << 16) |
-         (( uint64_t )( p[3] ) << 24) |
-         (( uint64_t )( p[4] ) << 32) |
-         (( uint64_t )( p[5] ) << 40) |
-         (( uint64_t )( p[6] ) << 48) |
-         (( uint64_t )( p[7] ) << 56) ;
-#endif
-}
-
-static BLAKE2_INLINE uint16_t load16( const void *src )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  uint16_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
-#else
-  const uint8_t *p = ( const uint8_t * )src;
-  return ( uint16_t )((( uint32_t )( p[0] ) <<  0) |
-                      (( uint32_t )( p[1] ) <<  8));
-#endif
-}
-
-static BLAKE2_INLINE void store16( void *dst, uint16_t w )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
-#else
-  uint8_t *p = ( uint8_t * )dst;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w;
-#endif
-}
-
-static BLAKE2_INLINE void store32( void *dst, uint32_t w )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
-#else
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
-#endif
-}
-
-static BLAKE2_INLINE void store64( void *dst, uint64_t w )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
-#else
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
-  p[4] = (uint8_t)(w >> 32);
-  p[5] = (uint8_t)(w >> 40);
-  p[6] = (uint8_t)(w >> 48);
-  p[7] = (uint8_t)(w >> 56);
-#endif
-}
-
-static BLAKE2_INLINE uint64_t load48( const void *src )
-{
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint64_t )( p[0] ) <<  0) |
-         (( uint64_t )( p[1] ) <<  8) |
-         (( uint64_t )( p[2] ) << 16) |
-         (( uint64_t )( p[3] ) << 24) |
-         (( uint64_t )( p[4] ) << 32) |
-         (( uint64_t )( p[5] ) << 40) ;
-}
-
-static BLAKE2_INLINE void store48( void *dst, uint64_t w )
-{
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
-  p[4] = (uint8_t)(w >> 32);
-  p[5] = (uint8_t)(w >> 40);
-}
-
-static BLAKE2_INLINE uint32_t rotr32( const uint32_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 32 - c ) );
-}
-
-static BLAKE2_INLINE uint64_t rotr64( const uint64_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 64 - c ) );
-}
-
-/* prevents compiler optimizing out memset() */
-static BLAKE2_INLINE void secure_zero_memory(void *v, size_t n)
-{
-  static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
-  memset_v(v, 0, n);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/blake2.h b/src/dashbls/depends/relic/src/md/blake2.h
deleted file mode 100644
index ca390305e604..000000000000
--- a/src/dashbls/depends/relic/src/md/blake2.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-
-   Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.  You may use this under the
-   terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
-   your option.  The terms of these licenses can be found at:
-
-   - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
-   - OpenSSL license   : https://www.openssl.org/source/license.html
-   - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
-
-   More information about the BLAKE2 hash function can be found at
-   https://blake2.net.
-*/
-#ifndef BLAKE2_H
-#define BLAKE2_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#if defined(_MSC_VER)
-#define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))
-#else
-#define BLAKE2_PACKED(x) x __attribute__((packed))
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-  enum blake2s_constant
-  {
-    BLAKE2S_BLOCKBYTES = 64,
-    BLAKE2S_OUTBYTES   = 32,
-    BLAKE2S_KEYBYTES   = 32,
-    BLAKE2S_SALTBYTES  = 8,
-    BLAKE2S_PERSONALBYTES = 8
-  };
-
-  enum blake2b_constant
-  {
-    BLAKE2B_BLOCKBYTES = 128,
-    BLAKE2B_OUTBYTES   = 64,
-    BLAKE2B_KEYBYTES   = 64,
-    BLAKE2B_SALTBYTES  = 16,
-    BLAKE2B_PERSONALBYTES = 16
-  };
-
-  typedef struct blake2s_state__
-  {
-    uint32_t h[8];
-    uint32_t t[2];
-    uint32_t f[2];
-    uint8_t  buf[BLAKE2S_BLOCKBYTES];
-    size_t   buflen;
-    size_t   outlen;
-    uint8_t  last_node;
-  } blake2s_state;
-
-  typedef struct blake2b_state__
-  {
-    uint64_t h[8];
-    uint64_t t[2];
-    uint64_t f[2];
-    uint8_t  buf[BLAKE2B_BLOCKBYTES];
-    size_t   buflen;
-    size_t   outlen;
-    uint8_t  last_node;
-  } blake2b_state;
-
-  typedef struct blake2sp_state__
-  {
-    blake2s_state S[8][1];
-    blake2s_state R[1];
-    uint8_t       buf[8 * BLAKE2S_BLOCKBYTES];
-    size_t        buflen;
-    size_t        outlen;
-  } blake2sp_state;
-
-  typedef struct blake2bp_state__
-  {
-    blake2b_state S[4][1];
-    blake2b_state R[1];
-    uint8_t       buf[4 * BLAKE2B_BLOCKBYTES];
-    size_t        buflen;
-    size_t        outlen;
-  } blake2bp_state;
-
-
-  BLAKE2_PACKED(struct blake2s_param__
-  {
-    uint8_t  digest_length; /* 1 */
-    uint8_t  key_length;    /* 2 */
-    uint8_t  fanout;        /* 3 */
-    uint8_t  depth;         /* 4 */
-    uint32_t leaf_length;   /* 8 */
-    uint32_t node_offset;  /* 12 */
-    uint16_t xof_length;    /* 14 */
-    uint8_t  node_depth;    /* 15 */
-    uint8_t  inner_length;  /* 16 */
-    /* uint8_t  reserved[0]; */
-    uint8_t  salt[BLAKE2S_SALTBYTES]; /* 24 */
-    uint8_t  personal[BLAKE2S_PERSONALBYTES];  /* 32 */
-  });
-
-  typedef struct blake2s_param__ blake2s_param;
-
-  BLAKE2_PACKED(struct blake2b_param__
-  {
-    uint8_t  digest_length; /* 1 */
-    uint8_t  key_length;    /* 2 */
-    uint8_t  fanout;        /* 3 */
-    uint8_t  depth;         /* 4 */
-    uint32_t leaf_length;   /* 8 */
-    uint32_t node_offset;   /* 12 */
-    uint32_t xof_length;    /* 16 */
-    uint8_t  node_depth;    /* 17 */
-    uint8_t  inner_length;  /* 18 */
-    uint8_t  reserved[14];  /* 32 */
-    uint8_t  salt[BLAKE2B_SALTBYTES]; /* 48 */
-    uint8_t  personal[BLAKE2B_PERSONALBYTES];  /* 64 */
-  });
-
-  typedef struct blake2b_param__ blake2b_param;
-
-  typedef struct blake2xs_state__
-  {
-    blake2s_state S[1];
-    blake2s_param P[1];
-  } blake2xs_state;
-
-  typedef struct blake2xb_state__
-  {
-    blake2b_state S[1];
-    blake2b_param P[1];
-  } blake2xb_state;
-
-  /* Padded structs result in a compile-time error */
-  enum {
-    BLAKE2_DUMMY_1 = 1/(int)(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
-    BLAKE2_DUMMY_2 = 1/(int)(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
-  };
-
-  /* Streaming API */
-  int blake2s_init( blake2s_state *S, size_t outlen );
-  int blake2s_init_key( blake2s_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
-  int blake2s_update( blake2s_state *S, const void *in, size_t inlen );
-  int blake2s_final( blake2s_state *S, void *out, size_t outlen );
-
-  int blake2b_init( blake2b_state *S, size_t outlen );
-  int blake2b_init_key( blake2b_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
-  int blake2b_update( blake2b_state *S, const void *in, size_t inlen );
-  int blake2b_final( blake2b_state *S, void *out, size_t outlen );
-
-  int blake2sp_init( blake2sp_state *S, size_t outlen );
-  int blake2sp_init_key( blake2sp_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2sp_update( blake2sp_state *S, const void *in, size_t inlen );
-  int blake2sp_final( blake2sp_state *S, void *out, size_t outlen );
-
-  int blake2bp_init( blake2bp_state *S, size_t outlen );
-  int blake2bp_init_key( blake2bp_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2bp_update( blake2bp_state *S, const void *in, size_t inlen );
-  int blake2bp_final( blake2bp_state *S, void *out, size_t outlen );
-
-  /* Variable output length API */
-  int blake2xs_init( blake2xs_state *S, const size_t outlen );
-  int blake2xs_init_key( blake2xs_state *S, const size_t outlen, const void *key, size_t keylen );
-  int blake2xs_update( blake2xs_state *S, const void *in, size_t inlen );
-  int blake2xs_final(blake2xs_state *S, void *out, size_t outlen);
-
-  int blake2xb_init( blake2xb_state *S, const size_t outlen );
-  int blake2xb_init_key( blake2xb_state *S, const size_t outlen, const void *key, size_t keylen );
-  int blake2xb_update( blake2xb_state *S, const void *in, size_t inlen );
-  int blake2xb_final(blake2xb_state *S, void *out, size_t outlen);
-
-  /* Simple API */
-  int blake2s( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  int blake2sp( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2bp( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  int blake2xs( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2xb( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  /* This is simply an alias for blake2b */
-  int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/blake2_COPYING b/src/dashbls/depends/relic/src/md/blake2_COPYING
deleted file mode 100644
index 0e259d42c996..000000000000
--- a/src/dashbls/depends/relic/src/md/blake2_COPYING
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
diff --git a/src/dashbls/depends/relic/src/md/blake2s-ref.c b/src/dashbls/depends/relic/src/md/blake2s-ref.c
deleted file mode 100644
index c8b035f62135..000000000000
--- a/src/dashbls/depends/relic/src/md/blake2s-ref.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
-   BLAKE2 reference source code package - reference C implementations
-
-   Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.  You may use this under the
-   terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
-   your option.  The terms of these licenses can be found at:
-
-   - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
-   - OpenSSL license   : https://www.openssl.org/source/license.html
-   - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
-
-   More information about the BLAKE2 hash function can be found at
-   https://blake2.net.
-*/
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "blake2.h"
-#include "blake2-impl.h"
-
-static const uint32_t blake2s_IV[8] =
-{
-  0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
-  0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
-};
-
-static const uint8_t blake2s_sigma[10][16] =
-{
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-};
-
-static void blake2s_set_lastnode( blake2s_state *S )
-{
-  S->f[1] = (uint32_t)-1;
-}
-
-/* Some helper functions, not necessarily useful */
-static int blake2s_is_lastblock( const blake2s_state *S )
-{
-  return S->f[0] != 0;
-}
-
-static void blake2s_set_lastblock( blake2s_state *S )
-{
-  if( S->last_node ) blake2s_set_lastnode( S );
-
-  S->f[0] = (uint32_t)-1;
-}
-
-static void blake2s_increment_counter( blake2s_state *S, const uint32_t inc )
-{
-  S->t[0] += inc;
-  S->t[1] += ( S->t[0] < inc );
-}
-
-static void blake2s_init0( blake2s_state *S )
-{
-  size_t i;
-  memset( S, 0, sizeof( blake2s_state ) );
-
-  for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
-}
-
-/* init2 xors IV with input parameter block */
-int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
-{
-  const unsigned char *p = ( const unsigned char * )( P );
-  size_t i;
-
-  blake2s_init0( S );
-
-  /* IV XOR ParamBlock */
-  for( i = 0; i < 8; ++i )
-    S->h[i] ^= load32( &p[i * 4] );
-
-  S->outlen = P->digest_length;
-  return 0;
-}
-
-
-/* Sequential blake2s initialization */
-int blake2s_init( blake2s_state *S, size_t outlen )
-{
-  blake2s_param P[1];
-
-  /* Move interval verification here? */
-  if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = 0;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store16( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  /* memset(P->reserved, 0, sizeof(P->reserved) ); */
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-  return blake2s_init_param( S, P );
-}
-
-int blake2s_init_key( blake2s_state *S, size_t outlen, const void *key, size_t keylen )
-{
-  blake2s_param P[1];
-
-  if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1;
-
-  if ( !key || !keylen || keylen > BLAKE2S_KEYBYTES ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = (uint8_t)keylen;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store16( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  /* memset(P->reserved, 0, sizeof(P->reserved) ); */
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-
-  if( blake2s_init_param( S, P ) < 0 ) return -1;
-
-  {
-    uint8_t block[BLAKE2S_BLOCKBYTES];
-    memset( block, 0, BLAKE2S_BLOCKBYTES );
-    memcpy( block, key, keylen );
-    blake2s_update( S, block, BLAKE2S_BLOCKBYTES );
-    secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from stack */
-  }
-  return 0;
-}
-
-#define G(r,i,a,b,c,d)                      \
-  do {                                      \
-    a = a + b + m[blake2s_sigma[r][2*i+0]]; \
-    d = rotr32(d ^ a, 16);                  \
-    c = c + d;                              \
-    b = rotr32(b ^ c, 12);                  \
-    a = a + b + m[blake2s_sigma[r][2*i+1]]; \
-    d = rotr32(d ^ a, 8);                   \
-    c = c + d;                              \
-    b = rotr32(b ^ c, 7);                   \
-  } while(0)
-
-#define ROUND(r)                    \
-  do {                              \
-    G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-    G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-    G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-    G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-    G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-    G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-    G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-    G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-  } while(0)
-
-static void blake2s_compress( blake2s_state *S, const uint8_t in[BLAKE2S_BLOCKBYTES] )
-{
-  uint32_t m[16];
-  uint32_t v[16];
-  size_t i;
-
-  for( i = 0; i < 16; ++i ) {
-    m[i] = load32( in + i * sizeof( m[i] ) );
-  }
-
-  for( i = 0; i < 8; ++i ) {
-    v[i] = S->h[i];
-  }
-
-  v[ 8] = blake2s_IV[0];
-  v[ 9] = blake2s_IV[1];
-  v[10] = blake2s_IV[2];
-  v[11] = blake2s_IV[3];
-  v[12] = S->t[0] ^ blake2s_IV[4];
-  v[13] = S->t[1] ^ blake2s_IV[5];
-  v[14] = S->f[0] ^ blake2s_IV[6];
-  v[15] = S->f[1] ^ blake2s_IV[7];
-
-  ROUND( 0 );
-  ROUND( 1 );
-  ROUND( 2 );
-  ROUND( 3 );
-  ROUND( 4 );
-  ROUND( 5 );
-  ROUND( 6 );
-  ROUND( 7 );
-  ROUND( 8 );
-  ROUND( 9 );
-
-  for( i = 0; i < 8; ++i ) {
-    S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
-  }
-}
-
-#undef G
-#undef ROUND
-
-int blake2s_update( blake2s_state *S, const void *pin, size_t inlen )
-{
-  const unsigned char * in = (const unsigned char *)pin;
-  if( inlen > 0 )
-  {
-    size_t left = S->buflen;
-    size_t fill = BLAKE2S_BLOCKBYTES - left;
-    if( inlen > fill )
-    {
-      S->buflen = 0;
-      memcpy( S->buf + left, in, fill ); /* Fill buffer */
-      blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
-      blake2s_compress( S, S->buf ); /* Compress */
-      in += fill; inlen -= fill;
-      while(inlen > BLAKE2S_BLOCKBYTES) {
-        blake2s_increment_counter(S, BLAKE2S_BLOCKBYTES);
-        blake2s_compress( S, in );
-        in += BLAKE2S_BLOCKBYTES;
-        inlen -= BLAKE2S_BLOCKBYTES;
-      }
-    }
-    memcpy( S->buf + S->buflen, in, inlen );
-    S->buflen += inlen;
-  }
-  return 0;
-}
-
-int blake2s_final( blake2s_state *S, void *out, size_t outlen )
-{
-  uint8_t buffer[BLAKE2S_OUTBYTES] = {0};
-  size_t i;
-
-  if( out == NULL || outlen < S->outlen )
-    return -1;
-
-  if( blake2s_is_lastblock( S ) )
-    return -1;
-
-  blake2s_increment_counter( S, ( uint32_t )S->buflen );
-  blake2s_set_lastblock( S );
-  memset( S->buf + S->buflen, 0, BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */
-  blake2s_compress( S, S->buf );
-
-  for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
-    store32( buffer + sizeof( S->h[i] ) * i, S->h[i] );
-
-  memcpy( out, buffer, outlen );
-  secure_zero_memory(buffer, sizeof(buffer));
-  return 0;
-}
-
-int blake2s( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen )
-{
-  blake2s_state S[1];
-
-  /* Verify parameters */
-  if ( NULL == in && inlen > 0 ) return -1;
-
-  if ( NULL == out ) return -1;
-
-  if ( NULL == key && keylen > 0) return -1;
-
-  if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1;
-
-  if( keylen > BLAKE2S_KEYBYTES ) return -1;
-
-  if( keylen > 0 )
-  {
-    if( blake2s_init_key( S, outlen, key, keylen ) < 0 ) return -1;
-  }
-  else
-  {
-    if( blake2s_init( S, outlen ) < 0 ) return -1;
-  }
-
-  blake2s_update( S, ( const uint8_t * )in, inlen );
-  blake2s_final( S, out, outlen );
-  return 0;
-}
-
-#if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
-{
-  return blake2s( out, BLAKE2S_OUTBYTES, in, inlen, NULL, 0 );
-}
-#endif
-
-#if defined(BLAKE2S_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( void )
-{
-  uint8_t key[BLAKE2S_KEYBYTES];
-  uint8_t buf[BLAKE2_KAT_LENGTH];
-  size_t i, step;
-
-  for( i = 0; i < BLAKE2S_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  /* Test simple API */
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2S_OUTBYTES];
-    blake2s( hash, BLAKE2S_OUTBYTES, buf, i, key, BLAKE2S_KEYBYTES );
-
-    if( 0 != memcmp( hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES ) )
-    {
-      goto fail;
-    }
-  }
-
-  /* Test streaming API */
-  for(step = 1; step < BLAKE2S_BLOCKBYTES; ++step) {
-    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
-      uint8_t hash[BLAKE2S_OUTBYTES];
-      blake2s_state S;
-      uint8_t * p = buf;
-      size_t mlen = i;
-      int err = 0;
-
-      if( (err = blake2s_init_key(&S, BLAKE2S_OUTBYTES, key, BLAKE2S_KEYBYTES)) < 0 ) {
-        goto fail;
-      }
-
-      while (mlen >= step) {
-        if ( (err = blake2s_update(&S, p, step)) < 0 ) {
-          goto fail;
-        }
-        mlen -= step;
-        p += step;
-      }
-      if ( (err = blake2s_update(&S, p, mlen)) < 0) {
-        goto fail;
-      }
-      if ( (err = blake2s_final(&S, hash, BLAKE2S_OUTBYTES)) < 0) {
-        goto fail;
-      }
-
-      if (0 != memcmp(hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES)) {
-        goto fail;
-      }
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-fail:
-  puts("error");
-  return -1;
-}
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_blake2s.c b/src/dashbls/depends/relic/src/md/relic_md_blake2s.c
deleted file mode 100644
index cf0b79b5493b..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_blake2s.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2015 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the BLAKE2s hash function.
- *
- * @ingroup md
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_util.h"
-#include "relic_md.h"
-#include "blake2.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == B2S160 || !defined(STRIP)
-
-void md_map_b2s160(uint8_t *hash, const uint8_t *msg, int len) {
-	memset(hash, 0, RLC_MD_LEN_B2S160);
-	blake2s(hash, RLC_MD_LEN_B2S160, msg, len, NULL, 0);
-}
-
-#endif
-
-#if MD_MAP == B2S256 || !defined(STRIP)
-
-void md_map_b2s256(uint8_t *hash, const uint8_t *msg, int len) {
-	memset(hash, 0, RLC_MD_LEN_B2S256);
-	blake2s(hash, RLC_MD_LEN_B2S256, msg, len, NULL, 0);
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_hmac.c b/src/dashbls/depends/relic/src/md/relic_md_hmac.c
deleted file mode 100644
index 00b7e63b5737..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_hmac.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Hash-based Message Authentication Code.
- *
- * @ingroup md
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_util.h"
-#include "relic_md.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void md_hmac(uint8_t *mac, const uint8_t *in, int in_len, const uint8_t *key,
-    int key_len) {
-#if MD_MAP == SH224 || MD_MAP == SH256 || MD_MAP == B2S160 || MD_MAP == B2S256
-  #define block_size 64
-#elif MD_MAP == SH384 || MD_MAP == SH512
-  #define block_size  128
-#endif
-    uint8_t opad[block_size + RLC_MD_LEN];
-    uint8_t *ipad = RLC_ALLOCA(uint8_t, block_size + in_len);
-	uint8_t _key[RLC_MAX(RLC_MD_LEN, block_size)];
-
-    if (ipad == NULL) {
-        RLC_THROW(ERR_NO_MEMORY);
-		return;
-    }
-
-	if (key_len > block_size) {
-		md_map(_key, key, key_len);
-		key = _key;
-		key_len = RLC_MD_LEN;
-	}
-	if (key_len <= block_size) {
-		memcpy(_key, key, key_len);
-		memset(_key + key_len, 0, block_size - key_len);
-		key = _key;
-	}
-	for (int i = 0; i < block_size; i++) {
-		opad[i] = 0x5C ^ key[i];
-		ipad[i] = 0x36 ^ key[i];
-	}
-	memcpy(ipad + block_size, in, in_len);
-	md_map(opad + block_size, ipad, block_size + in_len);
-	md_map(mac, opad, block_size + RLC_MD_LEN);
-
-    RLC_FREE(ipad);
-}
diff --git a/src/dashbls/depends/relic/src/md/relic_md_kdf.c b/src/dashbls/depends/relic/src/md/relic_md_kdf.c
deleted file mode 100644
index 47c42cfbf0f4..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_kdf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of a Key Derivation function.
- *
- * @ingroup md
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_util.h"
-#include "relic_md.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void md_kdf(uint8_t *key, int key_len, const uint8_t *in,
-		int in_len) {
-	uint32_t i, j, d;
-	uint8_t* buffer = RLC_ALLOCA(uint8_t, in_len + sizeof(uint32_t));
-	uint8_t* t = RLC_ALLOCA(uint8_t, key_len + RLC_MD_LEN);
-	if (buffer == NULL || t == NULL) {
-		RLC_FREE(buffer);
-		RLC_FREE(t);
-		RLC_THROW(ERR_NO_MEMORY);
-		return;
-	}
-
-	/* d = ceil(kLen/hLen). */
-	d = RLC_CEIL(key_len, RLC_MD_LEN);
-	memcpy(buffer, in, in_len);
-	for (i = 1; i <= d; i++) {
-		j = util_conv_big(i);
-		/* c = integer_to_string(c, 4). */
-		memcpy(buffer + in_len, &j, sizeof(uint32_t));
-		/* t = t || hash(z || c). */
-		md_map(t + (i - 1) * RLC_MD_LEN, buffer, in_len + sizeof(uint32_t));
-	}
-	memcpy(key, t, key_len);
-
-	RLC_FREE(buffer);
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/md/relic_md_mgf.c b/src/dashbls/depends/relic/src/md/relic_md_mgf.c
deleted file mode 100644
index 1c7737636faa..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_mgf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of a Mask Generation Function.
- *
- * @ingroup md
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_util.h"
-#include "relic_md.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void md_mgf(uint8_t *key, int key_len, const uint8_t *in,
-		int in_len) {
-	uint32_t i, j, d;
-	uint8_t *buffer = RLC_ALLOCA(uint8_t, in_len + sizeof(uint32_t));
-	uint8_t *t = RLC_ALLOCA(uint8_t, key_len + RLC_MD_LEN);
-
-	if (buffer == NULL || t == NULL) {
-		RLC_FREE(buffer);
-		RLC_FREE(t);
-		RLC_THROW(ERR_NO_MEMORY);
-		return;
-	}
-
-	/* d = ceil(kLen/hLen). */
-	d = RLC_CEIL(key_len, RLC_MD_LEN);
-	memcpy(buffer, in, in_len);
-	for (i = 0; i < d; i++) {
-		j = util_conv_big(i);
-		/* c = integer_to_string(c, 4). */
-		memcpy(buffer + in_len, &j, sizeof(uint32_t));
-		/* t = t || hash(z || c). */
-		md_map(t + i * RLC_MD_LEN, buffer, in_len + sizeof(uint32_t));
-	}
-	memcpy(key, t, key_len);
-
-	RLC_FREE(buffer);
-	RLC_FREE(t);
-}
diff --git a/src/dashbls/depends/relic/src/md/relic_md_sha224.c b/src/dashbls/depends/relic/src/md/relic_md_sha224.c
deleted file mode 100644
index 7009f00aaa94..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_sha224.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the SHA-224 hash function.
- *
- * @ingroup md
- */
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_md.h"
-#include "sha.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == SH224 || !defined(STRIP)
-
-void md_map_sh224(uint8_t *hash, const uint8_t *msg, int len) {
-	SHA224Context ctx;
-
-	if (SHA224Reset(&ctx) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA224Input(&ctx, msg, len) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA224Result(&ctx, hash) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_sha256.c b/src/dashbls/depends/relic/src/md/relic_md_sha256.c
deleted file mode 100644
index 2e589cb747a3..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_sha256.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the SHA-256 hash function.
- *
- * @ingroup md
- */
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_md.h"
-#include "sha.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == SH256 || !defined(STRIP)
-
-void md_map_sh256(uint8_t *hash, const uint8_t *msg, int len) {
-	SHA256Context ctx;
-
-	if (SHA256Reset(&ctx) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA256Input(&ctx, msg, len) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA256Result(&ctx, hash) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_sha384.c b/src/dashbls/depends/relic/src/md/relic_md_sha384.c
deleted file mode 100644
index cc93c8b2bd56..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_sha384.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the SHA-384 hash function.
- *
- * @ingroup md
- */
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_md.h"
-#include "sha.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == SH384 || !defined(STRIP)
-
-void md_map_sh384(uint8_t *hash, const uint8_t *msg, int len) {
-	SHA384Context ctx;
-
-	if (SHA384Reset(&ctx) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA384Input(&ctx, msg, len) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA384Result(&ctx, hash) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_sha512.c b/src/dashbls/depends/relic/src/md/relic_md_sha512.c
deleted file mode 100644
index 5d2cd3b3f773..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_sha512.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the SHA-512 hash function.
- *
- * @ingroup md
- */
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_md.h"
-#include "sha.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == SH512 || !defined(STRIP)
-
-void md_map_sh512(uint8_t *hash, const uint8_t *msg, int len) {
-	SHA512Context ctx;
-
-	if (SHA512Reset(&ctx) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA512Input(&ctx, msg, len) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-	if (SHA512Result(&ctx, hash) != shaSuccess) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/md/relic_md_xmd.c b/src/dashbls/depends/relic/src/md/relic_md_xmd.c
deleted file mode 100644
index ccc876b9232f..000000000000
--- a/src/dashbls/depends/relic/src/md/relic_md_xmd.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of an extensible-output function from a Merkle-Damgaard hash.
- *
- * @ingroup md
- */
-
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "sha.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Helper: check result of a SHA call.
- */
-#define _check_md(EXPR)                                                        \
-	do {                                                                       \
-		if ((EXPR) != shaSuccess) {                                            \
-			RLC_THROW(ERR_NO_VALID);                                           \
-			return;                                                            \
-		}                                                                      \
-	} while (0)
-
-/**
- * Construct an extensible-output function based on HASH, which must be
- * one of SHA224, SHA256, SHA384, or SHA512.
- */
-#define make_md_xmd(HASH, HNAME)                                               \
-	_make_md_xmd(md_xmd_##HNAME, HASH##_Message_Block_Size, HASH##HashSize,    \
-				 HASH##Context, HASH##Reset, HASH##Input, HASH##Result)
-
-/**
- * Helper for make_md_xmd
- */
-#define _make_md_xmd(HName, HBlockSize, HHashSize, HContext, HReset, HInput, HResult)                             \
-	void HName(uint8_t *buf, int buf_len, const uint8_t *in, int in_len, const uint8_t *dst, int dst_len) {       \
-		const unsigned ell = (buf_len + HHashSize - 1) / HHashSize;                                               \
-		if (buf_len < 0 || ell > 255 || dst_len > 255) {                                                          \
-			RLC_THROW(ERR_NO_VALID);                                                                              \
-			return;                                                                                               \
-		}                                                                                                         \
-                                                                                                                  \
-		/* info needed for hashing: zero padding and some lengths */                                              \
-		const uint8_t Z_pad[HBlockSize] = {                                                                       \
-			0,                                                                                                    \
-		};                                                                                                        \
-		const uint8_t l_i_b_0_str[] = {buf_len >> 8, buf_len & 0xff, 0, dst_len};                                 \
-		const uint8_t *dstlen_str = l_i_b_0_str + 3;                                                              \
-                                                                                                                  \
-		/* now compute b_0 */                                                                                     \
-		uint8_t b_0[HHashSize];                                                                                   \
-		HContext ctx;                                                                                             \
-		_check_md(HReset(&ctx));                                                                                  \
-		_check_md(HInput(&ctx, Z_pad, HBlockSize)); /* Z_pad */                                                   \
-		_check_md(HInput(&ctx, in, in_len));        /* msg */                                                     \
-		_check_md(HInput(&ctx, l_i_b_0_str, 3));    /* l_i_b_str || I2OSP(0, 1) */                                \
-		_check_md(HInput(&ctx, dst, dst_len));      /* DST */                                                     \
-		_check_md(HInput(&ctx, dstlen_str, 1));     /* I2OSP(len(dst), 1) */                                      \
-		_check_md(HResult(&ctx, b_0));              /* finalize computation */                                    \
-                                                                                                                  \
-		/* now compute b_i */                                                                                     \
-		uint8_t b_i[HHashSize + 1] = {                                                                            \
-			0,                                                                                                    \
-		};                                                                                                        \
-		for (unsigned i = 1; i <= ell; ++i) {                                                                     \
-			/* compute b_0 XOR b_(i-1) */                                                                         \
-			for (unsigned j = 0; j < HHashSize; ++j) {                                                            \
-				b_i[j] = b_0[j] ^ b_i[j];                                                                         \
-			}                                                                                                     \
-			b_i[HHashSize] = i;                                                                                   \
-                                                                                                                  \
-			_check_md(HReset(&ctx));                                                                              \
-			_check_md(HInput(&ctx, b_i, HHashSize + 1)); /* b_0 ^ b_(i-1) || I2OSP(i, 1) */                       \
-			_check_md(HInput(&ctx, dst, dst_len));       /* DST */                                                \
-			_check_md(HInput(&ctx, dstlen_str, 1));      /* I2OSP(len(dst), 1) */                                 \
-			_check_md(HResult(&ctx, b_i));               /* finalize computation */                               \
-                                                                                                                  \
-			/* copy into output buffer */                                                                         \
-			const int rem_after = buf_len - i * HHashSize;                                                        \
-			const int copy_len = HHashSize + (rem_after < 0 ? rem_after : 0);                                     \
-			memcpy(buf + (i - 1) * HHashSize, b_i, copy_len);                                                     \
-		}                                                                                                         \
-	}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if MD_MAP == SH224 || !defined(STRIP)
-make_md_xmd(SHA224, sh224)
-#endif
-
-#if MD_MAP == SH256 || !defined(STRIP)
-make_md_xmd(SHA256, sh256)
-#endif
-
-#if MD_MAP == SH384 || !defined(STRIP)
-make_md_xmd(SHA384, sh384)
-#endif
-
-#if MD_MAP == SH512 || !defined(STRIP)
-make_md_xmd(SHA512, sh512)
-#endif
diff --git a/src/dashbls/depends/relic/src/md/sha.h b/src/dashbls/depends/relic/src/md/sha.h
deleted file mode 100644
index 690976ef3b79..000000000000
--- a/src/dashbls/depends/relic/src/md/sha.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/**************************** sha.h ****************************/
-/******************* See RFC 4634 for details ******************/
-#ifndef _SHA_H_
-#define _SHA_H_
-
-#include "sha_private.h"
-
-/*
- *  Description:
- *      This file implements the Secure Hash Signature Standard
- *      algorithms as defined in the National Institute of Standards
- *      and Technology Federal Information Processing Standards
- *      Publication (FIPS PUB) 180-1 published on April 17, 1995, 180-2
- *      published on August 1, 2002, and the FIPS PUB 180-2 Change
- *      Notice published on February 28, 2004.
- *
- *      A combined document showing all algorithms is available at
- *              http://csrc.nist.gov/publications/fips/
- *              fips180-2/fips180-2withchangenotice.pdf
- *
- *      The five hashes are defined in these sizes:
- *              SHA-224         28 byte / 224 bit
- *              SHA-256         32 byte / 256 bit
- *              SHA-384         48 byte / 384 bit
- *              SHA-512         64 byte / 512 bit
- */
-
-#include <stdint.h>
-/*
- * If you do not have the ISO standard stdint.h header file, then you
- * must typedef the following:
- *    name              meaning
- *  uint64_t         unsigned 64 bit integer
- *  uint32_t         unsigned 32 bit integer
- *  uint8_t          unsigned 8 bit integer (i.e., uint8_t)
- *  int_least16_t    integer of >= 16 bits
- *
- */
-
-#ifndef _SHA_enum_
-#define _SHA_enum_
-/*
- *  All SHA functions return one of these values.
- */
-enum {
-    shaSuccess = 0,
-    shaNull,            /* Null pointer parameter */
-    shaInputTooLong,    /* input data too long */
-    shaStateError,      /* called Input after FinalBits or Result */
-    shaBadParam         /* passed a bad parameter */
-};
-#endif /* _SHA_enum_ */
-
-/*
- *  These constants hold size information for each of the SHA
- *  hashing operations
- */
-enum {
-    SHA224_Message_Block_Size = 64,
-    SHA256_Message_Block_Size = 64, SHA384_Message_Block_Size = 128,
-    SHA512_Message_Block_Size = 128,
-    USHA_Max_Message_Block_Size = SHA512_Message_Block_Size,
-
-    SHA224HashSize = 28, SHA256HashSize = 32,
-    SHA384HashSize = 48, SHA512HashSize = 64,
-    USHAMaxHashSize = SHA512HashSize,
-
-    SHA224HashSizeBits = 224,
-    SHA256HashSizeBits = 256, SHA384HashSizeBits = 384,
-    SHA512HashSizeBits = 512, USHAMaxHashSizeBits = SHA512HashSizeBits
-};
-
-/*
- *  These constants are used in the USHA (unified sha) functions.
- */
-typedef enum SHAversion {
-    SHA224, SHA256, SHA384, SHA512
-} SHAversion;
-
-/*
- *  This structure will hold context information for the SHA-256
- *  hashing operation.
- */
-typedef struct SHA256Context {
-    uint32_t Intermediate_Hash[SHA256HashSize/4]; /* Message Digest */
-
-    uint32_t Length_Low;                /* Message length in bits */
-    uint32_t Length_High;               /* Message length in bits */
-
-    int_least16_t Message_Block_Index;  /* Message_Block array index */
-                                        /* 512-bit message blocks */
-    uint8_t Message_Block[SHA256_Message_Block_Size];
-
-    int Computed;                       /* Is the digest computed? */
-    int Corrupted;                      /* Is the digest corrupted? */
-} SHA256Context;
-
-/*
- *  This structure will hold context information for the SHA-512
- *  hashing operation.
- */
-typedef struct SHA512Context {
-#ifdef USE_32BIT_ONLY
-    uint32_t Intermediate_Hash[SHA512HashSize/4]; /* Message Digest  */
-    uint32_t Length[4];                 /* Message length in bits */
-#else /* !USE_32BIT_ONLY */
-    uint64_t Intermediate_Hash[SHA512HashSize/8]; /* Message Digest */
-    uint64_t Length_Low, Length_High;   /* Message length in bits */
-#endif /* USE_32BIT_ONLY */
-    int_least16_t Message_Block_Index;  /* Message_Block array index */
-                                        /* 1024-bit message blocks */
-    uint8_t Message_Block[SHA512_Message_Block_Size];
-
-    int Computed;                       /* Is the digest computed?*/
-    int Corrupted;                      /* Is the digest corrupted? */
-} SHA512Context;
-
-/*
- *  This structure will hold context information for the SHA-224
- *  hashing operation. It uses the SHA-256 structure for computation.
- */
-typedef struct SHA256Context SHA224Context;
-
-/*
- *  This structure will hold context information for the SHA-384
- *  hashing operation. It uses the SHA-512 structure for computation.
- */
-typedef struct SHA512Context SHA384Context;
-
-/*
- *  This structure holds context information for all SHA
- *  hashing operations.
- */
-typedef struct USHAContext {
-    int whichSha;               /* which SHA is being used */
-    union {
-      SHA224Context sha224Context; SHA256Context sha256Context;
-      SHA384Context sha384Context; SHA512Context sha512Context;
-    } ctx;
-} USHAContext;
-
-/*
- *  This structure will hold context information for the HMAC
- *  keyed hashing operation.
- */
-typedef struct HMACContext {
-    int whichSha;               /* which SHA is being used */
-    int hashSize;               /* hash size of SHA being used */
-    int blockSize;              /* block size of SHA being used */
-    USHAContext shaContext;     /* SHA context */
-    uint8_t k_opad[USHA_Max_Message_Block_Size];
-                        /* outer padding - key XORd with opad */
-} HMACContext;
-
-/*
- *  Function Prototypes
- */
-
-/* SHA-224 */
-extern int SHA224Reset(SHA224Context *);
-extern int SHA224Input(SHA224Context *, const uint8_t *bytes,
-                       unsigned int bytecount);
-extern int SHA224FinalBits(SHA224Context *, const uint8_t bits,
-                           unsigned int bitcount);
-extern int SHA224Result(SHA224Context *,
-                        uint8_t Message_Digest[SHA224HashSize]);
-
-/* SHA-256 */
-extern int SHA256Reset(SHA256Context *);
-extern int SHA256Input(SHA256Context *, const uint8_t *bytes,
-                       unsigned int bytecount);
-extern int SHA256FinalBits(SHA256Context *, const uint8_t bits,
-                           unsigned int bitcount);
-extern int SHA256Result(SHA256Context *,
-                        uint8_t Message_Digest[SHA256HashSize]);
-
-/* SHA-384 */
-extern int SHA384Reset(SHA384Context *);
-extern int SHA384Input(SHA384Context *, const uint8_t *bytes,
-                       unsigned int bytecount);
-extern int SHA384FinalBits(SHA384Context *, const uint8_t bits,
-                           unsigned int bitcount);
-extern int SHA384Result(SHA384Context *,
-                        uint8_t Message_Digest[SHA384HashSize]);
-
-/* SHA-512 */
-extern int SHA512Reset(SHA512Context *);
-extern int SHA512Input(SHA512Context *, const uint8_t *bytes,
-                       unsigned int bytecount);
-extern int SHA512FinalBits(SHA512Context *, const uint8_t bits,
-                           unsigned int bitcount);
-extern int SHA512Result(SHA512Context *,
-                        uint8_t Message_Digest[SHA512HashSize]);
-
-#endif /* _SHA_H_ */
diff --git a/src/dashbls/depends/relic/src/md/sha224-256.c b/src/dashbls/depends/relic/src/md/sha224-256.c
deleted file mode 100644
index f090cf391250..000000000000
--- a/src/dashbls/depends/relic/src/md/sha224-256.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*************************** sha224-256.c ***************************/
-/********************* See RFC 4634 for details *********************/
-/*
- * Description:
- *   This file implements the Secure Hash Signature Standard
- *   algorithms as defined in the National Institute of Standards
- *   and Technology Federal Information Processing Standards
- *   Publication (FIPS PUB) 180-1 published on April 17, 1995, 180-2
- *   published on August 1, 2002, and the FIPS PUB 180-2 Change
- *   Notice published on February 28, 2004.
- *
- *   A combined document showing all algorithms is available at
- *       http://csrc.nist.gov/publications/fips/
- *       fips180-2/fips180-2withchangenotice.pdf
- *
- *   The SHA-224 and SHA-256 algorithms produce 224-bit and 256-bit
- *   message digests for a given data stream. It should take about
- *   2**n steps to find a message with the same digest as a given
- *   message and 2**(n/2) to find any two messages with the same
- *   digest, when n is the digest size in bits. Therefore, this
- *   algorithm can serve as a means of providing a
- *   "fingerprint" for a message.
- *
- * Portability Issues:
- *   SHA-224 and SHA-256 are defined in terms of 32-bit "words".
- *   This code uses <stdint.h> (included via "sha.h") to define 32
- *   and 8 bit unsigned integer types. If your C compiler does not
- *   support 32 bit unsigned integers, this code is not
- *   appropriate.
- *
- * Caveats:
- *   SHA-224 and SHA-256 are designed to work with messages less
- *   than 2^64 bits long. This implementation uses SHA224/256Input()
- *   to hash the bits that are a multiple of the size of an 8-bit
- *   character, and then uses SHA224/256FinalBits() to hash the
- *   final few bits of the input.
- */
-
-#include "sha.h"
-
-/* Define the SHA shift, rotate left and rotate right macro */
-#define SHA256_SHR(bits,word)      ((word) >> (bits))
-#define SHA256_ROTL(bits,word)                         \
-  (((word) << (bits)) | ((word) >> (32-(bits))))
-#define SHA256_ROTR(bits,word)                         \
-  (((word) >> (bits)) | ((word) << (32-(bits))))
-
-/* Define the SHA SIGMA and sigma macros */
-#define SHA256_SIGMA0(word)   \
-  (SHA256_ROTR( 2,word) ^ SHA256_ROTR(13,word) ^ SHA256_ROTR(22,word))
-#define SHA256_SIGMA1(word)   \
-  (SHA256_ROTR( 6,word) ^ SHA256_ROTR(11,word) ^ SHA256_ROTR(25,word))
-#define SHA256_sigma0(word)   \
-  (SHA256_ROTR( 7,word) ^ SHA256_ROTR(18,word) ^ SHA256_SHR( 3,word))
-#define SHA256_sigma1(word)   \
-  (SHA256_ROTR(17,word) ^ SHA256_ROTR(19,word) ^ SHA256_SHR(10,word))
-
-/*
- * add "length" to the length
- */
-#define SHA224_256AddLength(context, length)               \
-  (addTemp = (context)->Length_Low, (context)->Corrupted = \
-    (((context)->Length_Low += (length)) < addTemp) &&     \
-    (++(context)->Length_High == 0) ? 1 : 0)
-
-/* Local Function Prototypes */
-static void SHA224_256Finalize(SHA256Context *context,
-  uint8_t Pad_Byte);
-static void SHA224_256PadMessage(SHA256Context *context,
-  uint8_t Pad_Byte);
-static void SHA224_256ProcessMessageBlock(SHA256Context *context);
-static int SHA224_256Reset(SHA256Context *context, uint32_t *H0);
-static int SHA224_256ResultN(SHA256Context *context,
-  uint8_t Message_Digest[], int HashSize);
-
-/* Initial Hash Values: FIPS-180-2 Change Notice 1 */
-static uint32_t SHA224_H0[SHA256HashSize/4] = {
-    0xC1059ED8, 0x367CD507, 0x3070DD17, 0xF70E5939,
-    0xFFC00B31, 0x68581511, 0x64F98FA7, 0xBEFA4FA4
-};
-
-/* Initial Hash Values: FIPS-180-2 section 5.3.2 */
-static uint32_t SHA256_H0[SHA256HashSize/4] = {
-  0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
-  0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
-};
-
-/*
- * SHA224Reset
- *
- * Description:
- *   This function will initialize the SHA384Context in preparation
- *   for computing a new SHA224 message digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA224Reset(SHA224Context *context)
-{
-  return SHA224_256Reset(context, SHA224_H0);
-}
-
-/*
- * SHA224Input
- *
- * Description:
- *   This function accepts an array of octets as the next portion
- *   of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_array: [in]
- *     An array of characters representing the next portion of
- *     the message.
- *   length: [in]
- *     The length of the message in message_array
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA224Input(SHA224Context *context, const uint8_t *message_array,
-    unsigned int length)
-{
-  return SHA256Input(context, message_array, length);
-}
-
-/*
- * SHA224FinalBits
- *
- * Description:
- *   This function will add in any final bits of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_bits: [in]
- *     The final bits of the message, in the upper portion of the
- *     byte. (Use 0b###00000 instead of 0b00000### to input the
- *     three bits ###.)
- *   length: [in]
- *     The number of bits in message_bits, between 1 and 7.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA224FinalBits( SHA224Context *context,
-    const uint8_t message_bits, unsigned int length)
-{
-  return SHA256FinalBits(context, message_bits, length);
-}
-
-/*
- * SHA224Result
- *
- * Description:
- *   This function will return the 224-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 28th element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA224Result(SHA224Context *context,
-    uint8_t Message_Digest[SHA224HashSize])
-{
-  return SHA224_256ResultN(context, Message_Digest, SHA224HashSize);
-}
-
-/*
- * SHA256Reset
- *
- * Description:
- *   This function will initialize the SHA256Context in preparation
- *   for computing a new SHA256 message digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA256Reset(SHA256Context *context)
-{
-  return SHA224_256Reset(context, SHA256_H0);
-}
-
-/*
- * SHA256Input
- *
- * Description:
- *   This function accepts an array of octets as the next portion
- *   of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_array: [in]
- *     An array of characters representing the next portion of
- *     the message.
- *   length: [in]
- *     The length of the message in message_array
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA256Input(SHA256Context *context, const uint8_t *message_array,
-    unsigned int length)
-{
-  if (!length)
-    return shaSuccess;
-
-  if (!context || !message_array)
-    return shaNull;
-
-  if (context->Computed) {
-    context->Corrupted = shaStateError;
-    return shaStateError;
-  }
-
-  if (context->Corrupted)
-     return context->Corrupted;
-
-  while (length-- && !context->Corrupted) {
-    context->Message_Block[context->Message_Block_Index++] =
-    		(uint8_t)(*message_array & 0xFF);
-
-    uint32_t addTemp;
-    if (!SHA224_256AddLength(context, 8) &&
-      (context->Message_Block_Index == SHA256_Message_Block_Size))
-      SHA224_256ProcessMessageBlock(context);
-
-    message_array++;
-  }
-
-  return shaSuccess;
-
-}
-
-/*
- * SHA256FinalBits
- *
- * Description:
- *   This function will add in any final bits of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_bits: [in]
- *     The final bits of the message, in the upper portion of the
- *     byte. (Use 0b###00000 instead of 0b00000### to input the
- *     three bits ###.)
- *   length: [in]
- *     The number of bits in message_bits, between 1 and 7.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA256FinalBits(SHA256Context *context,
-    const uint8_t message_bits, unsigned int length)
-{
-  uint8_t masks[8] = {
-      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
-      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
-      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
-      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
-  };
-
-  uint8_t markbit[8] = {
-      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
-      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
-      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
-      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
-  };
-
-  if (!length)
-    return shaSuccess;
-
-  if (!context)
-    return shaNull;
-
-  if ((context->Computed) || (length >= 8) || (length == 0)) {
-    context->Corrupted = shaStateError;
-    return shaStateError;
-  }
-
-  if (context->Corrupted)
-    return context->Corrupted;
-
-  uint32_t addTemp;
-  SHA224_256AddLength(context, length);
-  SHA224_256Finalize(context, (uint8_t)
-    ((message_bits & masks[length]) | markbit[length]));
-
-  return shaSuccess;
-}
-
-/*
- * SHA256Result
- *
- * Description:
- *   This function will return the 256-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 32nd element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *
- * Returns:
- *   sha Error Code.
- */
-int SHA256Result(SHA256Context *context, uint8_t Message_Digest[])
-{
-  return SHA224_256ResultN(context, Message_Digest, SHA256HashSize);
-}
-
-/*
- * SHA224_256Finalize
- *
- * Description:
- *   This helper function finishes off the digest calculations.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   Pad_Byte: [in]
- *     The last byte to add to the digest before the 0-padding
- *     and length. This will contain the last bits of the message
- *     followed by another single bit. If the message was an
- *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
- *
- * Returns:
- *   sha Error Code.
- */
-static void SHA224_256Finalize(SHA256Context *context,
-    uint8_t Pad_Byte)
-{
-  int i;
-  SHA224_256PadMessage(context, Pad_Byte);
-  /* message may be sensitive, so clear it out */
-  for (i = 0; i < SHA256_Message_Block_Size; ++i)
-    context->Message_Block[i] = 0;
-  context->Length_Low = 0;  /* and clear length */
-  context->Length_High = 0;
-  context->Computed = 1;
-}
-
-/*
- * SHA224_256PadMessage
- *
- * Description:
- *   According to the standard, the message must be padded to an
- *   even 512 bits. The first padding bit must be a '1'. The
- *   last 64 bits represent the length of the original message.
- *   All bits in between should be 0. This helper function will pad
- *   the message according to those rules by filling the
- *   Message_Block array accordingly. When it returns, it can be
- *   assumed that the message digest has been computed.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to pad
- *   Pad_Byte: [in]
- *     The last byte to add to the digest before the 0-padding
- *     and length. This will contain the last bits of the message
- *     followed by another single bit. If the message was an
- *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
- *
- * Returns:
- *   Nothing.
- */
-static void SHA224_256PadMessage(SHA256Context *context,
-    uint8_t Pad_Byte)
-{
-  /*
-   * Check to see if the current message block is too small to hold
-   * the initial padding bits and length. If so, we will pad the
-   * block, process it, and then continue padding into a second
-   * block.
-   */
-  if (context->Message_Block_Index >= (SHA256_Message_Block_Size-8)) {
-    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
-    while (context->Message_Block_Index < SHA256_Message_Block_Size)
-      context->Message_Block[context->Message_Block_Index++] = 0;
-    SHA224_256ProcessMessageBlock(context);
-  } else
-    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
-
-  while (context->Message_Block_Index < (SHA256_Message_Block_Size-8))
-    context->Message_Block[context->Message_Block_Index++] = 0;
-
-  /*
-   * Store the message length as the last 8 octets
-   */
-  context->Message_Block[56] = (uint8_t)(context->Length_High >> 24);
-  context->Message_Block[57] = (uint8_t)(context->Length_High >> 16);
-  context->Message_Block[58] = (uint8_t)(context->Length_High >> 8);
-  context->Message_Block[59] = (uint8_t)(context->Length_High);
-  context->Message_Block[60] = (uint8_t)(context->Length_Low >> 24);
-  context->Message_Block[61] = (uint8_t)(context->Length_Low >> 16);
-  context->Message_Block[62] = (uint8_t)(context->Length_Low >> 8);
-  context->Message_Block[63] = (uint8_t)(context->Length_Low);
-
-  SHA224_256ProcessMessageBlock(context);
-}
-
-/*
- * SHA224_256ProcessMessageBlock
- *
- * Description:
- *   This function will process the next 512 bits of the message
- *   stored in the Message_Block array.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *
- * Returns:
- *   Nothing.
- *
- * Comments:
- *   Many of the variable names in this code, especially the
- *   single character names, were used because those were the
- *   names used in the publication.
- */
-static void SHA224_256ProcessMessageBlock(SHA256Context *context)
-{
-  /* Constants defined in FIPS-180-2, section 4.2.2 */
-  static const uint32_t K[64] = {
-      0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b,
-      0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01,
-      0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7,
-      0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-      0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152,
-      0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
-      0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc,
-      0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-      0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819,
-      0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08,
-      0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f,
-      0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-      0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-  };
-  int        t, t4;                   /* Loop counter */
-  uint32_t   temp1, temp2;            /* Temporary word value */
-  uint32_t   W[64];                   /* Word sequence */
-  uint32_t   A, B, C, D, E, F, G, H;  /* Word buffers */
-
-  /*
-   * Initialize the first 16 words in the array W
-   */
-  for (t = t4 = 0; t < 16; t++, t4 += 4)
-    W[t] = (((uint32_t)context->Message_Block[t4]) << 24) |
-           (((uint32_t)context->Message_Block[t4 + 1]) << 16) |
-           (((uint32_t)context->Message_Block[t4 + 2]) << 8) |
-           (((uint32_t)context->Message_Block[t4 + 3]));
-
-  for (t = 16; t < 64; t++)
-    W[t] = SHA256_sigma1(W[t-2]) + W[t-7] +
-        SHA256_sigma0(W[t-15]) + W[t-16];
-
-  A = context->Intermediate_Hash[0];
-  B = context->Intermediate_Hash[1];
-  C = context->Intermediate_Hash[2];
-  D = context->Intermediate_Hash[3];
-  E = context->Intermediate_Hash[4];
-  F = context->Intermediate_Hash[5];
-  G = context->Intermediate_Hash[6];
-  H = context->Intermediate_Hash[7];
-
-  for (t = 0; t < 64; t++) {
-    temp1 = H + SHA256_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
-    temp2 = SHA256_SIGMA0(A) + SHA_Maj(A,B,C);
-    H = G;
-    G = F;
-    F = E;
-    E = D + temp1;
-    D = C;
-    C = B;
-    B = A;
-    A = temp1 + temp2;
-  }
-
-  context->Intermediate_Hash[0] += A;
-  context->Intermediate_Hash[1] += B;
-  context->Intermediate_Hash[2] += C;
-  context->Intermediate_Hash[3] += D;
-  context->Intermediate_Hash[4] += E;
-  context->Intermediate_Hash[5] += F;
-  context->Intermediate_Hash[6] += G;
-  context->Intermediate_Hash[7] += H;
-
-  context->Message_Block_Index = 0;
-}
-
-/*
- * SHA224_256Reset
- *
- * Description:
- *   This helper function will initialize the SHA256Context in
- *   preparation for computing a new SHA256 message digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *   H0
- *     The initial hash value to use.
- *
- * Returns:
- *   sha Error Code.
- */
-static int SHA224_256Reset(SHA256Context *context, uint32_t *H0)
-{
-  if (!context)
-    return shaNull;
-
-  context->Length_Low           = 0;
-  context->Length_High          = 0;
-  context->Message_Block_Index  = 0;
-
-  context->Intermediate_Hash[0] = H0[0];
-  context->Intermediate_Hash[1] = H0[1];
-  context->Intermediate_Hash[2] = H0[2];
-  context->Intermediate_Hash[3] = H0[3];
-  context->Intermediate_Hash[4] = H0[4];
-  context->Intermediate_Hash[5] = H0[5];
-  context->Intermediate_Hash[6] = H0[6];
-  context->Intermediate_Hash[7] = H0[7];
-
-  context->Computed  = 0;
-  context->Corrupted = 0;
-
-  return shaSuccess;
-}
-
-/*
- * SHA224_256ResultN
- *
- * Description:
- *   This helper function will return the 224-bit or 256-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 28th/32nd element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *   HashSize: [in]
- *     The size of the hash, either 28 or 32.
- *
- * Returns:
- *   sha Error Code.
- */
-static int SHA224_256ResultN(SHA256Context *context,
-    uint8_t Message_Digest[], int HashSize)
-{
-  int i;
-
-  if (!context || !Message_Digest)
-    return shaNull;
-
-  if (context->Corrupted)
-    return context->Corrupted;
-
-  if (!context->Computed)
-    SHA224_256Finalize(context, 0x80);
-
-  for (i = 0; i < HashSize; ++i)
-    Message_Digest[i] = (uint8_t)
-      (context->Intermediate_Hash[i>>2] >> 8 * ( 3 - ( i & 0x03 ) ));
-
-  return shaSuccess;
-}
diff --git a/src/dashbls/depends/relic/src/md/sha384-512.c b/src/dashbls/depends/relic/src/md/sha384-512.c
deleted file mode 100644
index e4ba7010f7e4..000000000000
--- a/src/dashbls/depends/relic/src/md/sha384-512.c
+++ /dev/null
@@ -1,1042 +0,0 @@
-/*************************** sha384-512.c ***************************/
-/********************* See RFC 4634 for details *********************/
-/*
- * Description:
- *   This file implements the Secure Hash Signature Standard
- *   algorithms as defined in the National Institute of Standards
- *   and Technology Federal Information Processing Standards
- *   Publication (FIPS PUB) 180-1 published on April 17, 1995, 180-2
- *   published on August 1, 2002, and the FIPS PUB 180-2 Change
- *   Notice published on February 28, 2004.
- *
- *   A combined document showing all algorithms is available at
- *       http://csrc.nist.gov/publications/fips/
- *       fips180-2/fips180-2withchangenotice.pdf
- *
- *   The SHA-384 and SHA-512 algorithms produce 384-bit and 512-bit
- *   message digests for a given data stream. It should take about
- *   2**n steps to find a message with the same digest as a given
- *   message and 2**(n/2) to find any two messages with the same
- *   digest, when n is the digest size in bits. Therefore, this
- *   algorithm can serve as a means of providing a
- *   "fingerprint" for a message.
- *
- * Portability Issues:
- *   SHA-384 and SHA-512 are defined in terms of 64-bit "words",
- *   but if USE_32BIT_ONLY is #defined, this code is implemented in
- *   terms of 32-bit "words". This code uses <stdint.h> (included
- *   via "sha.h") to define the 64, 32 and 8 bit unsigned integer
- *   types. If your C compiler does not support 64 bit unsigned
- *   integers, and you do not #define USE_32BIT_ONLY, this code is
- *   not appropriate.
- *
- * Caveats:
- *   SHA-384 and SHA-512 are designed to work with messages less
- *   than 2^128 bits long. This implementation uses
- *   SHA384/512Input() to hash the bits that are a multiple of the
- *   size of an 8-bit character, and then uses SHA384/256FinalBits()
- *   to hash the final few bits of the input.
- *
- */
-
-#include "sha.h"
-
-#ifdef USE_32BIT_ONLY
-/*
- * Define 64-bit arithmetic in terms of 32-bit arithmetic.
- * Each 64-bit number is represented in a 2-word array.
- * All macros are defined such that the result is the last parameter.
- */
-
-/*
- * Define shift, rotate left and rotate right functions
- */
-#define SHA512_SHR(bits, word, ret) (                          \
-    /* (((uint64_t)((word))) >> (bits)) */                     \
-    (ret)[0] = (((bits) < 32) && ((bits) >= 0)) ?              \
-      ((word)[0] >> (bits)) : 0,                               \
-    (ret)[1] = ((bits) > 32) ? ((word)[0] >> ((bits) - 32)) :  \
-      ((bits) == 32) ? (word)[0] :                             \
-      ((bits) >= 0) ?                                          \
-        (((word)[0] << (32 - (bits))) |                        \
-        ((word)[1] >> (bits))) : 0 )
-
-#define SHA512_SHL(bits, word, ret) (                          \
-    /* (((uint64_t)(word)) << (bits)) */                       \
-    (ret)[0] = ((bits) > 32) ? ((word)[1] << ((bits) - 32)) :  \
-         ((bits) == 32) ? (word)[1] :                          \
-         ((bits) >= 0) ?                                       \
-           (((word)[0] << (bits)) |                            \
-           ((word)[1] >> (32 - (bits)))) :                     \
-         0,                                                    \
-    (ret)[1] = (((bits) < 32) && ((bits) >= 0)) ?              \
-        ((word)[1] << (bits)) : 0 )
-
-/*
- * Define 64-bit OR
- */
-#define SHA512_OR(word1, word2, ret) (                         \
-    (ret)[0] = (word1)[0] | (word2)[0],                        \
-    (ret)[1] = (word1)[1] | (word2)[1] )
-
-/*
- * Define 64-bit XOR
- */
-#define SHA512_XOR(word1, word2, ret) (                        \
-    (ret)[0] = (word1)[0] ^ (word2)[0],                        \
-    (ret)[1] = (word1)[1] ^ (word2)[1] )
-
-/*
- * Define 64-bit AND
- */
-#define SHA512_AND(word1, word2, ret) (                        \
-    (ret)[0] = (word1)[0] & (word2)[0],                        \
-    (ret)[1] = (word1)[1] & (word2)[1] )
-
-/*
- * Define 64-bit TILDA
- */
-#define SHA512_TILDA(word, ret)                                \
-  ( (ret)[0] = ~(word)[0], (ret)[1] = ~(word)[1] )
-
-/*
- * Define 64-bit ADD
- */
-#define SHA512_ADD(word1, word2, ret) (                        \
-    (ret)[1] = (word1)[1], (ret)[1] += (word2)[1],             \
-    (ret)[0] = (word1)[0] + (word2)[0] + ((ret)[1] < (word1)[1]) )
-
-/*
- * Add the 4word value in word2 to word1.
- */
-#define SHA512_ADDTO4(word1, word2) (                          \
-    ADDTO4_temp = (word1)[3],                                  \
-    (word1)[3] += (word2)[3],                                  \
-    ADDTO4_temp2 = (word1)[2],                                 \
-    (word1)[2] += (word2)[2] + ((word1)[3] < ADDTO4_temp),     \
-    ADDTO4_temp = (word1)[1],                                  \
-    (word1)[1] += (word2)[1] + ((word1)[2] < ADDTO4_temp2),    \
-    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO4_temp) )
-
-/*
- * Add the 2word value in word2 to word1.
- */
-#define SHA512_ADDTO2(word1, word2) (                          \
-    ADDTO2_temp = (word1)[1],                                  \
-    (word1)[1] += (word2)[1],                                  \
-    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO2_temp) )
-
-/*
- * SHA rotate   ((word >> bits) | (word << (64-bits)))
- */
-#define SHA512_ROTR(bits, word, ret) (                         \
-    SHA512_SHR((bits), (word), ROTR_temp1),                    \
-    SHA512_SHL(64-(bits), (word), ROTR_temp2),                 \
-    SHA512_OR(ROTR_temp1, ROTR_temp2, (ret)) )
-
-/*
- * Define the SHA SIGMA and sigma macros
- *  SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word)
- */
-#define SHA512_SIGMA0(word, ret) (                             \
-    SHA512_ROTR(28, (word), SIGMA0_temp1),                     \
-    SHA512_ROTR(34, (word), SIGMA0_temp2),                     \
-    SHA512_ROTR(39, (word), SIGMA0_temp3),                     \
-    SHA512_XOR(SIGMA0_temp2, SIGMA0_temp3, SIGMA0_temp4),      \
-    SHA512_XOR(SIGMA0_temp1, SIGMA0_temp4, (ret)) )
-
-/*
- * SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word)
- */
-#define SHA512_SIGMA1(word, ret) (                             \
-    SHA512_ROTR(14, (word), SIGMA1_temp1),                     \
-    SHA512_ROTR(18, (word), SIGMA1_temp2),                     \
-    SHA512_ROTR(41, (word), SIGMA1_temp3),                     \
-    SHA512_XOR(SIGMA1_temp2, SIGMA1_temp3, SIGMA1_temp4),      \
-    SHA512_XOR(SIGMA1_temp1, SIGMA1_temp4, (ret)) )
-
-/*
- * (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
- */
-#define SHA512_sigma0(word, ret) (                             \
-    SHA512_ROTR( 1, (word), sigma0_temp1),                     \
-    SHA512_ROTR( 8, (word), sigma0_temp2),                     \
-    SHA512_SHR( 7, (word), sigma0_temp3),                      \
-    SHA512_XOR(sigma0_temp2, sigma0_temp3, sigma0_temp4),      \
-    SHA512_XOR(sigma0_temp1, sigma0_temp4, (ret)) )
-
-/*
- * (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
- */
-#define SHA512_sigma1(word, ret) (                             \
-    SHA512_ROTR(19, (word), sigma1_temp1),                     \
-    SHA512_ROTR(61, (word), sigma1_temp2),                     \
-    SHA512_SHR( 6, (word), sigma1_temp3),                      \
-    SHA512_XOR(sigma1_temp2, sigma1_temp3, sigma1_temp4),      \
-    SHA512_XOR(sigma1_temp1, sigma1_temp4, (ret)) )
-
-#undef SHA_Ch
-#undef SHA_Maj
-
-#ifndef USE_MODIFIED_MACROS
-/*
- * These definitions are the ones used in FIPS-180-2, section 4.1.3
- *  Ch(x,y,z)   ((x & y) ^ (~x & z))
- */
-#define SHA_Ch(x, y, z, ret) (                                 \
-    SHA512_AND(x, y, Ch_temp1),                                \
-    SHA512_TILDA(x, Ch_temp2),                                 \
-    SHA512_AND(Ch_temp2, z, Ch_temp3),                         \
-    SHA512_XOR(Ch_temp1, Ch_temp3, (ret)) )
-/*
- *  Maj(x,y,z)  (((x)&(y)) ^ ((x)&(z)) ^ ((y)&(z)))
- */
-#define SHA_Maj(x, y, z, ret) (                                \
-    SHA512_AND(x, y, Maj_temp1),                               \
-    SHA512_AND(x, z, Maj_temp2),                               \
-    SHA512_AND(y, z, Maj_temp3),                               \
-    SHA512_XOR(Maj_temp2, Maj_temp3, Maj_temp4),               \
-    SHA512_XOR(Maj_temp1, Maj_temp4, (ret)) )
-#else /* !USE_32BIT_ONLY */
-/*
- * These definitions are potentially faster equivalents for the ones
- * used in FIPS-180-2, section 4.1.3.
- *   ((x & y) ^ (~x & z)) becomes
- *   ((x & (y ^ z)) ^ z)
- */
-#define SHA_Ch(x, y, z, ret) (                                 \
-   (ret)[0] = (((x)[0] & ((y)[0] ^ (z)[0])) ^ (z)[0]),         \
-   (ret)[1] = (((x)[1] & ((y)[1] ^ (z)[1])) ^ (z)[1]) )
-
-/*
- *   ((x & y) ^ (x & z) ^ (y & z)) becomes
- *   ((x & (y | z)) | (y & z))
- */
-#define SHA_Maj(x, y, z, ret) (                                 \
-   ret[0] = (((x)[0] & ((y)[0] | (z)[0])) | ((y)[0] & (z)[0])), \
-   ret[1] = (((x)[1] & ((y)[1] | (z)[1])) | ((y)[1] & (z)[1])) )
-#endif /* USE_MODIFIED_MACROS */
-
-/*
- * add "length" to the length
- */
-#define SHA384_512AddLength(context, length) (                        \
-    addTemp[3] = (length), SHA512_ADDTO4((context)->Length, addTemp), \
-    (context)->Corrupted = (((context)->Length[3] == 0) &&            \
-       ((context)->Length[2] == 0) && ((context)->Length[1] == 0) &&  \
-       ((context)->Length[0] < 8)) ? 1 : 0 )
-
-/* Local Function Prototypes */
-static void SHA384_512Finalize(SHA512Context *context,
-  uint8_t Pad_Byte);
-static void SHA384_512PadMessage(SHA512Context *context,
-  uint8_t Pad_Byte);
-static void SHA384_512ProcessMessageBlock(SHA512Context *context);
-static int SHA384_512Reset(SHA512Context *context, uint32_t H0[]);
-static int SHA384_512ResultN( SHA512Context *context,
-  uint8_t Message_Digest[], int HashSize);
-
-/* Initial Hash Values: FIPS-180-2 sections 5.3.3 and 5.3.4 */
-static uint32_t SHA384_H0[SHA512HashSize/4] = {
-    0xCBBB9D5D, 0xC1059ED8, 0x629A292A, 0x367CD507, 0x9159015A,
-    0x3070DD17, 0x152FECD8, 0xF70E5939, 0x67332667, 0xFFC00B31,
-    0x8EB44A87, 0x68581511, 0xDB0C2E0D, 0x64F98FA7, 0x47B5481D,
-    0xBEFA4FA4
-};
-
-static uint32_t SHA512_H0[SHA512HashSize/4] = {
-    0x6A09E667, 0xF3BCC908, 0xBB67AE85, 0x84CAA73B, 0x3C6EF372,
-    0xFE94F82B, 0xA54FF53A, 0x5F1D36F1, 0x510E527F, 0xADE682D1,
-    0x9B05688C, 0x2B3E6C1F, 0x1F83D9AB, 0xFB41BD6B, 0x5BE0CD19,
-    0x137E2179
-};
-
-#else /* !USE_32BIT_ONLY */
-
-/* Define the SHA shift, rotate left and rotate right macro */
-#define SHA512_SHR(bits,word)  (((uint64_t)(word)) >> (bits))
-#define SHA512_ROTR(bits,word) ((((uint64_t)(word)) >> (bits)) | \
-                                (((uint64_t)(word)) << (64-(bits))))
-
-/* Define the SHA SIGMA and sigma macros */
-#define SHA512_SIGMA0(word)   \
- (SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word))
-#define SHA512_SIGMA1(word)   \
- (SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word))
-#define SHA512_sigma0(word)   \
- (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
-#define SHA512_sigma1(word)   \
- (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
-
-/*
- * add "length" to the length
- */
-#define SHA384_512AddLength(context, length)                   \
-   (addTemp = context->Length_Low, context->Corrupted =        \
-    ((context->Length_Low += length) < addTemp) &&             \
-    (++context->Length_High == 0) ? 1 : 0)
-
-/* Local Function Prototypes */
-static void SHA384_512Finalize(SHA512Context *context,
-  uint8_t Pad_Byte);
-static void SHA384_512PadMessage(SHA512Context *context,
-  uint8_t Pad_Byte);
-static void SHA384_512ProcessMessageBlock(SHA512Context *context);
-static int SHA384_512Reset(SHA512Context *context, uint64_t H0[]);
-static int SHA384_512ResultN(SHA512Context *context,
-  uint8_t Message_Digest[], int HashSize);
-
-/* Initial Hash Values: FIPS-180-2 sections 5.3.3 and 5.3.4 */
-static uint64_t SHA384_H0[] = {
-    0xCBBB9D5DC1059ED8ll, 0x629A292A367CD507ll, 0x9159015A3070DD17ll,
-    0x152FECD8F70E5939ll, 0x67332667FFC00B31ll, 0x8EB44A8768581511ll,
-    0xDB0C2E0D64F98FA7ll, 0x47B5481DBEFA4FA4ll
-};
-static uint64_t SHA512_H0[] = {
-    0x6A09E667F3BCC908ll, 0xBB67AE8584CAA73Bll, 0x3C6EF372FE94F82Bll,
-    0xA54FF53A5F1D36F1ll, 0x510E527FADE682D1ll, 0x9B05688C2B3E6C1Fll,
-    0x1F83D9ABFB41BD6Bll, 0x5BE0CD19137E2179ll
-};
-
-#endif /* USE_32BIT_ONLY */
-
-/*
- * SHA384Reset
- *
- * Description:
- *   This function will initialize the SHA384Context in preparation
- *   for computing a new SHA384 message digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA384Reset(SHA384Context *context)
-{
-  return SHA384_512Reset(context, SHA384_H0);
-}
-
-/*
- * SHA384Input
- *
- * Description:
- *   This function accepts an array of octets as the next portion
- *   of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_array: [in]
- *     An array of characters representing the next portion of
- *     the message.
- *   length: [in]
- *     The length of the message in message_array
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA384Input(SHA384Context *context,
-    const uint8_t *message_array, unsigned int length)
-{
-  return SHA512Input(context, message_array, length);
-}
-
-/*
- * SHA384FinalBits
- *
- * Description:
- *   This function will add in any final bits of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_bits: [in]
- *     The final bits of the message, in the upper portion of the
- *     byte. (Use 0b###00000 instead of 0b00000### to input the
- *     three bits ###.)
- *   length: [in]
- *     The number of bits in message_bits, between 1 and 7.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA384FinalBits(SHA384Context *context,
-    const uint8_t message_bits, unsigned int length)
-{
-  return SHA512FinalBits(context, message_bits, length);
-}
-
-/*
- * SHA384Result
- *
- * Description:
- *   This function will return the 384-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 48th element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA384Result(SHA384Context *context,
-    uint8_t Message_Digest[SHA384HashSize])
-{
-  return SHA384_512ResultN(context, Message_Digest, SHA384HashSize);
-}
-
-/*
- * SHA512Reset
- *
- * Description:
- *   This function will initialize the SHA512Context in preparation
- *   for computing a new SHA512 message digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA512Reset(SHA512Context *context)
-{
-  return SHA384_512Reset(context, SHA512_H0);
-}
-
-/*
- * SHA512Input
- *
- * Description:
- *   This function accepts an array of octets as the next portion
- *   of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_array: [in]
- *     An array of characters representing the next portion of
- *     the message.
- *   length: [in]
- *     The length of the message in message_array
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA512Input(SHA512Context *context,
-        const uint8_t *message_array,
-        unsigned int length)
-{
-  if (!length)
-    return shaSuccess;
-
-  if (!context || !message_array)
-    return shaNull;
-
-  if (context->Computed) {
-    context->Corrupted = shaStateError;
-    return shaStateError;
-  }
-
-  if (context->Corrupted)
-     return context->Corrupted;
-
-  while (length-- && !context->Corrupted) {
-    context->Message_Block[context->Message_Block_Index++] =
-    		(uint8_t)(*message_array & 0xFF);
-
-#ifdef USE_32BIT_ONLY
-    uint32_t ADDTO4_temp, ADDTO4_temp2, addTemp[4] = { 0, 0, 0, 0 };
-#else
-    uint64_t addTemp;
-#endif
-    if (!SHA384_512AddLength(context, 8) &&
-      (context->Message_Block_Index == SHA512_Message_Block_Size))
-      SHA384_512ProcessMessageBlock(context);
-
-    message_array++;
-  }
-
-  return shaSuccess;
-}
-
-/*
- * SHA512FinalBits
- *
- * Description:
- *   This function will add in any final bits of the message.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   message_bits: [in]
- *     The final bits of the message, in the upper portion of the
- *     byte. (Use 0b###00000 instead of 0b00000### to input the
- *     three bits ###.)
- *   length: [in]
- *     The number of bits in message_bits, between 1 and 7.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA512FinalBits(SHA512Context *context,
-    const uint8_t message_bits, unsigned int length)
-{
-  uint8_t masks[8] = {
-      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
-      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
-      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
-      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
-  };
-  uint8_t markbit[8] = {
-      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
-      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
-      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
-      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
-  };
-
-  if (!length)
-    return shaSuccess;
-
-  if (!context)
-    return shaNull;
-
-  if ((context->Computed) || (length >= 8) || (length == 0)) {
-    context->Corrupted = shaStateError;
-    return shaStateError;
-  }
-
-  if (context->Corrupted)
-     return context->Corrupted;
-
-#ifdef USE_32BIT_ONLY
-  uint32_t ADDTO4_temp, ADDTO4_temp2, addTemp[4] = { 0, 0, 0, 0 };
-#else
-  uint64_t addTemp;
-#endif
-  SHA384_512AddLength(context, length);
-  SHA384_512Finalize(context, (uint8_t)
-    ((message_bits & masks[length]) | markbit[length]));
-
-  return shaSuccess;
-}
-
-/*
- * SHA384_512Finalize
- *
- * Description:
- *   This helper function finishes off the digest calculations.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *   Pad_Byte: [in]
- *     The last byte to add to the digest before the 0-padding
- *     and length. This will contain the last bits of the message
- *     followed by another single bit. If the message was an
- *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-static void SHA384_512Finalize(SHA512Context *context,
-    uint8_t Pad_Byte)
-{
-  int_least16_t i;
-  SHA384_512PadMessage(context, Pad_Byte);
-  /* message may be sensitive, clear it out */
-  for (i = 0; i < SHA512_Message_Block_Size; ++i)
-    context->Message_Block[i] = 0;
-#ifdef USE_32BIT_ONLY    /* and clear length */
-  context->Length[0] = context->Length[1] = 0;
-  context->Length[2] = context->Length[3] = 0;
-#else /* !USE_32BIT_ONLY */
-  context->Length_Low = 0;
-  context->Length_High = 0;
-#endif /* USE_32BIT_ONLY */
-  context->Computed = 1;
-}
-
-/*
- * SHA512Result
- *
- * Description:
- *   This function will return the 512-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 64th element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-int SHA512Result(SHA512Context *context,
-    uint8_t Message_Digest[SHA512HashSize])
-{
-  return SHA384_512ResultN(context, Message_Digest, SHA512HashSize);
-}
-
-/*
- * SHA384_512PadMessage
- *
- * Description:
- *   According to the standard, the message must be padded to an
- *   even 1024 bits. The first padding bit must be a '1'. The
- *   last 128 bits represent the length of the original message.
- *   All bits in between should be 0. This helper function will
- *   pad the message according to those rules by filling the
- *   Message_Block array accordingly. When it returns, it can be
- *   assumed that the message digest has been computed.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to pad
- *   Pad_Byte: [in]
- *     The last byte to add to the digest before the 0-padding
- *     and length. This will contain the last bits of the message
- *     followed by another single bit. If the message was an
- *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
- *
- * Returns:
- *   Nothing.
- *
- */
-static void SHA384_512PadMessage(SHA512Context *context,
-    uint8_t Pad_Byte)
-{
-  /*
-   * Check to see if the current message block is too small to hold
-   * the initial padding bits and length. If so, we will pad the
-   * block, process it, and then continue padding into a second
-   * block.
-   */
-  if (context->Message_Block_Index >= (SHA512_Message_Block_Size-16)) {
-    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
-    while (context->Message_Block_Index < SHA512_Message_Block_Size)
-      context->Message_Block[context->Message_Block_Index++] = 0;
-    SHA384_512ProcessMessageBlock(context);
-  } else
-    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
-
-  while (context->Message_Block_Index < (SHA512_Message_Block_Size-16))
-    context->Message_Block[context->Message_Block_Index++] = 0;
-
-  /*
-   * Store the message length as the last 16 octets
-   */
-#ifdef USE_32BIT_ONLY
-  context->Message_Block[112] = (uint8_t)(context->Length[0] >> 24);
-  context->Message_Block[113] = (uint8_t)(context->Length[0] >> 16);
-  context->Message_Block[114] = (uint8_t)(context->Length[0] >> 8);
-  context->Message_Block[115] = (uint8_t)(context->Length[0]);
-  context->Message_Block[116] = (uint8_t)(context->Length[1] >> 24);
-  context->Message_Block[117] = (uint8_t)(context->Length[1] >> 16);
-  context->Message_Block[118] = (uint8_t)(context->Length[1] >> 8);
-  context->Message_Block[119] = (uint8_t)(context->Length[1]);
-
-  context->Message_Block[120] = (uint8_t)(context->Length[2] >> 24);
-  context->Message_Block[121] = (uint8_t)(context->Length[2] >> 16);
-  context->Message_Block[122] = (uint8_t)(context->Length[2] >> 8);
-  context->Message_Block[123] = (uint8_t)(context->Length[2]);
-  context->Message_Block[124] = (uint8_t)(context->Length[3] >> 24);
-  context->Message_Block[125] = (uint8_t)(context->Length[3] >> 16);
-  context->Message_Block[126] = (uint8_t)(context->Length[3] >> 8);
-  context->Message_Block[127] = (uint8_t)(context->Length[3]);
-#else /* !USE_32BIT_ONLY */
-  context->Message_Block[112] = (uint8_t)(context->Length_High >> 56);
-  context->Message_Block[113] = (uint8_t)(context->Length_High >> 48);
-  context->Message_Block[114] = (uint8_t)(context->Length_High >> 40);
-  context->Message_Block[115] = (uint8_t)(context->Length_High >> 32);
-  context->Message_Block[116] = (uint8_t)(context->Length_High >> 24);
-  context->Message_Block[117] = (uint8_t)(context->Length_High >> 16);
-  context->Message_Block[118] = (uint8_t)(context->Length_High >> 8);
-  context->Message_Block[119] = (uint8_t)(context->Length_High);
-
-  context->Message_Block[120] = (uint8_t)(context->Length_Low >> 56);
-  context->Message_Block[121] = (uint8_t)(context->Length_Low >> 48);
-  context->Message_Block[122] = (uint8_t)(context->Length_Low >> 40);
-  context->Message_Block[123] = (uint8_t)(context->Length_Low >> 32);
-  context->Message_Block[124] = (uint8_t)(context->Length_Low >> 24);
-  context->Message_Block[125] = (uint8_t)(context->Length_Low >> 16);
-  context->Message_Block[126] = (uint8_t)(context->Length_Low >> 8);
-  context->Message_Block[127] = (uint8_t)(context->Length_Low);
-#endif /* USE_32BIT_ONLY */
-  SHA384_512ProcessMessageBlock(context);
-}
-
-/*
- * SHA384_512ProcessMessageBlock
- *
- * Description:
- *   This helper function will process the next 1024 bits of the
- *   message stored in the Message_Block array.
- *
- * Parameters:
- *   context: [in/out]
- *     The SHA context to update
- *
- * Returns:
- *   Nothing.
- *
- * Comments:
- *   Many of the variable names in this code, especially the
- *   single character names, were used because those were the
- *   names used in the publication.
- *
- *
- */
-static void SHA384_512ProcessMessageBlock(SHA512Context *context)
-{
-  /* Constants defined in FIPS-180-2, section 4.2.3 */
-#ifdef USE_32BIT_ONLY
-  static const uint32_t K[80*2] = {
-      0x428A2F98, 0xD728AE22, 0x71374491, 0x23EF65CD, 0xB5C0FBCF,
-      0xEC4D3B2F, 0xE9B5DBA5, 0x8189DBBC, 0x3956C25B, 0xF348B538,
-      0x59F111F1, 0xB605D019, 0x923F82A4, 0xAF194F9B, 0xAB1C5ED5,
-      0xDA6D8118, 0xD807AA98, 0xA3030242, 0x12835B01, 0x45706FBE,
-      0x243185BE, 0x4EE4B28C, 0x550C7DC3, 0xD5FFB4E2, 0x72BE5D74,
-      0xF27B896F, 0x80DEB1FE, 0x3B1696B1, 0x9BDC06A7, 0x25C71235,
-      0xC19BF174, 0xCF692694, 0xE49B69C1, 0x9EF14AD2, 0xEFBE4786,
-      0x384F25E3, 0x0FC19DC6, 0x8B8CD5B5, 0x240CA1CC, 0x77AC9C65,
-      0x2DE92C6F, 0x592B0275, 0x4A7484AA, 0x6EA6E483, 0x5CB0A9DC,
-      0xBD41FBD4, 0x76F988DA, 0x831153B5, 0x983E5152, 0xEE66DFAB,
-      0xA831C66D, 0x2DB43210, 0xB00327C8, 0x98FB213F, 0xBF597FC7,
-      0xBEEF0EE4, 0xC6E00BF3, 0x3DA88FC2, 0xD5A79147, 0x930AA725,
-      0x06CA6351, 0xE003826F, 0x14292967, 0x0A0E6E70, 0x27B70A85,
-      0x46D22FFC, 0x2E1B2138, 0x5C26C926, 0x4D2C6DFC, 0x5AC42AED,
-      0x53380D13, 0x9D95B3DF, 0x650A7354, 0x8BAF63DE, 0x766A0ABB,
-      0x3C77B2A8, 0x81C2C92E, 0x47EDAEE6, 0x92722C85, 0x1482353B,
-      0xA2BFE8A1, 0x4CF10364, 0xA81A664B, 0xBC423001, 0xC24B8B70,
-      0xD0F89791, 0xC76C51A3, 0x0654BE30, 0xD192E819, 0xD6EF5218,
-      0xD6990624, 0x5565A910, 0xF40E3585, 0x5771202A, 0x106AA070,
-      0x32BBD1B8, 0x19A4C116, 0xB8D2D0C8, 0x1E376C08, 0x5141AB53,
-      0x2748774C, 0xDF8EEB99, 0x34B0BCB5, 0xE19B48A8, 0x391C0CB3,
-      0xC5C95A63, 0x4ED8AA4A, 0xE3418ACB, 0x5B9CCA4F, 0x7763E373,
-      0x682E6FF3, 0xD6B2B8A3, 0x748F82EE, 0x5DEFB2FC, 0x78A5636F,
-      0x43172F60, 0x84C87814, 0xA1F0AB72, 0x8CC70208, 0x1A6439EC,
-      0x90BEFFFA, 0x23631E28, 0xA4506CEB, 0xDE82BDE9, 0xBEF9A3F7,
-      0xB2C67915, 0xC67178F2, 0xE372532B, 0xCA273ECE, 0xEA26619C,
-      0xD186B8C7, 0x21C0C207, 0xEADA7DD6, 0xCDE0EB1E, 0xF57D4F7F,
-      0xEE6ED178, 0x06F067AA, 0x72176FBA, 0x0A637DC5, 0xA2C898A6,
-      0x113F9804, 0xBEF90DAE, 0x1B710B35, 0x131C471B, 0x28DB77F5,
-      0x23047D84, 0x32CAAB7B, 0x40C72493, 0x3C9EBE0A, 0x15C9BEBC,
-      0x431D67C4, 0x9C100D4C, 0x4CC5D4BE, 0xCB3E42B6, 0x597F299C,
-      0xFC657E2A, 0x5FCB6FAB, 0x3AD6FAEC, 0x6C44198C, 0x4A475817
-  };
-  int     t, t2, t8;                  /* Loop counter */
-  uint32_t  temp1[2], temp2[2],       /* Temporary word values */
-        temp3[2], temp4[2], temp5[2];
-  uint32_t  W[2*80];                  /* Word sequence */
-  uint32_t  A[2], B[2], C[2], D[2],   /* Word buffers */
-        E[2], F[2], G[2], H[2];
-  uint32_t ROTR_temp1[2], ROTR_temp2[2];
-  uint32_t sigma0_temp1[2], sigma0_temp2[2],
-    sigma0_temp3[2], sigma0_temp4[2];
-  uint32_t sigma1_temp1[2], sigma1_temp2[2],
-    sigma1_temp3[2], sigma1_temp4[2];
-  uint32_t SIGMA1_temp1[2], SIGMA1_temp2[2], SIGMA1_temp3[2], SIGMA1_temp4[2];
-  uint32_t SIGMA0_temp1[2], SIGMA0_temp2[2], SIGMA0_temp3[2], SIGMA0_temp4[2];
-#ifndef USE_MODIFIED_MACROS
-  uint32_t Ch_temp1[2], Ch_temp2[2], Ch_temp3[2];
-  uint32_t Maj_temp1[2], Maj_temp2[2], Maj_temp3[2], Maj_temp4[2];
-#endif
-
-  /* Initialize the first 16 words in the array W */
-  for (t = t2 = t8 = 0; t < 16; t++, t8 += 8) {
-    W[t2++] = ((((uint32_t)context->Message_Block[t8    ])) << 24) |
-              ((((uint32_t)context->Message_Block[t8 + 1])) << 16) |
-              ((((uint32_t)context->Message_Block[t8 + 2])) << 8) |
-              ((((uint32_t)context->Message_Block[t8 + 3])));
-    W[t2++] = ((((uint32_t)context->Message_Block[t8 + 4])) << 24) |
-              ((((uint32_t)context->Message_Block[t8 + 5])) << 16) |
-              ((((uint32_t)context->Message_Block[t8 + 6])) << 8) |
-              ((((uint32_t)context->Message_Block[t8 + 7])));
-  }
-
-  for (t = 16; t < 80; t++, t2 += 2) {
-    /* W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
-      SHA512_sigma0(W[t-15]) + W[t-16]; */
-    uint32_t *Wt2 = &W[t2-2*2];
-    uint32_t *Wt7 = &W[t2-7*2];
-    uint32_t *Wt15 = &W[t2-15*2];
-    uint32_t *Wt16 = &W[t2-16*2];
-    SHA512_sigma1(Wt2, temp1);
-    SHA512_ADD(temp1, Wt7, temp2);
-    SHA512_sigma0(Wt15, temp1);
-    SHA512_ADD(temp1, Wt16, temp3);
-    SHA512_ADD(temp2, temp3, &W[t2]);
-  }
-
-  A[0] = context->Intermediate_Hash[0];
-  A[1] = context->Intermediate_Hash[1];
-  B[0] = context->Intermediate_Hash[2];
-  B[1] = context->Intermediate_Hash[3];
-  C[0] = context->Intermediate_Hash[4];
-  C[1] = context->Intermediate_Hash[5];
-  D[0] = context->Intermediate_Hash[6];
-  D[1] = context->Intermediate_Hash[7];
-  E[0] = context->Intermediate_Hash[8];
-  E[1] = context->Intermediate_Hash[9];
-  F[0] = context->Intermediate_Hash[10];
-  F[1] = context->Intermediate_Hash[11];
-  G[0] = context->Intermediate_Hash[12];
-  G[1] = context->Intermediate_Hash[13];
-  H[0] = context->Intermediate_Hash[14];
-  H[1] = context->Intermediate_Hash[15];
-
-  for (t = t2 = 0; t < 80; t++, t2 += 2) {
-    /*
-     * temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
-     */
-    SHA512_SIGMA1(E,temp1);
-    SHA512_ADD(H, temp1, temp2);
-    SHA_Ch(E,F,G,temp3);
-    SHA512_ADD(temp2, temp3, temp4);
-    SHA512_ADD(&K[t2], &W[t2], temp5);
-    SHA512_ADD(temp4, temp5, temp1);
-    /*
-     * temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
-     */
-    SHA512_SIGMA0(A,temp3);
-    SHA_Maj(A,B,C,temp4);
-    SHA512_ADD(temp3, temp4, temp2);
-    H[0] = G[0]; H[1] = G[1];
-    G[0] = F[0]; G[1] = F[1];
-    F[0] = E[0]; F[1] = E[1];
-    SHA512_ADD(D, temp1, E);
-    D[0] = C[0]; D[1] = C[1];
-    C[0] = B[0]; C[1] = B[1];
-    B[0] = A[0]; B[1] = A[1];
-    SHA512_ADD(temp1, temp2, A);
-  }
-
-  uint32_t ADDTO2_temp;
-  SHA512_ADDTO2(&context->Intermediate_Hash[0], A);
-  SHA512_ADDTO2(&context->Intermediate_Hash[2], B);
-  SHA512_ADDTO2(&context->Intermediate_Hash[4], C);
-  SHA512_ADDTO2(&context->Intermediate_Hash[6], D);
-  SHA512_ADDTO2(&context->Intermediate_Hash[8], E);
-  SHA512_ADDTO2(&context->Intermediate_Hash[10], F);
-  SHA512_ADDTO2(&context->Intermediate_Hash[12], G);
-  SHA512_ADDTO2(&context->Intermediate_Hash[14], H);
-
-#else /* !USE_32BIT_ONLY */
-  static const uint64_t K[80] = {
-      0x428A2F98D728AE22ll, 0x7137449123EF65CDll, 0xB5C0FBCFEC4D3B2Fll,
-      0xE9B5DBA58189DBBCll, 0x3956C25BF348B538ll, 0x59F111F1B605D019ll,
-      0x923F82A4AF194F9Bll, 0xAB1C5ED5DA6D8118ll, 0xD807AA98A3030242ll,
-      0x12835B0145706FBEll, 0x243185BE4EE4B28Cll, 0x550C7DC3D5FFB4E2ll,
-      0x72BE5D74F27B896Fll, 0x80DEB1FE3B1696B1ll, 0x9BDC06A725C71235ll,
-      0xC19BF174CF692694ll, 0xE49B69C19EF14AD2ll, 0xEFBE4786384F25E3ll,
-      0x0FC19DC68B8CD5B5ll, 0x240CA1CC77AC9C65ll, 0x2DE92C6F592B0275ll,
-      0x4A7484AA6EA6E483ll, 0x5CB0A9DCBD41FBD4ll, 0x76F988DA831153B5ll,
-      0x983E5152EE66DFABll, 0xA831C66D2DB43210ll, 0xB00327C898FB213Fll,
-      0xBF597FC7BEEF0EE4ll, 0xC6E00BF33DA88FC2ll, 0xD5A79147930AA725ll,
-      0x06CA6351E003826Fll, 0x142929670A0E6E70ll, 0x27B70A8546D22FFCll,
-      0x2E1B21385C26C926ll, 0x4D2C6DFC5AC42AEDll, 0x53380D139D95B3DFll,
-      0x650A73548BAF63DEll, 0x766A0ABB3C77B2A8ll, 0x81C2C92E47EDAEE6ll,
-      0x92722C851482353Bll, 0xA2BFE8A14CF10364ll, 0xA81A664BBC423001ll,
-      0xC24B8B70D0F89791ll, 0xC76C51A30654BE30ll, 0xD192E819D6EF5218ll,
-      0xD69906245565A910ll, 0xF40E35855771202All, 0x106AA07032BBD1B8ll,
-      0x19A4C116B8D2D0C8ll, 0x1E376C085141AB53ll, 0x2748774CDF8EEB99ll,
-      0x34B0BCB5E19B48A8ll, 0x391C0CB3C5C95A63ll, 0x4ED8AA4AE3418ACBll,
-      0x5B9CCA4F7763E373ll, 0x682E6FF3D6B2B8A3ll, 0x748F82EE5DEFB2FCll,
-      0x78A5636F43172F60ll, 0x84C87814A1F0AB72ll, 0x8CC702081A6439ECll,
-      0x90BEFFFA23631E28ll, 0xA4506CEBDE82BDE9ll, 0xBEF9A3F7B2C67915ll,
-      0xC67178F2E372532Bll, 0xCA273ECEEA26619Cll, 0xD186B8C721C0C207ll,
-      0xEADA7DD6CDE0EB1Ell, 0xF57D4F7FEE6ED178ll, 0x06F067AA72176FBAll,
-      0x0A637DC5A2C898A6ll, 0x113F9804BEF90DAEll, 0x1B710B35131C471Bll,
-      0x28DB77F523047D84ll, 0x32CAAB7B40C72493ll, 0x3C9EBE0A15C9BEBCll,
-      0x431D67C49C100D4Cll, 0x4CC5D4BECB3E42B6ll, 0x597F299CFC657E2All,
-      0x5FCB6FAB3AD6FAECll, 0x6C44198C4A475817ll
-  };
-  int        t, t8;                   /* Loop counter */
-  uint64_t   temp1, temp2;            /* Temporary word value */
-  uint64_t   W[80];                   /* Word sequence */
-  uint64_t   A, B, C, D, E, F, G, H;  /* Word buffers */
-
-  /*
-   * Initialize the first 16 words in the array W
-   */
-  for (t = t8 = 0; t < 16; t++, t8 += 8)
-    W[t] = ((uint64_t)(context->Message_Block[t8  ]) << 56) |
-           ((uint64_t)(context->Message_Block[t8 + 1]) << 48) |
-           ((uint64_t)(context->Message_Block[t8 + 2]) << 40) |
-           ((uint64_t)(context->Message_Block[t8 + 3]) << 32) |
-           ((uint64_t)(context->Message_Block[t8 + 4]) << 24) |
-           ((uint64_t)(context->Message_Block[t8 + 5]) << 16) |
-           ((uint64_t)(context->Message_Block[t8 + 6]) << 8) |
-           ((uint64_t)(context->Message_Block[t8 + 7]));
-
-  for (t = 16; t < 80; t++)
-    W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
-        SHA512_sigma0(W[t-15]) + W[t-16];
-
-  A = context->Intermediate_Hash[0];
-  B = context->Intermediate_Hash[1];
-  C = context->Intermediate_Hash[2];
-  D = context->Intermediate_Hash[3];
-  E = context->Intermediate_Hash[4];
-  F = context->Intermediate_Hash[5];
-  G = context->Intermediate_Hash[6];
-  H = context->Intermediate_Hash[7];
-
-  for (t = 0; t < 80; t++) {
-#ifdef USE_32BIT_ONLY
-	uint32_t ROTR_temp1[2], ROTR_temp2[2];
-	uint32_t SIGMA0_temp1[2], SIGMA0_temp2[2], SIGMA0_temp3[2], SIGMA0_temp4[2];
-#endif
-    temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
-    temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
-    H = G;
-    G = F;
-    F = E;
-    E = D + temp1;
-    D = C;
-    C = B;
-    B = A;
-    A = temp1 + temp2;
-  }
-
-  context->Intermediate_Hash[0] += A;
-  context->Intermediate_Hash[1] += B;
-  context->Intermediate_Hash[2] += C;
-  context->Intermediate_Hash[3] += D;
-  context->Intermediate_Hash[4] += E;
-  context->Intermediate_Hash[5] += F;
-  context->Intermediate_Hash[6] += G;
-  context->Intermediate_Hash[7] += H;
-#endif /* USE_32BIT_ONLY */
-
-  context->Message_Block_Index = 0;
-}
-
-/*
- * SHA384_512Reset
- *
- * Description:
- *   This helper function will initialize the SHA512Context in
- *   preparation for computing a new SHA384 or SHA512 message
- *   digest.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to reset.
- *   H0
- *     The initial hash value to use.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-#ifdef USE_32BIT_ONLY
-static int SHA384_512Reset(SHA512Context *context, uint32_t H0[])
-#else /* !USE_32BIT_ONLY */
-static int SHA384_512Reset(SHA512Context *context, uint64_t H0[])
-#endif /* USE_32BIT_ONLY */
-{
-  int i;
-  if (!context)
-    return shaNull;
-
-  context->Message_Block_Index = 0;
-
-#ifdef USE_32BIT_ONLY
-  context->Length[0] = context->Length[1] = 0;
-  context->Length[2] = context->Length[3] = 0;
-
-  for (i = 0; i < SHA512HashSize/4; i++)
-    context->Intermediate_Hash[i] = H0[i];
-#else /* !USE_32BIT_ONLY */
-  context->Length_High = context->Length_Low = 0;
-
-  for (i = 0; i < SHA512HashSize/8; i++)
-    context->Intermediate_Hash[i] = H0[i];
-#endif /* USE_32BIT_ONLY */
-
-  context->Computed = 0;
-  context->Corrupted = 0;
-
-  return shaSuccess;
-}
-
-/*
- * SHA384_512ResultN
- *
- * Description:
- *   This helper function will return the 384-bit or 512-bit message
- *   digest into the Message_Digest array provided by the caller.
- *   NOTE: The first octet of hash is stored in the 0th element,
- *      the last octet of hash in the 48th/64th element.
- *
- * Parameters:
- *   context: [in/out]
- *     The context to use to calculate the SHA hash.
- *   Message_Digest: [out]
- *     Where the digest is returned.
- *   HashSize: [in]
- *     The size of the hash, either 48 or 64.
- *
- * Returns:
- *   sha Error Code.
- *
- */
-static int SHA384_512ResultN(SHA512Context *context,
-    uint8_t Message_Digest[], int HashSize)
-{
-  int i;
-
-#ifdef USE_32BIT_ONLY
-  int i2;
-#endif /* USE_32BIT_ONLY */
-
-  if (!context || !Message_Digest)
-    return shaNull;
-
-  if (context->Corrupted)
-    return context->Corrupted;
-
-  if (!context->Computed)
-    SHA384_512Finalize(context, 0x80);
-
-#ifdef USE_32BIT_ONLY
-  for (i = i2 = 0; i < HashSize; ) {
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
-    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
-  }
-#else /* !USE_32BIT_ONLY */
-  for (i = 0; i < HashSize; ++i)
-    Message_Digest[i] = (uint8_t)
-      (context->Intermediate_Hash[i>>3] >> 8 * ( 7 - ( i % 8 ) ));
-#endif /* USE_32BIT_ONLY */
-
-  return shaSuccess;
-}
diff --git a/src/dashbls/depends/relic/src/md/sha_private.h b/src/dashbls/depends/relic/src/md/sha_private.h
deleted file mode 100644
index 43f391019038..000000000000
--- a/src/dashbls/depends/relic/src/md/sha_private.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************** sha-private.h ***************************/
-/********************** See RFC 4634 for details *********************/
-#ifndef _SHA_PRIVATE__H
-#define _SHA_PRIVATE__H
-/*
- * These definitions are defined in FIPS-180-2, section 4.1.
- * Ch() and Maj() are defined identically in sections 4.1.1,
- * 4.1.2 and 4.1.3.
- *
- * The definitions used in FIPS-180-2 are as follows:
- */
-
-#ifndef USE_MODIFIED_MACROS
-#define SHA_Ch(x,y,z)        (((x) & (y)) ^ ((~(x)) & (z)))
-#define SHA_Maj(x,y,z)       (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-#else /* USE_MODIFIED_MACROS */
-/*
- * The following definitions are equivalent and potentially faster.
- */
-
-#define SHA_Ch(x, y, z)      (((x) & ((y) ^ (z))) ^ (z))
-#define SHA_Maj(x, y, z)     (((x) & ((y) | (z))) | ((y) & (z)))
-#endif /* USE_MODIFIED_MACROS */
-
-#define SHA_Parity(x, y, z)  ((x) ^ (y) ^ (z))
-#if WSIZE <= 32
-#define USE_32BIT_ONLY
-#endif
-
-#endif /* _SHA_PRIVATE__H */
diff --git a/src/dashbls/depends/relic/src/mpc/relic_mt_mpc.c b/src/dashbls/depends/relic/src/mpc/relic_mt_mpc.c
deleted file mode 100644
index 5875f9b483d7..000000000000
--- a/src/dashbls/depends/relic/src/mpc/relic_mt_mpc.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of multiplication tri generation.
- *
- * @ingroup mpc
- */
-
-#include "relic_core.h"
-#include "relic_bn.h"
-#include "relic_mpc.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void mt_gen(mt_t tri[2], bn_t order) {
-	for (int i = 0; i < 2; i++) {
-		bn_rand_mod(tri[i]->a, order);
-		bn_rand_mod(tri[i]->b, order);
-	}
-	bn_add(tri[0]->c, tri[0]->a, tri[1]->a);
-	bn_mod(tri[0]->c, tri[0]->c, order);
-	bn_add(tri[1]->c, tri[0]->b, tri[1]->b);
-	bn_mod(tri[1]->c, tri[1]->c, order);
-
-	bn_mul(tri[0]->c, tri[0]->c, tri[1]->c);
-	bn_mod(tri[0]->c, tri[0]->c, order);
-
-	bn_rand_mod(tri[1]->c, order);
-	bn_sub(tri[0]->c, tri[0]->c, tri[1]->c);
-	if (bn_sign(tri[0]->c)) {
-		bn_add(tri[0]->c, tri[0]->c, order);
-	}
-}
-
-void mt_mul_lcl(bn_t d, bn_t e, bn_t x, bn_t y, bn_t n, mt_t tri) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		/* Compute public values for transmission. */
-
-		/* [d] = [x] - [a]. */
-		bn_sub(d, x, tri->a);
-		if (bn_sign(d) == RLC_NEG) {
-			bn_add(d, d, n);
-		}
-		bn_mod(d, d, n);
-
-		/* [e] = [y] - [b]. */
-		bn_sub(e, y, tri->b);
-		if (bn_sign(e) == RLC_NEG) {
-			bn_add(e, e, n);
-		}
-		bn_mod(e, e, n);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-	}
-}
-
-void mt_mul_bct(bn_t d[2], bn_t e[2], bn_t n) {
-	/* Open values d and e. */
-	bn_add(d[0], d[0], d[1]);
-	bn_mod(d[0], d[0], n);
-	bn_copy(d[1], d[0]);
-	bn_add(e[0], e[0], e[1]);
-	bn_mod(e[0], e[0], n);
-	bn_copy(e[1], e[0]);
-}
-
-void mt_mul_mpc(bn_t r, bn_t d, bn_t e, bn_t n, mt_t tri, int party) {
-	bn_t t;
-
-	bn_null(t);
-
-	RLC_TRY {
-		bn_new(t);
-
-		/* One party computes public value d*([b] + e), the other just d[b]. */
-		if (party == 0) {
-			bn_add(t, tri->b, e);
-			if (bn_sign(t) == RLC_NEG) {
-				bn_add(t, t, n);
-			}
-			bn_mod(t, t, n);
-		} else {
-			bn_copy(t, tri->b);
-		}
-		bn_mul(t, t, d);
-		bn_mod(t, t, n);
-		/* Compute r = [a]*e*/
-		bn_mul(r, tri->a, e);
-		bn_mod(r, r, n);
-		bn_add(r, r, t);
-		/* r = [a][e] + d[b] + de + c = [xy] */
-		bn_add(r, r, tri->c);
-		bn_mod(r, r, n);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/mpc/relic_pc_mpc.c b/src/dashbls/depends/relic/src/mpc/relic_pc_mpc.c
deleted file mode 100644
index 75ba3a5956bc..000000000000
--- a/src/dashbls/depends/relic/src/mpc/relic_pc_mpc.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing triples for MPC applications.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_mpc.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void g1_mul_lcl(bn_t d, g1_t q, bn_t x, g1_t p, mt_t tri) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Compute public values for transmission. */
-
-		/* [d] = [x] - [a]. */
-		g1_get_ord(n);
-		bn_sub(d, x, tri->a);
-		if (bn_sign(d) == RLC_NEG) {
-			bn_add(d, d, n);
-		}
-		bn_mod(d, d, n);
-
-		/* [Q] = [P] - [B] = [b]G. */
-		/* Copy first to avoid overwriting P. */
-		g1_copy(q, p);
-		g1_sub(q, q, *tri->b1);
-		g1_norm(q, q);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void g1_mul_bct(bn_t d[2], g1_t q[2]) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		/* Open values d and Q. */
-		g1_get_ord(n);
-		bn_add(d[0], d[0], d[1]);
-		bn_mod(d[0], d[0], n);
-		bn_copy(d[1], d[0]);
-		g1_add(q[0], q[0], q[1]);
-		g1_norm(q[0], q[0]);
-		g1_copy(q[1], q[0]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void g1_mul_mpc(g1_t r, bn_t d, g1_t q, mt_t tri, int party) {
-	g1_t t;
-
-	g1_null(t);
-
-	RLC_TRY {
-		g1_new(t);
-
-		if (party == 0) {
-			/* For one party, compute [B] + Q. */
-			g1_add(t, *tri->b1, q);
-			g1_norm(t, t);
-		} else {
-			g1_copy(t, *tri->b1);
-		}
-		/* Compute [a]Q + d([B] + Q) or d[B]. */
-		g1_mul_sim(r, q, tri->a, t, d);
-		/* R = [a]Q + d[B] + dQ + [C] = [xy] */
-		g1_add(r, r, *tri->c1);
-		g1_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g1_free(t);
-	}
-}
-
-void g2_mul_lcl(bn_t d, g2_t q, bn_t x, g2_t p, mt_t tri) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Compute public values for transmission. */
-
-		/* [d] = [x] - [a]. */
-		g2_get_ord(n);
-		bn_sub(d, x, tri->a);
-		if (bn_sign(d) == RLC_NEG) {
-			bn_add(d, d, n);
-		}
-		bn_mod(d, d, n);
-
-		/* [Q] = [P] - [B] = [b]G. */
-		/* Copy first to avoid overwriting P. */
-		g2_copy(q, p);
-		g2_sub(q, q, *tri->b2);
-		g2_norm(q, q);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void g2_mul_bct(bn_t d[2], g2_t q[2]) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		/* Open values d and Q. */
-		g2_get_ord(n);
-		bn_add(d[0], d[0], d[1]);
-		bn_mod(d[0], d[0], n);
-		bn_copy(d[1], d[0]);
-		g2_add(q[0], q[0], q[1]);
-		g2_norm(q[0], q[0]);
-		g2_copy(q[1], q[0]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void g2_mul_mpc(g2_t r, bn_t d, g2_t q, mt_t tri, int party) {
-	g2_t t;
-
-	g2_null(t);
-
-	RLC_TRY {
-		g2_new(t);
-
-		if (party == 0) {
-			/* For one party, compute [B] + Q. */
-			g2_add(t, *tri->b2, q);
-			g2_norm(t, t);
-		} else {
-			g2_copy(t, *tri->b2);
-		}
-		/* Compute [a]Q + d([B] + Q) or d[B]. */
-		g2_mul_sim(r, q, tri->a, t, d);
-		/* R = [a]Q + d[B] + dQ + [C] = [xy] */
-		g2_add(r, r, *tri->c2);
-		g2_norm(r, r);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g2_free(t);
-	}
-}
-
-void gt_exp_lcl(bn_t d, gt_t q, bn_t x, gt_t p, mt_t tri) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-
-		/* Compute public values for transmission. */
-
-		/* [d] = [x] - [a]. */
-		gt_get_ord(n);
-		bn_sub(d, x, tri->a);
-		if (bn_sign(d) == RLC_NEG) {
-			bn_add(d, d, n);
-		}
-		bn_mod(d, d, n);
-
-		/* [Q] = [P] - [B] = [b]G. */
-		/* Copy first to avoid overwriting P. */
-		gt_copy(q, p);
-		gt_inv(*tri->bt, *tri->bt);
-		gt_mul(q, q, *tri->bt);
-		gt_inv(*tri->bt, *tri->bt);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void gt_exp_bct(bn_t d[2], gt_t q[2]) {
-	bn_t n;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		/* Open values d and Q. */
-		gt_get_ord(n);
-		bn_add(d[0], d[0], d[1]);
-		bn_mod(d[0], d[0], n);
-		bn_copy(d[1], d[0]);
-		gt_mul(q[0], q[0], q[1]);
-		gt_copy(q[1], q[0]);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-	}
-}
-
-void gt_exp_mpc(gt_t r, bn_t d, gt_t q, mt_t tri, int party) {
-	gt_t t;
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		if (party == 0) {
-			/* For one party, compute [B] + Q. */
-			gt_mul(t, *tri->bt, q);
-		} else {
-			gt_copy(t, *tri->bt);
-		}
-		/* Compute [a]Q + d([B] + Q) or d[B]. */
-		gt_exp_sim(r, q, tri->a, t, d);
-		/* R = [a]Q + d[B] + dQ + [C] = [xy] */
-		gt_mul(r, r, *tri->ct);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		gt_free(t);
-	}
-}
-
-void pc_map_tri(pt_t t[2]) {
-	bn_t n;
-	mt_t tri[2];
-
-	bn_null(n);
-	mt_null(tri[0]);
-	mt_null(tri[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		mt_new(tri[0]);
-		mt_new(tri[1]);
-
-		g1_get_ord(n);
-		mt_gen(tri, n);
-
-		for (int i = 0; i < 2; i++) {
-			g1_mul_gen(t[i]->a, tri[i]->a);
-			g2_mul_gen(t[i]->b, tri[i]->b);
-			gt_exp_gen(t[i]->c, tri[i]->c);
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		mt_free(tri[0]);
-		mt_free(tri[1]);
-	}
-}
-
-void pc_map_lcl(g1_t d, g2_t e, g1_t p, g2_t q, pt_t t) {
-	/* Compute public values for transmission. */
-	g1_sub(d, p, t->a);
-	g1_norm(d, d);
-	g2_sub(e, q, t->b);
-	g2_norm(e, e);
-}
-
-void pc_map_bct(g1_t d[2], g2_t e[2]) {
-	/* Add public values and replicate. */
-	g1_add(d[0], d[0], d[1]);
-	g1_norm(d[0], d[0]);
-	g1_copy(d[1], d[0]);
-	g2_add(e[0], e[0], e[1]);
-	g2_norm(e[0], e[0]);
-	g2_copy(e[1], e[0]);
-}
-
-void pc_map_mpc(gt_t r, g1_t d1, g2_t d2, pt_t triple, int party) {
-	gt_t t;
-	g1_t _p[2];
-	g2_t _q[2];
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-		for (int i = 0; i < 2; i++) {
-			g1_null(_p[i]);
-			g2_null(_q[i]);
-			g1_new(_p[i]);
-			g2_new(_q[i]);
-		}
-
-		/* Compute the pairing in MPC. */
-		if (party == 0) {
-			g1_add(_p[0], triple->a, d1);
-			g1_norm(_p[0], _p[0]);
-			g2_copy(_q[0], d2);
-		} else {
-			g1_copy(_p[0], triple->a);
-			g2_copy(_q[0], d2);
-		}
-		g1_copy(_p[1], d1);
-		g2_copy(_q[1], triple->b);
-		pc_map_sim(t, _p, _q, 2);
-		gt_mul(r, triple->c, t);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		gt_free(t);
-		for (int i = 0; i < 2; i++) {
-			g1_free(_p[i]);
-			g2_free(_q[i]);
-			g1_free(_p[i]);
-			g2_free(_q[i]);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pc/relic_pc_core.c b/src/dashbls/depends/relic/src/pc/relic_pc_core.c
deleted file mode 100644
index b6d7f35a91a3..000000000000
--- a/src/dashbls/depends/relic/src/pc/relic_pc_core.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation core routines for pairing-based protocols.
- *
- * @ingroup pc
- */
-
-#include "relic_pc.h"
-#include "relic_core.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pc_core_init(void) {
-	gt_new(core_get()->gt_g);
-}
-
-void pc_core_calc(void) {
-	g1_t g1;
-	g2_t g2;
-	gt_t gt;
-
-	g1_null(g1);
-	g2_null(g2);
-	gt_null(gt);
-
-	RLC_TRY {
-		g1_new(g1);
-		g2_new(g2);
-		gt_new(gt);
-
-		g1_get_gen(g1);
-		g2_get_gen(g2);
-
-		pc_map(gt, g1, g2);
-		gt_copy(core_get()->gt_g, gt);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		g1_free(g1);
-		g2_free(g2);
-		gt_free(gt);
-	}
-}
-
-void pc_core_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		gt_free(core_get()->gt_g);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pc/relic_pc_exp.c b/src/dashbls/depends/relic/src/pc/relic_pc_exp.c
deleted file mode 100644
index 38e994455054..000000000000
--- a/src/dashbls/depends/relic/src/pc/relic_pc_exp.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-/**
- * @file
- *
- * Implementation of exponentiation in pairing groups.
- *
- * @ingroup pc
- */
-
-#include "relic_pc.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void g1_mul(g1_t c, g1_t a, bn_t b) {
-	bn_t n, _b;
-
-	bn_null(n);
-	bn_null(_b);
-
-	if (bn_bits(b) <= RLC_DIG) {
-		g1_mul_dig(c, a, b->dp[0]);
-		if (bn_sign(b) == RLC_NEG) {
-			g1_neg(c, c);
-		}
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-
-		RLC_CAT(RLC_G1_LOWER, mul)(c, a, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-	}
-}
-
-void g1_mul_gen(g1_t c, bn_t b) {
-	bn_t n, _b;
-
-	bn_null(n);
-	bn_null(_b);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-
-		RLC_CAT(RLC_G1_LOWER, mul_gen)(c, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-	}
-}
-
-void g2_mul(g2_t c, g2_t a, bn_t b) {
-	bn_t n, _b;
-
-	bn_null(n);
-	bn_null(_b);
-
-	if (bn_bits(b) <= RLC_DIG) {
-		g2_mul_dig(c, a, b->dp[0]);
-		if (bn_sign(b) == RLC_NEG) {
-			g2_neg(c, c);
-		}
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-
-		RLC_CAT(RLC_G2_LOWER, mul)(c, a, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-	}
-}
-
-void g2_mul_gen(g2_t c, bn_t b) {
-	bn_t n, _b;
-
-	bn_null(n);
-	bn_null(_b);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-
-		RLC_CAT(RLC_G2_LOWER, mul_gen)(c, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-	}
-}
-
-void gt_exp(gt_t c, gt_t a, bn_t b) {
-	bn_t n, _b;
-
-	bn_null(n);
-	bn_null(_b);
-
-	if (bn_bits(b) <= RLC_DIG) {
-		gt_exp_dig(c, a, b->dp[0]);
-		if (bn_sign(b) == RLC_NEG) {
-			gt_inv(c, c);
-		}
-		return;
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-
-		RLC_CAT(RLC_GT_LOWER, exp_cyc)(c, a, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-	}
-}
-
-void gt_exp_dig(gt_t c, gt_t a, dig_t b) {
-	gt_t t;
-
-	if (b == 0) {
-		gt_set_unity(c);
-		return;
-	}
-
-	gt_null(t);
-
-	RLC_TRY {
-		gt_new(t);
-
-		gt_copy(t, a);
-		for (int i = util_bits_dig(b) - 2; i >= 0; i--) {
-			gt_sqr(t, t);
-			if (b & ((dig_t)1 << i)) {
-				gt_mul(t, t, a);
-			}
-		}
-
-		gt_copy(c, t);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		gt_free(t);
-	}
-}
-
-void gt_exp_sim(gt_t e, gt_t a, bn_t b, gt_t c, bn_t d) {
-	bn_t n, _b, _d;
-
-	bn_null(n);
-	bn_null(_b);
-	bn_null(_d);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-		bn_new(_d);
-
-		gt_get_ord(n);
-		bn_mod(_b, b, n);
-		bn_mod(_d, d, n);
-
-		RLC_CAT(RLC_GT_LOWER, exp_cyc_sim)(e, a, _b, c, _d);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-		bn_free(_d);
-	}
-}
-
-void gt_exp_gen(gt_t c, bn_t b) {
-	bn_t n, _b;
-	gt_t g;
-
-	bn_null(n);
-	bn_null(_b);
-	gt_null(g);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(_b);
-		gt_new(g);
-
-		pc_get_ord(n);
-		bn_mod(_b, b, n);
-		gt_get_gen(g);
-		gt_exp(c, g, _b);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(_b);
-		gt_free(g);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pc/relic_pc_util.c b/src/dashbls/depends/relic/src/pc/relic_pc_util.c
deleted file mode 100644
index bfd4905e0ad0..000000000000
--- a/src/dashbls/depends/relic/src/pc/relic_pc_util.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-/**
- * @file
- *
- * Implementation of pairing computation utilities.
- *
- * @ingroup pc
- */
-
-#include "relic_pc.h"
-#include "relic_core.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Internal macro to map GT function to basic FPX implementation. The final
- * exponentiation from the pairing is used to move element to subgroup.
- *
- * @param[out] A 				- the element to assign.
- */
-#define gt_rand_imp(A)			RLC_CAT(RLC_GT_LOWER, rand)(A)
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void gt_rand(gt_t a) {
-	gt_rand_imp(a);
-#if FP_PRIME < 1536
-#if FP_PRIME == 509
-	pp_exp_k24(a, a);
-#else
-	pp_exp_k12(a, a);
-#endif
-#else
-	pp_exp_k2(a, a);
-#endif
-}
-
-void gt_get_gen(gt_t g) {
-    gt_copy(g, core_get()->gt_g);
-}
-
-int g1_is_valid(g1_t a) {
-	bn_t n;
-	g1_t t, u, v;
-	int r = 0;
-
-	if (g1_is_infty(a)) {
-		return 0;
-	}
-
-	bn_null(n);
-	g1_null(t);
-	g1_null(u);
-	g1_null(v);
-
-	RLC_TRY {
-		bn_new(n);
-		g1_new(t);
-		g1_new(u);
-		g1_new(v);
-
-		ep_curve_get_cof(n);
-		if (bn_cmp_dig(n, 1) == RLC_EQ) {
-			/* If curve has prime order, simpler to check if point on curve. */
-			r = g1_on_curve(a);
-		} else {
-			switch (ep_curve_is_pairf()) {
-				/* Formulas from "Faster Subgroup Checks for BLS12-381" by Bowe.
-				 * https://eprint.iacr.org/2019/814.pdf, together with tweaks
-				 * by Mike Scott. */
-				case EP_B12:
-					/* Check [(z^2−1)](\psi(P)+P) == -P.*/
-					fp_prime_get_par(n);
-					bn_sqr(n, n);
-					bn_sub_dig(n, n, 1);
-					ep_psi(t, a);
-					ep_add(t, t, a);
-					ep_copy(u, t);
-					for (int i = bn_bits(n) - 2; i >= 0; i--) {
-						g1_dbl(u, u);
-						if (bn_get_bit(n, i)) {
-							g1_add(u, u, t);
-						}
-					}
-					g1_neg(v, a);
-					r = g1_on_curve(a) && (g1_cmp(v, u) == RLC_EQ);
-					break;
-				default:
-					pc_get_ord(n);
-					bn_sub_dig(n, n, 1);
-					/* Otherwise, check order explicitly. */
-					/* We use fast scalar multiplication methods here, because
-					 * they should work only in the correct subgroup. */
-					g1_mul(u, a, n);
-					g1_neg(u, u);
-					r = g1_on_curve(a) && (g1_cmp(u, a) == RLC_EQ);
-					break;
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		g1_free(t);
-		g1_free(u);
-		g1_free(v);
-	}
-
-	return r;
-}
-
-int g2_is_valid(g2_t a) {
-#if FP_PRIME >= 1536
-	if (pc_map_is_type1()) {
-		return g1_is_valid(a);
-	}
-#else
-
-	if (g2_is_infty(a)) {
-		return 0;
-	}
-
-	bn_t p, n;
-	g2_t u, v;
-	int r = 0;
-
-	bn_null(n);
-	bn_null(p);
-	g2_null(u);
-	g2_null(v);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(p);
-		g2_new(u);
-		g2_new(v);
-
-		pc_get_ord(n);
-		ep_curve_get_cof(p);
-
-		if (bn_cmp_dig(p, 1) == RLC_EQ) {
-			/* Trick for curves of prime order or subgroup-secure. */
-			bn_mul(n, n, p);
-			dv_copy(p->dp, fp_prime_get(), RLC_FP_DIGS);
-			p->used = RLC_FP_DIGS;
-			p->sign = RLC_POS;
-			/* Compute trace t = p - n + 1. */
-			bn_sub(n, p, n);
-			bn_add_dig(n, n, 1);
-			g2_mul(u, a, n);
-			if (bn_sign(n) == RLC_NEG) {
-				g2_neg(u, u);
-			}
-			/* Compute v = a^(p + 1). */
-			g2_frb(v, a, 1);
-			g2_add(v, v, a);
-			/* Check if a^(p + 1) = a^t. */
-			r = g2_on_curve(a) && (g2_cmp(u, v) == RLC_EQ);
-		} else {
-			switch (ep_curve_is_pairf()) {
-				/* Formulas from "Faster Subgroup Checks for BLS12-381" by Bowe.
-				 * https://eprint.iacr.org/2019/814.pdf */
-				case EP_B12:
-#if FP_PRIME == 383
-					/* Since p mod n = r, we can check instead that
-					 * psi^4(P) + P == \psi^2(P). */
-					ep2_frb(u, a, 4);
-					ep2_add(u, u, a);
-					ep2_frb(v, a, 2);
-#else
-					/* Check [z]psi^3(P) + P == \psi^2(P). */
-					fp_prime_get_par(n);
-					g2_copy(u, a);
-					for (int i = bn_bits(n) - 2; i >= 0; i--) {
-						g2_dbl(u, u);
-						if (bn_get_bit(n, i)) {
-							g2_add(u, u, a);
-						}
-					}
-					if (bn_sign(n) == RLC_NEG) {
-						g2_neg(u, u);
-					}
-					g2_frb(u, u, 3);
-					g2_frb(v, a, 2);
-					g2_add(u, u, a);
-#endif
-					r = g2_on_curve(a) && (g2_cmp(u, v) == RLC_EQ);
-					break;
-				default:
-					pc_get_ord(n);
-					bn_sub_dig(n, n, 1);
-					/* Otherwise, check order explicitly. */
-					/* We use fast scalar multiplication methods here, because
-					 * they should work only in the correct order. */
-					g2_mul(u, a, n);
-					g2_neg(u, u);
-					r = g2_on_curve(a) && (g2_cmp(u, a) == RLC_EQ);
-					break;
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(p);
-		bn_free(n);
-		g2_free(u);
-		g2_free(v);
-	}
-
-	return r;
-#endif
-}
-
-#define GLS_MEMBER
-
-int gt_is_valid(gt_t a) {
-	bn_t p, n;
-	gt_t u, v;
-	int l, r = 0;
-	const int *b;
-
-	if (gt_is_unity(a)) {
-		return 0;
-	}
-
-	bn_null(n);
-	bn_null(p);
-	gt_null(u);
-	gt_null(v);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(p);
-		gt_new(u);
-		gt_new(v);
-
-		pc_get_ord(n);
-		ep_curve_get_cof(p);
-
-		/* For a BN curve, we can use the fast test from
-		 * Unbalancing Pairing-Based Key Exchange Protocols by Scott.
-		 * https://eprint.iacr.org/2013/688.pdf */
-		if (bn_cmp_dig(p, 1) == RLC_EQ) {
-			dv_copy(p->dp, fp_prime_get(), RLC_FP_DIGS);
-			p->used = RLC_FP_DIGS;
-			p->sign = RLC_POS;
-			if (ep_curve_is_pairf() == EP_BN) {
-				/* Compute trace t = p - n + 1, and compute a^t. */
-				fp_prime_get_par(n);
-				b = fp_prime_get_par_sps(&l);
-				fp12_exp_cyc_sps((void *)v, (void *)a, b, l, RLC_POS);
-				fp12_exp_cyc_sps((void *)u, (void *)v, b, l, RLC_POS);
-				gt_sqr(v, u);
-				gt_sqr(u, v);
-				gt_mul(u, u, v);
-			} else {
-				/* Compute trace t = p - n + 1. */
-				bn_sub(n, p, n);
-				/* Compute u = a^t. */
-				gt_exp(u, a, n);
-			}
-			/* Compute v = a^(p + 1). */
-			gt_frb(v, a, 1);
-			/* Check if a^(p + 1) = a^t. */
-			r = fp12_test_cyc((void *)a) && (gt_cmp(u, v) == RLC_EQ);
-		} else {
-			fp_prime_get_par(n);
-			b = fp_prime_get_par_sps(&l);
-			switch (ep_curve_is_pairf()) {
-				/* Formulas from "Faster Subgroup Checks for BLS12-381" by Bowe.
-				 * https://eprint.iacr.org/2019/814.pdf */
-				case EP_B12:
-#if FP_PRIME == 383
-					/* GT-strong, so test for cyclotomic only. */
-					r = 1;
-#else
-#ifdef GLS_MEMBER
-					/* The 4-GLS recoding of the exponent gives this. */
-					fp12_exp_cyc_sps((void *)u, (void *)a, b, l, RLC_POS);
-					gt_inv(u, u);
-					gt_mul(u, u, a);
-					gt_inv(u, u);
-					gt_frb(u, u, 2);
-					gt_frb(v, u, 1);
-					gt_inv(v, v);
-					gt_mul(u, u, v);
-					gt_inv(u, u);
-					r = (gt_cmp(u, a) == RLC_EQ);
-#else
-					gt_frb(u, a, 1);
-					fp12_exp_cyc_sps((void *)v, (void *)a, b, l, bn_sign(n));
-					r = (gt_cmp(u, v) == RLC_EQ);
-					fp12_exp_cyc_sps((void *)u, (void *)v, b, l, bn_sign(n));
-					gt_mul(u, u, a);
-					gt_sqr(v, v);
-					r &= (gt_cmp(u, v) != RLC_EQ);
-#endif
-#endif
-					r &= fp12_test_cyc((void *)a);
-					break;
-#if FP_PRIME == 509
-				case EP_B24:
-#ifdef GLS_MEMBER
-					/* The 8-GLS recoding of the exponent gives this. */
-					fp24_exp_cyc_sps((void *)u, (void *)a, b, l, bn_sign(n));
-					gt_mul(u, u, a);
-					gt_inv(u, u);
-					gt_frb(u, u, 4);
-					gt_frb(v, u, 1);
-					gt_inv(v, v);
-					gt_mul(u, u, v);
-					gt_frb(v, v, 1);
-					gt_inv(v, v);
-					gt_mul(u, u, v);
-					gt_frb(v, v, 1);
-					gt_inv(v, v);
-					gt_mul(u, u, v);
-					gt_inv(u, u);
-					r = (gt_cmp(u, a) == RLC_EQ);
-#else
-					gt_frb(u, a, 1);
-					fp24_exp_cyc_sps((void *)v, (void *)a, b, l, bn_sign(n));
-					r = (gt_cmp(u, v) == RLC_EQ);
-					fp24_exp_cyc_sps((void *)u, (void *)v, b, l, bn_sign(n));
-					gt_mul(u, u, a);
-					gt_sqr(v, v);
-					r &= (gt_cmp(u, v) != RLC_EQ);
-#endif
-					r = fp24_test_cyc((void *)a);
-					break;
-#endif
-				default:
-					/* Common case. */
-					bn_sub_dig(n, n, 1);
-					gt_exp(u, a, n);
-					gt_inv(u, u);
-					r = (gt_cmp(u, a) == RLC_EQ);
-					break;
-			}
-		}
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(p);
-		bn_free(n);
-		gt_free(u);
-		gt_free(v);
-	}
-
-	return r;
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k12.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k12.c
deleted file mode 100644
index 295e123a9ffc..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k12.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller addition for curves of embedding degree 12.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k12_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	int one = 1, zero = 0;
-	fp2_t s;
-	ep2_t t;
-
-	fp2_null(s);
-	ep2_null(t);
-
-	RLC_TRY {
-		fp2_new(s);
-		ep2_new(t);
-
-		ep2_copy(t, r);
-		ep2_add_slp_basic(r, s, r, q);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_mul(l[one][zero][0], s[0], p->x);
-		fp_mul(l[one][zero][1], s[1], p->x);
-		fp2_mul(l[one][one], s, t->x);
-		fp2_sub(l[one][one], t->y, l[one][one]);
-		fp_neg(l[zero][zero][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(s);
-		ep2_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_add_k12_projc_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-
-		/* B = t0 = x1 - x2 * z1. */
-		fp2_mul(t0, r->z, q->x);
-		fp2_sub(t0, r->x, t0);
-		/* A = t1 = y1 - y2 * z1. */
-		fp2_mul(t1, r->z, q->y);
-		fp2_sub(t1, r->y, t1);
-
-		/* D = B^2. */
-		fp2_sqr(t2, t0);
-		/* G = x1 * D. */
-		fp2_mul(r->x, r->x, t2);
-		/* E = B^3. */
-		fp2_mul(t2, t2, t0);
-		/* C = A^2. */
-		fp2_sqr(t3, t1);
-		/* F = E + z1 * C. */
-		fp2_mul(t3, t3, r->z);
-		fp2_add(t3, t2, t3);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* l10 = - (A * xp). */
-		fp_neg(t4[0], p->x);
-		fp_mul(l[one][zero][0], t1[0], t4[0]);
-		fp_mul(l[one][zero][1], t1[1], t4[0]);
-
-		/* t4 = B * x2. */
-		fp2_mul(t4, q->x, t1);
-
-		/* H = F - 2 * G. */
-		fp2_sub(t3, t3, r->x);
-		fp2_sub(t3, t3, r->x);
-		/* y3 = A * (G - H) - y1 * E. */
-		fp2_sub(r->x, r->x, t3);
-		fp2_mul(t1, t1, r->x);
-		fp2_mul(r->y, t2, r->y);
-		fp2_sub(r->y, t1, r->y);
-		/* x3 = B * H. */
-		fp2_mul(r->x, t0, t3);
-		/* z3 = z1 * E. */
-		fp2_mul(r->z, r->z, t2);
-
-		/* l11 = J = A * x2 - B * y2. */
-		fp2_mul(t2, q->y, t0);
-		fp2_sub(l[one][one], t4, t2);
-
-		/* l00 = B * yp. */
-		fp_mul(l[zero][zero][0], t0[0], p->y);
-		fp_mul(l[zero][zero][1], t0[1], p->y);
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_add_k12_projc_lazyr(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3;
-	dv2_t u0, u1;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		dv2_new(u0);
-		dv2_new(u1);
-
-		fp2_mul(t0, r->z, q->x);
-		fp2_sub(t0, r->x, t0);
-		fp2_mul(t1, r->z, q->y);
-		fp2_sub(t1, r->y, t1);
-
-		fp2_sqr(t2, t0);
-		fp2_mul(r->x, t2, r->x);
-		fp2_mul(t2, t0, t2);
-		fp2_sqr(t3, t1);
-		fp2_mul(t3, t3, r->z);
-		fp2_add(t3, t2, t3);
-
-		fp2_sub(t3, t3, r->x);
-		fp2_sub(t3, t3, r->x);
-		fp2_sub(r->x, r->x, t3);
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u0, t1, r->x);
-		fp2_mulc_low(u1, t2, r->y);
-#else
-		fp2_muln_low(u0, t1, r->x);
-		fp2_muln_low(u1, t2, r->y);
-#endif
-		fp2_subc_low(u1, u0, u1);
-		fp2_rdcn_low(r->y, u1);
-		fp2_mul(r->x, t0, t3);
-		fp2_mul(r->z, r->z, t2);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_neg(t3[0], p->x);
-		fp_mul(l[one][zero][0], t1[0], t3[0]);
-		fp_mul(l[one][zero][1], t1[1], t3[0]);
-
-#ifdef RLC_FP_ROOM
-		fp2_mulc_low(u0, q->x, t1);
-		fp2_mulc_low(u1, q->y, t0);
-#else
-		fp2_muln_low(u0, q->x, t1);
-		fp2_muln_low(u1, q->y, t0);
-#endif
-		fp2_subc_low(u0, u0, u1);
-		fp2_rdcn_low(l[one][one], u0);
-
-		fp_mul(l[zero][zero][0], t0[0], p->y);
-		fp_mul(l[zero][zero][1], t0[1], p->y);
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		dv2_free(u0);
-		dv2_free(u1);
-	}
-}
-
-#endif
-
-#endif
-
-void pp_add_lit_k12(fp12_t l, ep_t r, ep_t p, ep2_t q) {
-	fp_t t0, t1, t2, t3;
-	int one = 1, zero = 0;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-
-		fp_mul(t0, r->z, p->x);
-		fp_sub(t0, r->x, t0);
-		fp_mul(t1, r->z, p->y);
-		fp_sub(t1, r->y, t1);
-		fp_mul(t2, p->x, t1);
-		r->coord = PROJC;
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_mul(l[zero][zero][0], t0, p->y);
-		fp_sub(l[zero][zero][0], t2, l[zero][zero][0]);
-
-		fp_mul(l[zero][one][0], q->x[0], t1);
-		fp_mul(l[zero][one][1], q->x[1], t1);
-		fp2_neg(l[zero][one], l[zero][one]);
-
-		fp_mul(l[one][one][0], q->y[0], t0);
-		fp_mul(l[one][one][1], q->y[1], t0);
-
-		fp_sqr(t2, t0);
-		fp_mul(r->x, t2, r->x);
-		fp_mul(t2, t0, t2);
-		fp_sqr(t3, t1);
-		fp_mul(t3, t3, r->z);
-		fp_add(t3, t2, t3);
-		fp_sub(t3, t3, r->x);
-		fp_sub(t3, t3, r->x);
-		fp_sub(r->x, r->x, t3);
-		fp_mul(t1, t1, r->x);
-		fp_mul(r->y, t2, r->y);
-		fp_sub(r->y, t1, r->y);
-		fp_mul(r->x, t0, t3);
-		fp_mul(r->z, r->z, t2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k2.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k2.c
deleted file mode 100644
index 9bbb085bbbd2..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k2.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller addition for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k2_basic(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t s;
-	ep_t t;
-
-	fp_null(s);
-	ep_null(t);
-
-	RLC_TRY {
-		fp_new(s);
-		ep_new(t);
-
-		ep_copy(t, r);
-		ep_add_slp_basic(r, s, r, p);
-		fp_add(l[0], t->x, q->x);
-		fp_mul(l[0], l[0], s);
-		fp_sub(l[0], t->y, l[0]);
-		fp_neg(l[1], q->y);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(s);
-		ep_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_add_k2_projc_basic(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		/* t0 = z1^2. */
-		fp_sqr(t0, r->z);
-
-		/* t3 = x2 * z1^2. */
-		fp_mul(t3, p->x, t0);
-
-		/* t1 = y2 * z1^3. */
-		fp_mul(t1, t0, r->z);
-		fp_mul(t1, t1, p->y);
-
-		/* t2 = x1 - t3. */
-		fp_sub(t2, r->x, t3);
-
-		/* t4 = y1 - t1. */
-		fp_sub(t4, r->y, t1);
-
-		/* l0 = slope * (x2 + xq) - z3 * y2. */
-		fp_add(l[0], p->x, q->x);
-		fp_mul(l[0], l[0], t4);
-
-		fp_dbl(t0, t3);
-		fp_add(t3, t0, t2);
-		fp_dbl(t0, t1);
-		fp_add(t1, t0, t4);
-
-		fp_mul(r->z, t2, r->z);
-		fp_sqr(t0, t2);
-		fp_mul(t2, t0, t2);
-		fp_mul(t0, t0, t3);
-		fp_sqr(t3, t4);
-
-		fp_sub(r->x, t3, t0);
-		fp_sub(t0, t0, r->x);
-		fp_sub(t0, t0, r->x);
-		fp_mul(t5, t0, t4);
-		fp_mul(t2, t2, t1);
-		fp_sub(t1, t5, t2);
-
-		fp_mul(t5, r->z, p->y);
-		fp_sub(l[0], l[0], t5);
-
-		fp_mul(l[1], r->z, q->y);
-
-		fp_hlv(r->y, t1);
-
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_add_k2_projc_lazyr(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5;
-	dv_t u0, u1;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	dv_null(u0);
-	dv_null(u1);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		dv_new(u0);
-		dv_new(u1);
-
-		/* t0 = z1^2. */
-		fp_sqr(t0, r->z);
-
-		/* t3 = x2 * z1^2. */
-		fp_mul(t3, p->x, t0);
-
-		/* t1 = y2 * z1^3. */
-		fp_mul(t1, t0, r->z);
-		fp_mul(t1, t1, p->y);
-
-		/* t2 = x1 - t3. */
-		fp_sub(t2, r->x, t3);
-
-		/* t4 = y1 - t1. */
-		fp_sub(t4, r->y, t1);
-
-		/* l0 = slope * (x2 + xq) - z3 * y2. */
-		fp_add(l[0], p->x, q->x);
-		fp_muln_low(u0, l[0], t4);
-
-		fp_dbl(t0, t3);
-		fp_add(t3, t0, t2);
-		fp_dbl(t0, t1);
-		fp_add(t1, t0, t4);
-
-		fp_mul(r->z, t2, r->z);
-		fp_sqr(t0, t2);
-		fp_mul(t2, t0, t2);
-		fp_mul(t0, t0, t3);
-		fp_sqr(t3, t4);
-
-		fp_sub(r->x, t3, t0);
-		fp_sub(t0, t0, r->x);
-		fp_sub(t0, t0, r->x);
-		fp_mul(t5, t0, t4);
-		fp_mul(t2, t2, t1);
-		fp_sub(t1, t5, t2);
-
-		fp_muln_low(u1, r->z, p->y);
-		fp_subc_low(u0, u0, u1);
-		fp_rdcn_low(l[0], u0);
-
-		fp_mul(l[1], r->z, q->y);
-
-		fp_hlv(r->y, t1);
-
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		dv_free(u0);
-		dv_free(u1);
-	}
-}
-
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k24.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k24.c
deleted file mode 100644
index f64d499fe9a9..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k24.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * RELIC is an Efficient LIbrar->y for Cr->yptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 24.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k24_basic(fp24_t l, ep4_t r, ep4_t q, ep_t p) {
-	fp4_t s;
-	ep4_t t;
-
-	fp4_null(s);
-	ep4_null(t);
-
-	RLC_TRY {
-		fp4_new(s);
-		ep4_new(t);
-
-		ep4_copy(t, r);
-		ep4_add_slp_basic(r, s, r, q);
-
-		fp_mul(l[1][1][0][0], s[0][0], p->x);
-		fp_mul(l[1][1][0][1], s[0][1], p->x);
-		fp_mul(l[1][1][1][0], s[1][0], p->x);
-		fp_mul(l[1][1][1][1], s[1][1], p->x);
-
-		fp4_mul(l[0][0], s, t->x);
-		fp4_sub(l[0][0], t->y, l[0][0]);
-		fp4_mul_art(l[0][0], l[0][0]);
-
-		fp_neg(l[0][1][0][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(s);
-		ep4_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_add_k24_projc(fp24_t l, ep4_t r, ep4_t q, ep_t p) {
-	fp4_t t0, t1, t2, t3, t4;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-
-		/* B = t0 = x1 - x2 * z1. */
-		fp4_mul(t0, r->z, q->x);
-		fp4_sub(t0, r->x, t0);
-		/* A = t1 = y1 - y2 * z1. */
-		fp4_mul(t1, r->z, q->y);
-		fp4_sub(t1, r->y, t1);
-
-		/* D = B^2. */
-		fp4_sqr(t2, t0);
-		/* G = x1 * D. */
-		fp4_mul(r->x, r->x, t2);
-		/* E = B^3. */
-		fp4_mul(t2, t2, t0);
-		/* C = A^2. */
-		fp4_sqr(t3, t1);
-		/* F = E + z1 * C. */
-		fp4_mul(t3, t3, r->z);
-		fp4_add(t3, t2, t3);
-
-		/* l10 = - (A * xp). */
-		fp_neg(t4[0][0], p->x);
-		fp_mul(l[1][1][0][0], t1[0][0], t4[0][0]);
-		fp_mul(l[1][1][0][1], t1[0][1], t4[0][0]);
-		fp_mul(l[1][1][1][0], t1[1][0], t4[0][0]);
-		fp_mul(l[1][1][1][1], t1[1][1], t4[0][0]);
-
-		/* t4 = B * x2. */
-		fp4_mul(t4, q->x, t1);
-
-		/* H = E + F - 2 * G. */
-		fp4_sub(t3, t3, r->x);
-		fp4_sub(t3, t3, r->x);
-		/* y3 = A * (G - H) - y1 * E. */
-		fp4_sub(r->x, r->x, t3);
-		fp4_mul(t1, t1, r->x);
-		fp4_mul(r->y, t2, r->y);
-		fp4_sub(r->y, t1, r->y);
-		/* x3 = B * H. */
-		fp4_mul(r->x, t0, t3);
-		/* z3 = z1 * E. */
-		fp4_mul(r->z, r->z, t2);
-
-		/* l11 = J = B * x2 - A * y2. */
-		fp4_mul(t2, q->y, t0);
-		fp4_sub(l[0][0], t4, t2);
-		fp4_mul_art(l[0][0], l[0][0]);
-
-		/* l00 = B * yp. */
-		fp_mul(l[0][1][0][0], p->y, t0[0][0]);
-		fp_mul(l[0][1][0][1], p->y, t0[0][1]);
-		fp_mul(l[0][1][1][0], p->y, t0[1][0]);
-		fp_mul(l[0][1][1][1], p->y, t0[1][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k48.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k48.c
deleted file mode 100644
index 225612b74d32..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k48.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller addition for curves with embedding degree 48.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void ep8_add_basic(fp8_t s, fp8_t rx, fp8_t ry, fp8_t qx, fp8_t qy) {
-	fp8_t t0, t1, t2;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-
-		/* t0 = x2 - x1. */
-		fp8_sub(t0, qx, rx);
-		/* t1 = y2 - y1. */
-		fp8_sub(t1, qy, ry);
-
-		/* If t0 is zero. */
-		if (fp8_is_zero(t0)) {
-			if (fp8_is_zero(t1)) {
-				/* If t1 is zero, q = p, should have doubled. */
-				//ep8_dbl_basic(s, rx, ry);
-				RLC_THROW(ERR_NO_VALID);
-			} else {
-				/* If t1 is not zero and t0 is zero, q = -p and r = infty. */
-				fp8_zero(rx);
-				fp8_zero(ry);
-			}
-		} else {
-			/* t2 = 1/(x2 - x1). */
-			fp8_inv(t2, t0);
-			/* t2 = lambda = (y2 - y1)/(x2 - x1). */
-			fp8_mul(t2, t1, t2);
-
-			/* x3 = lambda^2 - x2 - x1. */
-			fp8_sqr(t1, t2);
-			fp8_sub(t0, t1, rx);
-			fp8_sub(t0, t0, qx);
-
-			/* y3 = lambda * (x1 - x3) - y1. */
-			fp8_sub(t1, rx, t0);
-			fp8_mul(t1, t2, t1);
-			fp8_sub(ry, t1, ry);
-
-			fp8_copy(rx, t0);
-
-			if (s != NULL) {
-				fp8_copy(s, t2);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k48_basic(fp48_t l, fp8_t rx, fp8_t ry, fp8_t qx, fp8_t qy, ep_t p) {
-	fp8_t s, tx, ty;
-
-	fp8_null(s);
-	fp8_null(tx);
-	fp8_null(ty);
-
-	RLC_TRY {
-		fp8_new(s);
-		fp8_new(tx);
-		fp8_new(ty);
-
-		fp8_copy(tx, rx);
-		fp8_copy(ty, ry);
-		ep8_add_basic(s, rx, ry, qx, qy);
-
-		fp48_zero(l);
-		fp_mul(l[0][1][0][0][0], p->x, s[0][0][0]);
-		fp_mul(l[0][1][0][0][1], p->x, s[0][0][1]);
-		fp_mul(l[0][1][0][1][0], p->x, s[0][1][0]);
-		fp_mul(l[0][1][0][1][1], p->x, s[0][1][1]);
-		fp_mul(l[0][1][1][0][0], p->x, s[1][0][0]);
-		fp_mul(l[0][1][1][0][1], p->x, s[1][0][1]);
-		fp_mul(l[0][1][1][1][0], p->x, s[1][1][0]);
-		fp_mul(l[0][1][1][1][1], p->x, s[1][1][1]);
-
-		fp8_mul(l[0][0], s, tx);
-		fp8_sub(l[0][0], ty, l[0][0]);
-
-		fp_neg(l[1][1][0][0][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(s);
-		fp8_free(tx);
-		fp8_free(ty);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_add_k48_projc(fp48_t l, fp8_t rx, fp8_t ry, fp8_t rz, fp8_t qx,
-		fp8_t qy, ep_t p) {
-	fp8_t t0, t1, t2, t3, t4;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-
-		/* B = t0 = x1 - x2 * z1. */
-		fp8_mul(t0, rz, qx);
-		fp8_sub(t0, rx, t0);
-		/* A = t1 = y1 - y2 * z1. */
-		fp8_mul(t1, rz, qy);
-		fp8_sub(t1, ry, t1);
-
-		/* D = B^2. */
-		fp8_sqr(t2, t0);
-		/* G = x1 * D. */
-		fp8_mul(rx, rx, t2);
-		/* E = B^3. */
-		fp8_mul(t2, t2, t0);
-		/* C = A^2. */
-		fp8_sqr(t3, t1);
-		/* F = E + z1 * C. */
-		fp8_mul(t3, t3, rz);
-		fp8_add(t3, t2, t3);
-
-		/* l10 = - (A * xp). */
-		fp_neg(t4[0][0][0], p->x);
-		fp_mul(l[0][1][0][0][0], t1[0][0][0], t4[0][0][0]);
-		fp_mul(l[0][1][0][0][1], t1[0][0][1], t4[0][0][0]);
-		fp_mul(l[0][1][0][1][0], t1[0][1][0], t4[0][0][0]);
-		fp_mul(l[0][1][0][1][1], t1[0][1][1], t4[0][0][0]);
-		fp_mul(l[0][1][1][0][0], t1[1][0][0], t4[0][0][0]);
-		fp_mul(l[0][1][1][0][1], t1[1][0][1], t4[0][0][0]);
-		fp_mul(l[0][1][1][1][0], t1[1][1][0], t4[0][0][0]);
-		fp_mul(l[0][1][1][1][1], t1[1][1][1], t4[0][0][0]);
-
-		/* t4 = B * x2. */
-		fp8_mul(t4, qx, t1);
-
-		/* H = E + F - 2 * G. */
-		fp8_sub(t3, t3, rx);
-		fp8_sub(t3, t3, rx);
-		/* y3 = A * (G - H) - y1 * E. */
-		fp8_sub(rx, rx, t3);
-		fp8_mul(t1, t1, rx);
-		fp8_mul(ry, t2, ry);
-		fp8_sub(ry, t1, ry);
-		/* x3 = B * H. */
-		fp8_mul(rx, t0, t3);
-		/* z3 = z1 * E. */
-		fp8_mul(rz, rz, t2);
-
-		/* l11 = J = B * x2 - A * y2. */
-		fp8_mul(t2, qy, t0);
-		fp8_sub(l[0][0], t4, t2);
-
-		/* l00 = B * yp. */
-		fp_mul(l[1][1][0][0][0], p->y, t0[0][0][0]);
-		fp_mul(l[1][1][0][0][1], p->y, t0[0][0][1]);
-		fp_mul(l[1][1][0][1][0], p->y, t0[0][1][0]);
-		fp_mul(l[1][1][0][1][1], p->y, t0[0][1][1]);
-		fp_mul(l[1][1][1][0][0], p->y, t0[1][0][0]);
-		fp_mul(l[1][1][1][0][1], p->y, t0[1][0][1]);
-		fp_mul(l[1][1][1][1][0], p->y, t0[1][1][0]);
-		fp_mul(l[1][1][1][1][1], p->y, t0[1][1][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k54.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k54.c
deleted file mode 100644
index bdbdcde902a6..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k54.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 54.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void ep9_add_basic(fp9_t s, fp9_t rx, fp9_t ry, fp9_t qx, fp9_t qy) {
-	fp9_t t0, t1, t2;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-
-		/* t0 = x2 - x1. */
-		fp9_sub(t0, qx, rx);
-		/* t1 = y2 - y1. */
-		fp9_sub(t1, qy, ry);
-
-		/* If t0 is zero. */
-		if (fp9_is_zero(t0)) {
-			if (fp9_is_zero(t1)) {
-				/* If t1 is zero, q = p, should have doubled. */
-				//ep9_dbl_basic(s, rx, ry);
-				RLC_THROW(ERR_NO_VALID);
-			} else {
-				/* If t1 is not zero and t0 is zero, q = -p and r = infty. */
-				fp9_zero(rx);
-				fp9_zero(ry);
-			}
-		} else {
-			/* t2 = 1/(x2 - x1). */
-			fp9_inv(t2, t0);
-			/* t2 = lambda = (y2 - y1)/(x2 - x1). */
-			fp9_mul(t2, t1, t2);
-
-			/* x3 = lambda^2 - x2 - x1. */
-			fp9_sqr(t1, t2);
-			fp9_sub(t0, t1, rx);
-			fp9_sub(t0, t0, qx);
-
-			/* y3 = lambda * (x1 - x3) - y1. */
-			fp9_sub(t1, rx, t0);
-			fp9_mul(t1, t2, t1);
-			fp9_sub(ry, t1, ry);
-
-			fp9_copy(rx, t0);
-
-			if (s != NULL) {
-				fp9_copy(s, t2);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k54_basic(fp54_t l, fp9_t rx, fp9_t ry, fp9_t qx, fp9_t qy, ep_t p) {
-	fp9_t s, tx, ty;
-
-	fp9_null(s);
-	fp9_null(tx);
-	fp9_null(ty);
-
-	RLC_TRY {
-		fp9_new(s);
-		fp9_new(tx);
-		fp9_new(ty);
-
-		fp9_copy(tx, rx);
-		fp9_copy(ty, ry);
-		ep9_add_basic(s, rx, ry, qx, qy);
-
-		fp54_zero(l);
-		fp_mul(l[2][0][0][0], p->x, s[0][0]);
-		fp_mul(l[2][0][0][1], p->x, s[0][1]);
-		fp_mul(l[2][0][0][2], p->x, s[0][2]);
-		fp_mul(l[2][0][1][0], p->x, s[1][0]);
-		fp_mul(l[2][0][1][1], p->x, s[1][1]);
-		fp_mul(l[2][0][1][2], p->x, s[1][2]);
-		fp_mul(l[2][0][2][0], p->x, s[2][0]);
-		fp_mul(l[2][0][2][1], p->x, s[2][1]);
-		fp_mul(l[2][0][2][2], p->x, s[2][2]);
-
-		fp9_mul(l[0][0], s, tx);
-		fp9_sub(l[0][0], ty, l[0][0]);
-
-		fp_neg(l[0][1][0][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(s);
-		fp9_free(tx);
-		fp9_free(ty);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_add_k54_projc(fp54_t l, fp9_t rx, fp9_t ry, fp9_t rz, fp9_t qx,
-		fp9_t qy, ep_t p) {
-	fp9_t t0, t1, t2, t3, t4;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-	fp9_null(t3);
-	fp9_null(t4);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-		fp9_new(t3);
-		fp9_new(t4);
-
-		/* B = t0 = x1 - x2 * z1. */
-		fp9_mul(t0, rz, qx);
-		fp9_sub(t0, rx, t0);
-		/* A = t1 = y1 - y2 * z1. */
-		fp9_mul(t1, rz, qy);
-		fp9_sub(t1, ry, t1);
-
-		/* D = B^2. */
-		fp9_sqr(t2, t0);
-		/* G = x1 * D. */
-		fp9_mul(rx, rx, t2);
-		/* E = B^3. */
-		fp9_mul(t2, t2, t0);
-		/* C = A^2. */
-		fp9_sqr(t3, t1);
-		/* F = E + z1 * C. */
-		fp9_mul(t3, t3, rz);
-		fp9_add(t3, t2, t3);
-
-		/* l10 = - (A * xp). */
-		fp_neg(t4[0][0], p->x);
-		fp_mul(l[2][0][0][0], t1[0][0], t4[0][0]);
-		fp_mul(l[2][0][0][1], t1[0][1], t4[0][0]);
-		fp_mul(l[2][0][0][2], t1[0][2], t4[0][0]);
-		fp_mul(l[2][0][1][0], t1[1][0], t4[0][0]);
-		fp_mul(l[2][0][1][1], t1[1][1], t4[0][0]);
-		fp_mul(l[2][0][1][2], t1[1][2], t4[0][0]);
-		fp_mul(l[2][0][2][0], t1[2][0], t4[0][0]);
-		fp_mul(l[2][0][2][1], t1[2][1], t4[0][0]);
-		fp_mul(l[2][0][2][2], t1[2][2], t4[0][0]);
-
-		/* t4 = B * x2. */
-		fp9_mul(t4, qx, t1);
-
-		/* H = E + F - 2 * G. */
-		fp9_sub(t3, t3, rx);
-		fp9_sub(t3, t3, rx);
-		/* y3 = A * (G - H) - y1 * E. */
-		fp9_sub(rx, rx, t3);
-		fp9_mul(t1, t1, rx);
-		fp9_mul(ry, t2, ry);
-		fp9_sub(ry, t1, ry);
-		/* x3 = B * H. */
-		fp9_mul(rx, t0, t3);
-		/* z3 = z1 * E. */
-		fp9_mul(rz, rz, t2);
-
-		/* l11 = J = B * x2 - A * y2. */
-		fp9_mul(t2, qy, t0);
-		fp9_sub(l[0][0], t4, t2);
-
-		/* l00 = B * yp. */
-		fp_mul(l[0][1][0][0], p->y, t0[0][0]);
-		fp_mul(l[0][1][0][1], p->y, t0[0][1]);
-		fp_mul(l[0][1][0][2], p->y, t0[0][2]);
-		fp_mul(l[0][1][1][0], p->y, t0[1][0]);
-		fp_mul(l[0][1][1][1], p->y, t0[1][1]);
-		fp_mul(l[0][1][1][2], p->y, t0[1][2]);
-		fp_mul(l[0][1][2][0], p->y, t0[2][0]);
-		fp_mul(l[0][1][2][1], p->y, t0[2][1]);
-		fp_mul(l[0][1][2][2], p->y, t0[2][2]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-		fp9_free(t3);
-		fp9_free(t4);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_add_k8.c b/src/dashbls/depends/relic/src/pp/relic_pp_add_k8.c
deleted file mode 100644
index ccd4e78b2b16..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_add_k8.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller addition for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_add_k8_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	int one = 1, zero = 0;
-	fp2_t s;
-	ep2_t t;
-
-	fp2_null(s);
-	ep2_null(t);
-
-	RLC_TRY {
-		fp2_new(s);
-		ep2_new(t);
-
-		ep2_copy(t, r);
-		ep2_add_slp_basic(r, s, r, q);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_mul(l[one][zero][0], s[0], p->x);
-		fp_mul(l[one][zero][1], s[1], p->x);
-		fp2_mul(l[one][one], s, t->x);
-		fp2_sub(l[one][one], t->y, l[one][one]);
-		fp_copy(l[zero][zero][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(s);
-		ep2_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_add_k8_projc_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = A = Z1^2, t1 = B = X2*Z1. */
-		fp2_sqr(t0, r->z);
-		fp2_mul(t1, r->z, q->x);
-
-		/* t0 = C = y2*A, t2 = D = (x1 - B) */
-		fp2_mul(t0, t0, q->y);
-		fp2_sub(t2, r->x, t1);
-
-		/* t3 = E = 2*(y1 - C), t4 = F = 2*D*z1, t2 = G = 4*D*F. */
-		fp2_sub(t3, r->y, t0);
-		fp2_dbl(t3, t3);
-		fp2_dbl(t2, t2);
-		fp2_mul(t4, t2, r->z);
-		fp2_mul(t2, t2, t4);
-		fp2_dbl(t2, t2);
-
-		/* l = E*X2 - F*Y2 - E*xQ + F*yQ. */
-		fp2_mul(l[one][one], t3, q->x);
-		fp2_mul(t0, t4, q->y);
-		fp2_sub(l[one][one], l[one][one], t0);
-		fp_mul(l[one][zero][0], t3[0], p->x);
-		fp_mul(l[one][zero][1], t3[1], p->x);
-		fp_mul(l[zero][zero][0], t4[0], p->y);
-		fp_mul(l[zero][zero][1], t4[1], p->y);
-
-		/* z3 = F^2, t4 = (F + E)^2, t3 = E^2. */
-		fp2_sqr(r->z, t4);
-		fp2_add(t4, t4, t3);
-		fp2_sqr(t4, t4);
-		fp2_sqr(t3, t3);
-
-		/* t5 = x3 = 2*E^2 - (x1 + B)*G. */
-		fp2_add(t1, t1, r->x);
-		fp2_mul(t1, t1, t2);
-		fp2_dbl(t5, t3);
-		fp2_sub(t5, t5, t1);
-
-		/* y3 = ((F + E)^2 - E^2 - F^2)*(x1*G - x3) - y1*G^2. */
-		fp2_sub(t4, t4, r->z);
-		fp2_sub(t4, t4, t3);
-		fp2_mul(t1, r->x, t2);
-		fp2_sub(t1, t1, t5);
-		fp2_mul(t4, t4, t1);
-		fp2_sqr(t2, t2);
-		fp2_mul(r->y, r->y, t2);
-		fp2_sub(r->y, t4, r->y);
-
-		/* Z3 = 2*F^2. */
-		fp2_dbl(r->z, r->z);
-		fp2_copy(r->x, t5);
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_add_k8_projc_lazyr(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = A = Z1^2, t1 = B = X2*Z1. */
-		fp2_sqr(t0, r->z);
-		fp2_mul(t1, r->z, q->x);
-
-		/* t0 = C = y2*A, t2 = D = (x1 - B) */
-		fp2_mul(t0, t0, q->y);
-		fp2_sub(t2, r->x, t1);
-
-		/* t3 = E = 2*(y1 - C), t4 = F = 2*D*z1, t2 = G = 4*D*F. */
-		fp2_sub(t3, r->y, t0);
-		fp2_dbl(t3, t3);
-		fp2_dbl(t2, t2);
-		fp2_mul(t4, t2, r->z);
-		fp2_mul(t2, t2, t4);
-		fp2_dbl(t2, t2);
-
-		/* l = E*X2 - F*Y2 - E*xQ + F*yQ. */
-		fp2_mul(l[one][one], t3, q->x);
-		fp2_mul(t0, t4, q->y);
-		fp2_sub(l[one][one], l[one][one], t0);
-		fp_mul(l[one][zero][0], t3[0], p->x);
-		fp_mul(l[one][zero][1], t3[1], p->x);
-		fp_mul(l[zero][zero][0], t4[0], p->y);
-		fp_mul(l[zero][zero][1], t4[1], p->y);
-
-		/* z3 = F^2, t4 = (F + E)^2, t3 = E^2. */
-		fp2_sqr(r->z, t4);
-		fp2_add(t4, t4, t3);
-		fp2_sqr(t4, t4);
-		fp2_sqr(t3, t3);
-
-		/* t5 = x3 = 2*E^2 - (x1 + B)*G. */
-		fp2_add(t1, t1, r->x);
-		fp2_mul(t1, t1, t2);
-		fp2_dbl(t5, t3);
-		fp2_sub(t5, t5, t1);
-
-		/* y3 = ((F + E)^2 - E^2 - F^2)*(x1*G - x3) - y1*G^2. */
-		fp2_sub(t4, t4, r->z);
-		fp2_sub(t4, t4, t3);
-		fp2_mul(t1, r->x, t2);
-		fp2_sub(t1, t1, t5);
-		fp2_mul(t4, t4, t1);
-		fp2_sqr(t2, t2);
-		fp2_mul(r->y, r->y, t2);
-		fp2_sub(r->y, t4, r->y);
-
-		/* Z3 = 2*F^2. */
-		fp2_dbl(r->z, r->z);
-		fp2_copy(r->x, t5);
-
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-	}
-}
-
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k12.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k12.c
deleted file mode 100644
index 743eb365a33e..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k12.c
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller doubling for curves of embedding degree 12.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_dbl_k12_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t s;
-	ep2_t t;
-	int one = 1, zero = 0;
-
-	fp2_null(s);
-	ep2_null(t);
-
-	RLC_TRY {
-		fp2_new(s);
-		ep2_new(t);
-		ep2_copy(t, q);
-		ep2_dbl_slp_basic(r, s, q);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_mul(l[one][zero][0], s[0], p->x);
-		fp_mul(l[one][zero][1], s[1], p->x);
-		fp2_mul(l[one][one], s, t->x);
-		fp2_sub(l[one][one], t->y, l[one][one]);
-		fp_copy(l[zero][zero][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(s);
-		ep2_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_dbl_k12_projc_basic(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		if (ep_curve_opt_b() == RLC_TWO) {
-			/* t0 = x1^2. */
-			fp2_sqr(t0, q->x);
-			/* t1 = B = y1^2. */
-			fp2_sqr(t1, q->y);
-			/* t2 = C = z1^2. */
-			fp2_sqr(t2, q->z);
-			/* t4 = A = (x1 * y1)/2. */
-			fp2_mul(t4, q->x, q->y);
-			fp_hlv(t4[0], t4[0]);
-			fp_hlv(t4[1], t4[1]);
-			/* t3 = E = 3b'C = 3C * (1 - i). */
-			fp2_dbl(t3, t2);
-			fp2_add(t2, t2, t3);
-			fp_add(t3[0], t2[0], t2[1]);
-			fp_sub(t3[1], t2[1], t2[0]);
-			/* t2 = F = 3E. */
-			fp2_dbl(t2, t3);
-			fp2_add(t2, t3, t2);
-			/* x3 = A * (B - F). */
-			fp2_sub(r->x, t1, t2);
-			fp2_mul(r->x, r->x, t4);
-			/* t2 = G = (B + F)/2. */
-			fp2_add(t2, t1, t2);
-			fp_hlv(t2[0], t2[0]);
-			fp_hlv(t2[1], t2[1]);
-			/* y3 = G^2 - 3E^2. */
-			fp2_sqr(t2, t2);
-			fp2_sqr(t4, t3);
-			/* t5 = y1 * z1. */
-			fp2_mul(t5, q->y, q->z);
-			fp2_dbl(r->y, t4);
-			fp2_add(r->y, r->y, t4);
-			fp2_sub(r->y, t2, r->y);
-
-			/* t2 = H = 2 * y1 * z1. */
-			fp2_dbl(t2, t5);
-			/* z3 = B * H. */
-			fp2_mul(r->z, t1, t2);
-
-			/* l11 = E - B. */
-			fp2_sub(l[one][one], t3, t1);
-
-			/* l10 = (3 * xp) * t0. */
-			fp_mul(l[one][zero][0], p->x, t0[0]);
-			fp_mul(l[one][zero][1], p->x, t0[1]);
-
-			/* l00 = H * (-yp). */
-			fp_mul(l[zero][zero][0], t2[0], p->y);
-			fp_mul(l[zero][zero][1], t2[1], p->y);
-		} else {
-			/* A = x1^2. */
-			fp2_sqr(t0, q->x);
-			/* B = y1^2. */
-			fp2_sqr(t1, q->y);
-			/* C = z1^2. */
-			fp2_sqr(t2, q->z);
-			/* D = 3bC, general b. */
-			fp2_dbl(t3, t2);
-			fp2_add(t3, t3, t2);
-			fp2_mul(t3, t3, ep2_curve_get_b());
-			/* E = (x1 + y1)^2 - A - B. */
-			fp2_add(t4, q->x, q->y);
-			fp2_sqr(t4, t4);
-			fp2_sub(t4, t4, t0);
-			fp2_sub(t4, t4, t1);
-
-			/* F = (y1 + z1)^2 - B - C. */
-			fp2_add(t5, q->y, q->z);
-			fp2_sqr(t5, t5);
-			fp2_sub(t5, t5, t1);
-			fp2_sub(t5, t5, t2);
-
-			/* G = 3D. */
-			fp2_dbl(t6, t3);
-			fp2_add(t6, t6, t3);
-
-			/* x3 = E * (B - G). */
-			fp2_sub(r->x, t1, t6);
-			fp2_mul(r->x, r->x, t4);
-
-			/* y3 = (B + G)^2 -12D^2. */
-			fp2_add(t6, t6, t1);
-			fp2_sqr(t6, t6);
-			fp2_sqr(t2, t3);
-			fp2_dbl(r->y, t2);
-			fp2_dbl(t2, r->y);
-			fp2_dbl(r->y, t2);
-			fp2_add(r->y, r->y, t2);
-			fp2_sub(r->y, t6, r->y);
-
-			/* z3 = 4B * F. */
-			fp2_dbl(r->z, t1);
-			fp2_dbl(r->z, r->z);
-			fp2_mul(r->z, r->z, t5);
-
-			/* l11 = D - B. */
-			fp2_sub(l[one][one], t3, t1);
-
-			/* l10 = (3 * xp) * A. */
-			fp_mul(l[one][zero][0], p->x, t0[0]);
-			fp_mul(l[one][zero][1], p->x, t0[1]);
-
-			/* l00 = F * (-yp). */
-			fp_mul(l[zero][zero][0], t5[0], p->y);
-			fp_mul(l[zero][zero][1], t5[1], p->y);
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_dbl_k12_projc_lazyr(fp12_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-	dv2_t u0, u1;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-		dv2_new(u0);
-		dv2_new(u1);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		if (ep_curve_opt_b() == RLC_TWO) {
-			/* C = z1^2. */
-			fp2_sqr(t0, q->z);
-			/* B = y1^2. */
-			fp2_sqr(t1, q->y);
-			/* t5 = B + C. */
-			fp2_add(t5, t0, t1);
-			/* t3 = E = 3b'C = 3C * (1 - i). */
-			fp2_dbl(t3, t0);
-			fp2_add(t0, t0, t3);
-			fp_add(t2[0], t0[0], t0[1]);
-			fp_sub(t2[1], t0[1], t0[0]);
-
-			/* t0 = x1^2. */
-			fp2_sqr(t0, q->x);
-			/* t4 = A = (x1 * y1)/2. */
-			fp2_mul(t4, q->x, q->y);
-			fp_hlv(t4[0], t4[0]);
-			fp_hlv(t4[1], t4[1]);
-			/* t3 = F = 3E. */
-			fp2_dbl(t3, t2);
-			fp2_add(t3, t3, t2);
-			/* x3 = A * (B - F). */
-			fp2_sub(r->x, t1, t3);
-			fp2_mul(r->x, r->x, t4);
-
-			/* G = (B + F)/2. */
-			fp2_add(t3, t1, t3);
-			fp_hlv(t3[0], t3[0]);
-			fp_hlv(t3[1], t3[1]);
-
-			/* y3 = G^2 - 3E^2. */
-			fp2_sqrn_low(u0, t2);
-			fp2_addd_low(u1, u0, u0);
-			fp2_addd_low(u1, u1, u0);
-			fp2_sqrn_low(u0, t3);
-			fp2_subc_low(u0, u0, u1);
-
-			/* H = (Y + Z)^2 - B - C. */
-			fp2_add(t3, q->y, q->z);
-			fp2_sqr(t3, t3);
-			fp2_sub(t3, t3, t5);
-
-			fp2_rdcn_low(r->y, u0);
-
-			/* z3 = B * H. */
-			fp2_mul(r->z, t1, t3);
-
-			/* l11 = E - B. */
-			fp2_sub(l[1][1], t2, t1);
-
-			/* l10 = (3 * xp) * t0. */
-			fp_mul(l[one][zero][0], p->x, t0[0]);
-			fp_mul(l[one][zero][1], p->x, t0[1]);
-
-			/* l01 = F * (-yp). */
-			fp_mul(l[zero][zero][0], t3[0], p->y);
-			fp_mul(l[zero][zero][1], t3[1], p->y);
-		} else {
-			/* A = x1^2. */
-			fp2_sqr(t0, q->x);
-			/* B = y1^2. */
-			fp2_sqr(t1, q->y);
-			/* C = z1^2. */
-			fp2_sqr(t2, q->z);
-			/* D = 3bC, for general b. */
-			fp2_dbl(t3, t2);
-			fp2_add(t3, t3, t2);
-			fp2_mul(t3, t3, ep2_curve_get_b());
-			/* E = (x1 + y1)^2 - A - B. */
-			fp2_add(t4, q->x, q->y);
-			fp2_sqr(t4, t4);
-			fp2_sub(t4, t4, t0);
-			fp2_sub(t4, t4, t1);
-
-			/* F = (y1 + z1)^2 - B - C. */
-			fp2_add(t5, q->y, q->z);
-			fp2_sqr(t5, t5);
-			fp2_sub(t5, t5, t1);
-			fp2_sub(t5, t5, t2);
-
-			/* G = 3D. */
-			fp2_dbl(t6, t3);
-			fp2_add(t6, t6, t3);
-
-			/* x3 = E * (B - G). */
-			fp2_sub(r->x, t1, t6);
-			fp2_mul(r->x, r->x, t4);
-
-			/* y3 = (B + G)^2 -12D^2. */
-			fp2_add(t6, t6, t1);
-			fp2_sqr(t6, t6);
-			fp2_sqr(t2, t3);
-			fp2_dbl(r->y, t2);
-			fp2_dbl(t2, r->y);
-			fp2_dbl(r->y, t2);
-			fp2_add(r->y, r->y, t2);
-			fp2_sub(r->y, t6, r->y);
-
-			/* z3 = 4B * F. */
-			fp2_dbl(r->z, t1);
-			fp2_dbl(r->z, r->z);
-			fp2_mul(r->z, r->z, t5);
-
-			/* l00 = D - B. */
-			fp2_sub(l[one][one], t3, t1);
-
-			/* l10 = (3 * xp) * A. */
-			fp_mul(l[one][zero][0], p->x, t0[0]);
-			fp_mul(l[one][zero][1], p->x, t0[1]);
-
-			/* l01 = F * (-yp). */
-			fp_mul(l[zero][zero][0], t5[0], p->y);
-			fp_mul(l[zero][zero][1], t5[1], p->y);
-		}
-		r->coord = PROJC;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-		dv2_free(u0);
-		dv2_free(u1);
-	}
-}
-
-#endif
-
-#endif
-
-void pp_dbl_lit_k12(fp12_t l, ep_t r, ep_t p, ep2_t q) {
-	fp_t t0, t1, t2, t3, t4, t5, t6;
-	int one = 1, zero = 0;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	fp_null(t6);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		fp_new(t6);
-
-		fp_sqr(t0, p->x);
-		fp_sqr(t1, p->y);
-		fp_sqr(t2, p->z);
-
-		fp_mul(t4, ep_curve_get_b(), t2);
-
-		fp_dbl(t3, t4);
-		fp_add(t3, t3, t4);
-
-		fp_add(t4, p->x, p->y);
-		fp_sqr(t4, t4);
-		fp_sub(t4, t4, t0);
-		fp_sub(t4, t4, t1);
-		fp_add(t5, p->y, p->z);
-		fp_sqr(t5, t5);
-		fp_sub(t5, t5, t1);
-		fp_sub(t5, t5, t2);
-		fp_dbl(t6, t3);
-		fp_add(t6, t6, t3);
-		fp_sub(r->x, t1, t6);
-		fp_mul(r->x, r->x, t4);
-		fp_add(r->y, t1, t6);
-		fp_sqr(r->y, r->y);
-		fp_sqr(t4, t3);
-		fp_dbl(t6, t4);
-		fp_add(t6, t6, t4);
-		fp_dbl(t6, t6);
-		fp_dbl(t6, t6);
-		fp_sub(r->y, r->y, t6);
-		fp_mul(r->z, t1, t5);
-		fp_dbl(r->z, r->z);
-		fp_dbl(r->z, r->z);
-		r->coord = PROJC;
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp2_dbl(l[zero][one], q->x);
-		fp2_add(l[zero][one], l[zero][one], q->x);
-		fp_mul(l[zero][one][0], l[zero][one][0], t0);
-		fp_mul(l[zero][one][1], l[zero][one][1], t0);
-
-		fp_sub(l[zero][zero][0], t3, t1);
-		fp_zero(l[zero][zero][1]);
-
-		fp_mul(l[one][one][0], q->y[0], t5);
-		fp_mul(l[one][one][1], q->y[1], t5);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		fp_free(t6);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k2.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k2.c
deleted file mode 100644
index ad1688ff0e6f..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k2.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller doubling for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_dbl_k2_basic(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t s;
-	ep_t t;
-
-	fp_null(s);
-	ep_null(t);
-
-	RLC_TRY {
-		fp_new(s);
-		ep_new(t);
-
-		ep_copy(t, p);
-		ep_dbl_slp_basic(r, s, p);
-		fp_add(l[0], t->x, q->x);
-		fp_mul(l[0], l[0], s);
-		fp_sub(l[0], t->y, l[0]);
-		fp_copy(l[1], q->y);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp_free(s);
-		ep_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_dbl_k2_projc_basic(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-
-		/* For these curves, we always can choose a = -3. */
-		/* dbl-2001-b formulas: 3M + 5S + 8add + 1*4 + 2*8 + 1*3 */
-		/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#doubling-dbl-2001-b */
-
-		/* t0 = delta = z1^2. */
-		fp_sqr(t0, p->z);
-
-		/* t1 = gamma = y1^2. */
-		fp_sqr(t1, p->y);
-
-		/* t2 = beta = x1 * y1^2. */
-		fp_mul(t2, p->x, t1);
-
-		/* t3 = alpha = 3 * (x1 - z1^2) * (x1 + z1^2). */
-		fp_sub(t3, p->x, t0);
-		fp_add(t4, p->x, t0);
-		fp_mul(t4, t3, t4);
-		fp_dbl(t3, t4);
-		fp_add(t3, t3, t4);
-
-		fp_dbl(t2, t2);
-		fp_dbl(t2, t2);
-
-		/* z3 = (y1 + z1)^2 - gamma - delta. */
-		fp_add(r->z, p->y, p->z);
-		fp_sqr(r->z, r->z);
-		fp_sub(r->z, r->z, t1);
-		fp_sub(r->z, r->z, t0);
-
-		/* l0 = 2 * gamma - alpha * (delta * xq + x1). */
-		fp_dbl(t1, t1);
-		fp_mul(t5, t0, q->x);
-		fp_add(t5, t5, p->x);
-		fp_mul(t5, t5, t3);
-		fp_sub(l[0], t1, t5);
-
-		/* x3 = alpha^2 - 8 * beta. */
-		fp_dbl(t5, t2);
-		fp_sqr(r->x, t3);
-		fp_sub(r->x, r->x, t5);
-
-		/* y3 = alpha * (4 * beta - x3) - 8 * gamma^2. */
-		fp_sqr(t4, t1);
-		fp_dbl(t4, t4);
-		fp_sub(r->y, t2, r->x);
-		fp_mul(r->y, r->y, t3);
-		fp_sub(r->y, r->y, t4);
-
-		/* l1 = - z3 * delta * yq. */
-		fp_mul(l[1], r->z, t0);
-		fp_mul(l[1], l[1], q->y);
-
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_dbl_k2_projc_lazyr(fp2_t l, ep_t r, ep_t p, ep_t q) {
-	fp_t t0, t1, t2, t3, t4, t5;
-	dv_t u0, u1;
-
-	fp_null(t0);
-	fp_null(t1);
-	fp_null(t2);
-	fp_null(t3);
-	fp_null(t4);
-	fp_null(t5);
-	dv_null(u0);
-	dv_null(u1);
-
-	RLC_TRY {
-		fp_new(t0);
-		fp_new(t1);
-		fp_new(t2);
-		fp_new(t3);
-		fp_new(t4);
-		fp_new(t5);
-		dv_new(u0);
-		dv_new(u1);
-
-		/* For these curves, we always can choose a = -3. */
-		/* dbl-2001-b formulas: 3M + 5S + 8add + 1*4 + 2*8 + 1*3 */
-		/* http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#doubling-dbl-2001-b */
-
-		/* t0 = delta = z1^2. */
-		fp_sqr(t0, p->z);
-
-		/* t1 = gamma = y1^2. */
-		fp_sqr(t1, p->y);
-
-		/* t2 = beta = x1 * y1^2. */
-		fp_mul(t2, p->x, t1);
-
-		/* t3 = alpha = 3 * (x1 - z1^2) * (x1 + z1^2). */
-		fp_sub(t3, p->x, t0);
-		fp_add(t4, p->x, t0);
-		fp_mul(t4, t3, t4);
-		fp_dbl(t3, t4);
-		fp_add(t3, t3, t4);
-
-		/* t2 = 4 * beta. */
-		fp_dbl(t2, t2);
-		fp_dbl(t2, t2);
-
-		/* z3 = (y1 + z1)^2 - gamma - delta. */
-		fp_add(r->z, p->y, p->z);
-		fp_sqr(r->z, r->z);
-		fp_sub(r->z, r->z, t1);
-		fp_sub(r->z, r->z, t0);
-
-		/* l0 = 2 * gamma - alpha * (delta * xq + x1). */
-		fp_dbl(t1, t1);
-		fp_mul(t5, t0, q->x);
-		fp_add(t5, t5, p->x);
-		fp_mul(t5, t5, t3);
-		fp_sub(l[0], t1, t5);
-
-		/* x3 = alpha^2 - 8 * beta. */
-		fp_dbl(t5, t2);
-		fp_sqr(r->x, t3);
-		fp_sub(r->x, r->x, t5);
-
-		/* y3 = alpha * (4 * beta - x3) - 8 * gamma^2. */
-		fp_sqrn_low(u0, t1);
-		fp_addc_low(u0, u0, u0);
-		fp_subm_low(r->y, t2, r->x);
-		fp_muln_low(u1, r->y, t3);
-		fp_subc_low(u1, u1, u0);
-		fp_rdcn_low(r->y, u1);
-
-		/* l1 = - z3 * delta * yq. */
-		fp_mul(l[1], r->z, t0);
-		fp_mul(l[1], l[1], q->y);
-
-		r->coord = JACOB;
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp_free(t0);
-		fp_free(t1);
-		fp_free(t2);
-		fp_free(t3);
-		fp_free(t4);
-		fp_free(t5);
-		dv_free(u0);
-		dv_free(u1);
-	}
-}
-
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k24.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k24.c
deleted file mode 100644
index 3935047ae66a..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k24.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * RELIC is an Efficient LIbrar->y for Cr->yptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 24.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_dbl_k24_basic(fp24_t l, ep4_t r, ep4_t q, ep_t p) {
-	fp4_t s;
-	ep4_t t;
-
-	fp4_null(s);
-	ep4_null(t);
-
-	RLC_TRY {
-		fp4_new(s);
-		ep4_new(t);
-		ep4_copy(t, q);
-		ep4_dbl_slp_basic(r, s, q);
-		fp24_zero(l);
-
-		fp_mul(l[1][1][0][0], s[0][0], p->x);
-		fp_mul(l[1][1][0][1], s[0][1], p->x);
-		fp_mul(l[1][1][1][0], s[1][0], p->x);
-		fp_mul(l[1][1][1][1], s[1][1], p->x);
-
-		fp4_mul(l[0][0], s, t->x);
-		fp4_sub(l[0][0], t->y, l[0][0]);
-		fp4_mul_art(l[0][0], l[0][0]);
-
-		fp_copy(l[0][1][0][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(s);
-		ep4_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_dbl_k24_projc(fp24_t l, ep4_t r, ep4_t q, ep_t p) {
-	fp4_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp4_null(t0);
-	fp4_null(t1);
-	fp4_null(t2);
-	fp4_null(t3);
-	fp4_null(t4);
-	fp4_null(t5);
-	fp4_null(t6);
-
-	RLC_TRY {
-		fp4_new(t0);
-		fp4_new(t1);
-		fp4_new(t2);
-		fp4_new(t3);
-		fp4_new(t4);
-		fp4_new(t5);
-		fp4_new(t6);
-
-		/* A = x1^2. */
-		fp4_sqr(t0, q->x);
-		/* B = y1^2. */
-		fp4_sqr(t1, q->y);
-		/* C = z1^2. */
-		fp4_sqr(t2, q->z);
-		/* D = 3bC, general b. */
-		fp4_dbl(t3, t2);
-		fp4_add(t3, t3, t2);
-		ep4_curve_get_b(t4);
-		fp4_mul(t3, t3, t4);
-
-		/* E = (x1 + y1)^2 - A - B. */
-		fp4_add(t4, q->x, q->y);
-		fp4_sqr(t4, t4);
-		fp4_sub(t4, t4, t0);
-		fp4_sub(t4, t4, t1);
-
-		/* F = (y1 + z1)^2 - B - C. */
-		fp4_add(t5, q->y, q->z);
-		fp4_sqr(t5, t5);
-		fp4_sub(t5, t5, t1);
-		fp4_sub(t5, t5, t2);
-
-		/* G = 3D. */
-		fp4_dbl(t6, t3);
-		fp4_add(t6, t6, t3);
-
-		/* x3 = E * (B - G). */
-		fp4_sub(r->x, t1, t6);
-		fp4_mul(r->x, r->x, t4);
-
-		/* y3 = (B + G)^2 -12D^2. */
-		fp4_add(t6, t6, t1);
-		fp4_sqr(t6, t6);
-		fp4_sqr(t2, t3);
-		fp4_dbl(r->y, t2);
-		fp4_dbl(t2, r->y);
-		fp4_dbl(r->y, t2);
-		fp4_add(r->y, r->y, t2);
-		fp4_sub(r->y, t6, r->y);
-
-		/* z3 = 4B * F. */
-		fp4_dbl(r->z, t1);
-		fp4_dbl(r->z, r->z);
-		fp4_mul(r->z, r->z, t5);
-
-		/* l11 = D - B. */
-		fp4_sub(l[0][0], t3, t1);
-		fp4_mul_art(l[0][0], l[0][0]);
-
-		/* l10 = (3 * xp) * A. */
-		fp_mul(l[1][1][0][0], p->x, t0[0][0]);
-		fp_mul(l[1][1][0][1], p->x, t0[0][1]);
-		fp_mul(l[1][1][1][0], p->x, t0[1][0]);
-		fp_mul(l[1][1][1][1], p->x, t0[1][1]);
-
-		/* l00 = F * (-yp). */
-		fp_mul(l[0][1][0][0], p->y, t5[0][0]);
-		fp_mul(l[0][1][0][1], p->y, t5[0][1]);
-		fp_mul(l[0][1][1][0], p->y, t5[1][0]);
-		fp_mul(l[0][1][1][1], p->y, t5[1][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp4_free(t0);
-		fp4_free(t1);
-		fp4_free(t2);
-		fp4_free(t3);
-		fp4_free(t4);
-		fp4_free(t5);
-		fp4_free(t6);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k48.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k48.c
deleted file mode 100644
index 3d26f8568531..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k48.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller doubling for curves with embedding degree 48.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void ep8_dbl_basic(fp8_t s, fp8_t rx, fp8_t ry) {
-	fp8_t t0, t1, t2;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-
-		/* t0 = 1/(2 * y1). */
-		fp8_dbl(t0, ry);
-		fp8_inv(t0, t0);
-
-		/* t1 = 3 * x1^2 + a. */
-		fp8_sqr(t1, rx);
-		fp8_copy(t2, t1);
-		fp8_dbl(t1, t1);
-		fp8_add(t1, t1, t2);
-
-		/* a = 0. */
-		/* t1 = (3 * x1^2 + a)/(2 * y1). */
-		fp8_mul(t1, t1, t0);
-
-		if (s != NULL) {
-			fp8_copy(s, t1);
-		}
-
-		/* t2 = t1^2. */
-		fp8_sqr(t2, t1);
-
-		/* x3 = t1^2 - 2 * x1. */
-		fp8_dbl(t0, rx);
-		fp8_sub(t0, t2, t0);
-
-		/* y3 = t1 * (x1 - x3) - y1. */
-		fp8_sub(t2, rx, t0);
-		fp8_mul(t1, t1, t2);
-
-		fp8_sub(ry, t1, ry);
-
-		fp8_copy(rx, t0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_dbl_k48_basic(fp48_t l, fp8_t rx, fp8_t ry, ep_t p) {
-	fp8_t s, tx, ty;
-
-	fp8_null(s);
-	fp8_null(tx);
-	fp8_null(ty);
-
-	RLC_TRY {
-		fp8_new(s);
-		fp8_new(tx);
-		fp8_new(ty);
-
-		fp8_copy(tx, rx);
-		fp8_copy(ty, ry);
-		ep8_dbl_basic(s, rx, ry);
-		fp48_zero(l);
-
-		fp_mul(l[0][1][0][0][0], p->x, s[0][0][0]);
-		fp_mul(l[0][1][0][0][1], p->x, s[0][0][1]);
-		fp_mul(l[0][1][0][1][0], p->x, s[0][1][0]);
-		fp_mul(l[0][1][0][1][1], p->x, s[0][1][1]);
-		fp_mul(l[0][1][1][0][0], p->x, s[1][0][0]);
-		fp_mul(l[0][1][1][0][1], p->x, s[1][0][1]);
-		fp_mul(l[0][1][1][1][0], p->x, s[1][1][0]);
-		fp_mul(l[0][1][1][1][1], p->x, s[1][1][1]);
-
-		fp8_mul(l[0][0], s, tx);
-		fp8_sub(l[0][0], ty, l[0][0]);
-
-		fp_copy(l[1][1][0][0][0], p->y);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(s);
-		fp8_free(tx);
-		fp8_free(ty);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_dbl_k48_projc(fp48_t l, fp8_t rx, fp8_t ry, fp8_t rz, ep_t p) {
-	fp8_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	fp8_null(t4);
-	fp8_null(t5);
-	fp8_null(t6);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		fp8_new(t5);
-		fp8_new(t6);
-
-		/* A = x1^2. */
-		fp8_sqr(t0, rx);
-		/* B = y1^2. */
-		fp8_sqr(t1, ry);
-		/* C = z1^2. */
-		fp8_sqr(t2, rz);
-		/* D = 3bC, general b. */
-		fp8_dbl(t3, t2);
-		fp8_add(t3, t3, t2);
-		fp8_zero(t4);
-		fp_copy(t4[1][0][0], ep_curve_get_b());
-
-		fp8_mul(t3, t3, t4);
-		/* E = (x1 + y1)^2 - A - B. */
-		fp8_add(t4, rx, ry);
-		fp8_sqr(t4, t4);
-		fp8_sub(t4, t4, t0);
-		fp8_sub(t4, t4, t1);
-
-		/* F = (y1 + z1)^2 - B - C. */
-		fp8_add(t5, ry, rz);
-		fp8_sqr(t5, t5);
-		fp8_sub(t5, t5, t1);
-		fp8_sub(t5, t5, t2);
-
-		/* G = 3D. */
-		fp8_dbl(t6, t3);
-		fp8_add(t6, t6, t3);
-
-		/* x3 = E * (B - G). */
-		fp8_sub(rx, t1, t6);
-		fp8_mul(rx, rx, t4);
-
-		/* y3 = (B + G)^2 -12D^2. */
-		fp8_add(t6, t6, t1);
-		fp8_sqr(t6, t6);
-		fp8_sqr(t2, t3);
-		fp8_dbl(ry, t2);
-		fp8_dbl(t2, ry);
-		fp8_dbl(ry, t2);
-		fp8_add(ry, ry, t2);
-		fp8_sub(ry, t6, ry);
-
-		/* z3 = 4B * F. */
-		fp8_dbl(rz, t1);
-		fp8_dbl(rz, rz);
-		fp8_mul(rz, rz, t5);
-
-		/* l11 = D - B. */
-		fp8_sub(l[0][0], t3, t1);
-
-		/* l10 = (3 * xp) * A. */
-		fp_mul(l[0][1][0][0][0], p->x, t0[0][0][0]);
-		fp_mul(l[0][1][0][0][1], p->x, t0[0][0][1]);
-		fp_mul(l[0][1][0][1][0], p->x, t0[0][1][0]);
-		fp_mul(l[0][1][0][1][1], p->x, t0[0][1][1]);
-		fp_mul(l[0][1][1][0][0], p->x, t0[1][0][0]);
-		fp_mul(l[0][1][1][0][1], p->x, t0[1][0][1]);
-		fp_mul(l[0][1][1][1][0], p->x, t0[1][1][0]);
-		fp_mul(l[0][1][1][1][1], p->x, t0[1][1][1]);
-
-		/* l00 = F * (-yp). */
-		fp_mul(l[1][1][0][0][0], p->y, t5[0][0][0]);
-		fp_mul(l[1][1][0][0][1], p->y, t5[0][0][1]);
-		fp_mul(l[1][1][0][1][0], p->y, t5[0][1][0]);
-		fp_mul(l[1][1][0][1][1], p->y, t5[0][1][1]);
-		fp_mul(l[1][1][1][0][0], p->y, t5[1][0][0]);
-		fp_mul(l[1][1][1][0][1], p->y, t5[1][0][1]);
-		fp_mul(l[1][1][1][1][0], p->y, t5[1][1][0]);
-		fp_mul(l[1][1][1][1][1], p->y, t5[1][1][1]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		fp8_free(t5);
-		fp8_free(t6);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k54.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k54.c
deleted file mode 100644
index c69ba29b0432..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k54.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 54.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void ep9_dbl_basic(fp9_t s, fp9_t rx, fp9_t ry) {
-	fp9_t t0, t1, t2;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-
-		/* t0 = 1/(2 * y1). */
-		fp9_dbl(t0, ry);
-		fp9_inv(t0, t0);
-
-		/* t1 = 3 * x1^2 + a. */
-		fp9_sqr(t1, rx);
-		fp9_copy(t2, t1);
-		fp9_dbl(t1, t1);
-		fp9_add(t1, t1, t2);
-
-		/* a = 0. */
-		/* t1 = (3 * x1^2 + a)/(2 * y1). */
-		fp9_mul(t1, t1, t0);
-
-		if (s != NULL) {
-			fp9_copy(s, t1);
-		}
-
-		/* t2 = t1^2. */
-		fp9_sqr(t2, t1);
-
-		/* x3 = t1^2 - 2 * x1. */
-		fp9_dbl(t0, rx);
-		fp9_sub(t0, t2, t0);
-
-		/* y3 = t1 * (x1 - x3) - y1. */
-		fp9_sub(t2, rx, t0);
-		fp9_mul(t1, t1, t2);
-
-		fp9_sub(ry, t1, ry);
-
-		fp9_copy(rx, t0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_dbl_k54_basic(fp54_t l, fp9_t rx, fp9_t ry, ep_t p) {
-	fp9_t s, tx, ty;
-
-	fp9_null(s);
-	fp9_null(tx);
-	fp9_null(ty);
-
-	RLC_TRY {
-		fp9_new(s);
-		fp9_new(tx);
-		fp9_new(ty);
-
-		fp9_copy(tx, rx);
-		fp9_copy(ty, ry);
-		ep9_dbl_basic(s, rx, ry);
-		fp54_zero(l);
-
-		fp_mul(l[2][0][0][0], p->x, s[0][0]);
-		fp_mul(l[2][0][0][1], p->x, s[0][1]);
-		fp_mul(l[2][0][0][2], p->x, s[0][2]);
-		fp_mul(l[2][0][1][0], p->x, s[1][0]);
-		fp_mul(l[2][0][1][1], p->x, s[1][1]);
-		fp_mul(l[2][0][1][2], p->x, s[1][2]);
-		fp_mul(l[2][0][2][0], p->x, s[2][0]);
-		fp_mul(l[2][0][2][1], p->x, s[2][1]);
-		fp_mul(l[2][0][2][2], p->x, s[2][2]);
-
-		fp9_mul(l[0][0], s, tx);
-		fp9_sub(l[0][0], ty, l[0][0]);
-
-		fp_copy(l[0][1][0][0], p->y);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(s);
-		fp9_free(tx);
-		fp9_free(ty);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-
-void pp_dbl_k54_projc(fp54_t l, fp9_t rx, fp9_t ry, fp9_t rz, ep_t p) {
-	fp9_t t0, t1, t2, t3, t4, t5, t6;
-
-	fp9_null(t0);
-	fp9_null(t1);
-	fp9_null(t2);
-	fp9_null(t3);
-	fp9_null(t4);
-	fp9_null(t5);
-	fp9_null(t6);
-
-	RLC_TRY {
-		fp9_new(t0);
-		fp9_new(t1);
-		fp9_new(t2);
-		fp9_new(t3);
-		fp9_new(t4);
-		fp9_new(t5);
-		fp9_new(t6);
-
-		/* A = x1^2. */
-		fp9_sqr(t0, rx);
-		/* B = y1^2. */
-		fp9_sqr(t1, ry);
-		/* C = z1^2. */
-		fp9_sqr(t2, rz);
-		/* D = 3bC, general b. */
-		fp9_dbl(t3, t2);
-		fp9_add(t3, t3, t2);
-		fp9_zero(t4);
-		fp_copy(t4[1][0], ep_curve_get_b());
-
-		fp9_mul(t3, t3, t4);
-		/* E = (x1 + y1)^2 - A - B. */
-		fp9_add(t4, rx, ry);
-		fp9_sqr(t4, t4);
-		fp9_sub(t4, t4, t0);
-		fp9_sub(t4, t4, t1);
-
-		/* F = (y1 + z1)^2 - B - C. */
-		fp9_add(t5, ry, rz);
-		fp9_sqr(t5, t5);
-		fp9_sub(t5, t5, t1);
-		fp9_sub(t5, t5, t2);
-
-		/* G = 3D. */
-		fp9_dbl(t6, t3);
-		fp9_add(t6, t6, t3);
-
-		/* x3 = E * (B - G). */
-		fp9_sub(rx, t1, t6);
-		fp9_mul(rx, rx, t4);
-
-		/* y3 = (B + G)^2 -12D^2. */
-		fp9_add(t6, t6, t1);
-		fp9_sqr(t6, t6);
-		fp9_sqr(t2, t3);
-		fp9_dbl(ry, t2);
-		fp9_dbl(t2, ry);
-		fp9_dbl(ry, t2);
-		fp9_add(ry, ry, t2);
-		fp9_sub(ry, t6, ry);
-
-		/* z3 = 4B * F. */
-		fp9_dbl(rz, t1);
-		fp9_dbl(rz, rz);
-		fp9_mul(rz, rz, t5);
-
-		/* l11 = D - B. */
-		fp9_sub(l[0][0], t3, t1);
-
-		/* l10 = (3 * xp) * A. */
-		fp_mul(l[2][0][0][0], p->x, t0[0][0]);
-		fp_mul(l[2][0][0][1], p->x, t0[0][1]);
-		fp_mul(l[2][0][0][2], p->x, t0[0][2]);
-		fp_mul(l[2][0][1][0], p->x, t0[1][0]);
-		fp_mul(l[2][0][1][1], p->x, t0[1][1]);
-		fp_mul(l[2][0][1][2], p->x, t0[1][2]);
-		fp_mul(l[2][0][2][0], p->x, t0[2][0]);
-		fp_mul(l[2][0][2][1], p->x, t0[2][1]);
-		fp_mul(l[2][0][2][2], p->x, t0[2][2]);
-
-		/* l00 = F * (-yp). */
-		fp_mul(l[0][1][0][0], p->y, t5[0][0]);
-		fp_mul(l[0][1][0][1], p->y, t5[0][1]);
-		fp_mul(l[0][1][0][2], p->y, t5[0][2]);
-		fp_mul(l[0][1][1][0], p->y, t5[1][0]);
-		fp_mul(l[0][1][1][1], p->y, t5[1][1]);
-		fp_mul(l[0][1][1][2], p->y, t5[1][2]);
-		fp_mul(l[0][1][2][0], p->y, t5[2][0]);
-		fp_mul(l[0][1][2][1], p->y, t5[2][1]);
-		fp_mul(l[0][1][2][2], p->y, t5[2][2]);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp9_free(t0);
-		fp9_free(t1);
-		fp9_free(t2);
-		fp9_free(t3);
-		fp9_free(t4);
-		fp9_free(t5);
-		fp9_free(t6);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k8.c b/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k8.c
deleted file mode 100644
index fa0b8af5e430..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_dbl_k8.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of Miller doubling for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_fp_low.h"
-#include "relic_fpx_low.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if EP_ADD == BASIC || !defined(STRIP)
-
-void pp_dbl_k8_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t s;
-	ep2_t t;
-	int one = 1, zero = 0;
-
-	fp2_null(s);
-	ep2_null(t);
-
-	RLC_TRY {
-		fp2_new(s);
-		ep2_new(t);
-		ep2_copy(t, q);
-		ep2_dbl_slp_basic(r, s, q);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		fp_mul(l[one][zero][0], s[0], p->x);
-		fp_mul(l[one][zero][1], s[1], p->x);
-		fp2_mul(l[one][one], s, t->x);
-		fp2_sub(l[one][one], t->y, l[one][one]);
-		fp_copy(l[zero][zero][0], p->y);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(s);
-		ep2_free(t);
-	}
-}
-
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-
-#if PP_EXT == BASIC || !defined(STRIP)
-
-void pp_dbl_k8_projc_new(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = z2 = z1^2, t1 = y1^2, t2 = x1*t1. */
-		fp2_sqr(t0, q->z);
-		fp2_sqr(t1, q->y);
-		fp2_mul(t2, q->x, t1);
-
-		/* t3 = 3/2*x1^2 + (a = 2)/2*Z2^2. */
-		fp2_sqr(t3, q->x);
-		fp_hlv(t4[0], t3[0]);
-		fp_hlv(t4[1], t3[1]);
-		fp2_add(t3, t3, t4);
-		fp2_sqr(t4, t0);
-		fp2_mul_art(t4, t4);
-		fp2_add(t3, t3, t4);
-
-		/* z3 := z1*y1, l := z3*z2*yP + (t3*x1 - t1) + t3*z2*xP. */
-		fp2_mul(r->z, q->y, q->z);
-		fp2_mul(l[one][one], t3, q->x);
-		fp2_sub(l[one][one], l[one][one], t1);
-		fp2_mul(l[zero][zero], r->z, t0);
-		fp_mul(l[zero][zero][0], l[zero][zero][0], p->y);
-		fp_mul(l[zero][zero][1], l[zero][zero][1], p->y);
-		fp2_mul(l[one][zero], t3, t0);
-		fp_mul(l[one][zero][0], l[one][zero][0], p->x);
-		fp_mul(l[one][zero][1], l[one][zero][1], p->x);
-
-		/* x3 := t3^2 - 2*t2. */
-		fp2_sqr(r->x, t3);
-		fp2_sub(r->x, r->x, t2);
-		fp2_sub(r->x, r->x, t2);
-		/* y3 := t3*(t2 - x3) - t1^2. */
-		fp2_sub(t2, t2, r->x);
-		fp2_mul(r->y, t3, t2);
-		fp2_sqr(t1, t1);
-		fp2_sub(r->y, r->y, t1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-	}
-}
-
-void pp_dbl_k8_projc_basic(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = A = X1^2, t1 = B = Y1^2, t2 = C = Z1^2, t3 = D = a*C. */
-		fp2_sqr(t0, q->x);
-		fp2_sqr(t1, q->y);
-		fp2_sqr(t2, q->z);
-		switch (ep_curve_opt_a()) {
-			case RLC_ZERO:
-				fp2_zero(t3);
-				break;
-			case RLC_ONE:
-				fp2_copy(t3, t2);
-				break;
-#if FP_RDC != MONTY
-			case RLC_TINY:
-				fp_mul_dig(t3[0], t2[0], ep_curve_get_a()[0]);
-				fp_mul_dig(t3[1], t2[1], ep_curve_get_a()[0]);
-				break;
-#endif
-			default:
-				fp_mul(t3[0], t2[0], ep_curve_get_a());
-				fp_mul(t3[1], t2[1], ep_curve_get_a());
-				break;
-		}
-		fp2_mul_art(t3, t3);
-
-		/* x3 = (A - D)^2, l11 = (A - D + x1)^2 - x3 - A. */
-		fp2_sub(t5, t0, t3);
-		fp2_add(l[one][one], t5, q->x);
-		fp2_sqr(r->x, t5);
-		fp2_sqr(l[one][one], l[one][one]);
-		fp2_sub(l[one][one], l[one][one], r->x);
-		fp2_sub(l[one][one], l[one][one], t0);
-
-		/* l10 := -xp*z1*2*(3A + D). */
-		fp2_add(t6, t0, t3);
-		fp2_dbl(t0, t0);
-		fp2_add(t0, t0, t6);
-		fp2_dbl(t0, t0);
-		fp2_mul(l[one][zero], t0, q->z);
-		fp_mul(l[one][zero][0], l[one][zero][0], p->x);
-		fp_mul(l[one][zero][1], l[one][zero][1], p->x);
-
-		/* l01 = 2*((y1 + z1)^2 - B - C)*yP. */
-		fp2_add(l[zero][zero], q->y, q->z);
-		fp2_sqr(l[zero][zero], l[zero][zero]);
-		fp2_sub(l[zero][zero], l[zero][zero], t1);
-		fp2_sub(l[zero][zero], l[zero][zero], t2);
-		fp2_dbl(l[zero][zero], l[zero][zero]);
-		fp_mul(l[zero][zero][0], l[zero][zero][0], p->y);
-		fp_mul(l[zero][zero][1], l[zero][zero][1], p->y);
-
-		/* t4 = E = 2*(A + D)^2 - x3. */
-		fp2_sqr(t4, t6);
-		fp2_dbl(t4, t4);
-		fp2_sub(t4, t4, r->x);
-		/* y3 = E * ((A - D + y1)^2 - B - x3). */
-		fp2_add(r->y, t5, q->y);
-		fp2_sqr(r->y, r->y);
-		fp2_sub(r->y, r->y, t1);
-		fp2_sub(r->y, r->y, r->x);
-		fp2_mul(r->y, r->y, t4);
-		/* z3 = 4*B. */
-		fp2_dbl(r->z, t1);
-		fp2_dbl(r->z, r->z);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-	}
-}
-
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-
-void pp_dbl_k8_projc_lazyr(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3, t4, t5, t6;
-	dv2_t u0, u1;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	fp2_null(t4);
-	fp2_null(t5);
-	fp2_null(t6);
-	dv2_null(u0);
-	dv2_null(u1);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		fp2_new(t4);
-		fp2_new(t5);
-		fp2_new(t6);
-		dv2_new(u0);
-		dv2_new(u1);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = A = X1^2, t1 = B = Y1^2, t2 = C = Z1^2, t3 = D = a*C. */
-		fp2_sqr(t0, q->x);
-		fp2_sqr(t1, q->y);
-		fp2_sqr(t2, q->z);
-		switch (ep_curve_opt_a()) {
-			case RLC_ZERO:
-				fp2_zero(t3);
-				break;
-			case RLC_ONE:
-				fp2_copy(t3, t2);
-				break;
-			case RLC_TWO:
-				fp2_dbl(t3, t2);
-				break;
-#if FP_RDC != MONTY
-			case RLC_TINY:
-				fp_mul_dig(t3[0], t2[0], ep_curve_get_a()[0]);
-				fp_mul_dig(t3[1], t2[1], ep_curve_get_a()[0]);
-				break;
-#endif
-			default:
-				fp_mul(t3[0], t2[0], ep_curve_get_a());
-				fp_mul(t3[1], t2[1], ep_curve_get_a());
-				break;
-		}
-		fp2_mul_art(t3, t3);
-
-		/* x3 = (A - D)^2, l11 = (A - D + x1)^2 - x3 - A. */
-		fp2_sub(t5, t0, t3);
-		fp2_add(l[one][one], t5, q->x);
-		fp2_sqr(r->x, t5);
-		fp2_sqr(l[one][one], l[one][one]);
-		fp2_sub(l[one][one], l[one][one], r->x);
-		fp2_sub(l[one][one], l[one][one], t0);
-
-		/* l10 := -xp*z1*2*(3A + D). */
-		fp2_add(t6, t0, t3);
-		fp2_dbl(t0, t0);
-		fp2_add(t0, t0, t6);
-		fp2_dbl(t0, t0);
-		fp2_mul(l[one][zero], t0, q->z);
-		fp_mul(l[one][zero][0], l[one][zero][0], p->x);
-		fp_mul(l[one][zero][1], l[one][zero][1], p->x);
-
-		/* l01 = 2*yP*((y1 + z1)^2 - B - C). */
-		fp2_add(l[zero][zero], q->y, q->z);
-		fp2_sqr(l[zero][zero], l[zero][zero]);
-		fp2_sub(l[zero][zero], l[zero][zero], t1);
-		fp2_sub(l[zero][zero], l[zero][zero], t2);
-		fp2_dbl(l[zero][zero], l[zero][zero]);
-		fp_mul(l[zero][zero][0], l[zero][zero][0], p->y);
-		fp_mul(l[zero][zero][1], l[zero][zero][1], p->y);
-
-		/* t4 = E = 2*(A + D)^2 - x3. */
-		fp2_sqr(t4, t6);
-		fp2_dbl(t4, t4);
-		fp2_sub(t4, t4, r->x);
-		/* y3 = E * ((A - D + y1)^2 - B - x3). */
-		fp2_add(r->y, t5, q->y);
-		fp2_sqr(r->y, r->y);
-		fp2_sub(r->y, r->y, t1);
-		fp2_sub(r->y, r->y, r->x);
-		fp2_mul(r->y, r->y, t4);
-		/* z3 = 4*B. */
-		fp2_dbl(r->z, t1);
-		fp2_dbl(r->z, r->z);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-		fp2_free(t4);
-		fp2_free(t5);
-		fp2_free(t6);
-		dv2_free(u0);
-		dv2_free(u1)
-	}
-}
-
-void pp_dbl_k8_projc_lazyr_new(fp8_t l, ep2_t r, ep2_t q, ep_t p) {
-	fp2_t t0, t1, t2, t3;
-	dv2_t u2, u3;
-	int one = 1, zero = 0;
-
-	fp2_null(t0);
-	fp2_null(t1);
-	fp2_null(t2);
-	fp2_null(t3);
-	dv2_null(u2);
-	dv2_null(u3);
-
-	RLC_TRY {
-		fp2_new(t0);
-		fp2_new(t1);
-		fp2_new(t2);
-		fp2_new(t3);
-		dv2_new(u2);
-		dv2_new(u3);
-
-		if (ep2_curve_is_twist() == RLC_EP_MTYPE) {
-			one ^= 1;
-			zero ^= 1;
-		}
-
-		/* t0 = z2 = z1^2, t1 = y1^2. */
-		fp2_sqr(t0, q->z);
-		fp2_sqr(t1, q->y);
-
-		/* t3 = 3/2*x1^2 + (a = 2)/2*z2^2, t2 = x1*t1. */
-		fp2_sqrn_low(u3, q->x);
-		fp_hlvd_low(u2[0], u3[0]);
-		fp_hlvd_low(u2[1], u3[1]);
-		fp2_addc_low(u3, u3, u2);
-		fp2_sqrn_low(u2, t0);
-		fp2_nord_low(u2, u2);
-		fp2_addc_low(u3, u3, u2);
-		fp2_rdcn_low(t3, u3);
-
-		/* z3 := z1*y1, l := z3*z2*yP + (t3*x1 - t1) + t3*z2*xP. */
-		fp2_mul(r->z, q->y, q->z);
-		fp2_mul(l[one][one], t3, q->x);
-		fp2_sub(l[one][one], l[one][one], t1);
-		fp2_mul(l[zero][zero], r->z, t0);
-		fp_mul(l[zero][zero][0], l[zero][zero][0], p->y);
-		fp_mul(l[zero][zero][1], l[zero][zero][1], p->y);
-		fp2_mul(l[one][zero], t3, t0);
-		fp_mul(l[one][zero][0], l[one][zero][0], p->x);
-		fp_mul(l[one][zero][1], l[one][zero][1], p->x);
-
-		/* x3 := t3^2 - 2*t2. */
-		fp2_muln_low(u2, q->x, t1);
-		fp2_sqrn_low(u3, t3);
-		fp2_subc_low(u3, u3, u2);
-		fp2_subc_low(u3, u3, u2);
-		fp2_rdcn_low(r->x, u3);
-		fp2_rdcn_low(t2, u2);
-		/* y3 := t3*(t2 - x3) - t1^2. */
-		fp2_sub(t2, t2, r->x);
-		fp2_muln_low(u3, t3, t2);
-		fp2_sqrn_low(u2, t1);
-		fp2_subc_low(u3, u3, u2);
-		fp2_rdcn_low(r->y, u3);
-		/* t2 - x3 = t3*(3*t2 - t3^2). */
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(t0);
-		fp2_free(t1);
-		fp2_free(t2);
-		fp2_free(t3);
-	}
-}
-
-#endif
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k12.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k12.c
deleted file mode 100644
index 91353402b6bf..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k12.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 12.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Computes the final exponentiation of a pairing defined over a Barreto-Naehrig
- * curve.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-static void pp_exp_bn(fp12_t c, fp12_t a) {
-	fp12_t t0, t1, t2, t3;
-	bn_t x;
-	const int *b;
-	int l;
-
-	fp12_null(t0);
-	fp12_null(t1);
-	fp12_null(t2);
-	fp12_null(t3);
-	bn_null(x);
-
-	RLC_TRY {
-		fp12_new(t0);
-		fp12_new(t1);
-		fp12_new(t2);
-		fp12_new(t3);
-		bn_new(x);
-
-		/*
-		 * New final exponentiation following Fuentes-Castañeda, Knapp and
-		 * Rodríguez-Henríquez: Fast Hashing to G_2.
-		 */
-		fp_prime_get_par(x);
-		b = fp_prime_get_par_sps(&l);
-
-		/* First, compute m = f^(p^6 - 1)(p^2 + 1). */
-		fp12_conv_cyc(c, a);
-
-		/* Now compute m^((p^4 - p^2 + 1) / r). */
-		/* t0 = m^2x. */
-		fp12_exp_cyc_sps(t0, c, b, l, RLC_POS);
-		fp12_sqr_cyc(t0, t0);
-		/* t1 = m^6x. */
-		fp12_sqr_cyc(t1, t0);
-		fp12_mul(t1, t1, t0);
-		/* t2 = m^6x^2. */
-		fp12_exp_cyc_sps(t2, t1, b, l, RLC_POS);
-		/* t3 = m^12x^3. */
-		fp12_sqr_cyc(t3, t2);
-		fp12_exp_cyc_sps(t3, t3, b, l, RLC_POS);
-
-		if (bn_sign(x) == RLC_NEG) {
-			fp12_inv_cyc(t0, t0);
-			fp12_inv_cyc(t1, t1);
-			fp12_inv_cyc(t3, t3);
-		}
-
-		/* t3 = a = m^12x^3 * m^6x^2 * m^6x. */
-		fp12_mul(t3, t3, t2);
-		fp12_mul(t3, t3, t1);
-
-		/* t0 = b = 1/(m^2x) * t3. */
-		fp12_inv_cyc(t0, t0);
-		fp12_mul(t0, t0, t3);
-
-		/* Compute t2 * t3 * m * b^p * a^p^2 * [b * 1/m]^p^3. */
-		fp12_mul(t2, t2, t3);
-		fp12_mul(t2, t2, c);
-		fp12_inv_cyc(c, c);
-		fp12_mul(c, c, t0);
-		fp12_frb(c, c, 3);
-		fp12_mul(c, c, t2);
-		fp12_frb(t0, t0, 1);
-		fp12_mul(c, c, t0);
-		fp12_frb(t3, t3, 2);
-		fp12_mul(c, c, t3);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(t0);
-		fp12_free(t1);
-		fp12_free(t2);
-		fp12_free(t3);
-		bn_free(x);
-	}
-}
-
-/**
- * Computes the final exponentiation of a pairing defined over a
- * Barreto-Lynn-Scott curve.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the extension field element to exponentiate.
- */
-static void pp_exp_b12(fp12_t c, fp12_t a) {
-	fp12_t t0, t1, t2, t3;
-	bn_t x;
-	const int *b;
-	int l;
-
-	fp12_null(t0);
-	fp12_null(t1);
-	fp12_null(t2);
-	fp12_null(t3);
-	bn_null(x);
-
-	RLC_TRY {
-		fp12_new(t0);
-		fp12_new(t1);
-		fp12_new(t2);
-		fp12_new(t3);
-		bn_new(x);
-
-		/*
-		 * Final exponentiation following Ghammam and Fouotsa:
-		 * On the Computation of Optimal Ate Pairing at the 192-bit Level.
-		 */
-		fp_prime_get_par(x);
-		b = fp_prime_get_par_sps(&l);
-
-		/* First, compute m^(p^6 - 1)(p^2 + 1). */
-		fp12_conv_cyc(c, a);
-
-		/* Now compute m^((p^4 - p^2 + 1) / r). */
-		/* t0 = f^2. */
-		fp12_sqr_cyc(t0, c);
-
-		/* t1 = f^x. */
-		fp12_exp_cyc_sps(t1, c, b, l, bn_sign(x));
-
-		/* t2 = f^(x^2). */
-		fp12_exp_cyc_sps(t2, t1, b, l, bn_sign(x));
-
-		/* t1 = t2/(t1^2 * f). */
-		fp12_inv_cyc(t3, c);
-		fp12_sqr_cyc(t1, t1);
-		fp12_mul(t1, t1, t3);
-		fp12_inv_cyc(t1, t1);
-		fp12_mul(t1, t1, t2);
-
-		/* t2 = t1^x. */
-		fp12_exp_cyc_sps(t2, t1, b, l, bn_sign(x));
-
-		/* t3 = t2^x/t1. */
-		fp12_exp_cyc_sps(t3, t2, b, l, bn_sign(x));
-		fp12_inv_cyc(t1, t1);
-		fp12_mul(t3, t1, t3);
-
-		/* t1 = t1^(-p^3 ) * t2^(p^2). */
-		fp12_inv_cyc(t1, t1);
-		fp12_frb(t1, t1, 3);
-		fp12_frb(t2, t2, 2);
-		fp12_mul(t1, t1, t2);
-
-		/* t2 = f * f^2 * t3^x. */
-		fp12_exp_cyc_sps(t2, t3, b, l, bn_sign(x));
-		fp12_mul(t2, t2, t0);
-		fp12_mul(t2, t2, c);
-
-		/* Compute t1 * t2 * t3^p. */
-		fp12_mul(t1, t1, t2);
-		fp12_frb(t2, t3, 1);
-		fp12_mul(c, t1, t2);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(t0);
-		fp12_free(t1);
-		fp12_free(t2);
-		fp12_free(t3);
-		bn_free(x);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_exp_k12(fp12_t c, fp12_t a) {
-	switch (ep_curve_is_pairf()) {
-		case EP_BN:
-			pp_exp_bn(c, a);
-			break;
-		case EP_B12:
-			pp_exp_b12(c, a);
-			break;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k2.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k2.c
deleted file mode 100644
index e9063ecae9d1..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k2.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_exp_k2(fp2_t c, fp2_t a) {
-	bn_t e, n;
-
-	bn_null(n);
-	bn_null(e);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(e);
-
-		ep_curve_get_ord(n);
-
-		fp2_conv_cyc(c, a);
-		dv_copy(e->dp, fp_prime_get(), RLC_FP_DIGS);
-		e->used = RLC_FP_DIGS;
-		e->sign = RLC_POS;
-		bn_add_dig(e, e, 1);
-		bn_div(e, e, n);
-		fp2_exp_cyc(c, c, e);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(n);
-		bn_free(e);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k24.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k24.c
deleted file mode 100644
index 7f075d680040..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k24.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 24.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_exp_k24(fp24_t c, fp24_t a) {
-	fp24_t t[8];
-	const int *b;
-	bn_t x;
-	int l;
-
-	bn_null(x);
-
-	RLC_TRY {
-		bn_new(x);
-		for (int i = 0; i < 8; i++) {
-			fp24_null(t[i]);
-			fp24_new(t[i]);
-		}
-
-		fp_prime_get_par(x);
-		b = fp_prime_get_par_sps(&l);
-		/* First, compute m^(p^12 - 1)(p^4 + 1). */
-		fp24_conv_cyc(c, a);
-
-		/* v7 = f^x. */
-		fp24_exp_cyc_sps(t[7], c, b, l, bn_sign(x));
-
-		/* v6 = f^(-2x + 1). */
-		fp24_sqr_cyc(t[6], t[7]);
-		fp24_inv_cyc(t[6], t[6]);
-		fp24_mul(t[6], t[6], c);
-
-		/* v7 = f^(x^2 - 2x + 1). */
-		fp24_exp_cyc_sps(t[7], t[7], b, l, bn_sign(x));
-		fp24_mul(t[7], t[7], t[6]);
-
-		fp24_exp_cyc_sps(t[6], t[7], b, l, bn_sign(x));
-
-		fp24_exp_cyc_sps(t[5], t[6], b, l, bn_sign(x));
-
-		fp24_exp_cyc_sps(t[4], t[5], b, l, bn_sign(x));
-
-		fp24_exp_cyc_sps(t[3], t[4], b, l, bn_sign(x));
-		fp24_inv_cyc(t[2], t[7]);
-		fp24_mul(t[3], t[3], t[2]);
-
-		fp24_exp_cyc_sps(t[2], t[3], b, l, bn_sign(x));
-
-		fp24_exp_cyc_sps(t[1], t[2], b, l, bn_sign(x));
-
-		/* c = c^3. */
-		fp24_sqr_cyc(t[0], c);
-		fp24_mul(c, c, t[0]);
-
-		fp24_exp_cyc_sps(t[0], t[1], b, l, bn_sign(x));
-
-		fp24_mul(c, c, t[0]);
-		for (int i = 1; i < 8; i++) {
-			fp24_frb(t[i], t[i], i);
-			fp24_mul(c, c, t[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(x);
-		for (int i = 0; i < 8; i++) {
-			fp24_free(t[i]);
-		}
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k48.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k48.c
deleted file mode 100644
index 1c8074bdb9d3..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k48.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 48.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_exp_k48(fp48_t c, fp48_t a) {
-	bn_t x;
-	const int *b;
-	fp48_t t0, t1, t2, t3;
-	int l;
-
-	fp48_null(t0);
-	fp48_null(t1);
-	fp48_null(t2);
-	fp48_null(t3);
-	bn_null(x);
-
-	RLC_TRY {
-		fp48_new(t0);
-		fp48_new(t1);
-		fp48_new(t2);
-		fp48_new(t3);
-		bn_new(x);
-
-		/*
-		 * Final exponentiation following Ghammam and Fouotsa:
-		 * On the Computation of Optimal Ate Pairing at the 192-bit Level.
-		 */
-		fp_prime_get_par(x);
-		b = fp_prime_get_par_sps(&l);
-		/* First, compute m^(p^24 - 1)(p^8 + 1). */
-		fp48_conv_cyc(c, a);
-
-		/* Now compute m^((p^16 - p^8 + 1) / r). */
-		/*k0 + k1^p + k2^p2 + k3^p3 + k4^p4 + k5^p5 + k6^p6 +
-		 * k7^p7 + k8^p8 + k9^p9 + k10^p10 + k11^p11 + k12^p12 +
-		 * k13^p13 + k14p^14 + k15p^15.
-		 * 
-		 * k15 = (x - 1)^2 , k14 = xk15, k13 = xk14, k12 = xk13, k11 = xk12,
-		 * k10 = xk11, k9 = xk10, k8 = xk9 , k7 = xk8 - k15, k6 = xk7, k5 = xk6,
-		 * k4 = xk5, k3 = xk4, k2 = xk3, k1 = xk2 , k0 = xk1 + 3 */
-
-		/* t2 = c^k15, t3 = t2^p^15. */
-		fp48_exp_cyc_sps(t0, c, b, l, bn_sign(x));
-		fp48_inv_cyc(t1, c);
-		fp48_mul(t0, t0, t1);
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_inv_cyc(t2, t0);
-		fp48_mul(t2, t1, t2);
-		/* t3 = c^3 (for handling part of k0). */
-		fp48_sqr_cyc(t3, c);
-		fp48_mul(c, c, t3);
-		fp48_frb(t3, t2, 15);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^k14, t3 = t0^p^14. */
-		fp48_exp_cyc_sps(t0, t2, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 14);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^x13, t3 = t1^p^13. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 13);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^x12, t3 = t0^p^12. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 12);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^x11, t3 = t0^p^11. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 11);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^x10, t3 = t1^p^10. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 10);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^x9, t3 = t0^p^9. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 9);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^x8, t3 = t1^p^8. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 8);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^(xk8 - k15), t3 = t1^p^7. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_inv_cyc(t2, t2);
-		fp48_mul(t1, t1, t2);
-		fp48_frb(t3, t1, 7);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^xk7, t3 = t0^p^6. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 6);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^xk6, t3 = t1^p^5. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 5);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^xk5, t3 = t0^p^4. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 4);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^xk4, t3 = t0^p^3. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 3);
-		fp48_mul(c, c, t3);
-
-		/* t0 = c^xk3, t3 = t0^p^2. */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_frb(t3, t0, 2);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^xk2, t3 = t1^p. */
-		fp48_exp_cyc_sps(t1, t0, b, l, bn_sign(x));
-		fp48_frb(t3, t1, 1);
-		fp48_mul(c, c, t3);
-
-		/* t1 = c^(xk1). */
-		fp48_exp_cyc_sps(t0, t1, b, l, bn_sign(x));
-		fp48_mul(c, c, t0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp48_free(t0);
-		fp48_free(t1);
-		fp48_free(t2);
-		fp48_free(t3);
-		bn_free(x);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k54.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k54.c
deleted file mode 100644
index 2c2a62a5b028..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k54.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 54.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-
-void pp_exp_k54(fp54_t c, fp54_t a) {
-	bn_t x;
-	const int *b;
-	fp54_t t0, t1, t2, t3, t4, t5, t6, t;
-	int l;
-
-	fp54_null(t0);
-	fp54_null(t1);
-	fp54_null(t2);
-	fp54_null(t3);
-	fp54_null(t4);
-	fp54_null(t5);
-	fp54_null(t6);
-	fp54_null(t);
-	bn_null(x);
-
-	RLC_TRY {
-		fp54_new(t0);
-		fp54_new(t1);
-		fp54_new(t2);
-		fp54_new(t3);
-		fp54_new(t4);
-		fp54_new(t5);
-		fp54_new(t6);
-		fp54_new(t);
-		bn_new(x);
-
-		fp_prime_get_par(x);
-		b = fp_prime_get_par_sps(&l);
-
-		/* First, compute m^(p^27 - 1)(p^9 + 1). */
-		fp54_conv_cyc(c, a);
-
-		/* Now compute m^((p^18 - p^9 + 1) / r). */
-		/*k0 + k1*p + k2*p^2 + k3*p^3 + k4*p^4 + k5*p^5 + k6*p^6 + k7*p^7 +
-		 * k8*p^8 + k9*p^9 + k10*p^10 + k11*p^11 + k12*p^12 + k13*p^13 + k14*p^14 +
-		 * k15*p^15 + k16*p^16 + k17*p^17
-		 *
-		 * k17:=3*x^2+3*x+1; k4:=9*x^4*k17; k11:=-3*x^2*k4; k8:=-9*x^3*k11+k17+3*x
-		 * k16:=x*k8-x*k17; k7:=-2*k16-3*x*k17; k6:=3*x^2*k8+3*x^2*k17;
-		 * k5:=-x*k6-3*x^3*k17; k15:=3*x^2*k17-k6; k13:=3*x*k5+k4;
-		 * k12:=x*k4-x*k13; k3:=k12-3*x*k4; k14:=3*x^3*k17-2*x*k15;
-		 * k2:=-3*x*k3-3*x^2*k4; k10:=x*k2-x*k11; k9:=-3*x*k10-3*x^2*k11-2;
-		 * k1:=-2*x*k2-x*k11; k0:=3*x^2*k11-k9-1; */
-
-		/* t2 = k17 = 3*x^2+3*x+1, t3 = 3*x. */
-		fp54_exp_cyc_sps(t0, c, b, l, bn_sign(x));
-		fp54_sqr_cyc(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_copy(t3, t0);
-		fp54_exp_cyc_sps(t, t0, b, l, bn_sign(x));
-		fp54_mul(t0, t0, c);
-		fp54_copy(t6, c);
-		fp54_mul(t2, t0, t);
-		fp54_frb(c, t2, 17);
-
-		/* t4 = k4 = 9*x^4*k17. */
-		fp54_exp_cyc_sps(t, t2, b, l, bn_sign(x));
-		fp54_sqr_cyc(t0, t);
-		fp54_mul(t0, t0, t);
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr_cyc(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_copy(t4, t0);
-		fp54_frb(t, t0, 4);
-		fp54_mul(c, c, t);
-
-		/* t0 = t5 = k11 = -3*x^2*k4, t1 = x*k4. */
-		fp54_exp_cyc_sps(t1, t4, b, l, bn_sign(x));
-		fp54_sqr_cyc(t0, t1);
-		fp54_mul(t0, t0, t1);
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_inv_cyc(t0, t0);
-		fp54_copy(t5, t0);
-		fp54_frb(t, t0, 11);
-		fp54_mul(c, c, t);
-
-		/* t0 = k8 = -9*x^3*k11 + k17 + 3*x. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr_cyc(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr_cyc(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_inv_cyc(t0, t0);
-		fp54_mul(t0, t0, t2);
-		fp54_mul(t0, t0, t3);
-		fp54_frb(t, t0, 8);
-		fp54_mul(c, c, t);
-
-		/* t0 = k16 = x*k8 - x*k17, t3 = x*k8, t2 = x*k17. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_exp_cyc_sps(t2, t2, b, l, bn_sign(x));
-		fp54_copy(t3, t0);
-		fp54_inv_cyc(t2, t2);
-		fp54_mul(t0, t0, t2);
-		fp54_frb(t, t0, 16);
-		fp54_mul(c, c, t);
-
-		/* t0 = k7 = -2*k16 - 3*x*k17, t2 = 3*x*k17. */
-		fp54_sqr_cyc(t0, t0);
-		fp54_inv_cyc(t0, t0);
-		fp54_sqr_cyc(t, t2);
-		fp54_mul(t2, t2, t);
-		fp54_mul(t0, t0, t2);
-		fp54_frb(t, t0, 7);
-		fp54_mul(c, c, t);
-
-		/* t3 = k6 = 3*x^2*k8 + 3*x^2*k17, t2 = 3*x^2*k17. */
-		fp54_exp_cyc_sps(t3, t3, b, l, bn_sign(x));
-		fp54_inv_cyc(t2, t2);
-		fp54_exp_cyc_sps(t2, t2, b, l, bn_sign(x));
-		fp54_sqr(t0, t3);
-		fp54_mul(t3, t3, t0);
-		fp54_mul(t3, t3, t2);
-		fp54_frb(t, t3, 6);
-		fp54_mul(c, c, t);
-
-		/* k15 = 3*x^2*k17 - k6. */
-		fp54_inv_cyc(t0, t3);
-		fp54_mul(t0, t0, t2);
-		fp54_frb(t, t0, 15);
-		fp54_mul(c, c, t);
-
-		/* t3 = k5 = -x*k6 - 3*x^3*k17. */
-		fp54_exp_cyc_sps(t3, t3, b, l, bn_sign(x));
-		fp54_exp_cyc_sps(t2, t2, b, l, bn_sign(x));
-		fp54_mul(t3, t3, t2);
-		fp54_inv_cyc(t3, t3);
-		fp54_frb(t, t3, 5);
-		fp54_mul(c, c, t);
-
-		/* k14 = 3*x^3*k17 - 2*x*k15. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr_cyc(t0, t0);
-		fp54_inv_cyc(t0, t0);
-		fp54_mul(t0, t0, t2);
-		fp54_frb(t, t0, 14);
-		fp54_mul(c, c, t);
-
-		/* k13 = 3*x*k5 + k4. */
-		fp54_exp_cyc_sps(t3, t3, b, l, bn_sign(x));
-		fp54_sqr(t0, t3);
-		fp54_mul(t0, t0, t3);
-		fp54_mul(t0, t0, t4);
-		fp54_frb(t, t0, 13);
-		fp54_mul(c, c, t);
-
-		/* k12 = x*k4-x*k13. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_inv_cyc(t0, t0);
-		fp54_mul(t0, t0, t1);
-		fp54_frb(t, t0, 12);
-		fp54_mul(c, c, t);
-
-		/* k3 = k12-3*x*k4, t4 = 3*x*k4. */
-		fp54_sqr_cyc(t, t1);
-		fp54_mul(t4, t1, t);
-		fp54_inv_cyc(t4, t4);
-		fp54_mul(t0, t0, t4);
-		fp54_frb(t, t0, 3);
-		fp54_mul(c, c, t);
-
-		/* k2 = -3*x*k3 - 3*x^2*k4. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_inv_cyc(t0, t0);
-		fp54_mul(t2, t0, t5);
-		fp54_frb(t, t2, 2);
-		fp54_mul(c, c, t);
-
-		/* k10 = x*k2-x*k11. */
-		fp54_exp_cyc_sps(t0, t2, b, l, bn_sign(x));
-		fp54_exp_cyc_sps(t5, t5, b, l, bn_sign(x));
-		fp54_inv_cyc(t5, t5);
-		fp54_mul(t0, t0, t5);
-		fp54_frb(t, t0, 10);
-		fp54_mul(c, c, t);
-
-		/* k1 = -2*x*k2 - x*k11. */
-		fp54_exp_cyc_sps(t2, t2, b, l, bn_sign(x));
-		fp54_sqr_cyc(t2, t2);
-		fp54_inv_cyc(t2, t2);
-		fp54_mul(t2, t2, t5);
-		fp54_frb(t, t2, 1);
-		fp54_mul(c, c, t);
-
-		/* k9 = -3*x*k10 - 3*x^2*k11 - 2. */
-		fp54_exp_cyc_sps(t0, t0, b, l, bn_sign(x));
-		fp54_sqr(t, t0);
-		fp54_mul(t0, t0, t);
-		fp54_inv_cyc(t0, t0);
-		fp54_exp_cyc_sps(t5, t5, b, l, bn_sign(x));
-		fp54_sqr(t, t5);
-		fp54_mul(t5, t5, t);
-		fp54_mul(t0, t0, t5);
-		fp54_inv_cyc(t6, t6);
-		fp54_sqr_cyc(t, t6);
-		fp54_mul(t0, t0, t);
-		fp54_frb(t, t0, 9);
-		fp54_mul(c, c, t);
-
-		/* k0 = 3*x^2*k11 - k9 - 1. */
-		fp54_mul(t0, t0, t5);
-		fp54_inv_cyc(t0, t0);
-		fp54_mul(t0, t0, t6);
-		fp54_mul(c, c, t0);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp54_free(t0);
-		fp54_free(t1);
-		fp54_free(t2);
-		fp54_free(t3);
-		fp54_free(t4);
-		fp54_free(t5);
-		fp54_free(t6);
-		fp54_free(t);
-		bn_free(x);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k8.c b/src/dashbls/depends/relic/src/pp/relic_pp_exp_k8.c
deleted file mode 100644
index 089cdcbc76fa..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_exp_k8.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the final exponentiation for curves of embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_exp_k8(fp8_t c, fp8_t a) {
-	fp8_t t0, t1, t2, t3, t4;
-	bn_t x, t;
-
-	fp8_null(t0);
-	fp8_null(t1);
-	fp8_null(t2);
-	fp8_null(t3);
-	bn_null(x);
-	bn_null(t);
-
-	RLC_TRY {
-		fp8_new(t0);
-		fp8_new(t1);
-		fp8_new(t2);
-		fp8_new(t3);
-		fp8_new(t4);
-		bn_new(x);
-		bn_new(t);
-
-		fp_prime_get_par(x);
-
-		/* First, compute m = f^(p^4 - 1). */
-		fp8_conv_cyc(c, a);
-
-		/* Now compute d = m^(p + T)(p^2 + T^2). */
-		fp8_frb(t0, c, 1);
-		fp8_exp_cyc(t1, c, x);
-		fp8_mul(t0, t0, t1);
-		fp8_exp_cyc(t1, t0, x);
-		fp8_exp_cyc(t1, t1, x);
-		fp8_frb(t0, t0, 2);
-		fp8_mul(t0, t0, t1);
-
-		/* Now compute d^(p + T)/r. */
-		bn_set_dig(t, 0xdc);
-		bn_lsh(t, t, 8);
-		bn_add_dig(t, t, 0x4);
-		/* t1 = a_y = a^y, t2 = a_u = a^u */
-		fp8_exp_cyc(t1, t0, t);
-		fp8_copy(t2, t0);
-		/* t3 = a_q = a_y^y * a_u^u, b = a_q * !a_u. */
-		fp8_exp_cyc(t3, t1, t);
-		fp8_copy(t4, t2);
-		fp8_mul(t3, t3, t4);
-		fp8_inv_cyc(t2, t2);
-		fp8_mul(t4, t3, t2);
-
-		bn_rsh(x, x, 2);
-		/* b = (b^4 * a)^(T/4) * a_y. */
-		fp8_sqr_cyc(t4, t4);
-		fp8_sqr_cyc(t4, t4);
-		fp8_mul(t4, t4, t0);
-		fp8_exp_cyc(t4, t4, x);
-		fp8_mul(t4, t4, t1);
-
-		/* b = (b^4)^U * !a_y. */
-		fp8_sqr_cyc(t4, t4);
-		fp8_sqr_cyc(t4, t4);
-		fp8_exp_cyc(t4, t4, x);
-		fp8_inv_cyc(t1, t1);
-		fp8_mul(t4, t4, t1);
-
-		/* b = (b^4 * a)^(T/4) * !a_u * a. */
-		fp8_sqr_cyc(t4, t4);
-		fp8_sqr_cyc(t4, t4);
-		fp8_mul(t4, t4, t0);
-		fp8_exp_cyc(t4, t4, x);
-		fp8_mul(t4, t4, t2);
-		fp8_mul(t4, t4, t0);
-
-		/* b = (b^4)^U * a_q. */
-		fp8_sqr_cyc(t4, t4);
-		fp8_sqr_cyc(t4, t4);
-		fp8_exp_cyc(t4, t4, x);
-		fp8_mul(t4, t4, t3);
-
-		/* return f^(p^4 - 1)*(1 + (p + T)(p^2 + T^2)(p + T)/r) */
-		fp8_mul(c, c, t4);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(t0);
-		fp8_free(t1);
-		fp8_free(t2);
-		fp8_free(t3);
-		fp8_free(t4);
-		bn_free(x);
-		bn_free(t);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map.c b/src/dashbls/depends/relic/src/pp/relic_pp_map.c
deleted file mode 100644
index 389c13bda3e5..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairings over prime curves.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_map_init(void) {
-	ep2_curve_init();
-	ep4_curve_init();
-}
-
-void pp_map_clean(void) {
-	ep2_curve_clean();
-	ep4_curve_clean();
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k12.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k12.c
deleted file mode 100644
index 8f4f35ba6a35..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k12.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 12.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Compute the Miller loop for pairings of type G_2 x G_1 over the bits of a
- * given parameter represented in sparse form.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] q				- the vector of first arguments in affine coordinates.
- * @param[in] p				- the vector of second arguments in affine coordinates.
- * @param[in] n 			- the number of pairings to evaluate.
- * @param[in] a				- the loop parameter.
- */
-static void pp_mil_k12(fp12_t r, ep2_t *t, ep2_t *q, ep_t *p, int m, bn_t a) {
-	fp12_t l;
-	ep_t *_p = RLC_ALLOCA(ep_t, m);
-	ep2_t *_q = RLC_ALLOCA(ep2_t, m);
-	int i, j, len = bn_bits(a) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	if (m == 0) {
-		return;
-	}
-
-	fp12_null(l);
-
-	RLC_TRY {
-		fp12_new(l);
-		if (_p == NULL || _q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (j = 0; j < m; j++) {
-			ep_null(_p[j]);
-			ep2_null(_q[j]);
-			ep_new(_p[j]);
-			ep2_new(_q[j]);
-			ep2_copy(t[j], q[j]);
-			ep2_neg(_q[j], q[j]);
-#if EP_ADD == BASIC
-			ep_neg(_p[j], p[j]);
-#else
-			fp_add(_p[j]->x, p[j]->x, p[j]->x);
-			fp_add(_p[j]->x, _p[j]->x, p[j]->x);
-			fp_neg(_p[j]->y, p[j]->y);
-#endif
-		}
-
-		fp12_zero(l);
-		bn_rec_naf(s, &len, a, 2);
-		pp_dbl_k12(r, t[0], t[0], _p[0]);
-		for (j = 1; j < m; j++) {
-			pp_dbl_k12(l, t[j], t[j], _p[j]);
-			fp12_mul_dxs(r, r, l);
-		}
-		if (s[len - 2] > 0) {
-			for (j = 0; j < m; j++) {
-				pp_add_k12(l, t[j], q[j], p[j]);
-				fp12_mul_dxs(r, r, l);
-			}
-		}
-		if (s[len - 2] < 0) {
-			for (j = 0; j < m; j++) {
-				pp_add_k12(l, t[j], _q[j], p[j]);
-				fp12_mul_dxs(r, r, l);
-			}
-		}
-
-		for (i = len - 3; i >= 0; i--) {
-			fp12_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_k12(l, t[j], t[j], _p[j]);
-				fp12_mul_dxs(r, r, l);
-				if (s[i] > 0) {
-					pp_add_k12(l, t[j], q[j], p[j]);
-					fp12_mul_dxs(r, r, l);
-				}
-				if (s[i] < 0) {
-					pp_add_k12(l, t[j], _q[j], p[j]);
-					fp12_mul_dxs(r, r, l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(l);
-		for (j = 0; j < m; j++) {
-			ep_free(_p[j]);
-			ep2_free(_q[j]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-	}
-}
-
-/**
- * Compute the Miller loop for pairings of type G_1 x G_2 over the bits of a
- * given parameter.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] p				- the first pairing argument in affine coordinates.
- * @param[in] q				- the second pairing argument in affine coordinates.
- * @param[in] n 			- the number of pairings to evaluate.
- * @param[in] a				- the loop parameter.
- */
-static void pp_mil_lit_k12(fp12_t r, ep_t *t, ep_t *p, ep2_t *q, int m, bn_t a) {
-	fp12_t l;
-	ep2_t *_q = RLC_ALLOCA(ep2_t, m);
-	int j;
-
-	fp12_null(l);
-
-	RLC_TRY {
-		if (_q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		fp12_new(l);
-		for (j = 0; j < m; j++) {
-			ep2_null(_q[j]);
-			ep2_new(_q[j]);
-			ep_copy(t[j], p[j]);
-			ep2_neg(_q[j], q[j]);
-		}
-
-		fp12_zero(l);
-		for (int i = bn_bits(a) - 2; i >= 0; i--) {
-			fp12_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_lit_k12(l, t[j], t[j], _q[j]);
-				fp12_mul(r, r, l);
-				if (bn_get_bit(a, i)) {
-					pp_add_lit_k12(l, t[j], p[j], q[j]);
-					fp12_mul(r, r, l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(l);
-		for (j = 0; j < m; j++) {
-			ep2_free(_q[j]);
-		}
-		RLC_FREE(_q);
-	}
-}
-
-/**
- * Compute the final lines for optimal ate pairings.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] q				- the first point of the pairing, in G_2.
- * @param[in] p				- the second point of the pairing, in G_1.
- * @param[in] a				- the loop parameter.
- */
-static void pp_fin_k12_oatep(fp12_t r, ep2_t t, ep2_t q, ep_t p) {
-	ep2_t q1, q2;
-	fp12_t tmp;
-
-	fp12_null(tmp);
-	ep2_null(q1);
-	ep2_null(q2);
-
-	RLC_TRY {
-		ep2_new(q1);
-		ep2_new(q2);
-		fp12_new(tmp);
-		fp12_zero(tmp);
-
-		fp2_set_dig(q1->z, 1);
-		fp2_set_dig(q2->z, 1);
-
-		ep2_frb(q1, q, 1);
-		ep2_frb(q2, q, 2);
-		ep2_neg(q2, q2);
-
-		pp_add_k12(tmp, t, q1, p);
-		fp12_mul_dxs(r, r, tmp);
-		pp_add_k12(tmp, t, q2, p);
-		fp12_mul_dxs(r, r, tmp);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		fp12_free(tmp);
-		ep2_free(q1);
-		ep2_free(q2);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if PP_MAP == TATEP || !defined(STRIP)
-
-void pp_map_tatep_k12(fp12_t r, ep_t p, ep2_t q) {
-	ep_t _p[1], t[1];
-	ep2_t _q[1];
-	bn_t n;
-
-	ep_null(_p[0]);
-	ep_null(t[0]);
-	ep2_null(_q[0]);
-	bn_null(n);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep_new(t[0]);
-		ep2_new(_q[0]);
-		bn_new(n);
-
-		ep_norm(_p[0], p);
-		ep2_norm(_q[0], q);
-		ep_curve_get_ord(n);
-		fp12_set_dig(r, 1);
-
-		if (!ep_is_infty(p) && !ep2_is_infty(q)) {
-			pp_mil_lit_k12(r, t, _p, _q, 1, n);
-			pp_exp_k12(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep_free(t[0]);
-		ep2_free(_q[0]);
-		bn_free(n);
-	}
-}
-
-void pp_map_sim_tatep_k12(fp12_t r, ep_t *p, ep2_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m), *t = RLC_ALLOCA(ep_t, m);
-	ep2_t *_q = RLC_ALLOCA(ep2_t, m);
-	bn_t n;
-	int i, j;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		if (_p == NULL || _q == NULL || t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep_null(t[i]);
-			ep2_null(_q[i]);
-			ep_new(_p[i]);
-			ep_new(t[i]);
-			ep2_new(_q[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep2_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep2_norm(_q[j++], q[i]);
-			}
-		}
-
-		ep_curve_get_ord(n);
-		fp12_set_dig(r, 1);
-		if (j > 0) {
-			pp_mil_lit_k12(r, t, _p, _q, j, n);
-			pp_exp_k12(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep_free(t[i]);
-			ep2_free(_q[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(t);
-		RLC_FREE(_q);
-	}
-}
-
-#endif
-
-#if PP_MAP == WEILP || !defined(STRIP)
-
-void pp_map_weilp_k12(fp12_t r, ep_t p, ep2_t q) {
-	ep_t _p[1], t0[1];
-	ep2_t _q[1], t1[1];
-	fp12_t r0, r1;
-	bn_t n;
-
-	ep_null(_p[0]);
-	ep_null(t0[0]);
-	ep2_null(_q[0]);
-	ep2_null(t1[0]);
-	fp12_null(r0);
-	fp12_null(r1);
-	bn_null(n);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep_new(t0[0]);
-		ep2_new(_q[0]);
-		ep2_new(t1[0]);
-		fp12_new(r0);
-		fp12_new(r1);
-		bn_new(n);
-
-		ep_norm(_p[0], p);
-		ep2_norm(_q[0], q);
-		ep_curve_get_ord(n);
-		bn_sub_dig(n, n, 1);
-		fp12_set_dig(r0, 1);
-		fp12_set_dig(r1, 1);
-
-		if (!ep_is_infty(_p[0]) && !ep2_is_infty(_q[0])) {
-			pp_mil_lit_k12(r0, t0, _p, _q, 1, n);
-			pp_mil_k12(r1, t1, _q, _p, 1, n);
-			fp12_inv(r1, r1);
-			fp12_mul(r0, r0, r1);
-			fp12_inv(r1, r0);
-			fp12_inv_cyc(r0, r0);
-		}
-		fp12_mul(r, r0, r1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep_free(t0[0]);
-		ep2_free(_q[0]);
-		ep2_free(t1[0]);
-		fp12_free(r0);
-		fp12_free(r1);
-		bn_free(n);
-	}
-}
-
-void pp_map_sim_weilp_k12(fp12_t r, ep_t *p, ep2_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m), *t0 = RLC_ALLOCA(ep_t, m);
-	ep2_t *_q = RLC_ALLOCA(ep2_t, m), *t1 = RLC_ALLOCA(ep2_t, m);
-	fp12_t r0, r1;
-	bn_t n;
-	int i, j;
-
-	fp12_null(r0);
-	fp12_null(r1);
-	bn_null(n);
-
-	RLC_TRY {
-		fp12_new(r0);
-		fp12_new(r1);
-		bn_new(n);
-		if (_p == NULL || _q == NULL || t0 == NULL || t1 == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep_null(t0[i]);
-			ep2_null(_q[i]);
-			ep2_null(t1[i]);
-			ep_new(_p[i]);
-			ep_new(t0[i]);
-			ep2_new(_q[i]);
-			ep2_new(t1[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep2_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep2_norm(_q[j++], q[i]);
-			}
-		}
-
-		ep_curve_get_ord(n);
-		bn_sub_dig(n, n, 1);
-		fp12_set_dig(r0, 1);
-		fp12_set_dig(r1, 1);
-
-		if (j > 0) {
-			pp_mil_lit_k12(r0, t0, _p, _q, j, n);
-			pp_mil_k12(r1, t1, _q, _p, j, n);
-			fp12_inv(r1, r1);
-			fp12_mul(r0, r0, r1);
-			fp12_inv(r1, r0);
-			fp12_inv_cyc(r0, r0);
-		}
-		fp12_mul(r, r0, r1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp12_free(r0);
-		fp12_free(r1);
-		bn_free(n);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep_free(t0[i]);
-			ep2_free(_q[i]);
-			ep2_free(t1[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-		RLC_FREE(t0);
-		RLC_FREE(t1);
-	}
-}
-
-#endif
-
-#if PP_MAP == OATEP || !defined(STRIP)
-
-void pp_map_oatep_k12(fp12_t r, ep_t p, ep2_t q) {
-	ep_t _p[1];
-	ep2_t t[1], _q[1];
-	bn_t a;
-
-	ep_null(_p[0]);
-	ep2_null(_q[0]);
-	ep2_null(t[0]);
-	bn_null(a);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep2_new(_q[0]);
-		ep2_new(t[0]);
-		bn_new(a);
-
-		fp_prime_get_par(a);
-		fp12_set_dig(r, 1);
-
-		ep_norm(_p[0], p);
-		ep2_norm(_q[0], q);
-
-		if (!ep_is_infty(_p[0]) && !ep2_is_infty(_q[0])) {
-			switch (ep_curve_is_pairf()) {
-				case EP_BN:
-					bn_mul_dig(a, a, 6);
-					bn_add_dig(a, a, 2);
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k12(r, t, _q, _p, 1, a);
-					if (bn_sign(a) == RLC_NEG) {
-						/* f_{-a,Q}(P) = 1/f_{a,Q}(P). */
-						fp12_inv_cyc(r, r);
-						ep2_neg(t[0], t[0]);
-					}
-					pp_fin_k12_oatep(r, t[0], _q[0], _p[0]);
-					pp_exp_k12(r, r);
-					break;
-				case EP_B12:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k12(r, t, _q, _p, 1, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp12_inv_cyc(r, r);
-						ep2_neg(t[0], t[0]);
-					}
-					pp_exp_k12(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep2_free(_q[0]);
-		ep2_free(t[0]);
-		bn_free(a);
-	}
-}
-
-void pp_map_sim_oatep_k12(fp12_t r, ep_t *p, ep2_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m);
-	ep2_t *t = RLC_ALLOCA(ep2_t, m), *_q = RLC_ALLOCA(ep2_t, m);
-	bn_t a;
-	int i, j;
-
-	RLC_TRY {
-		bn_null(a);
-		bn_new(a);
-		if (_p == NULL || _q == NULL || t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep2_null(_q[i]);
-			ep2_null(t[i]);
-			ep_new(_p[i]);
-			ep2_new(_q[i]);
-			ep2_new(t[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep2_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep2_norm(_q[j++], q[i]);
-			}
-		}
-
-		fp_prime_get_par(a);
-		fp12_set_dig(r, 1);
-
-		if (j > 0) {
-			switch (ep_curve_is_pairf()) {
-				case EP_BN:
-					bn_mul_dig(a, a, 6);
-					bn_add_dig(a, a, 2);
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k12(r, t, _q, _p, j, a);
-					if (bn_sign(a) == RLC_NEG) {
-						/* f_{-a,Q}(P) = 1/f_{a,Q}(P). */
-						fp12_inv_cyc(r, r);
-					}
-					for (i = 0; i < j; i++) {
-						if (bn_sign(a) == RLC_NEG) {
-							ep2_neg(t[i], t[i]);
-						}
-						pp_fin_k12_oatep(r, t[i], _q[i], _p[i]);
-					}
-					pp_exp_k12(r, r);
-					break;
-				case EP_B12:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k12(r, t, _q, _p, j, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp12_inv_cyc(r, r);
-					}
-					pp_exp_k12(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep2_free(_q[i]);
-			ep2_free(t[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-		RLC_FREE(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k2.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k2.c
deleted file mode 100644
index f4dbabf96e89..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k2.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 2.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Compute the Miller loop for pairings of type G_2 x G_1 over the bits of a
- * given parameter.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] p				- the first pairing argument in affine coordinates.
- * @param[in] q				- the second pairing argument in affine coordinates.
- * @param[in] m 			- the number of pairings to evaluate.
- * @param[in] a				- the loop parameter.
- */
-static void pp_mil_k2(fp2_t r, ep_t *t, ep_t *p, ep_t *q, int m, bn_t a) {
-	fp2_t l;
-	ep_t *_q = RLC_ALLOCA(ep_t, m);
-	int i, j;
-
-	fp2_null(l);
-
-	RLC_TRY {
-		if (_q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		fp2_new(l);
-		for (j = 0; j < m; j++) {
-			ep_null(_q[j]);
-			ep_new(_q[j]);
-			ep_copy(t[j], p[j]);
-			ep_neg(_q[j], q[j]);
-		}
-
-		fp2_zero(l);
-		for (i = bn_bits(a) - 2; i >= 0; i--) {
-			fp2_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_k2(l, t[j], t[j], _q[j]);
-				fp2_mul(r, r, l);
-				if (bn_get_bit(a, i)) {
-					pp_add_k2(l, t[j], p[j], q[j]);
-					fp2_mul(r, r, l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(l);
-		for (j = 0; j < m; j++) {
-			ep_free(_q[j]);
-		}
-		RLC_FREE(_q);
-	}
-}
-
-/**
- * Compute the Miller loop for pairings of type G_1 x G_2 over the bits of a
- * given parameter.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] p				- the first pairing argument in affine coordinates.
- * @param[in] q				- the second pairing argument in affine coordinates.
- * @param[in] a				- the loop parameter.
- */
-static void pp_mil_lit_k2(fp2_t r, ep_t *t, ep_t *p, ep_t *q, int m, bn_t a) {
-	fp2_t l, _l;
-	ep_t *_q = RLC_ALLOCA(ep_t, m);
-	int i, j;
-
-	fp2_null(l);
-	fp2_null(_l);
-
-	RLC_TRY {
-		if (_q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		fp2_new(l);
-		fp2_new(_l);
-		for (j = 0; j < m; j++) {
-			ep_null(_q[j]);
-			ep_new(_q[j]);
-			ep_copy(t[j], p[j]);
-			ep_neg(_q[j], q[j]);
-		}
-
-		for (i = bn_bits(a) - 2; i >= 0; i--) {
-			fp2_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_k2(l, t[j], t[j], _q[j]);
-				fp_copy(_l[0], l[1]);
-				fp_copy(_l[1], l[0]);
-				fp2_mul(r, r, _l);
-				if (bn_get_bit(a, i)) {
-					pp_add_k2(l, t[j], p[j], q[j]);
-					fp_copy(_l[0], l[1]);
-					fp_copy(_l[1], l[0]);
-					fp2_mul(r, r, _l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(l);
-		fp2_free(_l);
-		for (j = 0; j < m; j++) {
-			ep_null(_q[j]);
-		}
-		RLC_FREE(_q);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if PP_MAP == TATEP || PP_MAP == OATEP || !defined(STRIP)
-
-void pp_map_tatep_k2(fp2_t r, ep_t p, ep_t q) {
-	ep_t _p[1], _q[1], t[1];
-	bn_t n;
-
-	ep_null(_p[0]);
-	ep_null(_q[0]);
-	ep_null(t[0]);
-	bn_null(n);
-
-	RLC_TRY {
-		ep_new(t[0]);
-		bn_new(n);
-
-		ep_norm(_p[0], p);
-		ep_norm(_q[0], q);
-		ep_curve_get_ord(n);
-		/* Since p has order n, we do not have to perform last iteration. */
-		bn_sub_dig(n, n, 1);
-		fp2_set_dig(r, 1);
-
-		if (!ep_is_infty(p) && !ep_is_infty(q)) {
-			pp_mil_k2(r, t, _p, _q, 1, n);
-			pp_exp_k2(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep_free(_q[0]);
-		ep_free(t[0]);
-		bn_free(n);
-	}
-}
-
-void pp_map_sim_tatep_k2(fp2_t r, ep_t *p, ep_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m),
-			*_q = RLC_ALLOCA(ep_t, m), *t = RLC_ALLOCA(ep_t, m);
-	bn_t n;
-	int i, j;
-
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(n);
-		if (_p == NULL || _q == NULL || t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep_null(_q[i]);
-			ep_null(t[i]);
-			ep_new(_p[i]);
-			ep_new(_q[i]);
-			ep_new(t[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep_norm(_q[j++], q[i]);
-			}
-		}
-
-		ep_curve_get_ord(n);
-		bn_sub_dig(n, n, 1);
-		fp2_set_dig(r, 1);
-		if (j > 0) {
-			pp_mil_k2(r, t, _p, _q, j, n);
-			pp_exp_k2(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(n);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep_free(_q[i]);
-			ep_free(t[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-		RLC_FREE(t);
-	}
-}
-
-#endif
-
-#if PP_MAP == WEILP || !defined(STRIP)
-
-void pp_map_weilp_k2(fp2_t r, ep_t p, ep_t q) {
-	ep_t _p[1], _q[1], t0[1], t1[1];
-	fp2_t r0, r1;
-	bn_t n;
-
-	ep_null(_p[0]);
-	ep_null(_q[0]);
-	ep_null(t0[0]);
-	ep_null(t1[0]);
-	fp2_null(r0);
-	fp2_null(r1);
-	bn_null(n);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep_new(_q[0]);
-		ep_new(t0[0]);
-		ep_new(t1[0]);
-		fp2_new(r0);
-		fp2_new(r1);
-		bn_new(n);
-
-		ep_norm(_p[0], p);
-		ep_norm(_q[0], q);
-		ep_curve_get_ord(n);
-		/* Since p has order n, we do not have to perform last iteration. */
-		bn_sub_dig(n, n, 1);
-		fp2_set_dig(r0, 1);
-		fp2_set_dig(r1, 1);
-
-		if (!ep_is_infty(_p[0]) && !ep_is_infty(_q[0])) {
-			pp_mil_lit_k2(r0, t0, _p, _q, 1, n);
-			pp_mil_k2(r1, t1, _q, _p, 1, n);
-			fp2_inv(r1, r1);
-			fp2_mul(r0, r0, r1);
-			fp2_inv(r1, r0);
-			fp2_inv_cyc(r0, r0);
-		}
-		fp2_mul(r, r0, r1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep_free(_q[0]);
-		ep_free(t0[0]);
-		ep_free(t1[0]);
-		fp2_free(r0);
-		fp2_free(r1);
-		bn_free(n);
-	}
-}
-
-void pp_map_sim_weilp_k2(fp2_t r, ep_t *p, ep_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m),
-			*_q = RLC_ALLOCA(ep_t, m),
-			*t0 = RLC_ALLOCA(ep_t, m), *t1 = RLC_ALLOCA(ep_t, m);
-	fp2_t r0, r1;
-	bn_t n;
-	int i, j;
-
-	fp2_null(r0);
-	fp2_null(r1);
-	bn_null(r);
-
-	RLC_TRY {
-		fp2_new(r0);
-		fp2_new(r1);
-		bn_new(n);
-		if (_p == NULL || _q == NULL || t0 == NULL || t1 == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep_null(_q[i]);
-			ep_null(t0[i]);
-			ep_null(t1[i]);
-			ep_new(_p[i]);
-			ep_new(_q[i]);
-			ep_new(t0[i]);
-			ep_new(t1[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep_norm(_q[j++], q[i]);
-			}
-		}
-
-		ep_curve_get_ord(n);
-		bn_sub_dig(n, n, 1);
-		fp2_set_dig(r0, 1);
-		fp2_set_dig(r1, 1);
-
-		if (j > 0) {
-			pp_mil_lit_k2(r0, t0, _p, _q, j, n);
-			pp_mil_k2(r1, t1, _q, _p, j, n);
-			fp2_inv(r1, r1);
-			fp2_mul(r0, r0, r1);
-			fp2_inv(r1, r0);
-			fp2_inv_cyc(r0, r0);
-		}
-		fp2_mul(r, r0, r1);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp2_free(r0);
-		fp2_free(r1);
-		bn_free(n);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep_free(_q[i]);
-			ep_free(t0[i]);
-			ep_free(t1[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-		RLC_FREE(t0);
-		RLC_FREE(t1);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k24.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k24.c
deleted file mode 100644
index 70af03e18568..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k24.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 12.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Compute the Miller loop for pairings of type G_2 x G_1 over the bits of a
- * given parameter represented in sparse form.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] q				- the vector of first arguments in affine coordinates.
- * @param[in] p				- the vector of second arguments in affine coordinates.
- * @param[in] n 			- the number of pairings to evaluate.
- * @param[in] a				- the loop parameter.
- */
-static void pp_mil_k24(fp24_t r, ep4_t *t, ep4_t *q, ep_t *p, int m, bn_t a) {
-	fp24_t l;
-	ep_t *_p = RLC_ALLOCA(ep_t, m);
-	ep4_t *_q = RLC_ALLOCA(ep4_t, m);
-	int i, j, len = bn_bits(a) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	if (m == 0) {
-		return;
-	}
-
-	fp24_null(l);
-
-	RLC_TRY {
-		fp24_new(l);
-		if (_p == NULL || _q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (j = 0; j < m; j++) {
-			ep_null(_p[j]);
-			ep4_null(_q[j]);
-			ep_new(_p[j]);
-			ep4_new(_q[j]);
-			ep4_copy(t[j], q[j]);
-			ep4_neg(_q[j], q[j]);
-#if EP_ADD == BASIC
-			ep_neg(_p[j], p[j]);
-#else
-			fp_add(_p[j]->x, p[j]->x, p[j]->x);
-			fp_add(_p[j]->x, _p[j]->x, p[j]->x);
-			fp_neg(_p[j]->y, p[j]->y);
-#endif
-		}
-
-		fp24_zero(l);
-		bn_rec_naf(s, &len, a, 2);
-		pp_dbl_k24(r, t[0], t[0], _p[0]);
-		for (j = 1; j < m; j++) {
-			pp_dbl_k24(l, t[j], t[j], _p[j]);
-			fp24_mul_dxs(r, r, l);
-		}
-		if (s[len - 2] > 0) {
-			for (j = 0; j < m; j++) {
-				pp_add_k24(l, t[j], q[j], p[j]);
-				fp24_mul_dxs(r, r, l);
-			}
-		}
-		if (s[len - 2] < 0) {
-			for (j = 0; j < m; j++) {
-				pp_add_k24(l, t[j], _q[j], p[j]);
-				fp24_mul_dxs(r, r, l);
-			}
-		}
-
-		for (i = len - 3; i >= 0; i--) {
-			fp24_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_k24(l, t[j], t[j], _p[j]);
-				fp24_mul(r, r, l);
-				if (s[i] > 0) {
-					pp_add_k24(l, t[j], q[j], p[j]);
-					fp24_mul_dxs(r, r, l);
-				}
-				if (s[i] < 0) {
-					pp_add_k24(l, t[j], _q[j], p[j]);
-					fp24_mul_dxs(r, r, l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp24_free(l);
-		for (j = 0; j < m; j++) {
-			ep_free(_p[j]);
-			ep4_free(_q[j]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if PP_MAP == OATEP || !defined(STRIP)
-
-void pp_map_k24(fp24_t r, ep_t p, ep4_t q) {
-	ep_t _p[1];
-	ep4_t t[1], _q[1];
-	bn_t a;
-
-	ep_null(_p[0]);
-	ep4_null(_q[0]);
-	ep4_null(t[0]);
-	bn_null(a);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep4_new(_q[0]);
-		ep4_new(t[0]);
-		bn_new(a);
-
-		fp_prime_get_par(a);
-		fp24_set_dig(r, 1);
-
-		ep_norm(_p[0], p);
-		ep4_norm(_q[0], q);
-
-		if (!ep_is_infty(_p[0]) && !ep4_is_infty(_q[0])) {
-			switch (ep_curve_is_pairf()) {
-				case EP_B24:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k24(r, t, _q, _p, 1, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp24_inv_cyc(r, r);
-						ep4_neg(t[0], t[0]);
-					}
-					pp_exp_k24(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep4_free(_q[0]);
-		ep4_free(t[0]);
-		bn_free(a);
-	}
-}
-
-void pp_map_sim_k24(fp24_t r, ep_t *p, ep4_t *q, int m) {
-	ep_t *_p = RLC_ALLOCA(ep_t, m);
-	ep4_t *t = RLC_ALLOCA(ep4_t, m), *_q = RLC_ALLOCA(ep4_t, m);
-	bn_t a;
-	int i, j;
-
-	RLC_TRY {
-		bn_null(a);
-		bn_new(a);
-		if (_p == NULL || _q == NULL || t == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-		for (i = 0; i < m; i++) {
-			ep_null(_p[i]);
-			ep4_null(_q[i]);
-			ep4_null(t[i]);
-			ep_new(_p[i]);
-			ep4_new(_q[i]);
-			ep4_new(t[i]);
-		}
-
-		j = 0;
-		for (i = 0; i < m; i++) {
-			if (!ep_is_infty(p[i]) && !ep4_is_infty(q[i])) {
-				ep_norm(_p[j], p[i]);
-				ep4_norm(_q[j++], q[i]);
-			}
-		}
-
-		fp_prime_get_par(a);
-		fp24_set_dig(r, 1);
-
-		if (j > 0) {
-			switch (ep_curve_is_pairf()) {
-				case EP_B24:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k24(r, t, _q, _p, j, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp24_inv_cyc(r, r);
-					}
-					pp_exp_k24(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a);
-		for (i = 0; i < m; i++) {
-			ep_free(_p[i]);
-			ep4_free(_q[i]);
-			ep4_free(t[i]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-		RLC_FREE(t);
-	}
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k48.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k48.c
deleted file mode 100644
index 2f14fd534c98..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k48.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 48.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                         */
-/*============================================================================*/
-
-static void pp_mil_k48(fp48_t r, fp8_t qx, fp8_t qy, ep_t p, bn_t a) {
-	fp48_t l;
-	ep_t _p;
-	fp8_t rx, ry, rz;
-	int i, len = bn_bits(a) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	fp48_null(l);
-	ep_null(_p);
-	fp8_null(rx);
-	fp8_null(ry);
-	fp8_null(rz);
-
-	RLC_TRY {
-		fp48_new(l);
-		ep_new(_p);
-		fp8_new(rx);
-		fp8_new(ry);
-		fp8_new(rz);
-
-		fp48_zero(l);
-		fp8_copy(rx, qx);
-		fp8_copy(ry, qy);
-		fp8_set_dig(rz, 1);
-#if EP_ADD == BASIC
-		ep_neg(_p, p);
-#else
-		fp_add(_p->x, p->x, p->x);
-		fp_add(_p->x, _p->x, p->x);
-		fp_neg(_p->y, p->y);
-#endif
-
-		bn_rec_naf(s, &len, a, 2);
-		for (i = len - 2; i >= 0; i--) {
-			fp48_sqr(r, r);
-			pp_dbl_k48(l, rx, ry, rz, _p);
-			fp48_mul_dxs(r, r, l);
-			if (s[i] > 0) {
-				pp_add_k48(l, rx, ry, rz, qx, qy, p);
-				fp48_mul_dxs(r, r, l);
-			}
-			if (s[i] < 0) {
-				fp8_neg(qy, qy);
-				pp_add_k48(l, rx, ry, rz, qx, qy, p);
-				fp8_neg(qy, qy);
-				fp48_mul_dxs(r, r, l);
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp48_free(l);
-		ep_free(_p);
-		fp8_free(rx);
-		fp8_free(ry);
-		fp8_free(rz);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_map_k48(fp48_t r, ep_t p, fp8_t qx, fp8_t qy) {
-	bn_t a;
-
-	bn_null(a);
-
-	RLC_TRY {
-		bn_new(a);
-
-		fp_prime_get_par(a);
-		fp48_set_dig(r, 1);
-
-		if (!ep_is_infty(p) && !(fp8_is_zero(qx) && fp8_is_zero(qy))) {
-			switch (ep_curve_is_pairf()) {
-				case EP_B48:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k48(r, qx, qy, p, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp48_inv_cyc(r, r);
-					}
-					pp_exp_k48(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k54.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k54.c
deleted file mode 100644
index 604f4a9e7fc0..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k54.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 54.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-static void pp_mil_k54(fp54_t r, fp9_t qx, fp9_t qy, ep_t p, bn_t a) {
-	fp54_t l;
-	ep_t _p;
-	fp9_t rx, ry, rz, sx, sy, sz;
-	int i, len = bn_bits(a) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	fp54_null(l);
-	ep_null(_p);
-	fp9_null(rx);
-	fp9_null(ry);
-	fp9_null(rz);
-	fp9_null(sx);
-	fp9_null(sy);
-	fp9_null(sz);
-
-	RLC_TRY {
-		fp54_new(l);
-		ep_new(_p);
-		fp9_new(rx);
-		fp9_new(ry);
-		fp9_new(rz);
-		fp9_new(sx);
-		fp9_new(sy);
-		fp9_new(sz);
-
-		fp54_zero(l);
-		fp9_copy(rx, qx);
-		fp9_copy(ry, qy);
-		fp9_set_dig(rz, 1);
-#if EP_ADD == BASIC
-		ep_neg(_p, p);
-#else
-		fp_add(_p->x, p->x, p->x);
-		fp_add(_p->x, _p->x, p->x);
-		fp_neg(_p->y, p->y);
-#endif
-
-		bn_rec_naf(s, &len, a, 2);
-		for (i = len - 2; i >= 0; i--) {
-			fp54_sqr(r, r);
-			pp_dbl_k54(l, rx, ry, rz, _p);
-			fp54_mul_dxs(r, r, l);
-			if (s[i] > 0) {
-				pp_add_k54(l, rx, ry, rz, qx, qy, p);
-				fp54_mul_dxs(r, r, l);
-			}
-			if (s[i] < 0) {
-				fp9_neg(qy, qy);
-				pp_add_k54(l, rx, ry, rz, qx, qy, p);
-				fp9_neg(qy, qy);
-				fp54_mul_dxs(r, r, l);
-			}
-		}
-		/* Compute f^3. */
-		fp54_sqr(l, r);
-		fp54_mul(r, r, l);
-
-		fp54_zero(l);
-		fp9_copy(sx, rx);
-		fp9_copy(sy, ry);
-		fp9_copy(sz, rz);
-		pp_dbl_k54(l, sx, sy, sz, _p);
-		fp54_mul_dxs(r, r, l);
-#if EP_ADD == PROJC
-		fp9_inv(sz, sz);
-		fp9_mul(sx, sx, sz);
-		fp9_mul(sy, sy, sz);
-#endif
-		pp_add_k54(l, rx, ry, rz, sx, sy, p);
-		fp54_mul_dxs(r, r, l);
-		fp9_frb(rx, qx, 1);
-		fp9_frb(ry, qy, 1);
-		fp9_zero(sz);
-		fp3_set_dig(sz[1], 1);
-		fp9_inv(sz, sz);
-		fp_copy(sz[0][0], sz[2][2]);
-		fp_mul(sz[0][0], sz[0][0], core_get()->fp3_p0[1]);
-		fp_mul(sz[0][0], sz[0][0], core_get()->fp3_p1[3]);
-		fp_mul(sz[0][0], sz[0][0], core_get()->fp3_p1[0]);
-		fp3_mul_nor(sz[0], sz[0]);
-		fp3_mul_nor(sz[0], sz[0]);
-		fp3_mul_nor(sz[0], sz[0]);
-		fp_mul(sz[1][0], sz[0][0], core_get()->fp3_p2[1]);
-
-		for (int i = 0; i < 3; i++) {
-			fp3_mul(ry[i], ry[i], sz[0]);
-			fp3_mul(rx[i], rx[i], sz[1]);
-		}
-
-		fp9_frb(sx, qx, 10);
-		fp9_frb(sy, qy, 10);
-		for (int j = 0; j < 10; j++) {
-			for (int i = 0; i < 3; i++) {
-				fp3_mul(sy[i], sy[i], sz[0]);
-				fp3_mul(sx[i], sx[i], sz[1]);
-			}
-		}
-		fp9_set_dig(sz, 1);
-
-		pp_add_k54(l, sx, sy, sz, rx, ry, p);
-		fp54_mul_dxs(r, r, l);
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp54_free(l);
-		ep_free(_p);
-		fp9_free(rx);
-		fp9_free(ry);
-		fp9_free(rz);
-		fp9_free(sx);
-		fp9_free(sy);
-		fp9_free(sz);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_map_k54(fp54_t r, ep_t p, fp9_t qx, fp9_t qy) {
-	bn_t a;
-
-	bn_null(a);
-
-	RLC_TRY {
-		bn_new(a);
-
-		fp_prime_get_par(a);
-		fp54_set_dig(r, 1);
-
-		if (!ep_is_infty(p) && !(fp9_is_zero(qx) && fp9_is_zero(qy))) {
-			switch (ep_curve_is_pairf()) {
-				case EP_K54:
-					/* r = f_{|a|,Q}(P). */
-					pp_mil_k54(r, qx, qy, p, a);
-					if (bn_sign(a) == RLC_NEG) {
-						fp54_inv_cyc(r, r);
-					}
-					pp_exp_k54(r, r);
-					break;
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		bn_free(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_map_k8.c b/src/dashbls/depends/relic/src/pp/relic_pp_map_k8.c
deleted file mode 100644
index 0f31472bffc5..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_map_k8.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2019 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of pairing computation for curves with embedding degree 8.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_pp.h"
-#include "relic_util.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Compute the Miller loop for pairings of type G_2 x G_1 over the bits of a
- * given parameter represented in sparse form.
- *
- * @param[out] r			- the result.
- * @param[out] t			- the resulting point.
- * @param[in] q				- the vector of first arguments in affine coordinates.
- * @param[in] p				- the vector of second arguments in affine coordinates.
- * @param[in] n 			- the number of pairings to evaluate.
- * @param[in] s				- the loop parameter in sparse form.
- * @paramin] len			- the length of the loop parameter.
- */
-static void pp_mil_k8(fp8_t r, ep2_t *t, ep2_t *q, ep_t *p, int m, bn_t a) {
-	fp8_t l;
-	ep_t *_p = RLC_ALLOCA(ep_t, m);
-	ep2_t *_q = RLC_ALLOCA(ep2_t, m);
-	int i, j, len = bn_bits(a) + 1;
-	int8_t s[RLC_FP_BITS + 1];
-
-	if (m == 0) {
-		return;
-	}
-
-	fp8_null(l);
-
-	RLC_TRY {
-		fp8_new(l);
-		if (_p == NULL || _q == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-		}
-
-		for (j = 0; j < m; j++) {
-			ep_null(_p[j]);
-			ep2_null(_q[j]);
-			ep_new(_p[j]);
-			ep2_new(_q[j]);
-			ep2_copy(t[j], q[j]);
-			ep2_neg(_q[j], q[j]);
-
-#if EP_ADD == BASIC
-			ep_neg(_p[j], p[j]);
-#else
-			fp_neg(_p[j]->x, p[j]->x);
-			fp_copy(_p[j]->y, p[j]->y);
-#endif
-		}
-
-		fp8_zero(l);
-		bn_rec_naf(s, &len, a, 2);
-		for (i = len - 2; i >= 0; i--) {
-			fp8_sqr(r, r);
-			for (j = 0; j < m; j++) {
-				pp_dbl_k8(l, t[j], t[j], _p[j]);
-				fp8_mul(r, r, l);
-				if (s[i] > 0) {
-					pp_add_k8(l, t[j], q[j], _p[j]);
-					fp8_mul_dxs(r, r, l);
-				}
-				if (s[i] < 0) {
-					pp_add_k8(l, t[j], _q[j], _p[j]);
-					fp8_mul_dxs(r, r, l);
-				}
-			}
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		fp8_free(l);
-		for (j = 0; j < m; j++) {
-			ep_free(_p[j]);
-			ep2_free(_q[j]);
-		}
-		RLC_FREE(_p);
-		RLC_FREE(_q);
-	}
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_map_oatep_k8(fp8_t r, ep_t p, ep2_t q) {
-	ep_t _p[1];
-	ep2_t t[1], _q[1];
-	bn_t a;
-
-	ep_null(_p[0]);
-	ep2_null(_q[0]);
-	ep2_null(t[0]);
-	bn_null(a);
-
-	RLC_TRY {
-		ep_new(_p[0]);
-		ep2_new(_q[0]);
-		ep2_new(t[0]);
-		bn_new(a);
-
-		fp_prime_get_par(a);
-		fp8_set_dig(r, 1);
-
-		ep_norm(_p[0], p);
-		ep2_norm(_q[0], q);
-
-		if (!ep_is_infty(_p[0]) && !ep2_is_infty(_q[0])) {
-			/* r = f_{|a|,Q}(P). */
-			pp_mil_k8(r, t, _q, _p, 1, a);
-			if (bn_sign(a) == RLC_NEG) {
-				fp8_inv_cyc(r, r);
-				ep2_neg(t[0], t[0]);
-			}
-			pp_exp_k8(r, r);
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	}
-	RLC_FINALLY {
-		ep_free(_p[0]);
-		ep2_free(_q[0]);
-		ep2_free(t[0]);
-		bn_free(a);
-	}
-}
diff --git a/src/dashbls/depends/relic/src/pp/relic_pp_norm.c b/src/dashbls/depends/relic/src/pp/relic_pp_norm.c
deleted file mode 100644
index b2a8f8521fbc..000000000000
--- a/src/dashbls/depends/relic/src/pp/relic_pp_norm.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2011 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of point normalization for points used in pairing computation.
- *
- * @ingroup pp
- */
-
-#include "relic_core.h"
-#include "relic_md.h"
-#include "relic_pp.h"
-#include "relic_conf.h"
-#include "relic_fp_low.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void pp_norm_k2(ep_t r, ep_t p) {
-	ep_norm(r, p);
-}
-
-void pp_norm_k8(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	if (p->coord) {
-		/* If the point is represented in affine coordinates, we just copy it. */
-		ep2_copy(r, p);
-	}
-#if EP_ADD == PROJC || !defined(STRIP)
-	fp2_inv(r->z, p->z);
-	fp2_mul(r->x, p->x, r->z);
-	fp2_mul(r->y, p->y, r->z);
-	fp2_mul(r->y, r->y, r->z);
-	fp2_set_dig(r->z, 1);
-	r->coord = BASIC;
-#endif
-}
-
-void pp_norm_k12(ep2_t r, ep2_t p) {
-	if (ep2_is_infty(p)) {
-		ep2_set_infty(r);
-		return;
-	}
-
-	if (p->coord) {
-		/* If the point is represented in affine coordinates, we just copy it. */
-		ep2_copy(r, p);
-	}
-#if EP_ADD == PROJC || !defined(STRIP)
-	fp2_inv(r->z, p->z);
-	fp2_mul(r->x, p->x, r->z);
-	fp2_mul(r->y, p->y, r->z);
-	fp2_set_dig(r->z, 1);
-	r->coord = BASIC;
-#endif
-}
-
-void pp_norm_k24(ep4_t r, ep4_t p) {
-	if (ep4_is_infty(p)) {
-		ep4_set_infty(r);
-		return;
-	}
-
-	if (p->coord) {
-		/* If the point is represented in affine coordinates, we just copy it. */
-		ep4_copy(r, p);
-	}
-#if EP_ADD == PROJC || !defined(STRIP)
-	fp4_inv(r->z, p->z);
-	fp4_mul(r->x, p->x, r->z);
-	fp4_mul(r->y, p->y, r->z);
-	fp4_set_dig(r->z, 1);
-	r->coord = BASIC;
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/rand/relic_rand_call.c b/src/dashbls/depends/relic/src/rand/relic_rand_call.c
deleted file mode 100644
index f59236be6628..000000000000
--- a/src/dashbls/depends/relic/src/rand/relic_rand_call.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of stub generator overridden by callback function.
- *
- * @ingroup rand
- */
-
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_rand.h"
-
-/*============================================================================*/
-/* Private definitions                                                         */
-/*============================================================================*/
-
-#if RAND == CALL
-
-static void rand_stub(uint8_t *buf, int size, void *args) {
-	int c, l, fd = open("/dev/urandom", O_RDONLY);
-
-	if (fd == -1) {
-		RLC_THROW(ERR_NO_FILE);
-		return;
-	}
-
-	l = 0;
-	do {
-		c = read(fd, buf + l, size - l);
-		l += c;
-		if (c == -1) {
-			RLC_THROW(ERR_NO_READ);
-			return;
-		}
-	} while (l < size);
-
-	close(fd);
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if RAND == CALL
-
-void rand_bytes(uint8_t *buf, int size) {
-	ctx_t *ctx = core_get();
-
-	ctx->rand_call(buf, size, ctx->rand_args);
-	if (rand_check(buf, size) == RLC_ERR) {
-		RLC_THROW(ERR_NO_RAND);
-	}
-}
-
-void rand_seed(void (*callback)(uint8_t *, int, void *), void *args) {
-	ctx_t *ctx = core_get();
-
-	if (callback == NULL) {
-		ctx->rand_call = rand_stub;
-		ctx->rand_args = NULL;
-	} else {
-		ctx->rand_call = callback;
-		ctx->rand_args = args;
-	}
-	core_get()->seeded = 1;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/rand/relic_rand_core.c b/src/dashbls/depends/relic/src/rand/relic_rand_core.c
deleted file mode 100644
index 10f8929f8a1a..000000000000
--- a/src/dashbls/depends/relic/src/rand/relic_rand_core.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of utilities for pseudo-random number generation.
- *
- * @ingroup rand
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_rand.h"
-#include "relic_md.h"
-#include "relic_err.h"
-
-#if RAND == UDEV || SEED == UDEV
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#elif SEED == WCGR
-
-/* Avoid redefinition warning. */
-#undef ERROR
-#undef WSIZE
-#undef DOUBLE
-
-#include <windows.h>
-#include <wincrypt.h>
-
-#elif SEED == RDRND
-
-#include <immintrin.h>
-
-#endif
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * The path to the char device that supplies entropy.
- */
-#if SEED == DEV
-#define RLC_RAND_PATH		"/dev/random"
-#else
-#define RLC_RAND_PATH		"/dev/urandom"
-#endif
-
-/** The maximum number of bytes that can be repeated in the output. */
-#define RAND_REP			6
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void rand_init(void) {
-	uint8_t buf[RLC_RAND_SEED];
-
-#if RAND == UDEV
-	int *fd = (int *)&(core_get()->rand);
-
-	*fd = open(RLC_RAND_PATH, O_RDONLY);
-	if (*fd == -1) {
-		RLC_THROW(ERR_NO_FILE);
-		return;
-	}
-#else
-
-#if !defined(SEED)
-
-	memset(buf, 0, RLC_RAND_SEED);
-
-#elif SEED == DEV || SEED == UDEV
-	int fd, c, l;
-
-	fd = open(RLC_RAND_PATH, O_RDONLY);
-	if (fd == -1) {
-		RLC_THROW(ERR_NO_FILE);
-		return;
-	}
-
-	l = 0;
-	do {
-		c = read(fd, buf + l, RLC_RAND_SEED - l);
-		l += c;
-		if (c == -1) {
-			RLC_THROW(ERR_NO_READ);
-			return;
-		}
-	} while (l < RLC_RAND_SEED);
-
-	if (fd != -1) {
-		close(fd);
-	}
-#elif SEED == LIBC
-
-#if OPSYS == FREEBSD || OPSYS == NETBSD
-	/* This is better than using a fixed value. */
-	srandomdev();
-	for (int i = 0; i < RLC_RAND_SEED; i++) {
-		buf[i] = (uint8_t)random();
-	}
-#else
-	/* This is horribly insecure, serves only for benchmarking. */
-	srand(1);
-	for (int i = 0; i < RLC_RAND_SEED; i++) {
-		buf[i] = (uint8_t)rand();
-	}
-#endif
-
-#elif SEED == WCGR
-
-	HCRYPTPROV hCryptProv;
-
-	if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
-					CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
-		RLC_THROW(ERR_NO_FILE);
-		return;
-	}
-	if (hCryptProv && !CryptGenRandom(hCryptProv, RLC_RAND_SEED, buf)) {
-		RLC_THROW(ERR_NO_READ);
-		return;
-	}
-	if (hCryptProv && !CryptReleaseContext(hCryptProv, 0)) {
-		RLC_THROW(ERR_NO_READ);
-		return;
-	}
-
-#elif SEED == RDRND
-
-	int i, j;
-	ull_t r;
-
-	while (i < RLC_RAND_SEED) {
-#ifdef __RDRND__
-		while (_rdrand64_step(&r) == 0);
-#else
-#error "RdRand not available, check your compiler settings."
-#endif
-		for (j = 0; i < RLC_RAND_SEED && j < sizeof(ull_t); i++, j++) {
-			buf[i] = r & 0xFF;
-		}
-	}
-
-#endif
-
-#endif /* RAND == UDEV */
-
-#if RAND != CALL
-	core_get()->seeded = 0;
-	rand_seed(buf, RLC_RAND_SEED);
-#else
-	rand_seed(NULL, NULL);
-#endif
-}
-
-int rand_check(uint8_t *buf, int size) {
-	int count = 0;
-
-	for (int i = 1; i < size; i++) {
-		if (buf[i] == buf[i - 1]) {
-			count++;
-		} else {
-			count = 0;
-		}
-	}
-
-	if (count > RAND_REP) {
-		return RLC_ERR;
-	}
-	return RLC_OK;
-}
-
-void rand_clean(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-#if RAND == UDEV
-		int *fd = (int *)&(ctx->rand);
-		close(*fd);
-#endif
-#if RAND != CALL
-		memset(ctx->rand, 0, sizeof(ctx->rand));
-#else
-		ctx->rand_call = NULL;
-		ctx->rand_args = NULL;
-#endif
-		ctx->seeded = 0;
-	}
-}
diff --git a/src/dashbls/depends/relic/src/rand/relic_rand_hashd.c b/src/dashbls/depends/relic/src/rand/relic_rand_hashd.c
deleted file mode 100644
index f91414a37c58..000000000000
--- a/src/dashbls/depends/relic/src/rand/relic_rand_hashd.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2018 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the Hash_DRBG pseudo-random number generator.
- *
- * @ingroup rand
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_rand.h"
-#include "relic_md.h"
-#include "relic_err.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if RAND == HASHD
-
-/*
- * Computes the hash derivation function.
- *
- * param[out] out       - the result.
- * param[in] out_len    - the number of bytes to return.
- * param[in] in         - the input string.
- * param[in] in_len     - the number of bytes in the input.
- */
-static void rand_hash(uint8_t *out, int out_len, uint8_t *in, int in_len) {
-	uint32_t j = util_conv_big(8 * out_len);
-	int len = RLC_CEIL(out_len, RLC_MD_LEN);
-	uint8_t* buf = RLC_ALLOCA(uint8_t, 1 + sizeof(uint32_t) + in_len);
-	uint8_t hash[RLC_MD_LEN];
-
-	if (buf == NULL) {
-		RLC_THROW(ERR_NO_MEMORY);
-		return;
-	}
-
-	buf[0] = 1;
-	memcpy(buf + 1, &j, sizeof(uint32_t));
-	memcpy(buf + 1 + sizeof(uint32_t), in, in_len);
-
-	for (int i = 0; i < len; i++) {
-		/* h = Hash(counter || bits_to_return || input_string) */
-		md_map(hash, buf, 1 + sizeof(uint32_t) + in_len);
-		/* temp = temp || h */
-		memcpy(out, hash, RLC_MIN(RLC_MD_LEN, out_len));
-		out += RLC_MD_LEN;
-		out_len -= RLC_MD_LEN;
-		/* counter = counter + 1 */
-		buf[0]++;
-	}
-
-	RLC_FREE(buf);
-}
-
-/**
- * Accumulates a small integer in the internal state.
- *
- * @param[in,out] state		- the internal state.
- * @param[in] digit			- the small integer.
- */
-static int rand_inc(uint8_t *data, int size, int digit) {
-	int carry = digit;
-	for (int i = size - 1; i >= 0; i--) {
-		int16_t s;
-		s = (data[i] + carry);
-		data[i] = s & 0xFF;
-		carry = s >> 8;
-	}
-	return carry;
-}
-
-/**
- * Accumulates the hash value in the internal state.
- *
- * @param[in,out] state		- the internal state.
- * @param[in] hash			- the hash value.
- */
-static int rand_add(uint8_t *state, uint8_t *hash, int size) {
-	int carry = 0;
-	for (int i = size - 1; i >= 0; i--) {
-		/* Make sure carries are detected. */
-		int16_t s;
-		s = (state[i] + hash[i] + carry);
-		state[i] = s & 0xFF;
-		carry = s >> 8;
-	}
-	return carry;
-}
-
-/**
- * Generates pseudo-random bytes by iterating the hash function.
- *
- * @param[out] out 			- the buffer to write.
- * @param[in] out_len		- the number of bytes to write.
- */
-static void rand_gen(uint8_t *out, int out_len) {
-	int m = RLC_CEIL(out_len, RLC_MD_LEN);
-	uint8_t hash[RLC_MD_LEN], data[(RLC_RAND_SIZE - 1)/2];
-	ctx_t *ctx = core_get();
-
-	/* data = V */
-	memcpy(data, ctx->rand + 1, (RLC_RAND_SIZE - 1)/2);
-	for (int i = 0; i < m; i++) {
-		/* w_i = Hash(data) */
-		md_map(hash, data, sizeof(data));
-		/* W = W || w_i */
-		memcpy(out, hash, RLC_MIN(RLC_MD_LEN, out_len));
-		out += RLC_MD_LEN;
-		out_len -= RLC_MD_LEN;
-		/* data = data + 1 mod 2^b. */
-		rand_inc(data, (RLC_RAND_SIZE - 1)/2, 1);
-	}
-}
-
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if RAND == HASHD
-
-void rand_bytes(uint8_t *buf, int size) {
-	uint8_t hash[RLC_MD_LEN];
-	int carry, len  = (RLC_RAND_SIZE - 1)/2;
-	ctx_t *ctx = core_get();
-
-	if (sizeof(int) > 2 && size > (1 << 16)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	/* buf = hash_gen(size) */
-	rand_gen(buf, size);
-	/* H = hash(03 || V) */
-	ctx->rand[0] = 0x3;
-	md_map(hash, ctx->rand, 1 + len);
-	/* V = V + H + C  + reseed_counter. */
-	rand_add(ctx->rand + 1, ctx->rand + 1 + len, len);
-	carry = rand_add(ctx->rand + 1 + (len - RLC_MD_LEN), hash, RLC_MD_LEN);
-	rand_inc(ctx->rand, len - RLC_MD_LEN + 1, carry);
-	rand_inc(ctx->rand, len + 1, ctx->counter);
-	ctx->counter = ctx->counter + 1;
-}
-
-void rand_seed(uint8_t *buf, int size) {
-	ctx_t *ctx = core_get();
-	int len = (RLC_RAND_SIZE - 1) / 2;
-
-	if (size <= 0) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	if (sizeof(int) > 4 && size > (1 << 32)) {
-		RLC_THROW(ERR_NO_VALID);
-		return;
-	}
-
-	ctx->rand[0] = 0x0;
-	if (ctx->seeded == 0) {
-		/* V = hash_df(seed). */
-		rand_hash(ctx->rand + 1, len, buf, size);
-		/* C = hash_df(00 || V). */
-		rand_hash(ctx->rand + 1 + len, len, ctx->rand, len + 1);
-	} else {
-		/* V = hash_df(01 || V || seed). */
-        int tmp_size = 1 + len + size;
-		uint8_t* tmp = RLC_ALLOCA(uint8_t, tmp_size);
-		if (tmp == NULL) {
-			RLC_THROW(ERR_NO_MEMORY);
-			return;
-		}
-		tmp[0] = 1;
-		memcpy(tmp + 1, ctx->rand + 1, len);
-		memcpy(tmp + 1 + len, buf, size);
-		rand_hash(ctx->rand + 1, len, tmp, tmp_size);
-		/* C = hash_df(00 || V). */
-		rand_hash(ctx->rand + 1 + len, len, ctx->rand, len + 1);
-		RLC_FREE(tmp);
-	}
-	ctx->counter = ctx->seeded = 1;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/rand/relic_rand_rdrnd.c b/src/dashbls/depends/relic/src/rand/relic_rand_rdrnd.c
deleted file mode 100644
index 2de68a0f3169..000000000000
--- a/src/dashbls/depends/relic/src/rand/relic_rand_rdrnd.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the wrapper around the Intel RdRand instruction.
- *
- * @ingroup rand
- */
-
-#include <immintrin.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_rand.h"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if RAND == RDRND
-
-void rand_bytes(uint8_t *buf, int size) {
-	int i = 0, j;
-	unsigned long long r;
-
-	while (i < size) {
-#ifdef __RDRND__
-		while (_rdrand64_step(&r) == 0);
-#else
-#error "RdRand not available, check your compiler settings."
-#endif
-		for (j = 0; i < size && j < sizeof(ull_t); i++, j++) {
-			buf[i] = r & 0xFF;
-		}
-	}
-}
-
-void rand_seed(uint8_t *buf, int size) {
-	/* Do nothing, mark as seeded. */
-	core_get()->seeded = 1;
-}
-
-#endif
\ No newline at end of file
diff --git a/src/dashbls/depends/relic/src/rand/relic_rand_udev.c b/src/dashbls/depends/relic/src/rand/relic_rand_udev.c
deleted file mode 100644
index aea3fb344f06..000000000000
--- a/src/dashbls/depends/relic/src/rand/relic_rand_udev.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the /dev/urandom wrapper.
- *
- * @ingroup rand
- */
-
-#include <unistd.h>
-
-#include "relic_conf.h"
-#include "relic_core.h"
-#include "relic_label.h"
-#include "relic_rand.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * The path to the char device that supplies entropy.
- */
-#define RLC_RAND_PATH		"/dev/urandom"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if RAND == UDEV
-
-void rand_bytes(uint8_t *buf, int size) {
-	int c, l, *fd = (int *)&(core_get()->rand);
-
-	l = 0;
-	do {
-		c = read(*fd, buf + l, size - l);
-		l += c;
-		if (c == -1) {
-			RLC_THROW(ERR_NO_READ);
-			return;
-		}
-	} while (l < size);
-}
-
-void rand_seed(uint8_t *buf, int size) {
-	/* Do nothing, only mark as seeded. */
-	core_get()->seeded = 1;
-}
-
-#endif
diff --git a/src/dashbls/depends/relic/src/relic_bench.c b/src/dashbls/depends/relic/src/relic_bench.c
deleted file mode 100644
index 5adf77e7739b..000000000000
--- a/src/dashbls/depends/relic/src/relic_bench.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of useful benchmark routines.
- *
- * @ingroup relic
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-
-#if OPSYS == DUINO && TIMER == HREAL
-/*
- * Prototype for Arduino timing function.
- *
- * @return The time in microseconds since the program began running.
- */
-uint32_t micros();
-#endif
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-#if defined(OVERH) && defined(TIMER) && BENCH > 1
-
-/**
- * Dummy function for measuring benchmarking overhead.
- *
- * @param a				- the dummy parameter.
- */
-static void empty(int *a) {
-	(*a)++;
-}
-
-#endif /* OVER && TIMER && BENCH > 1 */
-
-/**
- * Shared parameter for these timer.
- */
-#if TIMER == HREAL
-#define CLOCK			CLOCK_REALTIME
-#elif TIMER == HPROC
-#define CLOCK			CLOCK_PROCESS_CPUTIME_ID
-#elif TIMER == HTHRD
-#define CLOCK			CLOCK_THREAD_CPUTIME_ID
-#else
-#define CLOCK			NULL
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#if defined(OVERH) && defined(TIMER) && BENCH > 1
-
-void bench_overhead(void) {
-	ctx_t *ctx = core_get();
-	int a[BENCH + 1];
-	int *tmpa;
-
-	do {
-		ctx->over = 0;
-		for (int l = 0; l < BENCH; l++) {
-			bench_reset();
-			/* Measure the cost of (n^2 + over). */
-			bench_before();
-			for (int i = 0; i < BENCH; i++) {
-				tmpa = a;
-				for (int j = 0; j < BENCH; j++) {
-					empty(tmpa++);
-				}
-			}
-			bench_after();
-			/* Add the cost of (n^2 + over). */
-			ctx->over += ctx->total;
-		}
-		/* Overhead stores the cost of n*(n^2 + over) = n^3 + n*over. */
-		bench_reset();
-		/* Measure the cost of (n^3 + over). */
-		bench_before();
-		for (int i = 0; i < BENCH; i++) {
-			for (int k = 0; k < BENCH; k++) {
-				tmpa = a;
-				for (int j = 0; j < BENCH; j++) {
-					empty(tmpa++);
-				}
-			}
-		}
-		bench_after();
-		/* Subtract the cost of (n^3 + over). */
-		ctx->over -= ctx->total;
-		/* Now overhead stores (n - 1)*over, so take the average to obtain the
-		 * overhead to execute BENCH operations inside a benchmark. */
-		ctx->over /= (BENCH - 1);
-		/* Divide to obtain the overhead of one operation pair. */
-		ctx->over /= BENCH;
-	} while (ctx->over < 0);
-	ctx->total = ctx->over;
-	bench_print();
-}
-
-#endif /* OVER && TIMER && BENCH > 1 */
-
-void bench_init(void) {
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-#ifdef OVERH
-		ctx->over = 0;
-#endif
-#if TIMER == PERF
-		static struct perf_event_attr attr;
-		attr.type = PERF_TYPE_HARDWARE;
-		attr.config = PERF_COUNT_HW_CPU_CYCLES;
-		attr.exclude_kernel = 1;
-
-		ctx->perf_buf = NULL;
-		ctx->perf_fd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0);
-		if (ctx->perf_fd != -1) {
-			ctx->perf_buf = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ, MAP_SHARED,
-				ctx->perf_fd, 0);
-		} else {
-			RLC_THROW(ERR_NO_FILE);
-		}
-#endif
-	}
-}
-
-void bench_reset(void) {
-#ifdef TIMER
-	core_get()->total = 0;
-#endif
-}
-
-void bench_before(void) {
-#if OPSYS == DUINO && TIMER == HREAL
-	core_get()->before = micros();
-#elif TIMER == HREAL || TIMER == HPROC || TIMER == HTHRD
-	clock_gettime(CLOCK, &(core_get()->before));
-#elif TIMER == ANSI
-	core_get()->before = clock();
-#elif TIMER == POSIX
-	gettimeofday(&(core_get()->before), NULL);
-#elif TIMER == CYCLE || TIMER == PERF
-	core_get()->before = arch_cycles();
-#endif
-}
-
-void bench_after(void) {
-	ctx_t *ctx = core_get();
-	long long result;
-
-#if OPSYS == DUINO && TIMER == HREAL
-	core_get()->after = micros();
-	result = (ctx->after - ctx->before);
-#elif TIMER == HREAL || TIMER == HPROC || TIMER == HTHRD
-	clock_gettime(CLOCK, &(ctx->after));
-	result = ((long)ctx->after.tv_sec - (long)ctx->before.tv_sec) * 1000000000;
-	result += (ctx->after.tv_nsec - ctx->before.tv_nsec);
-#elif TIMER == ANSI
-	ctx->after = clock();
-	result = (ctx->after - ctx->before) * 1000000 / CLOCKS_PER_SEC;
-#elif TIMER == POSIX
-	gettimeofday(&(ctx->after), NULL);
-	result = ((long)ctx->after.tv_sec - (long)ctx->before.tv_sec) * 1000000;
-	result += (ctx->after.tv_usec - ctx->before.tv_usec);
-#elif TIMER == CYCLE || TIMER == PERF
-	ctx->after = arch_cycles();
-  	result = (ctx->after - ctx->before);
-#endif
-
-#ifdef TIMER
-	ctx->total += result;
-#else
-	(void)result;
-	(void)ctx;
-#endif
-}
-
-void bench_compute(int benches) {
-	ctx_t *ctx = core_get();
-#ifdef TIMER
-	ctx->total = ctx->total / benches;
-#ifdef OVERH
-	ctx->total = ctx->total - ctx->over;
-#endif /* OVERH */
-#else
-	(void)benches;
-	(void)ctx;
-#endif /* TIMER */
-}
-
-void bench_print(void) {
-	ctx_t *ctx = core_get();
-
-#if TIMER == POSIX || TIMER == ANSI || (OPSYS == DUINO && TIMER == HREAL)
-	util_print("%lld microsec", ctx->total);
-#elif TIMER == CYCLE || TIMER == PERF
-	util_print("%lld cycles", ctx->total);
-#else
-	util_print("%lld nanosec", ctx->total);
-#endif
-	if (ctx->total < 0) {
-		util_print(" (overflow or bad overhead estimation)\n");
-	} else {
-		util_print("\n");
-	}
-}
-
-ull_t bench_total(void) {
-	return core_get()->total;
-}
-
-void bench_clean(void) {
-#if TIMER == PERF
-	ctx_t *ctx = core_get();
-	if (ctx != NULL) {
-		close(ctx->perf_fd);
-		munmap(ctx->perf_buf, sysconf(_SC_PAGESIZE)),
-		ctx->perf_fd = -1;
-		ctx->perf_buf = NULL;
-	}
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/relic_conf.c b/src/dashbls/depends/relic/src/relic_conf.c
deleted file mode 100644
index 72dc783e562c..000000000000
--- a/src/dashbls/depends/relic/src/relic_conf.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of useful configuration routines.
- *
- * @ingroup relic
- */
-
-#include <stdio.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_bn.h"
-#include "relic_fp.h"
-#include "relic_fb.h"
-#include "relic_ep.h"
-#include "relic_eb.h"
-#include "relic_ed.h"
-#include "relic_ec.h"
-#include "relic_pc.h"
-#include "relic_bench.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Inserts quotation marks in the macro argument.
- */
-/** @{ */
-#define QUOTE(A)			_QUOTE(A)
-#define _QUOTE(A)			#A
-/** @} */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void conf_print(void) {
-#ifndef QUIET
-	util_print("-- RELIC " RLC_VERSION " configuration:\n\n");
-#if ALLOC == DYNAMIC
-	util_print("** Allocation mode: DYNAMIC\n\n");
-#elif ALLOC == AUTO
-	util_print("** Allocation mode: AUTO\n\n");
-#endif
-
-#if ARITH == EASY
-	util_print("** Arithmetic backend: easy\n\n");
-#elif ARITH == GMP
-	util_print("** Arithmetic backend: gmp\n\n");
-#elif ARITH == GMP_SEC
-	util_print("** Arithmetic backend: gmp-sec\n\n");
-#else
-	util_print("** Arithmetic backend: " QUOTE(ARITH) "\n\n");
-#endif
-
-#ifdef LABEL
-	util_print("** Configured label: " QUOTE(LABEL) "\n\n");
-#endif
-
-#if BENCH > 1
-	util_print("** Benchmarking options:\n");
-	util_print("   Number of times: %d\n", BENCH * BENCH);
-#ifdef OVERH
-	util_print("   Estimated overhead: ");
-	bench_overhead();
-#endif
-	util_print("\n");
-#endif
-
-#ifdef WITH_BN
-	util_print("** Multiple precision module options:\n");
-	util_print("   Precision: %d bits, %d words\n", RLC_BN_BITS, RLC_BN_DIGS);
-	util_print("   Arithmetic method: " BN_METHD "\n\n");
-#endif
-
-#ifdef WITH_FP
-	util_print("** Prime field module options:\n");
-	util_print("   Prime size: %d bits, %d words\n", RLC_FP_BITS, RLC_FP_DIGS);
-	util_print("   Arithmetic method: " FP_METHD "\n\n");
-#endif
-
-#ifdef WITH_FPX
-	util_print("** Prime field extension module options:\n");
-	util_print("   Arithmetic method: " FPX_METHD "\n\n");
-#endif
-
-#ifdef WITH_EP
-	util_print("** Prime elliptic curve module options:\n");
-	util_print("   Arithmetic method: " EP_METHD "\n\n");
-#endif
-
-#ifdef WITH_PP
-	util_print("** Bilinear pairing module options:\n");
-	util_print("   Arithmetic method: " PP_METHD "\n\n");
-#endif
-
-#ifdef WITH_FB
-	util_print("** Binary field module options:\n");
-	util_print("   Polynomial size: %d bits, %d words\n", RLC_FB_BITS, RLC_FB_DIGS);
-	util_print("   Arithmetic method: " FB_METHD "\n\n");
-#endif
-
-#ifdef WITH_EB
-	util_print("** Binary elliptic curve module options:\n");
-	util_print("   Arithmetic method: " EB_METHD "\n\n");
-#endif
-
-#ifdef WITH_EC
-	util_print("** Elliptic Curve Cryptography module options:\n");
-	util_print("   Arithmetic method: " EC_METHD "\n\n");
-#endif
-
-#ifdef WITH_ED
-	util_print("** Edwards Curve Cryptography module options:\n");
-	util_print("   Arithmetic method: " ED_METHD "\n\n");
-#endif
-
-#ifdef WITH_MD
-	util_print("** Hash function module options:\n");
-	util_print("   Chosen method: " MD_METHD "\n\n");
-#endif
-
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/relic_core.c b/src/dashbls/depends/relic/src/relic_core.c
deleted file mode 100644
index 5ec5cf04f489..000000000000
--- a/src/dashbls/depends/relic/src/relic_core.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of the library basic functions.
- *
- * @ingroup relic
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_bench.h"
-#include "relic_multi.h"
-#include "relic_rand.h"
-#include "relic_types.h"
-#include "relic_err.h"
-#include "relic_arch.h"
-#include "relic_fp.h"
-#include "relic_fb.h"
-#include "relic_ep.h"
-#include "relic_eb.h"
-#include "relic_cp.h"
-#include "relic_pp.h"
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/** Error message respective to ERR_NO_MEMORY. */
-#define MSG_NO_MEMORY 		"not enough memory"
-/** Error message respective to ERR_PRECISION. */
-#define MSG_NO_PRECI 		"insufficient precision"
-/** Error message respective to ERR_NO FILE. */
-#define MSG_NO_FILE			"file not found"
-/** Error message respective to ERR_NO_READ. */
-#define MSG_NO_READ			"can't read bytes from file"
-/** Error message respective to ERR_NO_VALID. */
-#define MSG_NO_VALID		"invalid value passed as input"
-/** Error message respective to ERR_NO_BUFFER. */
-#define MSG_NO_BUFFER		"insufficient buffer capacity"
-/** Error message respective to ERR_NO_FIELD. */
-#define MSG_NO_FIELD		"no finite field supported at this security level"
-/** Error message respective to ERR_NO_CURVE. */
-#define MSG_NO_CURVE		"no curve supported at this security level"
-/** Error message respective to ERR_NO_CONFIG. */
-#define MSG_NO_CONFIG		"invalid library configuration"
-/** Error message respective to ERR_NO_CURVE. */
-#define MSG_NO_RAND			"faulty pseudo-random number generator"
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-/**
- * Default library context.
- */
-#if MULTI
-rlc_thread ctx_t first_ctx;
-#else
-static ctx_t first_ctx;
-#endif
-
-#if defined(MULTI)
-/*
- * Initializer function to call for every thread's context
- */
-void (*core_thread_initializer)(void* init_ptr) = NULL;
-void* core_init_ptr = NULL;
-#endif
-
-#if MULTI
-rlc_thread ctx_t *core_ctx = NULL;
-#else
-static ctx_t *core_ctx = NULL;
-#endif
-
-int core_init(void) {
-	if (core_ctx == NULL) {
-		core_ctx = &(first_ctx);
-	}
-
-#ifdef CHECK
-	core_ctx->reason[ERR_NO_MEMORY] = MSG_NO_MEMORY;
-	core_ctx->reason[ERR_NO_PRECI] = MSG_NO_PRECI;
-	core_ctx->reason[ERR_NO_FILE] = MSG_NO_FILE;
-	core_ctx->reason[ERR_NO_READ] = MSG_NO_READ;
-	core_ctx->reason[ERR_NO_VALID] = MSG_NO_VALID;
-	core_ctx->reason[ERR_NO_BUFFER] = MSG_NO_BUFFER;
-	core_ctx->reason[ERR_NO_FIELD] = MSG_NO_FIELD;
-	core_ctx->reason[ERR_NO_CURVE] = MSG_NO_CURVE;
-	core_ctx->reason[ERR_NO_CONFIG] = MSG_NO_CONFIG;
-	core_ctx->reason[ERR_NO_RAND] = MSG_NO_RAND;
-	core_ctx->last = NULL;
-#endif /* CHECK */
-
-	core_ctx->code = RLC_OK;
-
-	RLC_TRY {
-		arch_init();
-		rand_init();
-
-#if BENCH > 0
-		bench_init();
-#endif
-
-#ifdef WITH_FP
-		fp_prime_init();
-#endif
-#ifdef WITH_FB
-		fb_poly_init();
-#endif
-#ifdef WITH_EP
-		ep_curve_init();
-#endif
-#ifdef WITH_EB
-		eb_curve_init();
-#endif
-#ifdef WITH_ED
-		ed_curve_init();
-#endif
-#ifdef WITH_PP
-		pp_map_init();
-#endif
-#ifdef WITH_PC
-		pc_core_init();
-#endif
-	} RLC_CATCH_ANY {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int core_clean(void) {
-#ifdef WITH_FP
-	fp_prime_clean();
-#endif
-#ifdef WITH_FB
-	fb_poly_clean();
-#endif
-#ifdef WITH_EP
-	ep_curve_clean();
-#endif
-#ifdef WITH_EB
-	eb_curve_clean();
-#endif
-#ifdef WITH_ED
-	ed_curve_clean();
-#endif
-#ifdef WITH_PP
-	pp_map_clean();
-#endif
-#ifdef WITH_PC
-	pc_core_clean();
-#endif
-
-#if BENCH > 0
-		bench_clean();
-#endif
-
-	arch_clean();
-	rand_clean();
-
-	if (core_ctx != NULL) {
-		int result = core_ctx->code;
-		core_ctx = NULL;
-		return result;
-	}
-	return RLC_OK;
-}
-
-ctx_t *core_get(void) {
-#if defined(MULTI)
-    if (core_ctx == NULL && core_thread_initializer != NULL) {
-        core_thread_initializer(core_init_ptr);
-    }
-#endif
-	return core_ctx;
-}
-
-void core_set(ctx_t *ctx) {
-	core_ctx = ctx;
-}
-
-#if defined(MULTI)
-void core_set_thread_initializer(void(*init)(void *init_ptr), void* init_ptr) {
-    core_thread_initializer = init;
-    core_init_ptr = init_ptr;
-}
-#endif
diff --git a/src/dashbls/depends/relic/src/relic_err.c b/src/dashbls/depends/relic/src/relic_err.c
deleted file mode 100644
index 4fb92938592d..000000000000
--- a/src/dashbls/depends/relic/src/relic_err.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2013 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of error-handling routines.
- *
- * @ingroup relic
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_err.h"
-
-#if defined(VERBS) && OPSYS == LINUX && HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-#ifdef CHECK
-
-void err_simple_msg(int error) {
-	if (error != ERR_CAUGHT) {
-		fprintf(stderr, "\nERROR: %s.\n", core_get()->reason[error]);
-	}
-}
-
-#ifdef VERBS
-
-void err_full_msg(const char *function, const char *file, int line,
-		int error) {
-	ctx_t *ctx = core_get();
-
-	if (error == ERR_CAUGHT) {
-		fprintf(stderr, "\tCAUGHT in %s() at %s,%d.\n", function, file, line);
-	} else {
-		fprintf(stderr, "\nERROR in %s() at %s,%d: %s.\n", function, file, line,
-				ctx->reason[error]);
-
-#if OPSYS == LINUX && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS 
-		void *trace[100];
-		char **symbols;
-		int n;
-
-		/* Print the stack trace. */
-		fprintf(stderr, "\tCall stack:\n");
-		n = backtrace(trace, 100);
-		symbols = backtrace_symbols(trace, n);
-		/*
-		 * Skip the first entry (err_complete_error) and the two last (this
-		 * binary and a libc entry.
-		 */
-		for (int i = 1; i < n - 2; i++) {
-			fprintf(stderr, "\t\t#%d %s\n", i - 1, symbols[i]);
-		}
-		free(symbols);
-#endif
-	}
-}
-
-#endif /* VERBS */
-
-void err_get_msg(err_t *e, char **msg) {
-	ctx_t *ctx = core_get();
-	*e = *(ctx->last->error);
-	*msg = ctx->reason[*e];
-	ctx->last = NULL;
-}
-
-#endif /* CHECK */
-
-int err_get_code(void) {
-	ctx_t *ctx = core_get();
-	int r = ctx->code;
-	ctx->code = RLC_OK;
-	return r;
-}
diff --git a/src/dashbls/depends/relic/src/relic_test.c b/src/dashbls/depends/relic/src/relic_test.c
deleted file mode 100644
index b19afb5bf503..000000000000
--- a/src/dashbls/depends/relic/src/relic_test.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of useful test routines.
- *
- * @ingroup relic
- */
-
-#include "relic_test.h"
-#include "relic_util.h"
-#include "relic_core.h"
-
-#ifdef _MSC_VER
-#undef DOUBLE
-#include <Windows.h>
-/**
- * Stores the default color used in the console.
- */
-static int default_color;
-#endif
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Color of the string printed when the test fails (red).
- */
-#ifdef _MSC_VER
-#define FAIL_COLOR      12
-#else
-#define FAIL_COLOR		31
-#endif
-
-/**
- * Color of the string printed when the test passes (green).
- */
-#ifdef _MSC_VER
-#define PASS_COLOR      10
-#else
-#define PASS_COLOR		32
-#endif
-
-/**
- * Command to set terminal colors.
- */
-#define CMD_SET			27
-
-/**
- * Command to reset terminal colors.
- */
-#define CMD_RESET		0
-
-/**
- * Print with bright attribute.
- */
-#define CMD_ATTR		1
-
-/**
- * Copies default color to global variable.
- */
-static void cache_default_color(void) {
-#ifdef _MSC_VER
-	CONSOLE_SCREEN_BUFFER_INFO csbi;
-	HANDLE m_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	GetConsoleScreenBufferInfo(m_hConsole, &csbi);
-	default_color = (csbi.wAttributes & 255);
-#endif
-}
-
-/**
- * Changes font to test failure mode.
- */
-static void fail_font(void) {
-    cache_default_color();
-#ifdef COLOR
-#ifdef _MSC_VER
-	HANDLE m_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	SetConsoleTextAttribute(m_hConsole, FAIL_COLOR);
-#else
-	util_print("%c[%d;%dm", CMD_SET, CMD_ATTR, FAIL_COLOR);
-#endif
-#endif
-}
-
-/**
- * Changes font to test pass mode.
- */
-static void pass_font(void) {
-    cache_default_color();
-#ifdef COLOR
-#ifdef _MSC_VER
-	HANDLE m_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	SetConsoleTextAttribute(m_hConsole, PASS_COLOR);
-#else
-	util_print("%c[%d;%dm", CMD_SET, CMD_ATTR, PASS_COLOR);
-#endif
-#endif
-}
-
-/**
- * Resets font to default.
- */
-static void reset_font(void) {
-#ifdef COLOR
-#ifdef _MSC_VER
-	HANDLE m_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	SetConsoleTextAttribute(m_hConsole, default_color);
-#else
-	util_print("%c[%dm", CMD_SET, CMD_RESET);
-#endif
-#endif
-}
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-void test_fail(void) {
-	fail_font();
-	util_print("[FAIL]\n");
-	reset_font();
-}
-
-void test_pass(void) {
-	pass_font();
-	util_print("[PASS]\n");
-	reset_font();
-}
diff --git a/src/dashbls/depends/relic/src/relic_util.c b/src/dashbls/depends/relic/src/relic_util.c
deleted file mode 100644
index 3bb369d00e07..000000000000
--- a/src/dashbls/depends/relic/src/relic_util.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Implementation of useful configuration routines.
- *
- * @ingroup relic
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-#include "relic_core.h"
-#include "relic_conf.h"
-#include "relic_util.h"
-#include "relic_types.h"
-
-#if ARCH == ARM && OPSYS == DROID
-#include <android/log.h>
-#endif
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Buffer to hold printed messages.
- */
-#if ARCH == AVR
-
-#ifndef QUIET
-volatile char print_buf[128 + 1];
-volatile char *util_print_ptr;
-
-#if OPSYS == DUINO
-/**
- * Send byte to serial port.
- */
-void uart_putchar(char c, FILE *stream) {
-	if (c == '\n') {
-		uart_putchar('\r', stream);
-	}
-	loop_until_bit_is_set(UCSR0A, UDRE0);
-	UDR0 = c;
-}
-
-/**
- * Stream for serial port.
- */
-FILE uart_output = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WRITE);
-
-#endif
-#endif
-
-#endif /* QUIET */
-
-/*============================================================================*/
-/* Public definitions                                                         */
-/*============================================================================*/
-
-uint32_t util_conv_endian(uint32_t i) {
-	uint32_t i1, i2, i3, i4;
-	i1 = i & 0xFF;
-	i2 = (i >> 8) & 0xFF;
-	i3 = (i >> 16) & 0xFF;
-	i4 = (i >> 24) & 0xFF;
-
-	return ((uint32_t) i1 << 24) | ((uint32_t) i2 << 16) | ((uint32_t) i3 << 8)
-			| i4;
-}
-
-uint32_t util_conv_big(uint32_t i) {
-#ifdef BIGED
-	return i;
-#else
-	return util_conv_endian(i);
-#endif
-}
-
-uint32_t util_conv_little(uint32_t i) {
-#ifndef BIGED
-	return util_conv_endian(i);
-#else
-	return i;
-#endif
-}
-
-char util_conv_char(dig_t i) {
-#if WSIZE == 8 || WSIZE == 16
-	/* Avoid tables to save up some memory. This is not performance-critical. */
-	if (i < 10) {
-		return i + '0';
-	}
-	if (i < 36) {
-		return (i - 10) + 'A';
-	}
-	if (i < 62) {
-		return (i - 36) + 'a';
-	}
-	if (i == 62) {
-		return '+';
-	} else {
-		return '/';
-	}
-#else
-	/* Use a table. */
-	static const char conv_table[] =
-			"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/";
-	return conv_table[i];
-#endif
-}
-
-int util_bits_dig(dig_t a) {
-    return RLC_DIG - arch_lzcnt(a);
-}
-
-int util_cmp_const(const void *a, const void *b, int size) {
-	const uint8_t *_a = (const uint8_t *)a;
-	const uint8_t *_b = (const uint8_t *)b;
-	uint8_t result = 0;
-	int i;
-
-	for (i = 0; i < size; i++) {
-		result |= _a[i] ^ _b[i];
-	}
-
-	return (result == 0 ? RLC_EQ : RLC_NE);
-}
-
-#ifndef QUIET
-void util_print(const char *format, ...) {
-#if ARCH == AVR && !defined(OPSYS)
-	util_print_ptr = print_buf + 1;
-	va_list list;
-	va_start(list, format);
-	vsnprintf_P((char *)util_print_ptr, sizeof(print_buf) - 1, format, list);
-	va_end(list);
-	print_buf[0] = (uint8_t)2;
-#elif ARCH == AVR && OPSYS == DUINO
-	stdout = &uart_output;
-	va_list list;
-	va_start(list, format);
-	vsnprintf_P((char *)print_buf, sizeof(print_buf), format, list);
-	printf("%s", (char *)print_buf);
-	va_end(list);
-#elif ARCH == MSP && !defined(OPSYS)
-	va_list list;
-	va_start(list, format);
-	vprintf(format, list);
-	va_end(list);
-#elif ARCH == ARM && OPSYS == DROID
-	va_list list;
-	va_start(list, format);
-	__android_log_vprint(ANDROID_LOG_INFO, "relic-toolkit", format, list);
-	va_end(list);
-#else
-	va_list list;
-	va_start(list, format);
-	vprintf(format, list);
-	fflush(stdout);
-	va_end(list);
-#endif
-}
-#endif
-
-void util_print_dig(dig_t a, int pad) {
-#if RLC_DIG == 64
-	if (pad) {
-		util_print("%.16" PRIX64, (uint64_t) a);
-	} else {
-		util_print("%" PRIX64, (uint64_t) a);
-	}
-#elif RLC_DIG == 32
-	if (pad) {
-		util_print("%.8" PRIX32, (uint32_t) a);
-	} else {
-		util_print("%" PRIX32, (uint32_t) a);
-	}
-#elif RLC_DIG == 16
-	if (pad) {
-		util_print("%.4" PRIX16, (uint16_t) a);
-	} else {
-		util_print("%" PRIX16, (uint16_t) a);
-	}
-#else
-	if (pad) {
-		util_print("%.2" PRIX8, (uint8_t)a);
-	} else {
-		util_print("%" PRIX8, (uint8_t)a);
-	}
-#endif
-}
diff --git a/src/dashbls/depends/relic/src/tmpl/relic_tmpl_map.h b/src/dashbls/depends/relic/src/tmpl/relic_tmpl_map.h
deleted file mode 100644
index 9bf62706c13a..000000000000
--- a/src/dashbls/depends/relic/src/tmpl/relic_tmpl_map.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Templates for hashing to elliptic curves.
- *
- * @ingroup tmpl
- */
-
-/*============================================================================*/
-/* Private definitions                                                        */
-/*============================================================================*/
-
-/**
- * Evaluate a polynomial represented by its coefficients over a using Horner's
- * rule. Might promove to an API if needed elsewhere in the future.
- */
-#define TMPL_MAP_HORNER(PFX, IN)											\
-	static void PFX##_eval(PFX##_t c, PFX##_t a, IN *coeffs, int deg) {		\
-		PFX##_copy(c, coeffs[deg]);											\
-		for (int i = deg; i > 0; --i) {										\
-			PFX##_mul(c, c, a);												\
-			PFX##_add(c, c, coeffs[i - 1]);									\
-		}																	\
-	}
-
-/* TODO: remove the ugly hack due to lack of support for JACOB in ep2. */
-/* conditionally normalize result of isogeny map when not using projective coords */
-#if EP_ADD == JACOB
-#define TMPL_MAP_ISOMAP_NORM(PFX)											\
-	do {																	\
-		/* Y = Ny * Dx * Z^2. */											\
-		PFX##_mul(q->y, p->y, t1);											\
-		PFX##_mul(q->y, q->y, t3);											\
-		/* Z = Dx * Dy, t1 = Z^2. */										\
-		PFX##_mul(q->z, t2, t3);											\
-		PFX##_sqr(t1, q->z);												\
-		PFX##_mul(q->y, q->y, t1);											\
-		/* X = Nx * Dy * Z. */												\
-		PFX##_mul(q->x, t0, t2);											\
-		PFX##_mul(q->x, q->x, q->z);										\
-		q->coord = JACOB;													\
-	} while (0)
-#elif EP_ADD == PROJC
-#define TMPL_MAP_ISOMAP_NORM(PFX)											\
-	if (#PFX[2] == '2') {													\
-		/* Y = Ny * Dx * Z^2. */											\
-		PFX##_mul(q->y, p->y, t1);											\
-		PFX##_mul(q->y, q->y, t3);											\
-		/* Z = Dx * Dy, t1 = Z^2. */										\
-		PFX##_mul(q->z, t2, t3);											\
-		PFX##_sqr(t1, q->z);												\
-		PFX##_mul(q->y, q->y, t1);											\
-		/* X = Nx * Dy * Z. */												\
-		PFX##_mul(q->x, t0, t2);											\
-		PFX##_mul(q->x, q->x, q->z);										\
-		q->coord = PROJC;													\
-	} else {																\
-		/* Z = Dx * Dy. */													\
-		PFX##_mul(q->z, t2, t3);											\
-		/* X = Nx * Dy. */													\
-		PFX##_mul(q->x, t0, t2);											\
-		/* Y = Ny * Dx. */													\
-		PFX##_mul(q->y, p->y, t1);											\
-		PFX##_mul(q->y, q->y, t3);											\
-		q->coord = PROJC;													\
-	}
-#else
-#define TMPL_MAP_ISOMAP_NORM(PFX)											\
-	do {																	\
-		/* when working with affine coordinates, clear denominator */		\
-		PFX##_mul(q->z, t2, t3);											\
-		PFX##_inv(q->z, q->z);												\
-		/* y coord */														\
-		PFX##_mul(q->y, p->y, q->z);										\
-		PFX##_mul(q->y, q->y, t3);											\
-		PFX##_mul(q->y, q->y, t1);											\
-		/* x coord */														\
-		PFX##_mul(q->x, t2, q->z);											\
-		PFX##_mul(q->x, q->x, t0);											\
-		/* z coord == 1 */													\
-		PFX##_set_dig(q->z, 1);												\
-		q->coord = BASIC;													\
-	} while (0)
-#endif
-
-/**
- * Generic isogeny map evaluation for use with SSWU map.
- */
-#define TMPL_MAP_ISOGENY_MAP(CUR, PFX, ISO)									\
-	/* declaring this function inline suppresses unused warnings */			\
-	static inline void CUR##_iso(CUR##_t q, CUR##_t p) {					\
-		PFX##_t t0, t1, t2, t3;												\
-																			\
-		if (!CUR##_curve_is_ctmap()) {										\
-			CUR##_copy(q, p);												\
-			return;															\
-		}																	\
-		/* XXX need to add real support for input projective points */		\
-		if (p->coord != BASIC) {											\
-			CUR##_norm(p, p);												\
-		}																	\
-																			\
-		PFX##_null(t0);														\
-		PFX##_null(t1);														\
-		PFX##_null(t2);														\
-		PFX##_null(t3);														\
-                                                                    		\
-		RLC_TRY {															\
-			PFX##_new(t0);													\
-			PFX##_new(t1);													\
-			PFX##_new(t2);													\
-			PFX##_new(t3);													\
-																			\
-			ISO##_t coeffs = CUR##_curve_get_iso();							\
-																			\
-			/* numerators */												\
-			PFX##_eval(t0, p->x, coeffs->xn, coeffs->deg_xn);				\
-			PFX##_eval(t1, p->x, coeffs->yn, coeffs->deg_yn);				\
-			/* denominators */												\
-			PFX##_eval(t2, p->x, coeffs->yd, coeffs->deg_yd);				\
-			PFX##_eval(t3, p->x, coeffs->xd, coeffs->deg_xd);				\
-																			\
-			/* normalize if necessary */									\
-			TMPL_MAP_ISOMAP_NORM(PFX);										\
-		}																	\
-		RLC_CATCH_ANY { RLC_THROW(ERR_CAUGHT); }							\
-		RLC_FINALLY {														\
-			PFX##_free(t0);													\
-			PFX##_free(t1);													\
-			PFX##_free(t2);													\
-			PFX##_free(t3);													\
-		}																	\
-	}
-
-/* Conditionally call isogeny mapping function depending on whether EP_CTMAP is defined */
-#ifdef EP_CTMAP
-#define TMPL_MAP_CALL_ISOMAP(CUR, PT)										\
-	do {																	\
-		if (CUR##_curve_is_ctmap()) {										\
-			CUR##_iso(PT, PT);												\
-		}																	\
-	} while (0)
-#else
-#define TMPL_MAP_CALL_ISOMAP(CUR, PT) /* No isogeny map call in this case. */
-#endif
-
-/**
- * Simplified SWU mapping from Section 4 of
- * "Fast and simple constant-time hashing to the BLS12-381 Elliptic Curve"
- */
-#define TMPL_MAP_SSWU(CUR, PFX, PTR_TY, COPY_COND)							\
-	static void CUR##_map_sswu(CUR##_t p, PFX##_t t) {						\
-		PFX##_t t0, t1, t2, t3;												\
-		ctx_t *ctx = core_get();											\
-		PTR_TY *mBoverA = ctx->CUR##_map_c[0];								\
-		PTR_TY *a = ctx->CUR##_map_c[2];									\
-		PTR_TY *b = ctx->CUR##_map_c[3];									\
-		PTR_TY *u = ctx->CUR##_map_u;										\
-                                                                            \
-		PFX##_null(t0);														\
-		PFX##_null(t1);														\
-		PFX##_null(t2);														\
-		PFX##_null(t3);														\
-																			\
-		RLC_TRY {															\
-			PFX##_new(t0);													\
-			PFX##_new(t1);													\
-			PFX##_new(t2);													\
-			PFX##_new(t3);													\
-																			\
-			/* start computing the map */									\
-			PFX##_sqr(t0, t);												\
-			PFX##_mul(t0, t0, u);  /* t0 = u * t^2 */						\
-			PFX##_sqr(t1, t0);     /* t1 = u^2 * t^4 */						\
-			PFX##_add(t2, t1, t0); /* t2 = u^2 * t^4 + u * t^2 */			\
-																			\
-			/* handle the exceptional cases */												\
-			/* XXX(rsw) should be done projectively */										\
-			{																				\
-				const int e1 = PFX##_is_zero(t2);											\
-				PFX##_neg(t3, u);         /* t3 = -u */										\
-				COPY_COND(t2, t3, e1);        /* exception: -u instead of u^2t^4 + ut^2 */	\
-				PFX##_inv(t2, t2);        /* t2 = -1/u or 1/(u^2 * t^4 + u*t^2) */			\
-				PFX##_add_dig(t3, t2, 1); /* t3 = 1 + t2 */									\
-				COPY_COND(t2, t3, e1 == 0);      /* only add 1 if t2 != -1/u */				\
-			}																				\
-			/* e1 goes out of scope */														\
-                                                                                			\
-			/* compute x1, g(x1) */															\
-			PFX##_mul(p->x, t2, mBoverA); /* -B / A * (1 + 1 / (u^2 * t^4 + u * t^2)) */	\
-			PFX##_sqr(p->y, p->x);        /* x^2 */											\
-			PFX##_add(p->y, p->y, a);     /* x^2 + a */										\
-			PFX##_mul(p->y, p->y, p->x);  /* x^3 + a x */									\
-			PFX##_add(p->y, p->y, b);     /* x^3 + a x + b */								\
-                                                                                    		\
-			/* compute x2, g(x2) */															\
-			PFX##_mul(t2, t0, p->x); /* t2 = u * t^2 * x1 */								\
-			PFX##_mul(t1, t0, t1);   /* t1 = u^3 * t^6 */									\
-			PFX##_mul(t3, t1, p->y); /* t5 = g(t2) = u^3 * t^6 * g(p->x) */					\
-																							\
-			/* XXX(rsw)                                                               */	\
-			/* This should be done in constant time and without computing 2 sqrts.    */	\
-			/* Avoiding a second sqrt relies on knowing the 2-adicity of the modulus. */	\
-			if (!PFX##_srt(p->y, p->y)) {													\
-				/* try x2, g(x2) */															\
-				PFX##_copy(p->x, t2);														\
-				if (!PFX##_srt(p->y, t3)) {													\
-					RLC_THROW(ERR_NO_VALID);												\
-				}																			\
-			}																				\
-			PFX##_set_dig(p->z, 1);											\
-			p->coord = BASIC;												\
-		}																	\
-		RLC_CATCH_ANY { RLC_THROW(ERR_CAUGHT); }							\
-		RLC_FINALLY {														\
-			PFX##_free(t0);													\
-			PFX##_free(t1);													\
-			PFX##_free(t2);													\
-			PFX##_free(t3);													\
-		}																	\
-	}
-
-/**
- * Shallue--van de Woestijne map, based on the definition from
- * draft-irtf-cfrg-hash-to-curve-06, Section 6.6.1
- */
-#define TMPL_MAP_SVDW(CUR, PFX, PTR_TY, COPY_COND)							\
-	static void CUR##_map_svdw(CUR##_t p, PFX##_t t) {						\
-		PFX##_t t1, t2, t3, t4;												\
-		PFX##_null(t1);														\
-		PFX##_null(t2);														\
-		PFX##_null(t3);														\
-		PFX##_null(t4);														\
-                                                                            \
-		RLC_TRY {															\
-			PFX##_new(t1);													\
-			PFX##_new(t2);													\
-			PFX##_new(t3);													\
-			PFX##_new(t4);													\
-																			\
-			ctx_t *ctx = core_get();										\
-			PTR_TY *gU = ctx->CUR##_map_c[0];								\
-			PTR_TY *mUover2 = ctx->CUR##_map_c[1];							\
-			PTR_TY *c3 = ctx->CUR##_map_c[2];								\
-			PTR_TY *c4 = ctx->CUR##_map_c[3];								\
-			PTR_TY *u = ctx->CUR##_map_u;									\
-                                                                            \
-			/* start computing the map */									\
-			PFX##_sqr(t1, t);												\
-			PFX##_mul(t1, t1, gU);											\
-			PFX##_add_dig(t2, t1, 1); /* 1 + t^2 * g(u) */					\
-			PFX##_sub_dig(t1, t1, 1);										\
-			PFX##_neg(t1, t1);     /* 1 - t^2 * g(u) */						\
-			PFX##_mul(t3, t1, t2); /* (1+t^2*g(u)) * (1-t^2*g(u)) */		\
-                                                                            \
-			/* handle exceptional case */									\
-			{																\
-				/* compute inv0(t3), i.e., 0 if t3 == 0, 1/t3 otherwise */	\
-				const int e0 = PFX##_is_zero(t3);							\
-				COPY_COND(t3, gU, e0); /* g(u) is nonzero */				\
-				PFX##_inv(t3, t3);											\
-				PFX##_zero(t4);												\
-				COPY_COND(t3, t4, e0);										\
-			}																\
-			/* e0 goes out of scope */										\
-			PFX##_mul(t4, t, t1);											\
-			PFX##_mul(t4, t4, t3);											\
-			PFX##_mul(t4, t4, c3);											\
-																			\
-			/* XXX(rsw) this should be constant time */						\
-			/* compute x1 and g(x1) */										\
-			PFX##_sub(p->x, mUover2, t4);									\
-			CUR##_rhs(p->y, p);												\
-			if (!PFX##_srt(p->y, p->y)) {									\
-				/* compute x2 and g(x2) */									\
-				PFX##_add(p->x, mUover2, t4);								\
-				CUR##_rhs(p->y, p);											\
-				if (!PFX##_srt(p->y, p->y)) {								\
-					/* compute x3 and g(x3) */								\
-					PFX##_sqr(p->x, t2);									\
-					PFX##_mul(p->x, p->x, t3);								\
-					PFX##_sqr(p->x, p->x);									\
-					PFX##_mul(p->x, p->x, c4);								\
-					PFX##_add(p->x, p->x, u);								\
-					CUR##_rhs(p->y, p);										\
-					if (!PFX##_srt(p->y, p->y)) {							\
-						RLC_THROW(ERR_NO_VALID);							\
-					}														\
-				}															\
-			}																\
-			PFX##_set_dig(p->z, 1);											\
-			p->coord = BASIC;												\
-		}																	\
-		RLC_CATCH_ANY { RLC_THROW(ERR_CAUGHT); }							\
-		RLC_FINALLY {														\
-			PFX##_free(t1);													\
-			PFX##_free(t2);													\
-			PFX##_free(t3);													\
-			PFX##_free(t4);													\
-		}																	\
-	}
diff --git a/src/dashbls/depends/relic/test/CMakeLists.txt b/src/dashbls/depends/relic/test/CMakeLists.txt
deleted file mode 100644
index 1b7a717cf0f3..000000000000
--- a/src/dashbls/depends/relic/test/CMakeLists.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-macro(ADD_MODULE MODULE)
-	add_executable(test_${MODULE} test_${MODULE}.c)
-	if (STLIB)
-		target_link_libraries(test_${MODULE} ${RELIC_S})
-	else(STLIB)
-		if (SHLIB)
-			target_link_libraries(test_${MODULE} ${RELIC})
-		endif(SHLIB)
-	endif(STLIB)
-	add_test(test_${MODULE} ${SIMUL} ${SIMAR} ${EXECUTABLE_OUTPUT_PATH}/test_${MODULE})
-endmacro(ADD_MODULE)
-
-if (CHECK)
-	ADD_MODULE(err)
-endif(CHECK)
-
-if (WITH_BN)
-	ADD_MODULE(bn)
-endif(WITH_BN)
-
-if (WITH_DV)
-	ADD_MODULE(dv)
-endif(WITH_DV)
-
-if (WITH_FP)
-	ADD_MODULE(fp)
-endif(WITH_FP)
-
-if (WITH_FPX)
-	ADD_MODULE(fpx)
-endif(WITH_FPX)
-
-if (WITH_FB)
-	ADD_MODULE(fb)
-endif(WITH_FB)
-
-if (WITH_FBX)
-	ADD_MODULE(fbx)
-endif(WITH_FBX)
-
-if (WITH_EP)
-	ADD_MODULE(ep)
-endif(WITH_EP)
-
-if (WITH_EPX)
-	ADD_MODULE(epx)
-endif(WITH_EPX)
-
-if (WITH_EB)
-	ADD_MODULE(eb)
-endif(WITH_EB)
-
-if (WITH_ED)
-	ADD_MODULE(ed)
-endif (WITH_ED)
-
-if (WITH_EC)
-	ADD_MODULE(ec)
-endif(WITH_EC)
-
-if (WITH_PC)
-	ADD_MODULE(pc)
-endif(WITH_PC)
-
-if (WITH_PP)
-	ADD_MODULE(pp)
-endif(WITH_PP)
-
-if (WITH_MD)
-	ADD_MODULE(md)
-endif(WITH_MD)
-
-if (WITH_CP)
-	ADD_MODULE(cp)
-endif(WITH_CP)
-
-if (WITH_MPC)
-	ADD_MODULE(mpc)
-endif(WITH_MPC)
-
-ADD_MODULE(rand)
-ADD_MODULE(core)
diff --git a/src/dashbls/depends/relic/test/test_bn.c b/src/dashbls/depends/relic/test/test_bn.c
deleted file mode 100644
index e8064c800059..000000000000
--- a/src/dashbls/depends/relic/test/test_bn.c
+++ /dev/null
@@ -1,2247 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for multiple precision integer arithmetic.
- *
- * @ingroup test
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	bn_t a;
-
-	bn_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			bn_new(a);
-			bn_free(a);
-		}
-		TEST_END;
-	}
-	RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util(void) {
-	int bits, code = RLC_ERR;
-	char str[RLC_BN_BITS + 2];
-	dig_t digit, raw[RLC_BN_DIGS];
-	uint8_t bin[RLC_CEIL(RLC_BN_BITS, 8)];
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			if (bn_cmp(a, b) != RLC_EQ) {
-				if (bn_cmp(a, b) == RLC_GT) {
-					TEST_ASSERT(bn_cmp(b, a) == RLC_LT, end);
-				} else {
-					TEST_ASSERT(bn_cmp(b, a) == RLC_GT, end);
-				}
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_rand(c, RLC_POS, RLC_BN_BITS);
-			if (bn_cmp(a, c) != RLC_EQ) {
-				bn_copy(c, a);
-				TEST_ASSERT(bn_cmp(c, a) == RLC_EQ, end);
-			}
-			if (bn_cmp(b, c) != RLC_EQ) {
-				bn_copy(c, b);
-				TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("absolute, negation and comparison are consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_neg(b, a);
-			bn_abs(a, b);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp(b, a) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp_abs(a, b) == RLC_EQ, end);
-			TEST_ASSERT(bn_cmp_dig(a, (dig_t)0) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp_dig(b, (dig_t)0) == RLC_LT, end);
-		} TEST_END;
-
-		TEST_CASE("signal test is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS);
-			TEST_ASSERT(bn_sign(a) == RLC_POS, end);
-			TEST_ASSERT(bn_sign(b) == RLC_NEG, end);
-		} TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS);
-			bn_zero(c);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp(c, a) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp(c, b) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp_dig(a, (dig_t)0) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp_dig(b, (dig_t)0) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp_dig(c, (dig_t)0) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			bn_zero(c);
-			TEST_ASSERT(bn_is_zero(c), end);
-			TEST_ASSERT(bn_cmp_dig(c, (dig_t)0) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("oddness test is correct") {
-			bn_set_dig(a, 2);
-			bn_set_dig(b, 1);
-			TEST_ASSERT(bn_is_even(a) == 1, end);
-			TEST_ASSERT(bn_is_even(b) == 0, end);
-		} TEST_END;
-
-		bits = 0;
-		TEST_CASE("assignment and bit counting are consistent") {
-			bn_set_2b(a, bits);
-			TEST_ASSERT(bits + 1 == bn_bits(a), end);
-			bits = (bits + 1) % RLC_BN_BITS;
-		} TEST_END;
-
-		bits = 0;
-		TEST_CASE("bit setting and getting are consistent") {
-			bn_zero(a);
-			bn_set_bit(a, bits, 1);
-			TEST_ASSERT(bn_get_bit(a, bits) == 1, end);
-			bn_set_bit(a, bits, 0);
-			TEST_ASSERT(bn_get_bit(a, bits) == 0, end);
-			bits = (bits + 1) % RLC_BN_BITS;
-		}
-		TEST_END;
-
-		bits = 0;
-		TEST_CASE("hamming weight is correct") {
-			bn_zero(a);
-			for (int j = 0; j < bits; j++) {
-				bn_set_bit(a, j, 1);
-			}
-			TEST_ASSERT(bn_ham(a) == bits, end);
-			bits = (bits + 1) % RLC_BN_BITS;
-		}
-		TEST_END;
-
-		TEST_CASE("generating a random integer is consistent") {
-			do {
-				bn_rand(b, RLC_POS, RLC_BN_BITS);
-			} while (bn_is_zero(b));
-			bn_rand_mod(a, b);
-			TEST_ASSERT(bn_sign(a) == bn_sign(b), end);
-			TEST_ASSERT(bn_is_zero(a) == 0, end);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_LT, end);
-			do {
-				bn_rand(b, RLC_NEG, RLC_DIG);
-			} while (bn_bits(b) <= 1);
-			bn_rand_mod(a, b);
-			TEST_ASSERT(bn_sign(a) == bn_sign(b), end);
-			TEST_ASSERT(bn_is_zero(a) == 0, end);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_GT, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing the first digit are consistent") {
-			bn_rand(a, RLC_POS, RLC_DIG);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&digit, a);
-			bn_set_dig(b, digit);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			bn_set_dig(a, 2);
-			bn_set_dig(b, 1);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp(b, a) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp_dig(a, (dig_t)0) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp_dig(b, (dig_t)0) == RLC_GT, end);
-		} TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS);
-			bn_zero(c);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_LT, end);
-			TEST_ASSERT(bn_cmp_dig(a, (dig_t)0) == RLC_GT, end);
-			TEST_ASSERT(bn_cmp_dig(b, (dig_t)0) == RLC_LT, end);
-		} TEST_END;
-
-		bits = 0;
-		TEST_CASE("different forms of assignment are consistent") {
-			bn_set_dig(a, (dig_t)(1) << (dig_t)bits);
-			bn_set_2b(b, bits);
-			bits++;
-			bits %= (RLC_DIG);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a positive number are consistent") {
-			int len = RLC_CEIL(RLC_BN_BITS, 8);
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			for (int j = 2; j <= 64; j++) {
-				bits = bn_size_str(a, j);
-				bn_write_str(str, bits, a, j);
-				bn_read_str(b, str, bits, j);
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-			bn_write_bin(bin, len, a);
-			bn_read_bin(b, bin, len);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			len = RLC_BN_DIGS;
-			bn_write_raw(raw, len, a);
-			bn_read_raw(b, raw, len);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a positive number is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			TEST_ASSERT((bn_size_str(a, 2) - 1) == bn_bits(a), end);
-			bits = (bn_bits(a) % 8 == 0 ? bn_bits(a) / 8 : bn_bits(a) / 8 + 1);
-			TEST_ASSERT(bn_size_bin(a) == bits, end);
-			TEST_ASSERT(bn_size_raw(a) == a->used, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a negative number are consistent") {
-			int len = RLC_CEIL(RLC_BN_BITS, 8);
-			bn_rand(a, RLC_NEG, RLC_BN_BITS);
-			for (int j = 2; j <= 64; j++) {
-				bits = bn_size_str(a, j);
-				bn_write_str(str, bits, a, j);
-				bn_read_str(b, str, bits, j);
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-			bn_write_bin(bin, len, a);
-			bn_read_bin(b, bin, len);
-			bn_neg(b, b);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			len = RLC_BN_DIGS;
-			bn_write_raw(raw, len, a);
-			bn_read_raw(b, raw, len);
-			bn_neg(b, b);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a negative number is correct") {
-			bn_rand(a, RLC_NEG, RLC_BN_BITS);
-			TEST_ASSERT((bn_size_str(a, 2) - 2) == bn_bits(a), end);
-			bits = (bn_bits(a) % 8 == 0 ? bn_bits(a) / 8 : bn_bits(a) / 8 + 1);
-			TEST_ASSERT(bn_size_bin(a) == bits, end);
-			TEST_ASSERT(bn_size_raw(a) == a->used, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int addition(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-
-		TEST_CASE("addition is commutative") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_add(d, a, b);
-			bn_add(e, b, a);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_rand(c, RLC_POS, RLC_BN_BITS);
-			bn_add(d, a, b);
-			bn_add(d, d, c);
-			bn_add(e, b, c);
-			bn_add(e, a, e);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_zero(d);
-			bn_add(e, a, d);
-			TEST_ASSERT(bn_cmp(e, a) == RLC_EQ, end);
-			bn_add(e, d, a);
-			TEST_ASSERT(bn_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_neg(d, a);
-			bn_add(e, a, d);
-			TEST_ASSERT(bn_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	return code;
-}
-
-static int subtraction(void) {
-	int code = RLC_ERR;
-	int s;
-	bn_t a, b, c, d;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_sub(c, a, b);
-			bn_sub(d, b, a);
-			TEST_ASSERT(bn_cmp_abs(c, d) == RLC_EQ, end);
-			if (!bn_is_zero(c)) {
-				s = bn_sign(d);
-				TEST_ASSERT(bn_sign(c) != s, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_zero(c);
-			bn_sub(d, a, c);
-			TEST_ASSERT(bn_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_sub(c, a, a);
-			TEST_ASSERT(bn_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e, f;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-	bn_null(f);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-		bn_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(d, a, b);
-			bn_mul(e, b, a);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 3);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 3);
-			bn_rand(c, RLC_POS, RLC_BN_BITS / 3);
-			bn_mul(d, a, b);
-			bn_mul(d, d, c);
-			bn_mul(e, b, c);
-			bn_mul(e, a, e);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(c, RLC_POS, RLC_BN_BITS / 2);
-			bn_add(d, a, b);
-			bn_mul(d, c, d);
-			bn_mul(e, c, a);
-			bn_mul(f, c, b);
-			bn_add(e, e, f);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_set_dig(d, (dig_t)1);
-			bn_mul(e, a, d);
-			TEST_ASSERT(bn_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_zero(d);
-			bn_mul(e, a, d);
-			TEST_ASSERT(bn_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has negation property") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_set_dig(d, 1);
-			bn_neg(d, d);
-			bn_mul(e, a, d);
-			TEST_ASSERT(bn_cmp_abs(e, a) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(e) == RLC_NEG, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by a positive number preserves order") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(c, RLC_POS, RLC_BN_BITS / 2);
-			int t = bn_cmp(a, b);
-			bn_mul(d, c, a);
-			bn_mul(e, c, b);
-			TEST_ASSERT(bn_cmp(d, e) == t, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by a negative number reverses order") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(c, RLC_POS, RLC_BN_BITS / 2);
-			int t = bn_cmp(a, b);
-			bn_neg(d, c);
-			bn_mul(e, d, a);
-			bn_mul(d, d, b);
-			if (t != RLC_EQ) {
-				TEST_ASSERT(bn_cmp(e, d) != t, end);
-			}
-		}
-		TEST_END;
-
-#if BN_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(c, a, b);
-			bn_mul_basic(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if BN_MUL == COMBA || !defined(STRIP)
-		TEST_CASE("comba multiplication is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(c, a, b);
-			bn_mul_comba(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-		TEST_CASE("karatsuba multiplication is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(c, a, b);
-			bn_mul_karat(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	bn_free(f);
-	return code;
-}
-
-static int squaring(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_CASE("squaring is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(b, a, a);
-			bn_sqr(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if BN_SQR == BASIC || !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_sqr(b, a);
-			bn_sqr_basic(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if BN_SQR == COMBA || !defined(STRIP)
-		TEST_CASE("comba squaring is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_sqr(b, a);
-			bn_sqr_comba(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if BN_KARAT > 0 || !defined(STRIP)
-		TEST_CASE("karatsuba squaring is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_sqr(b, a);
-			bn_sqr_karat(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int doubling_halving(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_CASE("doubling is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - 1);
-			bn_add(b, a, a);
-			bn_dbl(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("halving is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - 1);
-			bn_dbl(b, a);
-			bn_hlv(c, b);
-			TEST_ASSERT(bn_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int shifting(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_CASE("shifting by 1 bit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - 1);
-			bn_lsh(b, a, 1);
-			bn_dbl(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-			bn_rsh(b, a, 1);
-			bn_hlv(c, a);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-			bn_lsh(b, a, 1);
-			bn_rsh(c, b, 1);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 2 bits is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - 2);
-			bn_lsh(b, a, 2);
-			bn_rsh(c, b, 2);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by half digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG / 2);
-			bn_lsh(b, a, RLC_DIG / 2);
-			bn_rsh(c, b, RLC_DIG / 2);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 1 digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_DIG);
-			bn_lsh(b, a, RLC_DIG);
-			bn_rsh(c, b, RLC_DIG);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 2 digits is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - 2 * RLC_DIG);
-			bn_lsh(b, a, 2 * RLC_DIG);
-			bn_rsh(c, b, 2 * RLC_DIG);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("shifting by 1 digit and half is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG - RLC_DIG / 2);
-			bn_lsh(b, a, RLC_DIG + RLC_DIG / 2);
-			bn_copy(c, a);
-			for (int j = 0; j < (int)(RLC_DIG + RLC_DIG / 2); j++)
-				bn_dbl(c, c);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-			bn_rsh(b, a, (RLC_DIG + RLC_DIG / 2));
-			bn_copy(c, a);
-			for (int j = 0; j < (int)(RLC_DIG + RLC_DIG / 2); j++)
-				bn_hlv(c, c);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int division(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-
-		TEST_CASE("trivial division is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) == bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == RLC_POS, end);
-		} TEST_END;
-
-		TEST_CASE("trivial negative division is correct") {
-			bn_rand(a, RLC_NEG, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) == bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(b), end);
-		} TEST_END;
-
-		TEST_CASE("trivial division by negative is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) != bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(b), end);
-		} TEST_END;
-
-		TEST_CASE("negative trivial division by negative is correct") {
-			bn_rand(a, RLC_NEG, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) != bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(b), end);
-		} TEST_END;
-
-		TEST_CASE("division is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) == bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(d), end);
-		} TEST_END;
-
-		TEST_CASE("negative division is correct") {
-			bn_rand(a, RLC_NEG, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) == bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == RLC_POS, end);
-		} TEST_END;
-
-		TEST_CASE("division by negative is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS / 2);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) != bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(b), end);
-		} TEST_END;
-
-		TEST_CASE("negative division by negative is correct") {
-			bn_rand(a, RLC_NEG, RLC_BN_BITS);
-			bn_rand(b, RLC_NEG, RLC_BN_BITS / 2);
-			bn_div(e, a, b);
-			bn_div_rem(c, d, a, b);
-			TEST_ASSERT(bn_cmp(e, c) == RLC_EQ, end);
-			bn_mul(e, c, b);
-			bn_add(e, e, d);
-			TEST_ASSERT(bn_cmp(a, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_sign(a) != bn_sign(c), end);
-			TEST_ASSERT(bn_sign(d) == bn_sign(b), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	return code;
-}
-
-static int reduction(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-
-#if BN_MOD == BASIC || !defined(STRIP)
-		TEST_CASE("basic reduction is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_div_rem(c, d, a, b);
-			bn_sqr(c, b);
-			if (bn_cmp(a, c) == RLC_LT) {
-				bn_mod_basic(e, a, b);
-				TEST_ASSERT(bn_cmp(e, d) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-#endif
-
-#if BN_MOD == BARRT || !defined(STRIP)
-		TEST_CASE("barrett reduction is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_div_rem(c, d, a, b);
-			bn_sqr(c, b);
-			if (bn_cmp(a, c) == RLC_LT) {
-				bn_mod_pre_barrt(e, b);
-				bn_mod_barrt(e, a, b, e);
-				TEST_ASSERT(bn_cmp(e, d) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-#endif
-
-#if (BN_MOD == MONTY && BN_MUL == BASIC) || !defined(STRIP)
-		TEST_CASE("basic montgomery reduction is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(b)) {
-				bn_add_dig(b, b, 1);
-			}
-			bn_mod(a, a, b);
-			bn_mod_monty_conv(c, a, b);
-			bn_mod_pre_monty(e, b);
-			bn_mod_monty_basic(d, c, b, e);
-			TEST_ASSERT(bn_cmp(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if (BN_MOD == MONTY && BN_MUL == COMBA) || !defined(STRIP)
-		TEST_CASE("comba montgomery reduction is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS - RLC_DIG / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(b)) {
-				bn_add_dig(b, b, 1);
-			}
-			bn_mod(a, a, b);
-			bn_mod_monty_conv(c, a, b);
-			bn_mod_pre_monty(e, b);
-			bn_mod_monty_comba(d, c, b, e);
-			TEST_ASSERT(bn_cmp(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if BN_MOD == PMERS || !defined(STRIP)
-		TEST_CASE("pseudo-mersenne reduction is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(c, RLC_POS, RLC_BN_BITS / 4);
-			if (bn_is_zero(c))
-				bn_set_dig(c, 1);
-			bn_set_2b(b, RLC_BN_BITS / 2);
-			bn_sub(b, b, c);
-			bn_mod(c, a, b);
-			bn_mod_pre_pmers(e, b);
-			bn_mod_pmers(d, a, b, e);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	return code;
-}
-
-static int exponentiation(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, p;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(p);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(p);
-
-#if BN_MOD != PMERS
-		bn_gen_prime(p, RLC_BN_BITS);
-#elif BN_PRECI >= 128
-		/* Let's try a Mersenne prime. */
-		bn_zero(p);
-		bn_set_bit(p, 127, 1);
-		bn_sub_dig(p, p, 1);
-#endif
-
-		TEST_CASE("modular exponentiation is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_mod(a, a, p);
-			bn_mxp(b, a, p, p);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("modular exponentiation with zero power is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_zero(b);
-			bn_mxp(a, a, b, p);
-			TEST_ASSERT(bn_cmp_dig(a, 1) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("modular exponentiation with negative power is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_mod(a, a, p);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			/* Compute c = a^b mod p. */
-			bn_mxp(c, a, b, p);
-			/* Compute b = a^-b mod p. */
-			bn_neg(b, b);
-			bn_mxp(b, a, b, p);
-			/* Check that c * b = 1 mod p. */
-			bn_mul(c, c, b);
-			bn_mod(c, c, p);
-			TEST_ASSERT(bn_cmp_dig(c, 1) == RLC_EQ, end);
-		}
-		TEST_END;
-
-#if BN_MXP == BASIC || !defined(STRIP)
-		TEST_CASE("basic modular exponentiation is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_mod(a, a, p);
-			bn_mxp_basic(b, a, p, p);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if BN_MXP == SLIDE || !defined(STRIP)
-		TEST_CASE("sliding window modular exponentiation is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_mod(a, a, p);
-			bn_mxp_slide(b, a, p, p);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if BN_MXP == CONST || !defined(STRIP)
-		TEST_CASE("powering ladder modular exponentiation is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_mod(a, a, p);
-			bn_mxp_monty(b, a, p, p);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(p);
-	return code;
-}
-
-static int square_root(void) {
-	int bits, code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_ONCE("square root extraction is correct") {
-			for (bits = 0; bits < RLC_BN_BITS / 2; bits++) {
-				bn_rand(a, RLC_POS, bits);
-				bn_sqr(c, a);
-				bn_srt(b, c);
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-			for (bits = 0; bits < RLC_BN_BITS; bits++) {
-				bn_rand(a, RLC_POS, bits);
-				bn_srt(b, a);
-				bn_sqr(c, b);
-				TEST_ASSERT(bn_cmp(c, a) != RLC_GT, end);
-			}
-		}
-		TEST_END;
-
-		TEST_ONCE("square root of powers of 2 is correct") {
-			for (bits = 0; bits < RLC_BN_BITS / 2; bits++) {
-				bn_set_2b(a, bits);
-				bn_sqr(c, a);
-				bn_srt(b, c);
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int gcd(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e, f;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-	bn_null(f);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-		bn_new(f);
-
-		TEST_CASE("greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd(c, a, b);
-			bn_mod(d, a, c);
-			bn_mod(e, b, c);
-			TEST_ASSERT(bn_is_zero(d) && bn_is_zero(e), end);
-			bn_div(a, a, c);
-			bn_div(b, b, c);
-			bn_gcd(c, a, b);
-			TEST_ASSERT(bn_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_zero(b);
-			bn_gcd(c, a, b);
-			TEST_ASSERT(bn_cmp_abs(c, a) == RLC_EQ, end);
-			bn_rand(a, RLC_NEG, RLC_BN_BITS);
-			bn_zero(b);
-			bn_gcd(c, a, b);
-			TEST_ASSERT(bn_cmp_abs(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("extended greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd_ext(c, d, e, a, b);
-			bn_mul(d, d, a);
-			bn_mul(e, e, b);
-			bn_add(d, d, e);
-			bn_gcd(f, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ && bn_cmp(c, f) == RLC_EQ, end);
-		} TEST_END;
-
-#if BN_GCD == BASIC || !defined(STRIP)
-		TEST_CASE("basic greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd(c, a, b);
-			bn_gcd_basic(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("basic extended greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd_ext_basic(c, d, e, a, b);
-			bn_mul(d, d, a);
-			bn_mul(e, e, b);
-			bn_add(d, d, e);
-			bn_gcd_basic(f, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ && bn_cmp(c, f) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if BN_GCD == LEHME || !defined(STRIP)
-		TEST_CASE("lehmer greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd(c, a, b);
-			bn_gcd_lehme(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("lehmer extended greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd_ext_lehme(c, d, e, a, b);
-			bn_mul(d, d, a);
-			bn_mul(e, e, b);
-			bn_add(d, d, e);
-			bn_gcd_lehme(f, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ && bn_cmp(c, f) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if BN_GCD == STEIN || !defined(STRIP)
-		TEST_CASE("stein greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd(c, a, b);
-			bn_gcd_stein(d, a, b);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("stein extended greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd_ext_stein(c, d, e, a, b);
-			bn_mul(d, d, a);
-			bn_mul(e, e, b);
-			bn_add(d, d, e);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("midway extended greatest common divisor is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_gcd_ext_mid(c, d, e, f, a, b);
-			bn_abs(d, d);
-			bn_abs(f, f);
-			bn_mul(c, c, f);
-			bn_mul(e, e, d);
-			bn_add(c, c, e);
-			TEST_ASSERT(bn_cmp(b, c) == RLC_EQ || bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	bn_free(f);
-	return code;
-}
-
-static int lcm(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		TEST_CASE("least common multiple is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			bn_lcm(c, a, b);
-			bn_mod(a, c, a);
-			bn_mod(b, c, b);
-			TEST_ASSERT(bn_is_zero(a) && bn_is_zero(b), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int symbol(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, p, q;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(p);
-	bn_null(q);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(p);
-		bn_new(q);
-
-		do {
-			bn_gen_prime(p, RLC_BN_BITS);
-			bn_gen_prime(q, RLC_BN_BITS);
-		} while (bn_is_even(p) || bn_is_even(q));
-
-		TEST_CASE("legendre symbol is correct") {
-			bn_smb_leg(c, p, p);
-			TEST_ASSERT(bn_is_zero(c) == 1, end);
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_sqr(a, a);
-			bn_mod(a, a, p);
-			bn_smb_leg(c, a, p);
-			TEST_ASSERT(bn_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_smb_leg(c, a, p);
-			bn_set_dig(a, 1);
-			TEST_ASSERT(bn_cmp_abs(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("legendre symbol is a homomorphism") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_mul(c, a, b);
-			bn_smb_leg(a, a, p);
-			bn_smb_leg(b, b, p);
-			bn_smb_leg(c, c, p);
-			bn_mul(a, a, b);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_ONCE("legendre symbol satisfies quadratic reciprocity") {
-			/* Check the first supplement: (-1|p) = (-1)^(p-1)/2. */
-			bn_set_dig(a, 1);
-			bn_neg(a, a);
-			bn_smb_leg(b, a, p);
-			bn_sub_dig(c, p, 1);
-			bn_rsh(c, c, 1);
-			if (bn_is_even(c)) {
-				bn_neg(a, a);
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			/* Check second supplement: (2|p) = (-1)^(p^2-1)/8. */
-			bn_set_dig(a, 2);
-			bn_smb_leg(b, a, p);
-			bn_sqr(c, p);
-			bn_sub_dig(c, c, 1);
-			bn_rsh(c, c, 3);
-			bn_set_dig(a, 1);
-			if (!bn_is_even(c)) {
-				bn_neg(a, a);
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			/* Check quadratic reciprocity law. */
-			bn_smb_leg(a, q, p);
-			bn_smb_leg(b, p, q);
-			bn_sub_dig(c, p, 1);
-			bn_rsh(c, c, 1);
-			if (!bn_is_even(c)) {
-				bn_sub_dig(c, q, 1);
-				bn_rsh(c, c, 1);
-				if (!bn_is_even(c)) {
-					bn_neg(b, b);
-				}
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("jacobi symbol is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_smb_leg(c, a, p);
-			bn_smb_jac(b, a, p);
-			TEST_ASSERT(bn_cmp_abs(c, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("jacobi symbol is a homomorphism") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(b, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(p, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(p)) {
-				bn_add_dig(p, p, 1);
-			}
-			bn_mul(c, a, b);
-			bn_smb_jac(a, a, p);
-			bn_smb_jac(b, b, p);
-			bn_smb_jac(c, c, p);
-			bn_mul(a, a, b);
-			TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("jacobi symbol is consistent with gcd") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS / 2);
-			bn_rand(p, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(p)) {
-				bn_add_dig(p, p, 1);
-			}
-			bn_smb_jac(c, a, p);
-			bn_gcd(b, a, p);
-			if (bn_cmp_dig(b, 1) != RLC_EQ) {
-				TEST_ASSERT(bn_is_zero(c), end);
-			} else {
-				bn_set_dig(a, 1);
-				TEST_ASSERT(bn_cmp_abs(c, a) == RLC_EQ, end);
-			}
-		} TEST_END;
-
-		TEST_CASE("jacobi symbol satisfies quadratic reciprocity") {
-			bn_rand(p, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(p)) {
-				bn_add_dig(p, p, 1);
-			}
-			bn_rand(q, RLC_POS, RLC_BN_BITS / 2);
-			if (bn_is_even(q)) {
-				bn_add_dig(q, q, 1);
-			}
-			/* Check the first supplement: (-1|n) = (-1)^(n-1)/2. */
-			bn_set_dig(a, 1);
-			bn_neg(a, a);
-			bn_smb_jac(b, a, p);
-			bn_sub_dig(c, p, 1);
-			bn_rsh(c, c, 1);
-			if (bn_is_even(c)) {
-				bn_neg(a, a);
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			/* Check second supplement: (2|p) = (-1)^(p^2-1)/8. */
-			bn_set_dig(a, 2);
-			bn_smb_jac(b, a, p);
-			bn_sqr(c, p);
-			bn_sub_dig(c, c, 1);
-			bn_rsh(c, c, 3);
-			bn_set_dig(a, 1);
-			if (!bn_is_even(c)) {
-				bn_neg(a, a);
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			/* Check quadratic reciprocity law. */
-			bn_smb_jac(a, p, q);
-			bn_smb_jac(b, q, p);
-			bn_sub_dig(c, p, 1);
-			bn_rsh(c, c, 1);
-			if (!bn_is_even(c)) {
-				bn_sub_dig(c, q, 1);
-				bn_rsh(c, c, 1);
-				if (!bn_is_even(c)) {
-					bn_neg(b, b);
-				}
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(p);
-	bn_free(q);
-	return code;
-}
-
-static int digit(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, e, f;
-	dig_t g;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(e);
-	bn_null(f);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(e);
-		bn_new(f);
-
-		TEST_CASE("addition of a single digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_add(c, a, b);
-			bn_add_dig(d, a, g);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("subtraction of a single digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_sub(c, a, b);
-			bn_sub_dig(d, a, g);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by a single digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_mul(c, a, b);
-			bn_mul_dig(d, a, g);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("division by a single digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			if (bn_is_zero(b)) {
-				continue;
-			}
-			bn_div(d, a, b);
-			bn_div_dig(e, a, b->dp[0]);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-			bn_div_rem(d, c, a, b);
-			bn_div_rem_dig(e, &g, a, b->dp[0]);
-			TEST_ASSERT(bn_cmp(d, e) == RLC_EQ, end);
-			TEST_ASSERT(bn_cmp_dig(c, g) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("modular reduction modulo a digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			if (b->dp[0] == 0)
-				continue;
-			bn_div_rem(d, c, a, b);
-			bn_mod_dig(&g, a, b->dp[0]);
-			TEST_ASSERT(bn_cmp_dig(c, g) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("greatest common divisor with a digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_gcd(c, a, b);
-			bn_gcd_dig(e, a, g);
-			TEST_ASSERT(bn_cmp(c, e) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE
-				("extended greatest common divisor with a digit is consistent")
-		{
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_gcd_ext_dig(c, d, e, a, g);
-			bn_mul(d, d, a);
-			bn_mul(e, e, b);
-			bn_add(d, d, e);
-			TEST_ASSERT(bn_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-#if BN_MOD != PMERS
-		bn_gen_prime(d, RLC_BN_BITS);
-#elif BN_PRECI >= 128
-		/* Let's try a Mersenne prime. */
-		bn_zero(d);
-		bn_set_bit(d, 127, 1);
-		bn_sub_dig(d, d, 1);
-#endif
-
-		TEST_CASE("modular exponentiation with a digit is consistent") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_DIG);
-			bn_get_dig(&g, b);
-			bn_mxp(c, a, b, d);
-			bn_mxp_dig(e, a, g, d);
-			TEST_ASSERT(bn_cmp(c, e) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(e);
-	bn_free(f);
-	return code;
-}
-
-static int prime(void) {
-	int code = RLC_ERR;
-	bn_t p;
-
-	bn_null(p);
-
-	RLC_TRY {
-		bn_new(p);
-
-		TEST_ONCE("prime generation is consistent") {
-			bn_gen_prime(p, RLC_BN_BITS);
-			TEST_ASSERT(bn_is_prime(p) == 1, end);
-		} TEST_END;
-
-#if BN_GEN == BASIC || !defined(STRIP)
-		TEST_ONCE("basic prime generation is consistent") {
-			bn_gen_prime_basic(p, RLC_BN_BITS);
-			TEST_ASSERT(bn_is_prime(p) == 1, end);
-		} TEST_END;
-#endif
-
-#if BN_GEN == SAFEP || !defined(STRIP)
-		TEST_ONCE("safe prime generation is consistent") {
-			bn_gen_prime_safep(p, RLC_BN_BITS);
-			TEST_ASSERT(bn_is_prime(p) == 1, end);
-			bn_sub_dig(p, p, 1);
-			bn_hlv(p, p);
-			TEST_ASSERT(bn_is_prime(p) == 1, end);
-		} TEST_END;
-#endif
-
-#if BN_GEN == STRON || !defined(STRIP)
-		TEST_ONCE("strong prime generation is consistent") {
-			bn_gen_prime_stron(p, RLC_BN_BITS);
-			TEST_ASSERT(bn_is_prime(p) == 1, end);
-		} TEST_END;
-#endif
-
-		bn_gen_prime(p, RLC_BN_BITS);
-
-		TEST_ONCE("basic prime testing is correct") {
-			TEST_ASSERT(bn_is_prime_basic(p) == 1, end);
-		} TEST_END;
-
-		TEST_ONCE("miller-rabin prime testing is correct") {
-			TEST_ASSERT(bn_is_prime_rabin(p) == 1, end);
-		} TEST_END;
-
-		TEST_ONCE("solovay-strassen prime testing is correct") {
-			TEST_ASSERT(bn_is_prime_solov(p) == 1, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(p);
-	return code;
-}
-
-static int small_primes(void) {
-	int code = RLC_ERR;
-
-	int i;
-	const int nr_tests = 50;
-
-	dig_t primes[] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43,
-			47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103,
-			107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163,
-			167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227,
-			229};
-
-	dig_t non_primes[] = {1, 4, 6, 8, 9, 10, 12, 14, 15, 16, 18, 20, 21, 22,
-			24, 25, 26, 27, 28, 30, 32, 33, 34, 35, 36, 38, 39, 40,
-			42, 44, 45, 46, 48, 49, 50, 51, 52, 54, 55, 56, 57, 58,
-			60, 62, 63, 64, 65, 66, 68, 69};
-
-	bn_t p;
-	bn_null(p);
-
-	RLC_TRY {
-		bn_new(p);
-
-		TEST_ONCE("prime testing of small primes is correct") {
-			for(i = 0; i < nr_tests; i++) {
-				bn_set_dig(p, primes[i]);
-				TEST_ASSERT(bn_is_prime(p) == 1, end);
-			}
-		} TEST_END;
-
-		TEST_ONCE("miller-rabin testing of small primes is correct") {
-			for(i = 0; i < nr_tests; i++) {
-				bn_set_dig(p, primes[i]);
-				TEST_ASSERT(bn_is_prime_rabin(p) == 1, end);
-			}
-		} TEST_END;
-
-		TEST_ONCE("prime testing of small non-primes is correct") {
-			for(i = 0; i < nr_tests; i++) {
-				bn_set_dig(p, non_primes[i]);
-				TEST_ASSERT(bn_is_prime(p) == 0, end);
-			}
-		} TEST_END;
-
-		TEST_ONCE("miller-rabin testing of small non-primes is correct") {
-			for(i = 0; i < nr_tests; i++) {
-				bn_set_dig(p, non_primes[i]);
-				TEST_ASSERT(bn_is_prime_rabin(p) == 0, end);
-			}
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(p);
-	return code;
-}
-
-static int inversion(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-
-		bn_gen_prime(a, RLC_BN_BITS);
-
-		TEST_CASE("modular inversion is correct") {
-			bn_rand_mod(b, a);
-			bn_mod_inv(c, b, a);
-			TEST_ASSERT(bn_cmp_dig(c, 1) != RLC_EQ, end);
-			bn_mul(c, b, c);
-			bn_mod(c, c, a);
-			TEST_ASSERT(bn_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	return code;
-}
-
-static int factor(void) {
-	int code = RLC_ERR;
-	bn_t p, q, n;
-
-	bn_null(p);
-	bn_null(q);
-	bn_null(n);
-
-	RLC_TRY {
-		bn_new(p);
-		bn_new(q);
-		bn_new(n);
-
-		TEST_ONCE("integer factorization is consistent") {
-			bn_gen_prime(p, 16);
-			bn_rand(n, RLC_POS, RLC_BN_BITS - 16);
-			bn_mul(n, n, p);
-			if (bn_factor(q, n) == 1) {
-				TEST_ASSERT(bn_is_factor(q, n) == 1, end);
-			} else {
-				TEST_ASSERT(bn_is_factor(p, n) == 1, end);
-			}
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(p);
-	bn_free(q);
-	bn_free(n);
-	return code;
-}
-
-static int recoding(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, v1[3], v2[3];
-	int w, k, l;
-	uint8_t d[RLC_BN_BITS + 1];
-	int8_t e[2 * (RLC_BN_BITS + 1)];
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	for (k = 0; k < 3; k++) {
-		bn_null(v1[k]);
-		bn_null(v2[k]);
-	}
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		for (k = 0; k < 3; k++) {
-			bn_new(v1[k]);
-			bn_new(v2[k]);
-		}
-
-		TEST_CASE("window recoding is correct") {
-			for (w = 2; w <= 8; w++) {
-				bn_rand(a, RLC_POS, RLC_BN_BITS);
-				l = RLC_BN_BITS + 1;
-				bn_rec_win(d, &l, a, w);
-				bn_zero(b);
-				for (k = l - 1; k >= 0; k--) {
-					bn_lsh(b, b, w);
-					bn_add_dig(b, b, d[k]);
-				}
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		} TEST_END;
-
-		TEST_CASE("sliding window recoding is correct") {
-			for (w = 2; w <= 8; w++) {
-				bn_rand(a, RLC_POS, RLC_BN_BITS);
-				l = RLC_BN_BITS + 1;
-				bn_rec_slw(d, &l, a, w);
-				bn_zero(b);
-				for (k = 0; k < l; k++) {
-					if (d[k] == 0) {
-						bn_dbl(b, b);
-					} else {
-						bn_lsh(b, b, util_bits_dig(d[k]));
-						bn_add_dig(b, b, d[k]);
-					}
-				}
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		} TEST_END;
-
-		TEST_CASE("naf recoding is correct") {
-			for (w = 2; w <= 8; w++) {
-				bn_rand(a, RLC_POS, RLC_BN_BITS);
-				l = RLC_BN_BITS + 1;
-				bn_rec_naf(e, &l, a, w);
-				bn_zero(b);
-				for (k = l - 1; k >= 0; k--) {
-					bn_dbl(b, b);
-					if (e[k] >= 0) {
-						bn_add_dig(b, b, e[k]);
-					} else {
-						bn_sub_dig(b, b, -e[k]);
-					}
-				}
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		} TEST_END;
-
-#if defined(WITH_EB) && defined(EB_KBLTZ) && (EB_MUL == LWNAF || EB_MUL == RWNAF || EB_FIX == LWNAF || EB_SIM == INTER || !defined(STRIP))
-		if (eb_param_set_any_kbltz() == RLC_OK) {
-			eb_curve_get_ord(v1[2]);
-			TEST_CASE("tnaf recoding is correct") {
-				for (w = 2; w <= 8; w++) {
-					uint8_t t_w;
-					int8_t beta[64], gama[64];
-					int8_t tnaf[RLC_FB_BITS + 8];
-					int8_t u = (eb_curve_opt_a() == RLC_ZERO ? -1 : 1);
-					bn_rand_mod(a, v1[2]);
-					l = RLC_FB_BITS + 1;
-					bn_rec_tnaf_mod(v1[0], v1[1], a, u, RLC_FB_BITS);
-					bn_rec_tnaf_get(&t_w, beta, gama, u, w);
-					bn_rec_tnaf(tnaf, &l, a, u, RLC_FB_BITS, w);
-					bn_zero(a);
-					bn_zero(b);
-					for (k = l - 1; k >= 0; k--) {
-						bn_copy(c, b);
-						if (u == -1) {
-							bn_neg(c, c);
-						}
-						bn_add(c, c, a);
-						bn_dbl(a, b);
-						bn_neg(a, a);
-						bn_copy(b, c);
-						if (w == 2) {
-							if (tnaf[k] >= 0) {
-								bn_add_dig(a, a, tnaf[k]);
-							} else {
-								bn_sub_dig(a, a, -tnaf[k]);
-							}
-						} else {
-							if (tnaf[k] > 0) {
-								if (beta[tnaf[k] / 2] >= 0) {
-									bn_add_dig(a, a, beta[tnaf[k] / 2]);
-								} else {
-									bn_sub_dig(a, a, -beta[tnaf[k] / 2]);
-								}
-								if (gama[tnaf[k] / 2] >= 0) {
-									bn_add_dig(b, b, gama[tnaf[k] / 2]);
-								} else {
-									bn_sub_dig(b, b, -gama[tnaf[k] / 2]);
-								}
-							}
-							if (tnaf[k] < 0) {
-								if (beta[-tnaf[k] / 2] >= 0) {
-									bn_sub_dig(a, a, beta[-tnaf[k] / 2]);
-								} else {
-									bn_add_dig(a, a, -beta[-tnaf[k] / 2]);
-								}
-								if (gama[-tnaf[k] / 2] >= 0) {
-									bn_sub_dig(b, b, gama[-tnaf[k] / 2]);
-								} else {
-									bn_add_dig(b, b, -gama[-tnaf[k] / 2]);
-								}
-							}
-						}
-					}
-					TEST_ASSERT(bn_cmp(a, v1[0]) == RLC_EQ, end);
-					TEST_ASSERT(bn_cmp(b, v1[1]) == RLC_EQ, end);
-				}
-			}
-			TEST_END;
-
-			TEST_CASE("regular tnaf recoding is correct") {
-				for (w = 2; w <= 8; w++) {
-					uint8_t t_w;
-					int8_t beta[64], gama[64];
-					int8_t tnaf[RLC_FB_BITS + 8];
-					int8_t u = (eb_curve_opt_a() == RLC_ZERO ? -1 : 1);
-					int n;
-					do {
-						bn_rand_mod(a, v1[2]);
-						l = RLC_FB_BITS + 1;
-						bn_rec_tnaf_mod(v1[0], v1[1], a, u, RLC_FB_BITS);
-					} while (bn_is_even(v1[0]) || bn_is_even(v1[1]));
-					bn_rec_tnaf_get(&t_w, beta, gama, u, w);
-					bn_rec_rtnaf(tnaf, &l, a, u, RLC_FB_BITS, w);
-					bn_zero(a);
-					bn_zero(b);
-					n = 0;
-					for (k = l - 1; k >= 0; k--) {
-						for (int m = 0; m < w - 1; m++) {
-							bn_copy(c, b);
-							if (u == -1) {
-								bn_neg(c, c);
-							}
-							bn_add(c, c, a);
-							bn_dbl(a, b);
-							bn_neg(a, a);
-							bn_copy(b, c);
-						}
-						if (tnaf[k] != 0) {
-							n++;
-						}
-						if (w == 2) {
-							if (tnaf[k] >= 0) {
-								bn_add_dig(a, a, tnaf[k]);
-							} else {
-								bn_sub_dig(a, a, -tnaf[k]);
-							}
-						} else {
-							if (tnaf[k] > 0) {
-								if (beta[tnaf[k] / 2] >= 0) {
-									bn_add_dig(a, a, beta[tnaf[k] / 2]);
-								} else {
-									bn_sub_dig(a, a, -beta[tnaf[k] / 2]);
-								}
-								if (gama[tnaf[k] / 2] >= 0) {
-									bn_add_dig(b, b, gama[tnaf[k] / 2]);
-								} else {
-									bn_sub_dig(b, b, -gama[tnaf[k] / 2]);
-								}
-							}
-							if (tnaf[k] < 0) {
-								if (beta[-tnaf[k] / 2] >= 0) {
-									bn_sub_dig(a, a, beta[-tnaf[k] / 2]);
-								} else {
-									bn_add_dig(a, a, -beta[-tnaf[k] / 2]);
-								}
-								if (gama[-tnaf[k] / 2] >= 0) {
-									bn_sub_dig(b, b, gama[-tnaf[k] / 2]);
-								} else {
-									bn_add_dig(b, b, -gama[-tnaf[k] / 2]);
-								}
-							}
-						}
-					}
-					TEST_ASSERT(bn_cmp(a, v1[0]) == RLC_EQ, end);
-					TEST_ASSERT(bn_cmp(b, v1[1]) == RLC_EQ, end);
-				}
-			} TEST_END;
-		}
-#endif
-
-		TEST_CASE("regular recoding is correct") {
-			/* Recode same scalar with different widths. */
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			if (bn_is_even(a)) {
-				bn_add_dig(a, a, 1);
-			}
-			for (w = 2; w <= 8; w++) {
-				l = RLC_BN_BITS + 1;
-				bn_rec_reg(e, &l, a, RLC_BN_BITS, w);
-				bn_zero(b);
-				for (k = l - 1; k >= 0; k--) {
-					bn_lsh(b, b, w - 1);
-					if (e[k] > 0) {
-						bn_add_dig(b, b, e[k]);
-					} else {
-						bn_sub_dig(b, b, -e[k]);
-					}
-				}
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		} TEST_END;
-
-		TEST_CASE("jsf recoding is correct") {
-			bn_rand(a, RLC_POS, RLC_BN_BITS);
-			bn_rand(b, RLC_POS, RLC_BN_BITS);
-			l = 2 * (RLC_BN_BITS + 1);
-			bn_rec_jsf(e, &l, a, b);
-			w = RLC_MAX(bn_bits(a), bn_bits(b)) + 1;
-			bn_add(a, a, b);
-			bn_zero(b);
-			for (k = l - 1; k >= 0; k--) {
-				bn_dbl(b, b);
-				if (e[k] >= 0) {
-					bn_add_dig(b, b, e[k]);
-				} else {
-					bn_sub_dig(b, b, -e[k]);
-				}
-				if (e[k + w] >= 0) {
-					bn_add_dig(b, b, e[k + w]);
-				} else {
-					bn_sub_dig(b, b, -e[k + w]);
-				}
-			}
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-#if defined(WITH_EP) && defined(EP_ENDOM) && (EP_MUL == LWNAF || EP_FIX == COMBS || EP_FIX == LWNAF || EP_SIM == INTER || !defined(STRIP))
-		TEST_CASE("glv recoding is correct") {
-			if (ep_param_set_any_endom() == RLC_OK) {
-				ep_curve_get_v1(v1);
-				ep_curve_get_v2(v2);
-				ep_curve_get_ord(b);
-				bn_rand_mod(a, b);
-				bn_rec_glv(b, c, a, b, (const bn_t *)v1, (const bn_t *)v2);
-				ep_curve_get_ord(v2[0]);
-				/* Check that subscalars have the right length. */
-				TEST_ASSERT(bn_bits(b) <= 1 + (bn_bits(v2[0]) >> 1), end);
-				TEST_ASSERT(bn_bits(c) <= 1 + (bn_bits(v2[0]) >> 1), end);
-				/* Recover lambda parameter. */
-				if (bn_cmp_dig(v1[2], 1) == RLC_EQ) {
-					bn_gcd_ext(v1[0], v2[1], NULL, v1[1], v2[0]);
-				} else {
-					bn_gcd_ext(v1[0], v2[1], NULL, v1[2], v2[0]);
-				}
-				if (bn_sign(v2[1]) == RLC_NEG) {
-					/* Negate modulo r. */
-					bn_add(v2[1], v2[0], v2[1]);
-				}
-				if (bn_cmp_dig(v1[2], 1) == RLC_EQ) {
-					bn_sub(v1[0], v2[1], v1[2]);
-				} else {
-					bn_mul(v1[0], v2[1], v1[1]);
-				}
-				bn_mod(v1[0], v1[0], v2[0]);
-				bn_sub(v1[1], v2[0], v1[0]);
-				if (bn_cmp(v1[1], v1[0]) == RLC_LT) {
-					bn_copy(v1[0], v1[1]);
-				}
-				/* Check if b + c * lambda = k (mod n). */
-				bn_mul(c, c, v1[0]);
-				bn_add(b, b, c);
-				bn_mod(b, b, v2[0]);
-				if (bn_sign(b) == RLC_NEG) {
-					bn_add(b, b, v2[0]);
-				}
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}
-		} TEST_END;
-#endif /* WITH_EP && EP_ENDOM */
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	for (k = 0; k < 3; k++) {
-		bn_free(v1[k]);
-		bn_free(v2[k]);
-	}
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the BN module", 0);
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (subtraction() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (multiplication() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (squaring() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (doubling_halving() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (shifting() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (division() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (reduction() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (square_root() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (gcd() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (lcm() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (symbol() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (digit() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (recoding() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (exponentiation() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (prime() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (small_primes() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (inversion() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (factor() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_core.c b/src/dashbls/depends/relic/test/test_core.c
deleted file mode 100644
index a7642f08ffae..000000000000
--- a/src/dashbls/depends/relic/test/test_core.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for configuration management.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-#if defined(MULTI)
-#if MULTI == PTHREAD
-
-void *master(void *ptr) {
-	int *code = (int *)ptr;
-	core_init();
-	RLC_THROW(ERR_NO_MEMORY);
-	if (err_get_code() != RLC_ERR) {
-		*code = RLC_ERR;
-	} else {
-		*code = RLC_OK;
-	}
-	core_clean();
-	return NULL;
-}
-
-void *tester(void *ptr) {
-	int *code = (int *)ptr;
-	core_init();
-	if (err_get_code() != RLC_OK) {
-		*code = RLC_ERR;
-	} else {
-		*code = RLC_OK;
-	}
-	core_clean();
-	return NULL;
-}
-
-#endif
-#endif
-
-int main(void) {
-	int code = RLC_ERR;
-
-	/* Initialize library with default configuration. */
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the CORE module:\n", 0);
-
-	TEST_ONCE("the library context is consistent") {
-		TEST_ASSERT(core_get() != NULL, end);
-	} TEST_END;
-
-	TEST_ONCE("switching the library context is correct") {
-		ctx_t new_ctx, *old_ctx;
-		/* Backup the old context. */
-		old_ctx = core_get();
-		/* Switch the library context. */
-		core_set(&new_ctx);
-		/* Reinitialize library with new context. */
-		core_init();
-		/* Run function to manipulate the library context. */
-		RLC_THROW(ERR_NO_MEMORY);
-		core_set(old_ctx);
-		TEST_ASSERT(err_get_code() == RLC_OK, end);
-		core_set(&new_ctx);
-		TEST_ASSERT(err_get_code() == RLC_ERR, end);
-		/* Now we need to finalize the new context. */
-		core_clean();
-		/* And restore the original context. */
-		core_set(old_ctx);
-	} TEST_END;
-
-	code = RLC_OK;
-
-#if defined(MULTI)
-#if MULTI == OPENMP
-	TEST_ONCE("library context is thread-safe") {
-		omp_set_num_threads(CORES);
-#pragma omp parallel shared(code)
-		{
-			if (omp_get_thread_num() == 0) {
-				RLC_THROW(ERR_NO_MEMORY);
-				if (err_get_code() != RLC_ERR) {
-					code = RLC_ERR;
-				}
-			} else {
-				core_init();
-				if (err_get_code() != RLC_OK) {
-					code = RLC_ERR;
-				}
-				core_clean();
-			}
-		}
-		TEST_ASSERT(code == RLC_OK, end);
-
-		core_init();
-#pragma omp parallel copyin(core_ctx) shared(code)
-		{
-			if (core_get() == NULL) {
-				code = RLC_ERR;
-			}
-		}
-		TEST_ASSERT(code == RLC_OK, end);
-		core_clean();
-	} TEST_END;
-#endif
-
-#if MULTI == PTHREAD
-	TEST_ONCE("library context is thread-safe") {
-		pthread_t thread[CORES];
-		int result[CORES] = { RLC_OK };
-		for (int i = 0; i < CORES; i++) {
-			if (i == 0) {
-				if (pthread_create(&(thread[0]), NULL, master, &(result[0]))) {
-					code = RLC_ERR;
-				}
-			} else {
-				if (pthread_create(&(thread[i]), NULL, tester, &(result[i]))) {
-					code = RLC_ERR;
-				}
-			}
-			if (result[i] != RLC_OK) {
-				code = RLC_ERR;
-			}
-		}
-
-		for (int i = 0; i < CORES; i++) {
-			if (pthread_join(thread[i], NULL)) {
-				code = RLC_ERR;
-			}
-		}
-		TEST_ASSERT(code == RLC_OK, end);
-	} TEST_END;
-#endif
-#endif
-
-	util_banner("All tests have passed.\n", 0);
-  end:
-	core_clean();
-	return code;
-}
diff --git a/src/dashbls/depends/relic/test/test_cp.c b/src/dashbls/depends/relic/test/test_cp.c
deleted file mode 100644
index 22cfcc30f244..000000000000
--- a/src/dashbls/depends/relic/test/test_cp.c
+++ /dev/null
@@ -1,2137 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for implementation of cryptographic protocols.
- *
- * @version $Id$
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int rsa(void) {
-	int code = RLC_ERR;
-	rsa_t pub, prv;
-	uint8_t in[10], out[RLC_BN_BITS / 8 + 1], h[RLC_MD_LEN];
-	int il, ol;
-	int result;
-
-	rsa_null(pub);
-	rsa_null(prv);
-
-	RLC_TRY {
-		rsa_new(pub);
-		rsa_new(prv);
-
-		result = cp_rsa_gen(pub, prv, RLC_BN_BITS);
-
-		TEST_CASE("rsa encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			il = 10;
-			ol = RLC_BN_BITS / 8 + 1;
-			rand_bytes(in, il);
-			TEST_ASSERT(cp_rsa_enc(out, &ol, in, il, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_rsa_dec(out, &ol, out, ol, prv) == RLC_OK, end);
-			TEST_ASSERT(memcmp(in, out, ol) == 0, end);
-		} TEST_END;
-
-		result = cp_rsa_gen(pub, prv, RLC_BN_BITS);
-
-		TEST_CASE("rsa signature/verification is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			il = 10;
-			ol = RLC_BN_BITS / 8 + 1;
-			rand_bytes(in, il);
-			TEST_ASSERT(cp_rsa_sig(out, &ol, in, il, 0, prv) == RLC_OK, end);
-			TEST_ASSERT(cp_rsa_ver(out, ol, in, il, 0, pub) == 1, end);
-			md_map(h, in, il);
-			TEST_ASSERT(cp_rsa_sig(out, &ol, h, RLC_MD_LEN, 1, prv) == RLC_OK, end);
-			TEST_ASSERT(cp_rsa_ver(out, ol, h, RLC_MD_LEN, 1, pub) == 1, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	rsa_free(pub);
-	rsa_free(prv);
-	return code;
-}
-
-static int rabin(void) {
-	int code = RLC_ERR;
-	rabin_t pub, prv;
-	uint8_t in[10];
-	uint8_t out[RLC_BN_BITS / 8 + 1];
-	int in_len, out_len;
-	int result;
-
-	rabin_null(pub);
-	rabin_null(prv);
-
-	RLC_TRY {
-		rabin_new(pub);
-		rabin_new(prv);
-
-		result = cp_rabin_gen(pub, prv, RLC_BN_BITS);
-
-		TEST_CASE("rabin encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			in_len = 10;
-			out_len = RLC_BN_BITS / 8 + 1;
-			rand_bytes(in, in_len);
-			TEST_ASSERT(cp_rabin_enc(out, &out_len, in, in_len, pub) == RLC_OK,
-					end);
-			TEST_ASSERT(cp_rabin_dec(out, &out_len, out, out_len,
-							prv) == RLC_OK, end);
-			TEST_ASSERT(memcmp(in, out, out_len) == 0, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	rabin_free(pub);
-	rabin_free(prv);
-	return code;
-}
-
-static int benaloh(void) {
-	int code = RLC_ERR;
-	bdpe_t pub, prv;
-	bn_t a, b;
-	dig_t in, out;
-	uint8_t buf[RLC_BN_BITS / 8 + 1];
-	int len;
-	int result;
-
-	bn_null(a);
-	bn_null(b);
-	bdpe_null(pub);
-	bdpe_null(prv);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bdpe_new(pub);
-		bdpe_new(prv);
-
-		result = cp_bdpe_gen(pub, prv, bn_get_prime(47), RLC_BN_BITS);
-
-		TEST_CASE("benaloh encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			len = RLC_BN_BITS / 8 + 1;
-			rand_bytes(buf, 1);
-			in = buf[0] % bn_get_prime(47);
-			TEST_ASSERT(cp_bdpe_enc(buf, &len, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bdpe_dec(&out, buf, len, prv) == RLC_OK, end);
-			TEST_ASSERT(in == out, end);
-		} TEST_END;
-
-		TEST_CASE("benaloh encryption/decryption is homomorphic") {
-			TEST_ASSERT(result == RLC_OK, end);
-			len = RLC_BN_BITS / 8 + 1;
-			rand_bytes(buf, 1);
-			in = buf[0] % bn_get_prime(47);
-			TEST_ASSERT(cp_bdpe_enc(buf, &len, in, pub) == RLC_OK, end);
-			bn_read_bin(a, buf, len);
-			rand_bytes(buf, 1);
-			out = (buf[0] % bn_get_prime(47));
-			in = (in + out) % bn_get_prime(47);
-			TEST_ASSERT(cp_bdpe_enc(buf, &len, out, pub) == RLC_OK, end);
-			bn_read_bin(b, buf, len);
-			bn_mul(a, a, b);
-			bn_mod(a, a, pub->n);
-			len = bn_size_bin(pub->n);
-			bn_write_bin(buf, len, a);
-			TEST_ASSERT(cp_bdpe_dec(&out, buf, len, prv) == RLC_OK, end);
-			TEST_ASSERT(in == out, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(a);
-	bn_free(b);
-	bdpe_free(pub);
-	bdpe_free(prv);
-	return code;
-}
-
-static int paillier(void) {
-	int code = RLC_ERR;
-	bn_t a, b, c, d, s, pub;
-	phpe_t prv;
-	int result;
-
-	bn_null(a);
-	bn_null(b);
-	bn_null(c);
-	bn_null(d);
-	bn_null(s);
-	bn_null(pub);
-	phpe_null(prv);
-
-	RLC_TRY {
-		bn_new(a);
-		bn_new(b);
-		bn_new(c);
-		bn_new(d);
-		bn_new(s);
-		bn_new(pub);
-		phpe_new(prv);
-
-		result = cp_phpe_gen(pub, prv, RLC_BN_BITS / 2);
-
-		TEST_CASE("paillier encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			bn_rand_mod(a, pub);
-			TEST_ASSERT(cp_phpe_enc(c, a, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_phpe_dec(b, c, prv) == RLC_OK, end);
-			TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("paillier encryption/decryption is homomorphic") {
-			TEST_ASSERT(result == RLC_OK, end);
-			bn_rand_mod(a, pub);
-			bn_rand_mod(b, pub);
-			TEST_ASSERT(cp_phpe_enc(c, a, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_phpe_enc(d, b, pub) == RLC_OK, end);
-			bn_mul(c, c, d);
-			bn_sqr(d, pub);
-			bn_mod(c, c, d);
-			TEST_ASSERT(cp_phpe_dec(d, c, prv) == RLC_OK, end);
-			bn_add(a, a, b);
-			bn_mod(a, a, pub);
-			TEST_ASSERT(bn_cmp(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		for (int k = 1; k <= 2; k++) {
-			result = cp_ghpe_gen(pub, s, RLC_BN_BITS / (2 * k));
-			util_print("(s = %d) ", k);
-			TEST_CASE("general paillier encryption/decryption is correct") {
-				TEST_ASSERT(result == RLC_OK, end);
-				bn_rand(a, RLC_POS, k * (bn_bits(pub) - 1));
-				TEST_ASSERT(cp_ghpe_enc(c, a, pub, k) == RLC_OK, end);
-				TEST_ASSERT(cp_ghpe_dec(b, c, pub, s, k) == RLC_OK, end);
-				TEST_ASSERT(bn_cmp(a, b) == RLC_EQ, end);
-			}  TEST_END;
-
-			util_print("(s = %d) ", k);
-			TEST_CASE("general paillier encryption/decryption is homomorphic") {
-				TEST_ASSERT(result == RLC_OK, end);
-				bn_rand(a, RLC_POS, k * (bn_bits(pub) - 1));
-				bn_rand(b, RLC_POS, k * (bn_bits(pub) - 1));
-				TEST_ASSERT(cp_ghpe_enc(c, a, pub, k) == RLC_OK, end);
-				TEST_ASSERT(cp_ghpe_enc(d, b, pub, k) == RLC_OK, end);
-				bn_mul(c, c, d);
-				bn_sqr(d, pub);
-				if (k == 2) {
-					bn_mul(d, d, pub);
-				}
-				bn_mod(c, c, d);
-				TEST_ASSERT(cp_ghpe_dec(c, c, pub, s, k) == RLC_OK, end);
-				bn_add(a, a, b);
-				bn_copy(d, pub);
-				if (k == 2) {
-					bn_mul(d, d, pub);
-				}
-				bn_mod(a, a, d);
-				TEST_ASSERT(bn_cmp(a, c) == RLC_EQ, end);
-			}
-			TEST_END;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(a);
-	bn_free(b);
-	bn_free(c);
-	bn_free(d);
-	bn_free(s);
-	bn_free(pub);
-	phpe_free(prv);
-	return code;
-}
-
-#if defined(WITH_EC)
-
-/* Test vectors generated by BouncyCastle. */
-
-#if defined(EP_PLAIN) && FP_PRIME == 256
-
-#define NIST_P256_A		"DA818E65859F3997D4CD287945363B14A0030665B8ABD19719D57952E3A2BEAD"
-#define NIST_P256_B		"66BF67EDF1ABDC8178C8A07644FDD5C88EFD4954FD6D2691933B5F0EA0AE2153"
-#define NIST_P256_A_X	"9A2E9583CCBDD502933709D3ED1764E79D1C2EE601DF75A40C486BE3DAB3CDCA"
-#define NIST_P256_A_Y	"D025EA9D9BDA94C0DC7F3813ECA72B369F52CA87E92948BCD76984F44D319F8F"
-#define NIST_P256_B_X	"B8F245FC8A1C7E933D5CAD6E77102C72B0C1F393F779F3F504DA1CA776434B10"
-#define NIST_P256_B_Y	"5373FA01BC13FF5843D4A31E40833785C598C0BBC2F6AF7317C327BE09883799"
-
-uint8_t result[] = {
-	0xC0, 0xEC, 0x2B, 0xAC, 0xEB, 0x3C, 0x6E, 0xE3, 0x21, 0x96, 0xD5, 0x43,
-	0x0E, 0xE6, 0xDA, 0xBB, 0x50, 0xAE, 0xEE, 0xBE, 0xBA, 0xCE, 0x6B, 0x86,
-	0x09, 0xD7, 0xEB, 0x07, 0xD6, 0x45, 0xF6, 0x34, 0xD4, 0xE0, 0xD1, 0x9A,
-	0xAB, 0xA0, 0xD2, 0x90, 0x2F, 0x4A, 0xDC, 0x20, 0x1B, 0x0F, 0x35, 0x8D
-};
-
-#endif
-
-#define ASSIGNP(CURVE)														\
-	RLC_GET(str, CURVE##_A, sizeof(CURVE##_A));								\
-	bn_read_str(da, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_A_X, sizeof(CURVE##_A_X));							\
-	fp_read_str(qa->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A_Y, sizeof(CURVE##_A_Y));							\
-	fp_read_str(qa->y, str, strlen(str), 16);								\
-	fp_set_dig(qa->z, 1);													\
-	RLC_GET(str, CURVE##_B, sizeof(CURVE##_B));								\
-	bn_read_str(d_b, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_B_X, sizeof(CURVE##_B_X));							\
-	fp_read_str(q_b->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B_Y, sizeof(CURVE##_B_Y));							\
-	fp_read_str(q_b->y, str, strlen(str), 16);								\
-	fp_set_dig(q_b->z, 1);													\
-	qa->coord = q_b->coord = BASIC;											\
-
-#define ASSIGNK(CURVE)														\
-	RLC_GET(str, CURVE##_A, sizeof(CURVE##_A));								\
-	bn_read_str(da, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_A_X, sizeof(CURVE##_A_X));							\
-	fb_read_str(qa->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_A_Y, sizeof(CURVE##_A_Y));							\
-	fb_read_str(qa->y, str, strlen(str), 16);								\
-	fb_set_dig(qa->z, 1);													\
-	RLC_GET(str, CURVE##_B, sizeof(CURVE##_B));								\
-	bn_read_str(d_b, str, strlen(str), 16);									\
-	RLC_GET(str, CURVE##_B_X, sizeof(CURVE##_B_X));							\
-	fb_read_str(q_b->x, str, strlen(str), 16);								\
-	RLC_GET(str, CURVE##_B_Y, sizeof(CURVE##_B_Y));							\
-	fb_read_str(q_b->y, str, strlen(str), 16);								\
-	fb_set_dig(q_b->z, 1);													\
-	qa->coord = q_b->coord = BASIC;											\
-
-static int ecdh(void) {
-	int code = RLC_ERR;
-	bn_t da, d_b;
-	ec_t qa, q_b;
-	uint8_t k1[RLC_MD_LEN], k2[RLC_MD_LEN];
-
-	bn_null(da);
-	bn_null(d_b);
-	ec_null(qa);
-	ec_null(q_b);
-
-	RLC_TRY {
-		bn_new(da);
-		bn_new(d_b);
-		ec_new(qa);
-		ec_new(q_b);
-
-		TEST_CASE("ecdh key agreement is correct") {
-			TEST_ASSERT(cp_ecdh_gen(da, qa) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdh_gen(d_b, q_b) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdh_key(k1, RLC_MD_LEN, d_b, qa) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdh_key(k2, RLC_MD_LEN, da, q_b) == RLC_OK, end);
-			TEST_ASSERT(memcmp(k1, k2, RLC_MD_LEN) == 0, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(da);
-	bn_free(d_b);
-	ec_free(qa);
-	ec_free(q_b);
-	return code;
-}
-
-static int ecmqv(void) {
-	int code = RLC_ERR;
-	bn_t d1a, d1_b;
-	bn_t d2a, d2_b;
-	ec_t q1a, q1_b;
-	ec_t q2a, q2_b;
-	uint8_t key1[RLC_MD_LEN], key2[RLC_MD_LEN];
-
-	bn_null(d1a);
-	bn_null(d1_b);
-	ec_null(q1a);
-	ec_null(q1_b);
-	bn_null(d2a);
-	bn_null(d2_b);
-	ec_null(q2a);
-	ec_null(q2_b);
-
-	RLC_TRY {
-		bn_new(d1a);
-		bn_new(d1_b);
-		ec_new(q1a);
-		ec_new(q1_b);
-		bn_new(d2a);
-		bn_new(d2_b);
-		ec_new(q2a);
-		ec_new(q2_b);
-
-		TEST_CASE("ecmqv authenticated key agreement is correct") {
-			TEST_ASSERT(cp_ecmqv_gen(d1a, q1a) == RLC_OK, end);
-			TEST_ASSERT(cp_ecmqv_gen(d2a, q2a) == RLC_OK, end);
-			TEST_ASSERT(cp_ecmqv_gen(d1_b, q1_b) == RLC_OK, end);
-			TEST_ASSERT(cp_ecmqv_gen(d2_b, q2_b) == RLC_OK, end);
-			TEST_ASSERT(cp_ecmqv_key(key1, RLC_MD_LEN, d1_b, d2_b, q2_b, q1a,
-							q2a) == RLC_OK, end);
-			TEST_ASSERT(cp_ecmqv_key(key2, RLC_MD_LEN, d1a, d2a, q2a, q1_b,
-							q2_b) == RLC_OK, end);
-			TEST_ASSERT(memcmp(key1, key2, RLC_MD_LEN) == 0, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d1a);
-	bn_free(d1_b);
-	ec_free(q1a);
-	ec_free(q1_b);
-	bn_free(d2a);
-	bn_free(d2_b);
-	ec_free(q2a);
-	ec_free(q2_b);
-	return code;
-}
-
-static int ecies(void) {
-	int code = RLC_ERR;
-	ec_t r;
-	bn_t da, d_b;
-	ec_t qa, q_b;
-	int l, in_len, out_len;
-	uint8_t in[RLC_BC_LEN - 1], out[RLC_BC_LEN + RLC_MD_LEN];
-
-	ec_null(r);
-	bn_null(da);
-	bn_null(d_b);
-	ec_null(qa);
-	ec_null(q_b);
-
-	RLC_TRY {
-		ec_new(r);
-		bn_new(da);
-		bn_new(d_b);
-		ec_new(qa);
-		ec_new(q_b);
-
-		l = ec_param_level();
-		if (l == 80 || l == 128 || l == 192 || l == 256) {
-			TEST_CASE("ecies encryption/decryption is correct") {
-				TEST_ASSERT(cp_ecies_gen(da, qa) == RLC_OK, end);
-				in_len = RLC_BC_LEN - 1;
-				out_len = RLC_BC_LEN + RLC_MD_LEN;
-				rand_bytes(in, in_len);
-				TEST_ASSERT(cp_ecies_enc(r, out, &out_len, in, in_len, qa)
-						== RLC_OK, end);
-				TEST_ASSERT(cp_ecies_dec(out, &out_len, r, out, out_len, da)
-						== RLC_OK, end);
-				TEST_ASSERT(memcmp(in, out, out_len) == 0, end);
-			}
-			TEST_END;
-		}
-#if MD_MAP == SH256
-		uint8_t msg[RLC_BC_LEN + RLC_MD_LEN];
-		char str[2 * RLC_FC_BYTES + 1];
-
-		switch (ec_param_get()) {
-
-#if defined(EP_PLAIN) && FP_PRIME == 256
-			case NIST_P256:
-				ASSIGNP(NIST_P256);
-				memcpy(msg, result, sizeof(result));
-				break;
-#endif
-			default:
-				(void)str;
-				code = RLC_OK;
-				break;
-		}
-
-		if (code != RLC_OK) {
-
-			TEST_ONCE("ecies satisfies test vectors") {
-				uint8_t in[] = {
-					0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF
-				};
-				TEST_ASSERT(ec_on_curve(qa) == 1, end);
-				TEST_ASSERT(ec_on_curve(q_b) == 1, end);
-				out_len = 16;
-				TEST_ASSERT(cp_ecies_dec(out, &out_len, q_b, msg, sizeof(msg),
-								da) == RLC_OK, end);
-				TEST_ASSERT(out_len == sizeof(in), end);
-				TEST_ASSERT(memcmp(out, in, sizeof(in)) == RLC_OK, end);
-				out_len = 16;
-				TEST_ASSERT(cp_ecies_dec(out, &out_len, qa, msg, sizeof(msg),
-								d_b) == RLC_OK, end);
-				TEST_ASSERT(out_len == sizeof(in), end);
-				TEST_ASSERT(memcmp(out, in, sizeof(in)) == RLC_OK, end);
-			}
-			TEST_END;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	ec_free(r);
-	bn_free(da);
-	bn_free(d_b);
-	ec_free(qa);
-	ec_free(q_b);
-	return code;
-}
-
-static int ecdsa(void) {
-	int code = RLC_ERR;
-	bn_t d, r, s;
-	ec_t q;
-	uint8_t m[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-
-	bn_null(d);
-	bn_null(r);
-	bn_null(s);
-	ec_null(q);
-
-	RLC_TRY {
-		bn_new(d);
-		bn_new(r);
-		bn_new(s);
-		ec_new(q);
-
-		TEST_CASE("ecdsa signature is correct") {
-			TEST_ASSERT(cp_ecdsa_gen(d, q) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdsa_sig(r, s, m, sizeof(m), 0, d) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdsa_ver(r, s, m, sizeof(m), 0, q) == 1, end);
-			m[0] ^= 1;
-			TEST_ASSERT(cp_ecdsa_ver(r, s, m, sizeof(m), 0, q) == 0, end);
-			md_map(h, m, sizeof(m));
-			TEST_ASSERT(cp_ecdsa_sig(r, s, h, RLC_MD_LEN, 1, d) == RLC_OK, end);
-			TEST_ASSERT(cp_ecdsa_ver(r, s, h, RLC_MD_LEN, 1, q) == 1, end);
-			h[0] ^= 1;
-			TEST_ASSERT(cp_ecdsa_ver(r, s, h, RLC_MD_LEN, 1, q) == 0, end);
-			memset(h, 0, RLC_MD_LEN);
-			TEST_ASSERT(cp_ecdsa_ver(r, s, h, RLC_MD_LEN, 1, q) == 0, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d);
-	bn_free(r);
-	bn_free(s);
-	ec_free(q);
-	return code;
-}
-
-static int ecss(void) {
-	int code = RLC_ERR;
-	bn_t d, r;
-	ec_t q;
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(d);
-	bn_null(r);
-	ec_null(q);
-
-	RLC_TRY {
-		bn_new(d);
-		bn_new(r);
-		ec_new(q);
-
-		TEST_CASE("ecss signature is correct") {
-			TEST_ASSERT(cp_ecss_gen(d, q) == RLC_OK, end);
-			TEST_ASSERT(cp_ecss_sig(r, d, m, sizeof(m), d) == RLC_OK, end);
-			TEST_ASSERT(cp_ecss_ver(r, d, m, sizeof(m), q) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d);
-	bn_free(r);
-	ec_free(q);
-	return code;
-}
-
-static int vbnn(void) {
-	int code = RLC_ERR;
-	uint8_t ida[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	uint8_t idb[] = { 5, 6, 7, 8, 9, 0, 1, 2, 3, 4 };
-	bn_t ska, skb;
-	ec_t pka, pkb;
-	bn_t msk, z, h;
-	ec_t r, mpk;
-
-	uint8_t m[] = "Thrice the brinded cat hath mew'd.";
-
-	bn_null(z);
-	bn_null(h);
-	bn_null(msk);
-	bn_null(ska);
-	bn_null(skb);
-	ec_null(r);
-	ec_null(mpk);
-	bn_null(pka);
-	bn_null(pkb);
-
-	RLC_TRY {
-		bn_new(z);
-		bn_new(h);
-		bn_new(msk);
-		bn_new(ska);
-		bn_new(skb);
-		ec_new(r);
-		ec_new(mpk);
-		ec_new(pka);
-		ec_new(pkb);
-
-		TEST_CASE("vbnn signature is correct") {
-			TEST_ASSERT(cp_vbnn_gen(msk, mpk) == RLC_OK, end);
-			TEST_ASSERT(cp_vbnn_gen_prv(ska, pka, msk, ida, sizeof(ida)) == RLC_OK, end);
-			TEST_ASSERT(cp_vbnn_gen_prv(skb, pkb, msk, idb, sizeof(idb)) == RLC_OK, end);
-			TEST_ASSERT(cp_vbnn_sig(r, z, h, ida, sizeof(ida), m, sizeof(m), ska, pka) == RLC_OK, end);
-			TEST_ASSERT(cp_vbnn_ver(r, z, h, ida, sizeof(ida), m, sizeof(m), mpk) == 1, end);
-			TEST_ASSERT(cp_vbnn_ver(r, z, h, idb, sizeof(idb), m, sizeof(m), mpk) == 0, end);
-			TEST_ASSERT(cp_vbnn_sig(r, z, h, ida, sizeof(ida), m, sizeof(m), skb, pkb) == RLC_OK, end);
-			TEST_ASSERT(cp_vbnn_ver(r, z, h, ida, sizeof(ida), m, sizeof(m), mpk) == 0, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-end:
-	bn_free(z);
-	bn_free(h);
-	bn_free(msk);
-	bn_free(ska);
-	bn_free(skb);
-	ec_free(r);
-	ec_free(mpk);
-	ec_free(pka);
-	ec_free(pkb);
-	return code;
-}
-
-static int pok(void) {
-	int code = RLC_ERR;
-	bn_t c[2], n, r[2], x;
-	ec_t y[2];
-
-	bn_null(n);
-	bn_null(x);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(x);
-		for (int i = 0; i < 2; i++) {
-			bn_null(c[i]);
-			bn_null(r[i]);
-			ec_null(y[i]);
-			bn_new(c[i]);
-			bn_new(r[i]);
-			ec_new(y[i]);
-		}
-		ec_curve_get_ord(n);
-
-		TEST_CASE("proof of knowledge of discrete logarithm is correct") {
-			bn_rand_mod(x, n);
-			ec_mul_gen(y[0], x);
-			TEST_ASSERT(cp_pokdl_prv(c[0], r[0], y[0], x) == RLC_OK, end);
-			TEST_ASSERT(cp_pokdl_ver(c[0], r[0], y[0]) == 1, end);
-			ec_dbl(y[0], y[0]);
-			ec_norm(y[0], y[0]);
-			TEST_ASSERT(cp_pokdl_ver(c[0], r[0], y[0]) == 0, end);
-		} TEST_END;
-
-		TEST_CASE("proof of knowledge of disjunction is correct") {
-			bn_rand_mod(x, n);
-			do {
-				ec_rand(y[0]);
-				ec_mul_gen(y[1], x);
-			} while (ec_cmp(y[0], y[1]) == RLC_EQ);
-			TEST_ASSERT(cp_pokor_prv(c, r, y, x) == RLC_OK, end);
-			TEST_ASSERT(cp_pokor_ver(c, r, y) == 1, end);
-			ec_dbl(y[1], y[1]);
-			ec_norm(y[1], y[1]);
-			TEST_ASSERT(cp_pokor_ver(c, r, y) == 0, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-end:
-	bn_free(n);
-	bn_free(x);
-	for (int i = 0; i < 2; i++) {
-		bn_free(c[i]);
-		bn_free(r[i]);
-		ec_free(y[i]);
-	}
-	return code;
-}
-
-static int sok(void) {
-	int code = RLC_ERR;
-	bn_t c[2], n, r[2], x;
-	ec_t y[2];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(n);
-	bn_null(x);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(x);
-		for (int i = 0; i < 2; i++) {
-			bn_null(c[i]);
-			bn_null(r[i]);
-			ec_null(y[i]);
-			bn_new(c[i]);
-			bn_new(r[i]);
-			ec_new(y[i]);
-		}
-		ec_curve_get_ord(n);
-
-		TEST_CASE("signature of knowledge of discrete logarithm is correct") {
-			bn_rand_mod(x, n);
-			ec_mul_gen(y[0], x);
-			TEST_ASSERT(cp_sokdl_sig(c[0], r[0], m, 5, y[0], x) == RLC_OK, end);
-			TEST_ASSERT(cp_sokdl_ver(c[0], r[0], m, 5, y[0]) == 1, end);
-			ec_dbl(y[0], y[0]);
-			ec_norm(y[0], y[0]);
-			TEST_ASSERT(cp_sokdl_ver(c[0], r[0], m, 5, y[0]) == 0, end);
-		} TEST_END;
-
-		TEST_CASE("signature of knowledge of disjunction is correct") {
-			bn_rand_mod(x, n);
-			do {
-				ec_rand(y[0]);
-				ec_mul_gen(y[1], x);
-			} while (ec_cmp(y[0], y[1]) == RLC_EQ);
-			TEST_ASSERT(cp_sokor_sig(c, r,  m, 5, y, x, 0) == RLC_OK, end);
-			TEST_ASSERT(cp_sokor_ver(c, r,  m, 5, y) == 1, end);
-			ec_dbl(y[1], y[1]);
-			ec_norm(y[1], y[1]);
-			TEST_ASSERT(cp_sokor_ver(c, r,  m, 5, y) == 0, end);
-			do {
-				ec_mul_gen(y[0], x);
-				ec_rand(y[1]);
-			} while (ec_cmp(y[0], y[1]) == RLC_EQ);
-			TEST_ASSERT(cp_sokor_sig(c, r,  m, 5, y, x, 1) == RLC_OK, end);
-			TEST_ASSERT(cp_sokor_ver(c, r,  m, 5, y) == 1, end);
-			ec_dbl(y[0], y[0]);
-			ec_norm(y[0], y[0]);
-			TEST_ASSERT(cp_sokor_ver(c, r,  m, 5, y) == 0, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-end:
-	bn_free(n);
-	bn_free(x);
-	for (int i = 0; i < 2; i++) {
-		bn_free(c[i]);
-		bn_free(r[i]);
-		ec_free(y[i]);
-	}
-	return code;
-}
-
-static int ers(void) {
-	int size, code = RLC_ERR;
-	ec_t pp, pk[4];
-	bn_t sk[4], td;
-	ers_t ring[4];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(td);
-	ec_null(pp);
-
-	RLC_TRY {
-		bn_new(td);
-		ec_new(pp);
-		for (int i = 0; i < 4; i++) {
-			bn_null(sk[i]);
-			bn_new(sk[i]);
-			ec_null(pk[i]);
-			ec_new(pk[i]);
-			ers_null(ring[i]);
-			ers_new(ring[i]);
-			cp_ers_gen_key(sk[i], pk[i]);
-		}
-
-		cp_ers_gen(pp);
-
-		TEST_CASE("extendable ring signature scheme is correct") {
-			TEST_ASSERT(cp_ers_sig(td, ring[0], m, 5, sk[0], pk[0], pp) == RLC_OK, end);
-			TEST_ASSERT(cp_ers_ver(td, ring, 1, m, 5, pp) == 1, end);
-			TEST_ASSERT(cp_ers_ver(td, ring, 1, m, 0, pp) == 0, end);
-			size = 1;
-			for (int j = 1; j < 4; j++) {
-				TEST_ASSERT(cp_ers_ext(td, ring, &size, m, 5, pk[j], pp) == RLC_OK, end);
-				TEST_ASSERT(cp_ers_ver(td, ring, size, m, 5, pp) == 1, end);
-				TEST_ASSERT(cp_ers_ver(td, ring, size, m, 0, pp) == 0, end);
-			}
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-end:
-	bn_free(td);
-	ec_free(pp);
-	for (int i = 0; i < 4; i++) {
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		ers_free(ring[i])
-	}
-	return code;
-}
-
-static int etrs(void) {
-	int size, code = RLC_ERR;
-	ec_t pp, pk[4];
-	bn_t sk[4], td[4], y[4];
-	etrs_t ring[4];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-
-	ec_null(pp);
-
-	RLC_TRY {
-		ec_new(pp);
-		for (int i = 0; i < 4; i++) {
-			bn_null(td[i]);
-			bn_new(td[i]);
-			bn_null(y[i]);
-			bn_new(y[i]);
-			bn_null(sk[i]);
-			bn_new(sk[i]);
-			ec_null(pk[i]);
-			ec_new(pk[i]);
-			etrs_null(ring[i]);
-			etrs_new(ring[i]);
-			cp_etrs_gen_key(sk[i], pk[i]);
-		}
-
-		cp_etrs_gen(pp);
-
-		TEST_CASE("extendable threshold ring signature scheme is correct") {
-			TEST_ASSERT(cp_etrs_sig(td, y, 4, ring[0], m, 5, sk[0], pk[0], pp) == RLC_OK, end);
-			TEST_ASSERT(cp_etrs_ver(0, td, y, 4, ring, 1, m, 5, pp) == 0, end);
-			TEST_ASSERT(cp_etrs_ver(1, td, y, 4, ring, 1, m, 5, pp) == 1, end);
-			TEST_ASSERT(cp_etrs_ver(1, td, y, 4, ring, 1, m, 0, pp) == 0, end);
-			size = 1;
-			for (int j = 1; j < 4; j++) {
-				TEST_ASSERT(cp_etrs_ext(td, y, 4, ring, &size, m, 5, pk[j], pp) == RLC_OK, end);
-				TEST_ASSERT(cp_etrs_ver(0, td+j, y+j, 4-j, ring, size, m, 5, pp) == 0, end);
-				TEST_ASSERT(cp_etrs_ver(1, td+j, y+j, 4-j, ring, size, m, 5, pp) == 1, end);
-				TEST_ASSERT(cp_etrs_ver(1, td+j, y+j, 4-j, ring, size, m, 0, pp) == 0, end);
-			}
-
-			TEST_ASSERT(cp_etrs_sig(td, y, 4, ring[0], m, 5, sk[0], pk[0], pp) == RLC_OK, end);
-			size = 1;
-			TEST_ASSERT(cp_etrs_uni(1, td, y, 4, ring, &size, m, 5, sk[1], pk[1], pp) == RLC_OK, end);
-			TEST_ASSERT(cp_etrs_ver(1, td, y, 4, ring, size, m, 5, pp) == 0, end);
-			TEST_ASSERT(cp_etrs_ver(2, td, y, 4, ring, size, m, 5, pp) == 1, end);
-			TEST_ASSERT(cp_etrs_ver(2, td, y, 4, ring, size, m, 0, pp) == 0, end);
-			for (int j = 2; j < 4; j++) {
-				TEST_ASSERT(cp_etrs_ext(td, y, 4, ring, &size, m, 5, pk[j], pp) == RLC_OK, end);
-				TEST_ASSERT(cp_etrs_ver(1, td+j-1, y+j-1, 4-j+1, ring, size, m, 5, pp) == 0, end);
-				TEST_ASSERT(cp_etrs_ver(2, td+j-1, y+j-1, 4-j+1, ring, size, m, 5, pp) == 1, end);
-				TEST_ASSERT(cp_etrs_ver(2, td+j-1, y+j-1, 4-j+1, ring, size, m, 0, pp) == 0, end);
-			}
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-end:
-	ec_free(pp);
-	for (int i = 0; i < 4; i++) {
-		bn_free(td[i]);
-		bn_free(y[i]);
-		bn_free(sk[i]);
-		ec_free(pk[i]);
-		etrs_free(ring[i])
-	}
-	return code;
-}
-
-#endif /* WITH_EC */
-
-#if defined(WITH_PC)
-
-static int pdpub(void) {
-	int code = RLC_ERR;
-	bn_t r1, r2;
-	g1_t p, u1, v1;
-	g2_t q, u2, v2, w2;
-	gt_t e, r, g[3];
-
-	bn_null(r1);
-	bn_null(r2);
-	g1_null(p);
-	g1_null(u1);
-	g1_null(v1);
-	g2_null(q);
-	g2_null(u2);
-	g2_null(v2);
-	g2_null(w2);
-	gt_null(e);
-	gt_null(r);
-	gt_null(g[0]);
-	gt_null(g[1]);
-	gt_null(g[2]);
-
-	RLC_TRY {
-		bn_new(r1);
-		bn_new(r2);
-		g1_new(p);
-		g1_new(u1);
-		g1_new(v1);
-		g2_new(q);
-		g2_new(u2);
-		g2_new(v2);
-		g2_new(w2);
-		gt_new(e);
-		gt_new(r);
-		gt_new(g[0]);
-		gt_new(g[1]);
-		gt_new(g[2]);
-
-		TEST_CASE("delegated pairing computation with public inputs is correct") {
-			TEST_ASSERT(cp_pdpub_gen(r1, r2, u1, u2, v2, e) == RLC_OK, end);
-			g1_rand(p);
-			g2_rand(q);
-			TEST_ASSERT(cp_pdpub_ask(v1, w2, p, q, r1, r2, u1, u2, v2) == RLC_OK, end);
-			TEST_ASSERT(cp_pdpub_ans(g, p, q, v1, v2, w2) == RLC_OK, end);
-			TEST_ASSERT(cp_pdpub_ver(r, g, r1, e) == 1, end);
-			pc_map(e, p, q);
-			TEST_ASSERT(gt_cmp(r, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("faster delegated pairing with public inputs is correct") {
-			TEST_ASSERT(cp_lvpub_gen(r2, u1, u2, v2, e) == RLC_OK, end);
-			g1_rand(p);
-			g2_rand(q);
-			TEST_ASSERT(cp_lvpub_ask(r1, v1, w2, p, q, r2, u1, u2, v2) == RLC_OK, end);
-			TEST_ASSERT(cp_lvpub_ans(g, p, q, v1, v2, w2) == RLC_OK, end);
-			TEST_ASSERT(cp_lvpub_ver(r, g, r1, e) == 1, end);
-			pc_map(e, p, q);
-			TEST_ASSERT(gt_cmp(r, e) == RLC_EQ, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(r1);
-	bn_free(r2);
-	g1_free(p);
-	g1_free(u1);
-	g1_free(v1);
-	g2_free(q);
-	g2_free(u2);
-	g2_free(v2);
-	g2_free(w2);
-	gt_free(e);
-	gt_free(r);
-	gt_free(g[0]);
-	gt_free(g[1]);
-	gt_free(g[2]);
-  	return code;
-}
-
-static int pdprv(void) {
-	int code = RLC_ERR;
-	bn_t r1, r2[3];
-	g1_t p, u1[2], v1[3];
-	g2_t q, u2[2], v2[4], w2[4];
-	gt_t e[2], r, g[4];
-
-	bn_null(r1);
-	g1_null(p);
-	g2_null(q);
-	gt_null(r);
-	for (int i = 0; i < 2; i++) {
-		g1_null(u1[i]);
-		g2_null(u2[i]);
-		gt_null(e[i]);
-	}
-	for (int i = 0; i < 3; i++) {
-		g1_null(v1[i]);
-		bn_null(r2[i]);
-	}
-	for (int i = 0; i < 4; i++) {
-		g2_null(v2[i]);
-		g2_null(w2[i]);
-		gt_null(g[i]);
-	}
-
-	RLC_TRY {
-		bn_new(r1);
-		g1_new(p);
-		g2_new(q);
-		gt_new(r);
-		for (int i = 0; i < 2; i++) {
-			g1_new(u1[i]);
-			g2_new(u2[i]);
-			gt_new(e[i]);
-		}
-		for (int i = 0; i < 3; i++) {
-			g1_new(v1[i]);
-			bn_new(r2[i]);
-		}
-		for (int i = 0; i < 4; i++) {
-			g2_new(v2[i]);
-			g2_new(w2[i]);
-			gt_new(g[i]);
-		}
-
-		TEST_CASE("delegated pairing computation with private inputs is correct") {
-			TEST_ASSERT(cp_pdprv_gen(r1, r2, u1, u2, v2, e) == RLC_OK, end);
-			g1_rand(p);
-			g2_rand(q);
-			TEST_ASSERT(cp_pdprv_ask(v1, w2, p, q, r1, r2, u1, u2, v2) == RLC_OK, end);
-			TEST_ASSERT(cp_pdprv_ans(g, v1, w2) == RLC_OK, end);
-			TEST_ASSERT(cp_pdprv_ver(r, g, r1, e) == 1, end);
-			pc_map(e[0], p, q);
-			TEST_ASSERT(gt_cmp(r, e[0]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("faster delegated pairing with private inputs is correct") {
-			TEST_ASSERT(cp_pdprv_gen(r1, r2, u1, u2, v2, e) == RLC_OK, end);
-			g1_rand(p);
-			g2_rand(q);
-			TEST_ASSERT(cp_lvprv_ask(v1, w2, p, q, r1, r2, u1, u2, v2) == RLC_OK, end);
-			TEST_ASSERT(cp_lvprv_ans(g, v1, w2) == RLC_OK, end);
-			TEST_ASSERT(cp_lvprv_ver(r, g, r1, e) == 1, end);
-			pc_map(e[0], p, q);
-			TEST_ASSERT(gt_cmp(r, e[0]) == RLC_EQ, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(r1);
-	g1_free(p);
-	g2_free(q);
-	gt_free(r);
-	for (int i = 0; i < 2; i++) {
-		g1_free(u1[i]);
-		g2_free(u2[i]);
-		gt_free(e[i]);
-	}
-	for (int i = 0; i < 3; i++) {
-		g1_free(v1[i]);
-		bn_free(r2[i]);
-	}
-	for (int i = 0; i < 4; i++) {
-		g2_free(v2[i]);
-		g2_free(w2[i]);
-		gt_free(g[i]);
-	}
-  	return code;
-}
-
-static int sokaka(void) {
-	int code = RLC_ERR, l = RLC_MD_LEN;
-	sokaka_t k;
-	bn_t s;
-	uint8_t k1[RLC_MD_LEN], k2[RLC_MD_LEN];
-	char *ia = "Alice";
-	char *ib = "Bob";
-
-	sokaka_null(k);
-	bn_null(s);
-
-	RLC_TRY {
-		sokaka_new(k);
-		bn_new(s);
-
-		cp_sokaka_gen(s);
-
-		TEST_CASE
-				("sakai-ohgishi-kasahara authenticated key agreement is correct")
-		{
-			TEST_ASSERT(cp_sokaka_gen_prv(k, ia, s) == RLC_OK, end);
-			TEST_ASSERT(cp_sokaka_key(k1, l, ia, k, ib) == RLC_OK, end);
-			TEST_ASSERT(cp_sokaka_gen_prv(k, ib, s) == RLC_OK, end);
-			TEST_ASSERT(cp_sokaka_key(k2, l, ib, k, ia) == RLC_OK, end);
-			TEST_ASSERT(memcmp(k1, k2, l) == 0, end);
-		} TEST_END;
-
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	sokaka_free(k);
-	bn_free(s);
-	return code;
-}
-
-static int ibe(void) {
-	int code = RLC_ERR;
-	bn_t s;
-	g1_t pub;
-	g2_t prv;
-	uint8_t in[10], out[10 + 2 * RLC_FP_BYTES + 1];
-	char *id = "Alice";
-	int il, ol;
-	int result;
-
-	bn_null(s);
-	g1_null(pub);
-	g2_null(prv);
-
-	RLC_TRY {
-		bn_new(s);
-		g1_new(pub);
-		g2_new(prv);
-
-		result = cp_ibe_gen(s, pub);
-
-		TEST_CASE("boneh-franklin identity-based encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-			il = 10;
-			ol = il + 2 * RLC_FP_BYTES + 1;
-			rand_bytes(in, il);
-			TEST_ASSERT(cp_ibe_gen_prv(prv, id, s) == RLC_OK, end);
-			TEST_ASSERT(cp_ibe_enc(out, &ol, in, il, id, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_ibe_dec(out, &il, out, ol, prv) == RLC_OK, end);
-			TEST_ASSERT(memcmp(in, out, il) == 0, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(s);
-	g1_free(pub);
-	g2_free(prv);
-	return code;
-}
-
-static int bgn(void) {
-	int result, code = RLC_ERR;
-	g1_t c[2], d[2];
-	g2_t e[2], f[2];
-	gt_t g[4];
-	bgn_t pub, prv;
-	dig_t in, out, t;
-
-	g1_null(c[0]);
-	g1_null(c[1]);
-	g1_null(d[0]);
-	g1_null(d[1]);
-	g2_null(e[0]);
-	g2_null(e[1]);
-	g2_null(f[0]);
-	g2_null(f[1]);
-	bgn_null(pub);
-	bgn_null(prv);
-
-	RLC_TRY {
-		g1_new(c[0]);
-		g1_new(c[1]);
-		g1_new(d[0]);
-		g1_new(d[1]);
-		g2_new(e[0]);
-		g2_new(e[1]);
-		g2_new(f[0]);
-		g2_new(f[1]);
-		bgn_new(pub);
-		bgn_new(prv);
-		for (int i = 0; i < 4; i++) {
-			gt_null(g[i]);
-			gt_new(g[i]);
-		}
-
-		result = cp_bgn_gen(pub, prv);
-
-		TEST_CASE("boneh-go-nissim encryption/decryption is correct") {
-			TEST_ASSERT(result == RLC_OK, end);
-
-			rand_bytes((unsigned char *)&in, sizeof(dig_t));
-			in = in % 11;
-
-			TEST_ASSERT(cp_bgn_enc1(c, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_dec1(&out, c, prv) == RLC_OK, end);
-			TEST_ASSERT(in == out, end);
-			TEST_ASSERT(cp_bgn_enc2(e, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_dec2(&out, e, prv) == RLC_OK, end);
-			TEST_ASSERT(in == out, end);
-		} TEST_END;
-
-		TEST_CASE("boneh-go-nissim encryption is additively homomorphic") {
-			rand_bytes((unsigned char *)&in, sizeof(dig_t));
-			in = in % 11;
-			out = in % 7;
-			TEST_ASSERT(cp_bgn_enc1(c, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_enc1(d, out, pub) == RLC_OK, end);
-			g1_add(c[0], c[0], d[0]);
-			g1_add(c[1], c[1], d[1]);
-			g1_norm(c[0], c[0]);
-			g1_norm(c[1], c[1]);
-			TEST_ASSERT(cp_bgn_dec1(&t, c, prv) == RLC_OK, end);
-			TEST_ASSERT(in + out == t, end);
-			TEST_ASSERT(cp_bgn_enc2(e, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_enc2(f, out, pub) == RLC_OK, end);
-			g2_add(e[0], e[0], f[0]);
-			g2_add(e[1], e[1], f[1]);
-			g2_norm(e[0], e[0]);
-			g2_norm(e[1], e[1]);
-			TEST_ASSERT(cp_bgn_dec2(&t, e, prv) == RLC_OK, end);
-			TEST_ASSERT(in + out == t, end);
-		} TEST_END;
-
-		TEST_CASE("boneh-go-nissim encryption is multiplicatively homomorphic") {
-			rand_bytes((unsigned char *)&in, sizeof(dig_t));
-			in = in % 11;
-			out = in % 17;
-			TEST_ASSERT(cp_bgn_enc1(c, in, pub) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_enc2(e, out, pub) == RLC_OK, end);
-			in = in * out;
-			TEST_ASSERT(cp_bgn_mul(g, c, e) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_dec(&t, g, prv) == RLC_OK, end);
-			TEST_ASSERT(in == t, end);
-			TEST_ASSERT(cp_bgn_add(g, g, g) == RLC_OK, end);
-			TEST_ASSERT(cp_bgn_dec(&t, g, prv) == RLC_OK, end);
-			TEST_ASSERT(in + in == t, end);
-		} TEST_END;
-
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	g1_free(c[0]);
-	g1_free(c[1]);
-	g1_free(d[0]);
-	g1_free(d[1]);
-	g2_free(e[0]);
-	g2_free(e[1]);
-	g2_free(f[0]);
-	g2_free(f[1]);
-	bgn_free(pub);
-	bgn_free(prv);
-	for (int i = 0; i < 4; i++) {
-		gt_free(g[i]);
-	}
-	return code;
-}
-
-static int bls(void) {
-	int code = RLC_ERR;
-	bn_t d;
-	g1_t s;
-	g2_t q;
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-
-	bn_null(d);
-	g1_null(s);
-	g2_null(q);
-
-	RLC_TRY {
-		bn_new(d);
-		g1_new(s);
-		g2_new(q);
-
-		TEST_CASE("boneh-lynn-schacham short signature is correct") {
-			TEST_ASSERT(cp_bls_gen(d, q) == RLC_OK, end);
-			TEST_ASSERT(cp_bls_sig(s, m, sizeof(m), d) == RLC_OK, end);
-			TEST_ASSERT(cp_bls_ver(s, m, sizeof(m), q) == 1, end);
-			/* Check adversarial signature. */
-			memset(m, 0, sizeof(m));
-			g2_set_infty(q);
-			TEST_ASSERT(cp_bls_ver(s, m, sizeof(m), q) == 0, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d);
-	g1_free(s);
-	g2_free(q);
-	return code;
-}
-
-static int bbs(void) {
-	int code = RLC_ERR;
-	bn_t d;
-	g1_t s;
-	g2_t q;
-	gt_t z;
-	uint8_t m[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-
-	bn_null(d);
-	g1_null(s);
-	g2_null(q);
-	gt_null(z);
-
-	RLC_TRY {
-		bn_new(d);
-		g1_new(s);
-		g2_new(q);
-		gt_new(z);
-
-		TEST_CASE("boneh-boyen short signature is correct") {
-			TEST_ASSERT(cp_bbs_gen(d, q, z) == RLC_OK, end);
-			TEST_ASSERT(cp_bbs_sig(s, m, sizeof(m), 0, d) == RLC_OK, end);
-			TEST_ASSERT(cp_bbs_ver(s, m, sizeof(m), 0, q, z) == 1, end);
-			md_map(h, m, sizeof(m));
-			TEST_ASSERT(cp_bbs_sig(s, m, sizeof(m), 1, d) == RLC_OK, end);
-			TEST_ASSERT(cp_bbs_ver(s, m, sizeof(m), 1, q, z) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d);
-	g1_free(s);
-	g2_free(q);
-	gt_free(z);
-	return code;
-}
-
-static int cls(void) {
-	int i, code = RLC_ERR;
-	bn_t r, t, u, v, vs[4];
-	g1_t a, A, b, B, c, As[4], Bs[4];
-	g2_t x, y, z, zs[4];
-	uint8_t m[5] = { 0, 1, 2, 3, 4 };
-	uint8_t *msgs[5] = {m, m, m, m, m};
-	int lens[5] = {sizeof(m), sizeof(m), sizeof(m), sizeof(m), sizeof(m)};
-
-	bn_null(r);
-	bn_null(t);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(A);
-	g1_null(b);
-	g1_null(B);
-	g1_null(c);
-	g2_null(x);
-	g2_null(y);
-	g2_null(z);
-	for (i = 0; i < 4; i++) {
-		bn_null(vs[i]);
-		g1_null(As[i]);
-		g1_null(Bs[i]);
-		g2_null(zs[i]);
-	}
-
-	RLC_TRY {
-		bn_new(r);
-		bn_new(t);
-		bn_new(u);
-		bn_new(v);
-		g1_new(a);
-		g1_new(A);
-		g1_new(b);
-		g1_new(B);
-		g1_new(c);
-		g2_new(x);
-		g2_new(y);
-		g2_new(z);
-		for (i = 0; i < 4; i++) {
-			bn_new(vs[i]);
-			g1_new(As[i]);
-			g1_new(Bs[i]);
-			g2_new(zs[i]);
-		}
-
-		TEST_CASE("camenisch-lysyanskaya simple signature is correct") {
-			TEST_ASSERT(cp_cls_gen(u, v, x, y) == RLC_OK, end);
-			TEST_ASSERT(cp_cls_sig(a, b, c, m, sizeof(m), u, v) == RLC_OK, end);
-			TEST_ASSERT(cp_cls_ver(a, b, c, m, sizeof(m), x, y) == 1, end);
-			/* Check adversarial signature. */
-			g1_set_infty(a);
-			g1_set_infty(b);
-			g1_set_infty(c);
-			TEST_ASSERT(cp_cls_ver(a, b, c, m, sizeof(m), x, y) == 0, end);
-		}
-		TEST_END;
-
-		TEST_CASE("camenisch-lysyanskaya message-independent signature is correct") {
-			bn_rand(r, RLC_POS, 2 * pc_param_level());
-			TEST_ASSERT(cp_cli_gen(t, u, v, x, y, z) == RLC_OK, end);
-			TEST_ASSERT(cp_cli_sig(a, A, b, B, c, m, sizeof(m), r, t, u, v) == RLC_OK, end);
-			TEST_ASSERT(cp_cli_ver(a, A, b, B, c, m, sizeof(m), r, x, y, z) == 1, end);
-			/* Check adversarial signature. */
-			g1_set_infty(a);
-			g1_set_infty(A);
-			g1_set_infty(b);
-			g1_set_infty(B);
-			g1_set_infty(c);
-			TEST_ASSERT(cp_cli_ver(a, A, b, B, c, m, sizeof(m), r, x, y, z) == 0, end);
-		}
-		TEST_END;
-
-		TEST_CASE("camenisch-lysyanskaya message-block signature is correct") {
-			TEST_ASSERT(cp_clb_gen(t, u, vs, x, y, zs, 5) == RLC_OK, end);
-			TEST_ASSERT(cp_clb_sig(a, As, b, Bs, c, msgs, lens, t, u, vs, 5) == RLC_OK, end);
-			TEST_ASSERT(cp_clb_ver(a, As, b, Bs, c, msgs, lens, x, y, zs, 5) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-  	bn_free(r);
-  	bn_free(t);
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(A);
-	g1_free(b);
-	g1_free(B);
-	g1_free(c);
-	g2_free(x);
-	g2_free(y);
-	g2_free(z);
-	for (i = 0; i < 4; i++) {
-		bn_free(vs[i]);
-		g1_free(As[i]);
-		g1_free(Bs[i]);
-		g2_free(zs[i]);
-	}
-  	return code;
-}
-
-static int pss(void) {
-	int i, code = RLC_ERR;
-	bn_t ms[5], n, u, v, _v[5];
-	g1_t a, b;
-	g2_t g, x, y, _y[5];
-
-	bn_null(n);
-	bn_null(u);
-	bn_null(v);
-	g1_null(a);
-	g1_null(b);
-	g2_null(g);
-	g2_null(x);
-	g2_null(y);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(u);
-		bn_new(v);
-		g1_new(a);
-		g1_new(b);
-		g2_new(g);
-		g2_new(x);
-		g2_new(y);
-
-		g1_get_ord(n);
-
-		for (i = 0; i < 5; i++) {
-			bn_null(ms[i]);
-			bn_null(_v[i]);
-			g2_null(_y[i]);
-			bn_new(ms[i]);
-			bn_rand_mod(ms[i], n);
-			bn_new(_v[i]);
-			g2_new(_y[i]);
-		}
-
-		TEST_CASE("pointcheval-sanders simple signature is correct") {
-			TEST_ASSERT(cp_pss_gen(u, v, g, x, y) == RLC_OK, end);
-			TEST_ASSERT(cp_pss_sig(a, b, ms[0], u, v) == RLC_OK, end);
-			TEST_ASSERT(cp_pss_ver(a, b, ms[0], g, x, y) == 1, end);
-			/* Check adversarial signature. */
-			g1_set_infty(a);
-			g1_set_infty(b);
-			TEST_ASSERT(cp_pss_ver(a, b, ms[0], g, x, y) == 0, end);
-		}
-		TEST_END;
-
-		TEST_CASE("pointcheval-sanders block signature is correct") {
-			TEST_ASSERT(cp_psb_gen(u, _v, g, x, _y, 5) == RLC_OK, end);
-			TEST_ASSERT(cp_psb_sig(a, b, ms, u, _v, 5) == RLC_OK, end);
-			TEST_ASSERT(cp_psb_ver(a, b, ms, g, x, _y, 5) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(n);
-	bn_free(u);
-	bn_free(v);
-	g1_free(a);
-	g1_free(b);
-	g2_free(g);
-	g2_free(x);
-	g2_free(y);
-	for (i = 0; i < 5; i++) {
-		bn_free(ms[i]);
-		bn_free(_v[i]);
-		g2_free(_y[i]);
-	}
-  	return code;
-}
-
-#if defined(WITH_MPC)
-
-static int mpss(void) {
-	int i, j, code = RLC_ERR;
-	bn_t m[2], n, u[2], v[2], ms[5][2], _v[5][2];
-	g1_t g, s[2];
-	g2_t h, x[2], y[2], _y[5][2];
-	gt_t e[2], f[2];
-	mt_t tri[3][2];
-	pt_t t[2];
-
-	bn_null(n);
-	g1_null(g);
-	g2_null(h);
-
-	RLC_TRY {
-		bn_new(n);
-		g1_new(g);
-		g2_new(h);
-		g1_get_ord(n);
-		for (i = 0; i < 2; i++) {
-			bn_null(m[i]);
-			bn_null(u[i]);
-			bn_null(v[i]);
-			g1_null(s[i]);
-			g2_null(x[i]);
-			g2_null(y[i]);
-			gt_null(e[i]);
-			gt_null(f[i]);
-			mt_null(tri[0][i]);
-			mt_null(tri[1][i]);
-			mt_null(tri[2][i]);
-			pt_null(t[i]);
-			bn_new(m[i]);
-			bn_rand_mod(m[i], n);
-			bn_new(u[i]);
-			bn_new(v[i]);
-			g1_new(s[i]);
-			g2_new(x[i]);
-			g2_new(y[i]);
-			gt_new(e[i]);
-			gt_new(f[i]);
-			mt_new(tri[0][i]);
-			mt_new(tri[1][i]);
-			mt_new(tri[2][i]);
-			pt_new(t[i]);
-			for (j = 0; j < 5; j++) {
-				bn_null(ms[j][i]);
-				bn_null(_v[j][i]);
-				g2_null(_y[j][i]);
-				bn_new(ms[j][i]);
-				bn_rand_mod(ms[j][i], n);
-				bn_new(_v[j][i]);
-				g2_new(_y[j][i]);
-			}
-		}
-
-		TEST_CASE("multi-party pointcheval-sanders simple signature is correct") {
-			pc_map_tri(t);
-			mt_gen(tri[0], n);
-			mt_gen(tri[1], n);
-			mt_gen(tri[2], n);
-			gt_exp_gen(e[0], tri[2][0]->b);
-			gt_exp_gen(e[1], tri[2][1]->b);
-			gt_exp_gen(f[0], tri[2][0]->c);
-			gt_exp_gen(f[1], tri[2][1]->c);
-			tri[2][0]->bt = &e[0];
-			tri[2][1]->bt = &e[1];
-			tri[2][0]->ct = &f[0];
-			tri[2][1]->ct = &f[1];
-			TEST_ASSERT(cp_mpss_gen(u, v, h, x, y) == RLC_OK, end);
-			TEST_ASSERT(cp_mpss_bct(x, y) == RLC_OK, end);
-			/* Compute signature in MPC. */
-			TEST_ASSERT(cp_mpss_sig(g, s, m, u, v, tri[0], tri[1]) == RLC_OK, end);
-			/* Verify signature in MPC. */
-			cp_mpss_ver(e[0], g, s, m, h, x[0], y[0], tri[2], t);
-			TEST_ASSERT(gt_is_unity(e[0]) == 1, end);
-			/* Check that signature is also valid for conventional scheme. */
-			bn_add(m[0], m[0], m[1]);
-			bn_mod(m[0], m[0], n);
-			g1_add(s[0], s[0], s[1]);
-			g1_norm(s[0], s[0]);
-			TEST_ASSERT(cp_pss_ver(g, s[0], m[0], h, x[0], y[0]) == 1, end);
-		}
-		TEST_END;
-
-		TEST_CASE("multi-party pointcheval-sanders block signature is correct") {
-			g1_get_ord(n);
-			pc_map_tri(t);
-			mt_gen(tri[0], n);
-			mt_gen(tri[1], n);
-			mt_gen(tri[2], n);
-			gt_exp_gen(e[0], tri[2][0]->b);
-			gt_exp_gen(e[1], tri[2][1]->b);
-			gt_exp_gen(f[0], tri[2][0]->c);
-			gt_exp_gen(f[1], tri[2][1]->c);
-			tri[2][0]->bt = &e[0];
-			tri[2][1]->bt = &e[1];
-			tri[2][0]->ct = &f[0];
-			tri[2][1]->ct = &f[1];
-			TEST_ASSERT(cp_mpsb_gen(u, _v, h, x, _y, 5) == RLC_OK, end);
-			TEST_ASSERT(cp_mpsb_bct(x, _y, 5) == RLC_OK, end);
-			/* Compute signature in MPC. */
-			TEST_ASSERT(cp_mpsb_sig(g, s, ms, u, _v, tri[0], tri[1], 5) == RLC_OK, end);
-			/* Verify signature in MPC. */
-			cp_mpsb_ver(e[1], g, s, ms, h, x[0], _y, NULL, tri[2], t, 5);
-			TEST_ASSERT(gt_is_unity(e[1]) == 1, end);
-			gt_exp_gen(e[0], tri[2][0]->b);
-			gt_exp_gen(e[1], tri[2][1]->b);
-			cp_mpsb_ver(e[1], g, s, ms, h, x[0], _y, _v, tri[2], t, 5);
-			TEST_ASSERT(gt_is_unity(e[1]) == 1, end);
-			bn_sub_dig(ms[0][0], ms[0][0], 1);
-			cp_mpsb_ver(e[1], g, s, ms, h, x[0], _y, _v, tri[2], t, 5);
-			TEST_ASSERT(gt_is_unity(e[1]) == 0, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-  	bn_free(n);
-	g1_free(g);
-	g2_free(h);
-	for (i = 0; i < 2; i++) {
-		bn_free(m[i]);
-		bn_free(u[i]);
-		bn_free(v[i]);
-		g1_free(s[i]);
-		g2_free(x[i]);
-		g2_free(y[i]);
-		gt_free(e[i]);
-		gt_free(f[i]);
-		mt_free(tri[0][i]);
-		mt_free(tri[1][i]);
-		mt_free(tri[2][i]);
-		pt_free(t[i]);
-		for (j = 0; j < 5; j++) {
-			bn_free(ms[j][i]);
-			bn_free(_v[j][i]);
-			g2_free(_y[j][i]);
-		}
-	}
-  	return code;
-}
-
-#endif
-
-static int zss(void) {
-	int code = RLC_ERR;
-	bn_t d;
-	g1_t q;
-	g2_t s;
-	gt_t z;
-	uint8_t m[5] = { 0, 1, 2, 3, 4 }, h[RLC_MD_LEN];
-
-	bn_null(d);
-	g1_null(q);
-	g2_null(s);
-	gt_null(z);
-
-	RLC_TRY {
-		bn_new(d);
-		g1_new(q);
-		g2_new(s);
-		gt_new(z);
-
-		TEST_CASE("zhang-safavi-naini-susilo signature is correct") {
-			TEST_ASSERT(cp_zss_gen(d, q, z) == RLC_OK, end);
-			TEST_ASSERT(cp_zss_sig(s, m, sizeof(m), 0, d) == RLC_OK, end);
-			TEST_ASSERT(cp_zss_ver(s, m, sizeof(m), 0, q, z) == 1, end);
-			md_map(h, m, sizeof(m));
-			TEST_ASSERT(cp_zss_sig(s, m, sizeof(m), 1, d) == RLC_OK, end);
-			TEST_ASSERT(cp_zss_ver(s, m, sizeof(m), 1, q, z) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	bn_free(d);
-	g1_free(q);
-	g2_free(s);
-	gt_free(z);
-	return code;
-}
-
-#define S	2			/* Number of signers. */
-#define L	4			/* Number of labels. */
-#define K	RLC_MD_LEN	/* Size of PRF key. */
-
-static int lhs(void) {
-	int code = RLC_ERR;
-	uint8_t k[S][K];
-	bn_t m, n, msg[S][L], sk[S], d[S], x[S][L];
-	g1_t _r, h, as[S], cs[S], sig[S];
-	g1_t a[S][L], c[S][L], r[S][L];
-	g2_t _s, s[S][L], pk[S], y[S], z[S];
-	gt_t *hs[S], vk;
-	char *data = "database-identifier";
-	char *id[S] = { "Alice", "Bob" };
-	dig_t *f[S] = { NULL };
-	int flen[S];
-
-	bn_null(m);
-	bn_null(n);
-	g1_null(h);
-	g1_null(_r);
-	g2_null(_s);
-	gt_null(vk);
-
-	RLC_TRY {
-		bn_new(m);
-		bn_new(n);
-		g1_new(h);
-		g1_new(_r);
-		g2_new(_s);
-		gt_new(vk);
-
-		for (int i = 0; i < S; i++) {
-			hs[i] = RLC_ALLOCA(gt_t, RLC_TERMS);
-			for (int j = 0; j < RLC_TERMS; j++) {
-				gt_null(hs[i][j]);
-				gt_new(hs[i][j]);
-			}
-			for (int j = 0; j < L; j++) {
-				bn_null(x[i][j]);
-				bn_null(msg[i][j]);
-				g1_null(a[i][j]);
-				g1_null(c[i][j]);
-				g1_null(r[i][j]);
-				g2_null(s[i][j]);
-				bn_new(x[i][j]);
-				bn_new(msg[i][j]);
-				g1_new(a[i][j]);
-				g1_new(c[i][j]);
-				g1_new(r[i][j]);
-				g2_new(s[i][j]);
-			}
-			bn_null(sk[i]);
-			bn_null(d[i]);
-			g1_null(sig[i]);
-			g1_null(as[i]);
-			g1_null(cs[i]);
-			g2_null(y[i]);
-			g2_null(z[i]);
-			g2_null(pk[i]);
-
-			bn_new(sk[i]);
-			bn_new(d[i]);
-			g1_new(sig[i]);
-			g1_new(as[i]);
-			g1_new(cs[i]);
-			g2_new(y[i]);
-			g2_new(z[i]);
-			g2_new(pk[i]);
-		}
-
-		/* Define linear function. */
-		for (int i = 0; i < S; i++) {
-			f[i] = RLC_ALLOCA(dig_t, RLC_TERMS);
-			for (int j = 0; j < RLC_TERMS; j++) {
-				dig_t t;
-				rand_bytes((uint8_t *)&t, sizeof(dig_t));
-				f[i][j] = t & RLC_MASK(RLC_DIG / 2);
-			}
-			flen[i] = L;
-		}
-
-		/* Initialize scheme for messages of single components. */
-		g1_get_ord(n);
-		cp_cmlhs_init(h);
-		for (int j = 0; j < S; j++) {
-			cp_cmlhs_gen(x[j], hs[j], L, k[j], K, sk[j], pk[j], d[j], y[j]);
-		}
-
-		TEST_CASE("context-hiding linear homomorphic signature is correct") {
-			int label[L];
-			/* Compute all signatures. */
-			for (int j = 0; j < S; j++) {
-				for (int l = 0; l < L; l++) {
-					label[l] = l;
-					bn_rand_mod(msg[j][l], n);
-					cp_cmlhs_sig(sig[j], z[j], a[j][l], c[j][l], r[j][l], s[j][l],
-						msg[j][l], data, label[l], x[j][l], h, k[j], K,
-						d[j], sk[j]);
-				}
-			}
-			/* Apply linear function over signatures. */
-			for (int j = 0; j < S; j++) {
-				cp_cmlhs_fun(as[j], cs[j], a[j], c[j], f[j], flen[j]);
-			}
-
-			cp_cmlhs_evl(_r, _s, r[0], s[0], f[0], flen[0]);
-			for (int j = 1; j < S; j++) {
-				cp_cmlhs_evl(r[0][0], s[0][0], r[j], s[j], f[j], flen[j]);
-				g1_add(_r, _r, r[0][0]);
-				g2_add(_s, _s, s[0][0]);
-			}
-			g1_norm(_r, _r);
-			g2_norm(_s, _s);
-			/* We share messages between users to simplify tests. */
-			bn_zero(m);
-			for (int j = 0; j < S; j++) {
-				for (int l = 0; l < L; l++) {
-					bn_mul_dig(msg[j][l], msg[j][l], f[j][l]);
-					bn_add(m, m, msg[j][l]);
-					bn_mod(m, m, n);
-				}
-			}
-
-			TEST_ASSERT(cp_cmlhs_ver(_r, _s, sig, z, as, cs, m, data, h, label,
-				hs, f, flen, y, pk, S) == 1, end);
-
-			cp_cmlhs_off(vk, h, label, hs, f, flen, y, pk, S);
-			TEST_ASSERT(cp_cmlhs_onv(_r, _s, sig, z, as, cs, m, data, h, vk,
-				y, pk, S) == 1, end);
-		}
-		TEST_END;
-
-		char *ls[L] = { NULL };
-		dig_t ft[S];
-
-		TEST_CASE("simple linear multi-key homomorphic signature is correct") {
-			for (int j = 0; j < S; j++) {
-				cp_mklhs_gen(sk[j], pk[j]);
-				for (int l = 0; l < L; l++) {
-					ls[l] = "l";
-					bn_rand_mod(msg[j][l], n);
-					cp_mklhs_sig(a[j][l], msg[j][l], data, id[j], ls[l], sk[j]);
-				}
-			}
-
-			for (int j = 0; j < S; j++) {
-				cp_mklhs_fun(d[j], msg[j], f[j], L);
-			}
-
-			g1_set_infty(_r);
-			for (int j = 0; j < S; j++) {
-				cp_mklhs_evl(r[0][j], a[j], f[j], L);
-				g1_add(_r, _r, r[0][j]);
-			}
-			g1_norm(_r, _r);
-
-			bn_zero(m);
-			for (int j = 0; j < S; j++) {
-				for (int l = 0; l < L; l++) {
-					bn_mul_dig(msg[j][l], msg[j][l], f[j][l]);
-					bn_add(m, m, msg[j][l]);
-					bn_mod(m, m, n);
-				}
-			}
-
-			TEST_ASSERT(cp_mklhs_ver(_r, m, d, data, id, ls, f, flen, pk, S), end);
-
-			cp_mklhs_off(as, ft, id, ls, f, flen, S);
-			TEST_ASSERT(cp_mklhs_onv(_r, m, d, data, id, as, ft, pk, S), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-
-  end:
-	  bn_free(n);
-	  bn_free(m);
-	  g1_free(h);
-	  g1_free(_r);
-	  g2_free(_s);
-	  gt_free(vk);
-
-	  for (int i = 0; i < S; i++) {
-		  RLC_FREE(f[i]);
-		  for (int j = 0; j < RLC_TERMS; j++) {
-			  gt_free(hs[i][j]);
-		  }
-		  RLC_FREE(hs[i]);
-		  for (int j = 0; j < L; j++) {
-			  bn_free(x[i][j]);
-			  bn_free(msg[i][j]);
-			  g1_free(a[i][j]);
-			  g1_free(c[i][j]);
-			  g1_free(r[i][j]);
-			  g2_free(s[i][j]);
-		  }
-		  bn_free(sk[i]);
-		  bn_free(d[i]);
-		  g1_free(sig[i]);
-		  g1_free(as[i]);
-		  g1_free(cs[i]);
-		  g2_free(y[i]);
-		  g2_free(z[i]);
-		  g2_free(pk[i]);
-	  }
-	return code;
-}
-
-#endif /* WITH_PC */
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the CP module", 0);
-
-#if defined(WITH_BN)
-	util_banner("Protocols based on integer factorization:\n", 0);
-
-	if (rsa() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (rabin() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (benaloh() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (paillier() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-#endif
-
-#if defined(WITH_EC)
-	util_banner("Protocols based on elliptic curves:\n", 0);
-	if (ec_param_set_any() == RLC_OK) {
-
-		if (ecdh() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (ecmqv() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-#if defined(WITH_BC)
-		if (ecies() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-#endif
-
-		if (ecdsa() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (ecss() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (vbnn() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pok() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (sok() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (ers() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (etrs() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-#if defined(WITH_PC)
-	util_banner("Protocols based on pairings:\n", 0);
-	if (pc_param_set_any() == RLC_OK) {
-
-		if (pdpub() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pdprv() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (sokaka() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (ibe() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (bgn() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (bls() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (bbs() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cls() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pss() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-#if defined(WITH_MPC)
-		if (mpss() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-#endif
-
-		if (zss() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (lhs() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_dv.c b/src/dashbls/depends/relic/test/test_dv.c
deleted file mode 100644
index 91a92eab79af..000000000000
--- a/src/dashbls/depends/relic/test/test_dv.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for manipulating temporary double-precision digit vectors.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	dv_t a;
-
-	dv_null(a);
-
-	RLC_TRY {
-		TEST_CASE("temporary memory can be allocated") {
-			dv_new(a);
-			dv_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int copy(void) {
-	dv_t a, b;
-	int code = RLC_ERR;
-
-	dv_null(a);
-	dv_null(b);
-
-	RLC_TRY {
-		dv_new(a);
-		dv_new(b);
-
-		TEST_CASE("copy and comparison are consistent") {
-			rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-			rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-			if (dv_cmp(a, b, RLC_DV_DIGS) != RLC_EQ) {
-				if (dv_cmp(a, b, RLC_DV_DIGS) == RLC_GT) {
-					TEST_ASSERT(dv_cmp(b, a, RLC_DV_DIGS) == RLC_LT, end);
-				} else {
-					TEST_ASSERT(dv_cmp(b, a, RLC_DV_DIGS) == RLC_GT, end);
-				}
-			}
-			dv_copy(a, b, RLC_DV_DIGS);
-			TEST_ASSERT(dv_cmp_const(a, b, RLC_DV_DIGS) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("conditional copy and comparison are consistent") {
-			rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-			rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-			dv_copy_cond(a, b, RLC_DV_DIGS, 0);
-			TEST_ASSERT(dv_cmp_const(a, b, RLC_DV_DIGS) == RLC_NE, end);
-			dv_copy_cond(a, b, RLC_DV_DIGS, 1);
-			TEST_ASSERT(dv_cmp_const(a, b, RLC_DV_DIGS) == RLC_EQ, end);
-		}
-		TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	dv_free(a);
-	dv_free(b);
-	return code;
-}
-
-static int swap(void) {
-	dv_t a, b, c, d;
-	int code = RLC_ERR;
-
-	dv_null(a);
-	dv_null(b);
-	dv_null(c);
-	dv_null(d);
-
-	RLC_TRY {
-		dv_new(a);
-		dv_new(b);
-		dv_new(c);
-		dv_new(d);
-
-		TEST_CASE("conditional swap and copy are consistent") {
-			rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-			rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-			dv_copy(c, a, RLC_DV_DIGS);
-			dv_swap_cond(a, b, RLC_DV_DIGS, 1);
-			TEST_ASSERT(dv_cmp_const(c, b, RLC_DV_DIGS) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("conditional swap and comparison are consistent") {
-			rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-			rand_bytes((uint8_t *)b, RLC_DV_DIGS * sizeof(dig_t));
-			dv_copy(c, a, RLC_DV_DIGS);
-			dv_copy(d, b, RLC_DV_DIGS);
-			dv_swap_cond(a, b, RLC_DV_DIGS, 0);
-			TEST_ASSERT(dv_cmp_const(c, a, RLC_DV_DIGS) == RLC_EQ, end);
-			TEST_ASSERT(dv_cmp_const(d, b, RLC_DV_DIGS) == RLC_EQ, end);
-			TEST_ASSERT(dv_cmp_const(c, b, RLC_DV_DIGS) == RLC_NE, end);
-			TEST_ASSERT(dv_cmp_const(d, a, RLC_DV_DIGS) == RLC_NE, end);
-			dv_swap_cond(a, b, RLC_DV_DIGS, 1);
-			TEST_ASSERT(dv_cmp_const(c, b, RLC_DV_DIGS) == RLC_EQ, end);
-			TEST_ASSERT(dv_cmp_const(d, a, RLC_DV_DIGS) == RLC_EQ, end);
-			TEST_ASSERT(dv_cmp_const(c, a, RLC_DV_DIGS) == RLC_NE, end);
-			TEST_ASSERT(dv_cmp_const(d, b, RLC_DV_DIGS) == RLC_NE, end);
-		}
-		TEST_END;
-	} RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	dv_free(a);
-	dv_free(b);
-	dv_free(c);
-	dv_free(d);
-	return code;
-}
-
-static int shifting(void) {
-	int code = RLC_ERR;
-	dv_t a, b, c;
-
-	dv_null(a);
-	dv_null(b);
-	dv_null(c);
-
-	RLC_TRY {
-		dv_new(a);
-		dv_new(b);
-		dv_new(c);
-
-		TEST_CASE("shifting by  digit is consistent") {
-			rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-			a[RLC_DV_DIGS - 1] = 0;
-			dv_lshd(b, a, RLC_DV_DIGS, 1);
-			dv_rshd(c, b, RLC_DV_DIGS, 1);
-			TEST_ASSERT(dv_cmp(c, a, RLC_DV_DIGS) == RLC_EQ, end);
-		} TEST_END;
-
-		if (RLC_DV_DIGS > 1) {
-			TEST_CASE("shifting by 2 digits is consistent") {
-				rand_bytes((uint8_t *)a, RLC_DV_DIGS * sizeof(dig_t));
-				a[RLC_DV_DIGS - 1] = 0;
-				a[RLC_DV_DIGS - 2] = 0;
-				dv_lshd(b, a, RLC_DV_DIGS, 2);
-				dv_rshd(c, b, RLC_DV_DIGS, 2);
-				TEST_ASSERT(dv_cmp(c, a, RLC_DV_DIGS) == RLC_EQ, end);
-			} TEST_END;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	dv_free(a);
-	dv_free(b);
-	dv_free(c);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the DV module:\n", 0);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (copy() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (swap() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (shifting() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_eb.c b/src/dashbls/depends/relic/test/test_eb.c
deleted file mode 100644
index 5b019830247b..000000000000
--- a/src/dashbls/depends/relic/test/test_eb.c
+++ /dev/null
@@ -1,1347 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for arithmetic on binary elliptic curves.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	eb_t a;
-
-	eb_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			eb_new(a);
-			eb_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util(void) {
-	int l, code = RLC_ERR;
-	eb_t a, b, c;
-	uint8_t bin[2 * RLC_FB_BYTES + 1];
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-
-		TEST_CASE("copy and comparison are consistent") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_rand(c);
-			/* Compare points in affine coordinates. */
-			if (eb_cmp(a, c) != RLC_EQ) {
-				eb_copy(c, a);
-				TEST_ASSERT(eb_cmp(c, a) == RLC_EQ, end);
-			}
-			if (eb_cmp(b, c) != RLC_EQ) {
-				eb_copy(c, b);
-				TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			eb_dbl(c, a);
-			eb_norm(c, c);
-			eb_dbl(a, a);
-			TEST_ASSERT(eb_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(eb_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			eb_dbl(c, c);
-			eb_dbl(a, a);
-			TEST_ASSERT(eb_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(eb_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			eb_rand(a);
-			eb_neg(b, a);
-			TEST_ASSERT(eb_cmp(a, b) != RLC_EQ, end);
-			eb_neg(b, b);
-			TEST_ASSERT(eb_cmp(a, b) == RLC_EQ, end);
-			eb_neg(b, a);
-			eb_add(a, a, b);
-			eb_set_infty(b);
-			TEST_ASSERT(eb_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			eb_rand(a);
-			eb_set_infty(c);
-			TEST_ASSERT(eb_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(eb_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			eb_set_infty(a);
-			TEST_ASSERT(eb_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			eb_set_infty(a);
-			TEST_ASSERT(eb_on_curve(a), end);
-			eb_rand(a);
-			TEST_ASSERT(eb_on_curve(a), end);
-			fb_rand(a->x);
-			TEST_ASSERT(!eb_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			eb_rand(a);
-			eb_blind(a, a);
-			TEST_ASSERT(eb_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				eb_set_infty(a);
-				l = eb_size_bin(a, j);
-				eb_write_bin(bin, l, a, j);
-				eb_read_bin(b, bin, l);
-				TEST_ASSERT(eb_cmp(a, b) == RLC_EQ, end);
-				eb_rand(a);
-				l = eb_size_bin(a, j);
-				eb_write_bin(bin, l, a, j);
-				eb_read_bin(b, bin, l);
-				TEST_ASSERT(eb_cmp(a, b) == RLC_EQ, end);
-				eb_rand(a);
-				eb_dbl(a, a);
-				l = eb_size_bin(a, j);
-				eb_norm(a, a);
-				eb_write_bin(bin, l, a, j);
-				eb_read_bin(b, bin, l);
-				TEST_ASSERT(eb_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	return code;
-}
-
-static int addition(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c, d, e;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-	eb_null(d);
-	eb_null(e);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-		eb_new(d);
-		eb_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_add(d, a, b);
-			eb_add(e, b, a);
-			TEST_ASSERT(eb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_rand(c);
-			eb_add(d, a, b);
-			eb_add(d, d, c);
-			eb_add(e, b, c);
-			eb_add(e, e, a);
-			TEST_ASSERT(eb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			eb_rand(a);
-			eb_set_infty(d);
-			eb_add(e, a, d);
-			TEST_ASSERT(eb_cmp(e, a) == RLC_EQ, end);
-			eb_add(e, d, a);
-			TEST_ASSERT(eb_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			eb_rand(a);
-			eb_neg(d, a);
-			eb_add(e, a, d);
-			TEST_ASSERT(eb_is_infty(e), end);
-		} TEST_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point addition in affine coordinates is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_add(d, a, b);
-			eb_add_basic(e, a, b);
-			TEST_ASSERT(eb_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-#if !defined(EB_MIXED) || !defined(STRIP)
-		TEST_CASE("point addition in projective coordinates is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_rand(c);
-			eb_add_projc(a, a, b);
-			eb_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			eb_add_projc(d, a, b);
-			/* normalize before mixing coordinates. */
-			eb_norm(a, a);
-			eb_norm(b, b);
-			eb_add(e, a, b);
-			TEST_ASSERT(eb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point addition in mixed coordinates (z2 = 1) is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			/* a in projective, b in affine coordinates. */
-			eb_add_projc(a, a, b);
-			eb_add_projc(d, a, b);
-			/* a in affine coordinates. */
-			eb_norm(a, a);
-			eb_add(e, a, b);
-			TEST_ASSERT(eb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition in mixed coordinates (z1,z2 = 1) is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			/* a and b in affine coordinates. */
-			eb_add(d, a, b);
-			eb_add_projc(e, a, b);
-			TEST_ASSERT(eb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	eb_free(d);
-	eb_free(e);
-	return code;
-}
-
-static int subtraction(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c, d;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-	eb_null(d);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-		eb_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_sub(c, a, b);
-			eb_sub(d, b, a);
-			eb_neg(d, d);
-			TEST_ASSERT(eb_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			eb_rand(a);
-			eb_set_infty(c);
-			eb_sub(d, a, c);
-			TEST_ASSERT(eb_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			eb_rand(a);
-			eb_sub(c, a, a);
-			TEST_ASSERT(eb_is_infty(c), end);
-		}
-		TEST_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point subtraction in affine coordinates is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_sub(c, a, b);
-			eb_norm(c, c);
-			eb_sub_basic(d, a, b);
-			TEST_ASSERT(eb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-#if !defined(EB_MIXED) || !defined(STRIP)
-		TEST_CASE("point subtraction in projective coordinates is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_add_projc(a, a, b);
-			eb_rand(b);
-			eb_rand(c);
-			eb_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			eb_sub_projc(c, a, b);
-			eb_norm(c, c);
-			eb_norm(a, a);
-			eb_norm(b, b);
-			eb_sub(d, a, b);
-			eb_norm(d, d);
-			TEST_ASSERT(eb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point subtraction in mixed coordinates (z2 = 1) is correct") {
-			eb_rand(a);
-			eb_rand(b);
-			eb_add_projc(a, a, b);
-			eb_rand(b);
-			/* a and b in projective coordinates. */
-			eb_sub_projc(c, a, b);
-			eb_norm(c, c);
-			/* a in affine coordinates. */
-			eb_norm(a, a);
-			eb_sub(d, a, b);
-			eb_norm(d, d);
-			TEST_ASSERT(eb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE
-				("point subtraction in mixed coordinates (z1,z2 = 1) is correct")
-		{
-			eb_rand(a);
-			eb_rand(b);
-			eb_norm(a, a);
-			eb_norm(b, b);
-			/* a and b in affine coordinates. */
-			eb_sub(c, a, b);
-			eb_norm(c, c);
-			eb_sub_projc(d, a, b);
-			eb_norm(d, d);
-			TEST_ASSERT(eb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	eb_free(d);
-	return code;
-}
-
-static int doubling(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			eb_rand(a);
-			eb_add(b, a, a);
-			eb_norm(b, b);
-			eb_dbl(c, a);
-			TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point doubling in affine coordinates is correct") {
-			eb_rand(a);
-			eb_dbl(b, a);
-			eb_dbl_basic(c, a);
-			TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in projective coordinates is correct") {
-			eb_rand(a);
-			/* a in projective coordinates. */
-			eb_dbl_projc(a, a);
-			eb_dbl_projc(b, a);
-			eb_norm(a, a);
-			eb_dbl(c, a);
-			TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			eb_rand(a);
-			eb_dbl_projc(b, a);
-			eb_norm(b, b);
-			eb_dbl(c, a);
-			TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	return code;
-}
-
-static int halving(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-
-		TEST_CASE("point halving is correct") {
-			eb_rand(a);
-			eb_hlv(b, a);
-			eb_norm(b, b);
-			eb_dbl(c, b);
-			TEST_ASSERT(eb_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	return code;
-}
-
-static int frobenius(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-
-#if defined(EB_KBLTZ)
-		if (eb_curve_is_kbltz()) {
-			TEST_CASE("frobenius map is correct") {
-				/* Test if (t^2 + 2)P = utP. */
-				eb_rand(a);
-				eb_frb(b, a);
-				eb_frb(b, b);
-				eb_dbl(c, a);
-				eb_add(b, c, b);
-				eb_frb(c, a);
-				if (eb_curve_opt_a() == RLC_ZERO) {
-					eb_neg(c, c);
-				}
-				TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-			TEST_CASE("frobenius in affine coordinates is correct") {
-				/* Test if (t^2 + 2)P = utP. */
-				eb_rand(a);
-				eb_frb(b, a);
-				eb_frb(b, b);
-				eb_dbl(c, a);
-				eb_add(b, c, b);
-				/* Convert to affine. */
-				eb_norm(b, b);
-				eb_frb(c, a);
-				if (eb_curve_opt_a() == RLC_ZERO) {
-					eb_neg(c, c);
-				}
-				TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-			TEST_CASE("frobenius in projective coordinates is correct") {
-				eb_rand(a);
-				eb_dbl_projc(a, a);
-				/* a in projective coordinates. */
-				eb_frb(b, a);
-				eb_norm(a, a);
-				eb_frb(c, a);
-				TEST_ASSERT(eb_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-#endif
-		}
-#endif
-	(void)a;
-	(void)b;
-	(void)c;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	eb_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	eb_null(p);
-	eb_null(q);
-	eb_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		eb_new(p);
-		eb_new(q);
-		eb_new(r);
-
-		eb_curve_get_gen(p);
-		eb_curve_get_ord(n);
-
-		TEST_ONCE("generator has the right order") {
-			TEST_ASSERT(eb_on_curve(p), end);
-			eb_mul(r, p, n);
-			TEST_ASSERT(eb_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			eb_mul_gen(r, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_gen(r, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_gen(r, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_gen(r, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EB_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("binary point multiplication is correct") {
-			bn_zero(k);
-			eb_mul_basic(r, p, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_basic(r, p, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			eb_rand(p);
-			eb_mul_basic(r, p, n);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_basic(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_basic(r, p, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_MUL == LODAH || !defined(STRIP)
-		TEST_CASE("lopez-dahab point multiplication is correct") {
-			bn_zero(k);
-			eb_mul_lodah(r, p, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_lodah(r, p, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			eb_rand(p);
-			eb_mul_lodah(r, p, n);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_lodah(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_lodah(r, p, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EB_MUL == LWNAF || !defined(STRIP)
-		TEST_CASE("left-to-right w-(t)naf point multiplication is correct") {
-			bn_zero(k);
-			eb_mul_lwnaf(r, p, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_lwnaf(r, p, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			eb_rand(p);
-			eb_mul_lwnaf(r, p, n);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_lwnaf(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_lwnaf(r, p, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EB_MUL == RWNAF || !defined(STRIP)
-		TEST_CASE("right-to-left w-(t)naf point multiplication is correct") {
-			bn_zero(k);
-			eb_mul_rwnaf(r, p, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_rwnaf(r, p, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			eb_rand(p);
-			eb_mul_rwnaf(r, p, n);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_rwnaf(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_rwnaf(r, p, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EB_MUL == HALVE || !defined(STRIP)
-		TEST_CASE("point multiplication by halving is correct") {
-			bn_zero(k);
-			eb_mul_halve(r, p, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_halve(r, p, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			eb_rand(p);
-			eb_mul_halve(r, p, n);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_halve(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_halve(r, p, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-		TEST_CASE("point multiplication by digit is correct") {
-			eb_mul_dig(r, p, 0);
-			TEST_ASSERT(eb_is_infty(r), end);
-			eb_mul_dig(r, p, 1);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			eb_mul(q, p, k);
-			eb_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	eb_free(p);
-	eb_free(q);
-	eb_free(r);
-	return code;
-}
-
-static int fixed(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	eb_t p, q, r, t[RLC_EB_TABLE_MAX];
-
-	bn_null(n);
-	bn_null(k);
-	eb_null(p);
-	eb_null(q);
-	eb_null(r);
-
-	for (int i = 0; i < RLC_EB_TABLE_MAX; i++) {
-		eb_null(t[i]);
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		eb_new(p);
-		eb_new(q);
-		eb_new(r);
-
-		eb_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_EB_TABLE; i++) {
-			eb_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			eb_rand(p);
-			eb_mul_pre(t, p);
-			bn_zero(k);
-			eb_mul_fix(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_fix(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(q, p, k);
-			eb_mul_fix(q, (const eb_t *)t, k);
-			eb_mul(r, p, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_fix(r, (const eb_t *)t, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EB_TABLE; i++) {
-			eb_free(t[i]);
-		}
-
-#if EB_FIX == BASIC || !defined(STRIP)
-		for (int i = 0; i < RLC_EB_TABLE_BASIC; i++) {
-			eb_new(t[i]);
-		}
-		TEST_CASE("binary fixed point multiplication is correct") {
-			eb_rand(p);
-			eb_mul_pre_basic(t, p);
-			bn_zero(k);
-			eb_mul_fix_basic(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_fix_basic(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(r, p, k);
-			eb_mul_fix_basic(q, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_fix_basic(r, (const eb_t *)t, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EB_TABLE_BASIC; i++) {
-			eb_free(t[i]);
-		}
-#endif
-
-#if EB_FIX == COMBS || !defined(STRIP)
-		for (int i = 0; i < RLC_EB_TABLE_COMBS; i++) {
-			eb_new(t[i]);
-		}
-		TEST_CASE("single-table comb fixed point multiplication is correct") {
-			eb_rand(p);
-			eb_mul_pre_combs(t, p);
-			bn_zero(k);
-			eb_mul_fix_combs(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_fix_combs(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(r, p, k);
-			eb_mul_fix_combs(q, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_fix_combs(r, (const eb_t *)t, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EB_TABLE_COMBS; i++) {
-			eb_free(t[i]);
-		}
-#endif
-
-#if EB_FIX == COMBD || !defined(STRIP)
-		for (int i = 0; i < RLC_EB_TABLE_COMBD; i++) {
-			eb_new(t[i]);
-		}
-		TEST_CASE("double-table comb fixed point multiplication is correct") {
-			eb_rand(p);
-			eb_mul_pre_combd(t, p);
-			bn_zero(k);
-			eb_mul_fix_combd(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_fix_combd(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(r, p, k);
-			eb_mul_fix_combd(q, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_fix_combd(r, (const eb_t *)t, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EB_TABLE_COMBD; i++) {
-			eb_free(t[i]);
-		}
-#endif
-
-#if EB_FIX == LWNAF || !defined(STRIP)
-		for (int i = 0; i < RLC_EB_TABLE_LWNAF; i++) {
-			eb_new(t[i]);
-		}
-		TEST_CASE("left-to-right w(t)naf fixed point multiplication is correct") {
-			eb_rand(p);
-			eb_mul_pre_lwnaf(t, p);
-			bn_zero(k);
-			eb_mul_fix_lwnaf(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_is_infty(r), end);
-			bn_set_dig(k, 1);
-			eb_mul_fix_lwnaf(r, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			eb_mul(r, p, k);
-			eb_mul_fix_lwnaf(q, (const eb_t *)t, k);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_fix_lwnaf(r, (const eb_t *)t, k);
-			eb_neg(r, r);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EB_TABLE_LWNAF; i++) {
-			eb_free(t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	eb_free(p);
-	eb_free(q);
-	eb_free(r);
-	return code;
-}
-
-static int simultaneous(void) {
-	int code = RLC_ERR;
-	bn_t n, k, l;
-	eb_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(l);
-	eb_null(p);
-	eb_null(q);
-	eb_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(l);
-		eb_new(p);
-		eb_new(q);
-		eb_new(r);
-
-		eb_curve_get_gen(p);
-		eb_curve_get_gen(q);
-		eb_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul(q, p, k);
-			eb_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EB_SIM == BASIC || !defined(STRIP)
-		TEST_CASE("basic simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim_basic(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul(q, p, k);
-			eb_mul_sim_basic(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim_basic(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim_basic(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim_basic(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_SIM == TRICK || !defined(STRIP)
-		TEST_CASE("shamir's trick for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim_trick(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul(q, p, k);
-			eb_mul_sim_trick(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim_trick(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim_trick(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim_trick(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_SIM == INTER || !defined(STRIP)
-		TEST_CASE("interleaving for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim_inter(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul(q, p, k);
-			eb_mul_sim_inter(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim_inter(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim_inter(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim_inter(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EB_SIM == JOINT || !defined(STRIP)
-		TEST_CASE("jsf for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim_joint(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul(q, p, k);
-			eb_mul_sim_joint(r, p, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim_joint(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim_joint(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim_joint(r, p, k, q, l);
-			eb_mul(p, p, k);
-			eb_mul(q, q, l);
-			eb_add(q, q, p);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			eb_mul(q, p, l);
-			eb_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			eb_mul_gen(q, k);
-			eb_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			eb_mul_sim_gen(r, k, q, l);
-			eb_curve_get_gen(p);
-			eb_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			eb_mul_sim_gen(r, k, q, l);
-			eb_curve_get_gen(p);
-			eb_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			eb_mul_sim_gen(r, k, q, l);
-			eb_curve_get_gen(p);
-			eb_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(eb_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	bn_free(l);
-	eb_free(p);
-	eb_free(q);
-	eb_free(r);
-	return code;
-}
-
-static int compression(void) {
-	int code = RLC_ERR;
-	eb_t a, b, c;
-
-	eb_null(a);
-	eb_null(b);
-	eb_null(c);
-
-	RLC_TRY {
-		eb_new(a);
-		eb_new(b);
-		eb_new(c);
-
-		TEST_CASE("point compression is correct") {
-			eb_rand(a);
-			eb_pck(b, a);
-			TEST_ASSERT(eb_upk(c, b) == 1, end);
-			TEST_ASSERT(eb_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	eb_free(b);
-	eb_free(c);
-	return code;
-}
-
-static int hashing(void) {
-	int code = RLC_ERR;
-	eb_t a;
-	bn_t n;
-	uint8_t msg[5];
-
-	eb_null(a);
-	bn_null(n);
-
-	RLC_TRY {
-		eb_new(a);
-		bn_new(n);
-
-		eb_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			eb_map(a, msg, sizeof(msg));
-			eb_mul(a, a, n);
-			TEST_ASSERT(eb_is_infty(a) == 1, end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	eb_free(a);
-	bn_free(n);
-	return code;
-}
-
-static int test(void) {
-	eb_param_print();
-
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (halving() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (frobenius() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (compression() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (hashing() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int main(void) {
-	int r0 = RLC_ERR, r1 = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the EB module:", 0);
-
-	r0 = eb_param_set_any_plain();
-	if (r0 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-#if defined(EB_KBLTZ)
-	r1 = eb_param_set_any_kbltz();
-	if (r1 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-	if (r0 == RLC_ERR && r1 == RLC_ERR) {
-		if (eb_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-			core_clean();
-			return 0;
-		} else {
-			if (test() != RLC_OK) {
-				core_clean();
-				return 1;
-			}
-		}
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_ec.c b/src/dashbls/depends/relic/test/test_ec.c
deleted file mode 100644
index bd2dc7f9307a..000000000000
--- a/src/dashbls/depends/relic/test/test_ec.c
+++ /dev/null
@@ -1,727 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for the Elliptic Curve Cryptography module.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	ec_t a;
-
-	ec_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			ec_new(a);
-			ec_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-int util(void) {
-	int l, code = RLC_ERR;
-	ec_t a, b, c;
-	uint8_t bin[2 * RLC_FC_BYTES + 1];
-
-	ec_null(a);
-	ec_null(b);
-	ec_null(c);
-
-	RLC_TRY {
-		ec_new(a);
-		ec_new(b);
-		ec_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			ec_rand(a);
-			ec_rand(b);
-			TEST_ASSERT(ec_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			ec_rand(a);
-			ec_rand(b);
-			ec_rand(c);
-			/* Compare points in affine coordinates. */
-			if (ec_cmp(a, c) != RLC_EQ) {
-				ec_copy(c, a);
-				TEST_ASSERT(ec_cmp(c, a) == RLC_EQ, end);
-			}
-			if (ec_cmp(b, c) != RLC_EQ) {
-				ec_copy(c, b);
-				TEST_ASSERT(ec_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			ec_dbl(c, a);
-			ec_norm(c, c);
-			ec_dbl(a, a);
-			TEST_ASSERT(ec_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ec_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			ec_dbl(c, c);
-			ec_dbl(a, a);
-			TEST_ASSERT(ec_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ec_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			ec_rand(a);
-			ec_neg(b, a);
-			TEST_ASSERT(ec_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE
-				("assignment to random/infinity and comparison are consistent")
-		{
-			ec_rand(a);
-			ec_set_infty(c);
-			TEST_ASSERT(ec_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(ec_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			ec_set_infty(a);
-			TEST_ASSERT(ec_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			ec_rand(a);
-			TEST_ASSERT(ec_on_curve(a), end);
-			dv_zero(a->x, RLC_FC_DIGS);
-			TEST_ASSERT(!ec_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			ec_rand(a);
-			ec_blind(a, a);
-			TEST_ASSERT(ec_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				ec_set_infty(a);
-				l = ec_size_bin(a, j);
-				ec_write_bin(bin, l, a, j);
-				ec_read_bin(b, bin, l);
-				TEST_ASSERT(ec_cmp(a, b) == RLC_EQ, end);
-				ec_rand(a);
-				l = ec_size_bin(a, j);
-				ec_write_bin(bin, l, a, j);
-				ec_read_bin(b, bin, l);
-				TEST_ASSERT(ec_cmp(a, b) == RLC_EQ, end);
-				ec_rand(a);
-				ec_dbl(a, a);
-				l = ec_size_bin(a, j);
-				ec_norm(a, a);
-				ec_write_bin(bin, l, a, j);
-				ec_read_bin(b, bin, l);
-				TEST_ASSERT(ec_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	ec_free(b);
-	ec_free(c);
-	return code;
-}
-
-int addition(void) {
-	int code = RLC_ERR;
-
-	ec_t a, b, c, d, e;
-
-	ec_null(a);
-	ec_null(b);
-	ec_null(c);
-	ec_null(d);
-	ec_null(e);
-
-	RLC_TRY {
-		ec_new(a);
-		ec_new(b);
-		ec_new(c);
-		ec_new(d);
-		ec_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			ec_rand(a);
-			ec_rand(b);
-			ec_add(d, a, b);
-			ec_add(e, b, a);
-			TEST_ASSERT(ec_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			ec_rand(a);
-			ec_rand(b);
-			ec_rand(c);
-			ec_add(d, a, b);
-			ec_add(d, d, c);
-			ec_add(e, b, c);
-			ec_add(e, e, a);
-			TEST_ASSERT(ec_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			ec_rand(a);
-			ec_set_infty(d);
-			ec_add(e, a, d);
-			TEST_ASSERT(ec_cmp(e, a) == RLC_EQ, end);
-			ec_add(e, d, a);
-			TEST_ASSERT(ec_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			ec_rand(a);
-			ec_neg(d, a);
-			ec_add(e, a, d);
-			TEST_ASSERT(ec_is_infty(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	ec_free(b);
-	ec_free(c);
-	ec_free(d);
-	ec_free(e);
-	return code;
-}
-
-int subtraction(void) {
-	int code = RLC_ERR;
-	ec_t a, b, c, d;
-
-	ec_null(a);
-	ec_null(b);
-	ec_null(c);
-	ec_null(d);
-
-	RLC_TRY {
-		ec_new(a);
-		ec_new(b);
-		ec_new(c);
-		ec_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			ec_rand(a);
-			ec_rand(b);
-			ec_sub(c, a, b);
-			ec_sub(d, b, a);
-			ec_neg(d, d);
-			TEST_ASSERT(ec_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			ec_rand(a);
-			ec_set_infty(c);
-			ec_sub(d, a, c);
-			TEST_ASSERT(ec_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			ec_rand(a);
-			ec_sub(c, a, a);
-			TEST_ASSERT(ec_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	ec_free(b);
-	ec_free(c);
-	ec_free(d);
-	return code;
-}
-
-int doubling(void) {
-	int code = RLC_ERR;
-	ec_t a, b, c;
-
-	ec_null(a);
-	ec_null(b);
-	ec_null(c);
-
-	RLC_TRY {
-		ec_new(a);
-		ec_new(b);
-		ec_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			ec_rand(a);
-			ec_add(b, a, a);
-			ec_dbl(c, a);
-			TEST_ASSERT(ec_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	ec_free(b);
-	ec_free(c);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ec_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	ec_null(p);
-	ec_null(q);
-	ec_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ec_new(p);
-		ec_new(q);
-		ec_new(r);
-
-		ec_curve_get_gen(p);
-		ec_curve_get_ord(n);
-
-		TEST_ONCE("generator has the right order") {
-			ec_mul(r, p, n);
-			TEST_ASSERT(ec_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			ec_mul_gen(r, k);
-			TEST_ASSERT(ec_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ec_mul_gen(r, k);
-			TEST_ASSERT(ec_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ec_mul(q, p, k);
-			ec_mul_gen(r, k);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ec_mul_gen(r, k);
-			ec_neg(r, r);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point multiplication is correct") {
-			bn_zero(k);
-			ec_mul(r, p, k);
-			TEST_ASSERT(ec_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ec_mul(r, p, k);
-			TEST_ASSERT(ec_cmp(p, r) == RLC_EQ, end);
-			ec_rand(p);
-			ec_mul(r, p, n);
-			TEST_ASSERT(ec_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ec_mul(q, p, k);
-			bn_neg(k, k);
-			ec_mul(r, p, k);
-			ec_neg(r, r);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point multiplication by digit is correct") {
-			ep_mul_dig(r, p, 0);
-			TEST_ASSERT(ep_is_infty(r), end);
-			ep_mul_dig(r, p, 1);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			ep_mul(q, p, k);
-			ep_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(p);
-	ec_free(q);
-	ec_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int fixed(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ec_t p, q, r, t[RLC_EC_TABLE];
-
-	bn_null(n);
-	bn_null(k);
-	ec_null(p);
-	ec_null(q);
-	ec_null(r);
-
-	for (int i = 0; i < RLC_EC_TABLE; i++) {
-		ec_null(t[i]);
-	}
-
-	RLC_TRY {
-		ec_new(p);
-		ec_new(q);
-		ec_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		ec_curve_get_gen(p);
-		ec_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_EC_TABLE; i++) {
-			ec_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			ec_rand(p);
-			ec_mul_pre(t, p);
-			bn_zero(k);
-			ec_mul_fix(r, (const ec_t *)t, k);
-			TEST_ASSERT(ec_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ec_mul_fix(r, (const ec_t *)t, k);
-			TEST_ASSERT(ec_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ec_mul(q, p, k);
-			ec_mul_fix(q, (const ec_t *)t, k);
-			ec_mul(r, p, k);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ec_mul_fix(r, (const ec_t *)t, k);
-			ec_neg(r, r);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EC_TABLE; i++) {
-			ec_free(t[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(p);
-	ec_free(q);
-	ec_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous(void) {
-	int code = RLC_ERR;
-	bn_t n, k, l;
-	ec_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(l);
-	ec_null(p);
-	ec_null(q);
-	ec_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(l);
-		ec_new(p);
-		ec_new(q);
-		ec_new(r);
-
-		ec_curve_get_gen(p);
-		ec_curve_get_gen(q);
-		ec_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ec_mul(q, p, l);
-			ec_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ec_mul(q, p, k);
-			ec_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ec_mul_sim(r, p, k, q, l);
-			ec_mul(p, p, k);
-			ec_mul(q, q, l);
-			ec_add(q, q, p);
-			ec_norm(q, q);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ec_mul_sim(r, p, k, q, l);
-			ec_mul(p, p, k);
-			ec_mul(q, q, l);
-			ec_add(q, q, p);
-			ec_norm(q, q);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ec_mul_sim(r, p, k, q, l);
-			ec_mul(p, p, k);
-			ec_mul(q, q, l);
-			ec_add(q, q, p);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ec_mul(q, p, l);
-			ec_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ec_mul_gen(q, k);
-			ec_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ec_mul_sim_gen(r, k, q, l);
-			ec_curve_get_gen(p);
-			ec_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ec_mul_sim_gen(r, k, q, l);
-			ec_curve_get_gen(p);
-			ec_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ec_mul_sim_gen(r, k, q, l);
-			ec_curve_get_gen(p);
-			ec_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ec_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	bn_free(l);
-	ec_free(p);
-	ec_free(q);
-	ec_free(r);
-	return code;
-}
-
-static int compression(void) {
-	int code = RLC_ERR;
-	ec_t a, b, c;
-
-	ec_null(a);
-	ec_null(b);
-	ec_null(c);
-
-	RLC_TRY {
-		ec_new(a);
-		ec_new(b);
-		ec_new(c);
-
-		TEST_CASE("point compression is correct") {
-			ec_rand(a);
-			ec_pck(b, a);
-			ec_upk(c, b);
-			TEST_ASSERT(ec_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	ec_free(b);
-	ec_free(c);
-	return code;
-}
-
-static int hashing(void) {
-	int code = RLC_ERR;
-	ec_t a;
-	bn_t n;
-	uint8_t msg[5];
-
-	ec_null(a);
-	bn_null(n);
-
-	RLC_TRY {
-		ec_new(a);
-		bn_new(n);
-
-		ec_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			ec_map(a, msg, sizeof(msg));
-			ec_mul(a, a, n);
-			TEST_ASSERT(ec_is_infty(a) == 1, end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ec_free(a);
-	bn_free(n);
-	return code;
-}
-
-int test(void) {
-	ec_param_print();
-
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (compression() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (hashing() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the EC module:", 0);
-
-	if (ec_param_set_any() == RLC_ERR) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	if (test() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_ed.c b/src/dashbls/depends/relic/test/test_ed.c
deleted file mode 100644
index e1e371f26b7d..000000000000
--- a/src/dashbls/depends/relic/test/test_ed.c
+++ /dev/null
@@ -1,1278 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2014 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for arithmetic on prime Edwards elliptic curves.
- *
- * @version $Id$
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-/*
- * test vector inputs and outputs
- */
-#if FP_PRIME == 255
-const int ed_map_ntst = 4;
-const char *ed_map_input[4] = {
-	"",
-	"abc",
-	"abcdef0123456789",
-	"a64_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-};
-const uint8_t ed_map_output[4][2 * RLC_FP_BYTES + 1] = {
-	{0x04, 0x40, 0x89, 0xf7, 0xb5, 0x05, 0x40, 0xf3, 0x4c, 0xa8, 0xc3,
-	 0x2b, 0x3a, 0x71, 0x6e, 0x86, 0x28, 0x57, 0x81, 0x88, 0xa8, 0x8f,
-	 0x5d, 0x95, 0xce, 0x6b, 0x84, 0x5f, 0x51, 0x83, 0x28, 0x3d, 0xbb,
-	 0x66, 0xa9, 0x22, 0xb2, 0xaa, 0x0e, 0x7f, 0xb6, 0xf5, 0xf4, 0x8a,
-	 0x2e, 0xaf, 0x71, 0xc5, 0xb5, 0x60, 0xd4, 0xbc, 0xa6, 0xb9, 0x06,
-	 0x8e, 0xac, 0x38, 0x89, 0xc9, 0xa4, 0x4f, 0x3a, 0xd2, 0x83},
-	{0x04, 0x18, 0x3f, 0x8b, 0xbb, 0x73, 0x7f, 0x98, 0x0f, 0xb5, 0x20,
-	 0x27, 0x6b, 0xf5, 0x7a, 0x5b, 0xe4, 0x7f, 0x2f, 0x66, 0x3f, 0xca,
-	 0xfe, 0xc4, 0xd8, 0x79, 0x72, 0xf4, 0xba, 0xc4, 0x0f, 0x95, 0x56,
-	 0x4f, 0x6b, 0xfb, 0x7b, 0x97, 0x3d, 0x90, 0x69, 0x48, 0xd0, 0x61,
-	 0x9b, 0x26, 0x74, 0x8b, 0xd1, 0xca, 0x01, 0x8b, 0x8b, 0x9e, 0xf4,
-	 0x07, 0xa4, 0x9b, 0x94, 0xcb, 0x3b, 0x98, 0x1d, 0xe6, 0xbc},
-	{0x04, 0x20, 0xc0, 0xa2, 0xaa, 0x04, 0x69, 0x52, 0x20, 0x19, 0xe9,
-	 0x62, 0xa6, 0x75, 0xfe, 0xf9, 0x69, 0x51, 0x83, 0xe1, 0xd6, 0xec,
-	 0x08, 0x02, 0x5c, 0x1f, 0x1d, 0x78, 0x6f, 0xdd, 0xe9, 0x9c, 0xa6,
-	 0x04, 0x55, 0xfc, 0xcd, 0x2d, 0x6a, 0x54, 0xb9, 0xad, 0x17, 0x87,
-	 0xe4, 0x8e, 0xb3, 0xce, 0x00, 0x5c, 0x6d, 0x05, 0x1b, 0xeb, 0xea,
-	 0xac, 0x96, 0xce, 0x1f, 0x85, 0x9f, 0xb7, 0x5a, 0x44, 0xa9},
-	{0x04, 0x3d, 0x8d, 0x70, 0xb3, 0xd4, 0xde, 0x1d, 0x68, 0xfb, 0x75,
-	 0x95, 0x43, 0x48, 0x02, 0xc6, 0xa5, 0x49, 0xde, 0x02, 0x04, 0x21,
-	 0x41, 0x8a, 0x36, 0x0c, 0x44, 0xfa, 0xfe, 0x0c, 0x88, 0x0f, 0xc7,
-	 0x62, 0xe8, 0x6c, 0xef, 0xbb, 0xfc, 0x6a, 0x48, 0x61, 0xda, 0xc4,
-	 0xfb, 0x46, 0xd5, 0xf5, 0x7f, 0x24, 0x17, 0xd5, 0x23, 0x2e, 0xa3,
-	 0x02, 0xf6, 0xb7, 0xc7, 0xab, 0x4d, 0xad, 0x8f, 0xef, 0x04},
-};
-#else
-const int ed_map_ntst = 0;
-const char **ed_map_input = NULL;
-const uint8_t **ed_map_output = NULL;
-#endif
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	ed_t a;
-
-	ed_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			ed_new(a);
-			ed_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-int util(void) {
-	int l, code = RLC_ERR;
-	ed_t a, b, c;
-	uint8_t bin[2 * RLC_FP_BYTES + 1];
-
-	ed_null(a);
-	ed_null(b);
-	ed_null(c);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		ed_new(c);
-
-		TEST_CASE("copy and comparison are consistent") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_rand(c);
-			/* Compare points in affine coordinates. */
-			if (ed_cmp(a, c) != RLC_EQ) {
-				ed_copy(c, a);
-				TEST_ASSERT(ed_cmp(c, a) == RLC_EQ, end);
-			}
-			if (ed_cmp(b, c) != RLC_EQ) {
-				ed_copy(c, b);
-				TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			ed_dbl(c, a);
-			ed_norm(c, c);
-			ed_dbl(a, a);
-			TEST_ASSERT(ed_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ed_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			ed_dbl(c, c);
-			ed_dbl(a, a);
-			TEST_ASSERT(ed_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ed_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			ed_rand(a);
-			ed_neg(b, a);
-			TEST_ASSERT(ed_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			ed_rand(a);
-			ed_set_infty(c);
-			TEST_ASSERT(ed_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(ed_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			ed_set_infty(a);
-			TEST_ASSERT(ed_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			ed_set_infty(a);
-			TEST_ASSERT(ed_on_curve(a), end);
-			ed_rand(a);
-			TEST_ASSERT(ed_on_curve(a), end);
-			fp_rand(a->x);
-			TEST_ASSERT(!ed_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			ed_rand(a);
-			ed_blind(a, a);
-			TEST_ASSERT(ed_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				ed_set_infty(a);
-				l = ed_size_bin(a, j);
-				ed_write_bin(bin, l, a, j);
-				ed_read_bin(b, bin, l);
-				TEST_ASSERT(ed_cmp(a, b) == RLC_EQ, end);
-				ed_rand(a);
-				l = ed_size_bin(a, j);
-				ed_write_bin(bin, l, a, j);
-				ed_read_bin(b, bin, l);
-				TEST_ASSERT(ed_cmp(a, b) == RLC_EQ, end);
-				ed_rand(a);
-				ed_dbl(a, a);
-				l = ed_size_bin(a, j);
-				ed_norm(a, a);
-				ed_write_bin(bin, l, a, j);
-				ed_read_bin(b, bin, l);
-				TEST_ASSERT(ed_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	ed_free(c);
-	return code;
-}
-
-int addition(void) {
-	int code = RLC_ERR;
-	ed_t a, b, c, d, e;
-
-	ed_null(a);
-	ed_null(b);
-	ed_null(c);
-	ed_null(d);
-	ed_null(e);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		ed_new(c);
-		ed_new(d);
-		ed_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add(d, a, b);
-			ed_add(e, b, a);
-			TEST_ASSERT(ed_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_rand(c);
-			ed_add(d, a, b);
-			ed_add(d, d, c);
-			ed_add(e, b, c);
-			ed_add(e, e, a);
-			TEST_ASSERT(ed_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			ed_rand(a);
-			ed_set_infty(d);
-			ed_add(e, a, d);
-			TEST_ASSERT(ed_cmp(e, a) == RLC_EQ, end);
-			ed_add(e, d, a);
-			TEST_ASSERT(ed_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			ed_rand(a);
-			ed_neg(d, a);
-			ed_add(e, a, d);
-			TEST_ASSERT(ed_is_infty(e), end);
-		} TEST_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point addition in affine coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add(d, a, b);
-			ed_norm(d, d);
-			ed_add_basic(e, a, b);
-			TEST_ASSERT(ed_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_ADD == PROJC
-		TEST_CASE("point addition in projective coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add_projc(a, a, b);
-			ed_rand(b);
-			ed_rand(c);
-			ed_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			ed_add_projc(d, a, b);
-			ed_norm(d, d);
-			ed_norm(a, a);
-			ed_norm(b, b);
-			ed_add(e, a, b);
-			ed_norm(e, e);
-			TEST_ASSERT(ed_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#elif ED_ADD == EXTND && !defined(STRIP)
-		TEST_CASE("point addition in extended coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add_extnd(a, a, b);
-			ed_rand(b);
-			ed_rand(c);
-			ed_add_extnd(b, b, c);
-			/* a and b in projective coordinates. */
-			ed_add_extnd(d, a, b);
-			ed_norm(d, d);
-			ed_norm(a, a);
-			ed_norm(b, b);
-			ed_add(e, a, b);
-			ed_norm(e, e);
-			TEST_ASSERT(ed_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	ed_free(c);
-	ed_free(d);
-	ed_free(e);
-	return code;
-}
-
-int subtraction(void) {
-	int code = RLC_ERR;
-	ed_t a, b, c, d;
-
-	ed_null(a);
-	ed_null(b);
-	ed_null(c);
-	ed_null(d);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		ed_new(c);
-		ed_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_sub(c, a, b);
-			ed_sub(d, b, a);
-			ed_neg(d, d);
-			TEST_ASSERT(ed_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			ed_rand(a);
-			ed_set_infty(c);
-			ed_sub(d, a, c);
-			TEST_ASSERT(ed_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			ed_rand(a);
-			ed_sub(c, a, a);
-			TEST_ASSERT(ed_is_infty(c), end);
-		}
-		TEST_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point subtraction in affine coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_sub(c, a, b);
-			ed_norm(c, c);
-			ed_sub_basic(d, a, b);
-			TEST_ASSERT(ed_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_ADD == PROJC
-		TEST_CASE("point subtraction in projective coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add_projc(a, a, b);
-			ed_rand(b);
-			ed_rand(c);
-			ed_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			ed_sub_projc(c, a, b);
-			ed_norm(c, c);
-			ed_norm(a, a);
-			ed_norm(b, b);
-			ed_sub(d, a, b);
-			ed_norm(d, d);
-			TEST_ASSERT(ed_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#elif ED_ADD == EXTND && !defined(STRIP)
-		TEST_CASE("point subtraction in extended coordinates is correct") {
-			ed_rand(a);
-			ed_rand(b);
-			ed_add_extnd(a, a, b);
-			ed_rand(b);
-			ed_rand(c);
-			ed_add_extnd(b, b, c);
-			/* a and b in projective coordinates. */
-			ed_sub_extnd(c, a, b);
-			ed_norm(c, c);
-			ed_norm(a, a);
-			ed_norm(b, b);
-			ed_sub(d, a, b);
-			ed_norm(d, d);
-			TEST_ASSERT(ed_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	ed_free(c);
-	ed_free(d);
-	return code;
-}
-
-int doubling(void) {
-	int code = RLC_ERR;
-	ed_t a, b, c;
-
-	ed_null(a);
-	ed_null(b);
-	ed_null(c);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		ed_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			ed_rand(a);
-			ed_add(b, a, a);
-			ed_dbl(c, a);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if ED_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point doubling in affine coordinates is correct") {
-			ed_rand(a);
-			ed_dbl(b, a);
-			ed_norm(b, b);
-			ed_dbl_basic(c, a);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in projective coordinates is correct") {
-			ed_rand(a);
-			ed_dbl_projc(a, a);
-			/* a in projective coordinates. */
-			ed_dbl_projc(b, a);
-			ed_norm(b, b);
-			ed_norm(a, a);
-			ed_dbl(c, a);
-			ed_norm(c, c);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ed_rand(a);
-			ed_dbl_projc(b, a);
-			ed_norm(b, b);
-			ed_dbl(c, a);
-			ed_norm(c, c);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_ADD == EXTND || !defined(STRIP)
-		TEST_CASE("point doubling in extended coordinates is correct") {
-			ed_rand(a);
-			ed_dbl_extnd(a, a);
-			/* a in projective coordinates. */
-			ed_dbl_extnd(b, a);
-			ed_norm(b, b);
-			ed_norm(a, a);
-			ed_dbl(c, a);
-			ed_norm(c, c);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ed_rand(a);
-			ed_dbl_extnd(b, a);
-			ed_norm(b, b);
-			ed_dbl(c, a);
-			ed_norm(c, c);
-			TEST_ASSERT(ed_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	ed_free(c);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ed_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	ed_null(p);
-	ed_null(q);
-	ed_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ed_new(p);
-		ed_new(q);
-		ed_new(r);
-
-		ed_curve_get_gen(p);
-		ed_curve_get_ord(n);
-
-		TEST_CASE("generator has the right order") {
-			TEST_ASSERT(ed_on_curve(p), end);
-			ed_mul(r, p, n);
-			TEST_ASSERT(ed_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			ed_mul_gen(r, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_gen(r, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_gen(r, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_gen(r, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if ED_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("binary point multiplication is correct") {
-			bn_zero(k);
-			ed_mul_basic(r, p, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_basic(r, p, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			ed_rand(p);
-			ed_mul(r, p, n);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_basic(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_basic(r, p, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("sliding window point multiplication is correct") {
-			bn_zero(k);
-			ed_mul_slide(r, p, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_slide(r, p, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			ed_rand(p);
-			ed_mul(r, p, n);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_slide(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_slide(r, p, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if ED_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery ladder point multiplication is correct") {
-			bn_zero(k);
-			ed_mul_monty(r, p, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_monty(r, p, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			ed_rand(p);
-			ed_mul(r, p, n);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_monty(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_monty(r, p, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if ED_MUL == LWNAF || !defined(STRIP)
-		TEST_CASE("left-to-right w-naf point multiplication is correct") {
-			bn_zero(k);
-			ed_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			ed_rand(p);
-			ed_mul(r, p, n);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_lwnaf(r, p, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if ED_MUL == LWREG || !defined(STRIP)
-		TEST_CASE("left-to-right regular point multiplication is correct") {
-			bn_zero(k);
-			ed_mul_lwreg(r, p, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_lwreg(r, p, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			ed_rand(p);
-			ed_mul_lwreg(r, p, n);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_lwreg(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_lwreg(r, p, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-		TEST_CASE("point multiplication by digit is correct") {
-			ed_mul_dig(r, p, 0);
-			TEST_ASSERT(ed_is_infty(r), end);
-			ed_mul_dig(r, p, 1);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			ed_mul(q, p, k);
-			ed_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ed_free(p);
-	ed_free(q);
-	ed_free(r);
-	return code;
-}
-
-static int fixed(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ed_t p, q, r, t[RLC_ED_TABLE_MAX];
-
-	bn_null(n);
-	bn_null(k);
-	ed_null(p);
-	ed_null(q);
-	ed_null(r);
-
-	for (int i = 0; i < RLC_ED_TABLE_MAX; i++) {
-		ed_null(t[i]);
-	}
-
-	RLC_TRY {
-		ed_new(p);
-		ed_new(q);
-		ed_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		ed_curve_get_gen(p);
-		ed_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_ED_TABLE; i++) {
-			ed_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			ed_rand(p);
-			ed_mul_pre(t, p);
-			bn_zero(k);
-			ed_mul_fix(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_fix(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(q, p, k);
-			ed_mul_fix(q, (const ed_t *)t, k);
-			ed_mul(r, p, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_fix(r, (const ed_t *)t, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_ED_TABLE; i++) {
-			ed_free(t[i]);
-		}
-
-#if ED_FIX == BASIC || !defined(STRIP)
-		for (int i = 0; i < RLC_ED_TABLE_BASIC; i++) {
-			ed_new(t[i]);
-		}
-		TEST_CASE("binary fixed point multiplication is correct") {
-			ed_rand(p);
-			ed_mul_pre_basic(t, p);
-			bn_zero(k);
-			ed_mul_fix_basic(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_fix_basic(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(r, p, k);
-			ed_mul_fix_basic(q, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_fix_basic(r, (const ed_t *)t, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_ED_TABLE_BASIC; i++) {
-			ed_free(t[i]);
-		}
-#endif
-
-#if ED_FIX == COMBS || !defined(STRIP)
-		for (int i = 0; i < RLC_ED_TABLE_COMBS; i++) {
-			ed_new(t[i]);
-		}
-		TEST_CASE("single-table comb fixed point multiplication is correct") {
-			ed_rand(p);
-			ed_mul_pre_combs(t, p);
-			bn_zero(k);
-			ed_mul_fix_combs(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_fix_combs(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(r, p, k);
-			ed_mul_fix_combs(q, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_fix_combs(r, (const ed_t *)t, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_ED_TABLE_COMBS; i++) {
-			ed_free(t[i]);
-		}
-#endif
-
-#if ED_FIX == COMBD || !defined(STRIP)
-		for (int i = 0; i < RLC_ED_TABLE_COMBD; i++) {
-			ed_new(t[i]);
-		}
-		TEST_CASE("double-table comb fixed point multiplication is correct") {
-			ed_rand(p);
-			ed_mul_pre_combd(t, p);
-			bn_zero(k);
-			ed_mul_fix_combd(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_fix_combd(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(r, p, k);
-			ed_mul_fix_combd(q, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_fix_combd(r, (const ed_t *)t, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_ED_TABLE_COMBD; i++) {
-			ed_free(t[i]);
-		}
-#endif
-
-#if ED_FIX == LWNAF || !defined(STRIP)
-		for (int i = 0; i < RLC_ED_TABLE_LWNAF; i++) {
-			ed_new(t[i]);
-		}
-		TEST_CASE("left-to-right w-naf fixed point multiplication is correct") {
-			ed_rand(p);
-			ed_mul_pre_lwnaf(t, p);
-			bn_zero(k);
-			ed_mul_fix_lwnaf(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ed_mul_fix_lwnaf(r, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ed_mul(r, p, k);
-			ed_mul_fix_lwnaf(q, (const ed_t *)t, k);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_fix_lwnaf(r, (const ed_t *)t, k);
-			ed_neg(r, r);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_ED_TABLE_LWNAF; i++) {
-			ed_free(t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(p);
-	ed_free(q);
-	ed_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous(void) {
-	int code = RLC_ERR;
-	bn_t n, k, l;
-	ed_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(l);
-	ed_null(p);
-	ed_null(q);
-	ed_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(l);
-		ed_new(p);
-		ed_new(q);
-		ed_new(r);
-
-		ed_curve_get_gen(p);
-		ed_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul(q, p, k);
-			ed_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if ED_SIM == BASIC || !defined(STRIP)
-		TEST_CASE("basic simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim_basic(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul(q, p, k);
-			ed_mul_sim_basic(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim_basic(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim_basic(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim_basic(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_SIM == TRICK || !defined(STRIP)
-		TEST_CASE("shamir's trick for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim_trick(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul(q, p, k);
-			ed_mul_sim_trick(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim_trick(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim_trick(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim_trick(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_SIM == INTER || !defined(STRIP)
-		TEST_CASE("interleaving for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim_inter(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul(q, p, k);
-			ed_mul_sim_inter(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim_inter(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim_inter(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim_inter(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if ED_SIM == JOINT || !defined(STRIP)
-		TEST_CASE("jsf for simultaneous multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim_joint(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul(q, p, k);
-			ed_mul_sim_joint(r, p, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim_joint(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim_joint(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			ed_norm(q, q);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim_joint(r, p, k, q, l);
-			ed_mul(p, p, k);
-			ed_mul(q, q, l);
-			ed_add(q, q, p);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			ed_mul(q, p, l);
-			ed_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			ed_mul_gen(q, k);
-			ed_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			ed_mul_sim_gen(r, k, q, l);
-			ed_curve_get_gen(p);
-			ed_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ed_mul_sim_gen(r, k, q, l);
-			ed_curve_get_gen(p);
-			ed_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			ed_mul_sim_gen(r, k, q, l);
-			ed_curve_get_gen(p);
-			ed_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(ed_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	bn_free(l);
-	ed_free(p);
-	ed_free(q);
-	ed_free(r);
-	return code;
-}
-
-static int compression(void) {
-	int code = RLC_ERR;
-	ed_t a, b, c;
-
-	ed_null(a);
-	ed_null(b);
-	ed_null(c);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		ed_new(c);
-
-		TEST_CASE("point compression is correct") {
-			ed_rand(a);
-			ed_pck(b, a);
-			TEST_ASSERT(ed_upk(c, b) == 1, end);
-			TEST_ASSERT(ed_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	ed_free(c);
-	return code;
-}
-
-static int hashing(void) {
-	int code = RLC_ERR;
-	ed_t a;
-	ed_t b;
-	bn_t n;
-	uint8_t msg[5];
-
-	ed_null(a);
-	ed_null(b);
-	bn_null(n);
-
-	RLC_TRY {
-		ed_new(a);
-		ed_new(b);
-		bn_new(n);
-
-		ed_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			ed_map(a, msg, sizeof(msg));
-			TEST_ASSERT(ed_on_curve(a), end);
-			ed_map_dst(b, msg, sizeof(msg), (const uint8_t *)"RELIC", 5);
-			TEST_ASSERT(ed_cmp(a, b) == RLC_EQ, end);
-			ed_mul(a, a, n);
-			TEST_ASSERT(ed_is_infty(a) == 1, end);
-		}
-		/* test vectors */
-		for (int j = 0; j < ed_map_ntst; ++j) {
-			ed_map(a, (const uint8_t *)ed_map_input[j], strlen(ed_map_input[j]));
-			ed_read_bin(b, ed_map_output[j], 2 * RLC_FP_BYTES + 1);
-			TEST_ASSERT(ed_on_curve(a), end);
-			TEST_ASSERT(ed_on_curve(b), end);
-			TEST_ASSERT(ed_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ed_free(a);
-	ed_free(b);
-	bn_free(n);
-	return code;
-}
-
-int test(void) {
-	ed_param_print();
-
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (hashing() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (compression() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int main(void) {
-	int r0 = RLC_ERR, r1 = RLC_ERR, r2 = RLC_ERR, r3 = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the ED module:", 0);
-
-	if (r0 == RLC_ERR && r1 == RLC_ERR && r2 == RLC_ERR && r3 == RLC_ERR) {
-		if (ed_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-			core_clean();
-			return 0;
-		} else {
-			if (test() != RLC_OK) {
-				core_clean();
-				return 1;
-			}
-		}
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_ep.c b/src/dashbls/depends/relic/test/test_ep.c
deleted file mode 100644
index 0de7803ba8b7..000000000000
--- a/src/dashbls/depends/relic/test/test_ep.c
+++ /dev/null
@@ -1,1465 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for arithmetic on prime elliptic curves.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	ep_t a;
-
-	ep_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			ep_new(a);
-			ep_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util(void) {
-	int l, code = RLC_ERR;
-	ep_t a, b, c;
-	uint8_t bin[2 * RLC_FP_BYTES + 1];
-
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-
-		TEST_CASE("copy and comparison are consistent") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_rand(c);
-			/* Compare points in affine coordinates. */
-			if (ep_cmp(a, c) != RLC_EQ) {
-				ep_copy(c, a);
-				TEST_ASSERT(ep_cmp(c, a) == RLC_EQ, end);
-			}
-			if (ep_cmp(b, c) != RLC_EQ) {
-				ep_copy(c, b);
-				TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			ep_dbl(c, a);
-			ep_norm(c, c);
-			ep_dbl(a, a);
-			TEST_ASSERT(ep_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			ep_dbl(c, c);
-			ep_dbl(a, a);
-			TEST_ASSERT(ep_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			ep_rand(a);
-			ep_neg(b, a);
-			TEST_ASSERT(ep_cmp(a, b) != RLC_EQ, end);
-			ep_neg(b, b);
-			TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-			/* Compare with infinity. */
-			ep_neg(b, a);
-			ep_add(a, a, b);
-			ep_set_infty(b);
-			TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			ep_rand(a);
-			ep_set_infty(c);
-			TEST_ASSERT(ep_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(ep_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			ep_set_infty(a);
-			TEST_ASSERT(ep_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			ep_set_infty(a);
-			TEST_ASSERT(ep_on_curve(a), end);
-			ep_rand(a);
-			TEST_ASSERT(ep_on_curve(a), end);
-			fp_rand(a->x);
-			TEST_ASSERT(!ep_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			ep_rand(a);
-			ep_blind(a, a);
-			TEST_ASSERT(ep_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				ep_set_infty(a);
-				l = ep_size_bin(a, j);
-				ep_write_bin(bin, l, a, j);
-				ep_read_bin(b, bin, l);
-				TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-				ep_rand(a);
-				l = ep_size_bin(a, j);
-				ep_write_bin(bin, l, a, j);
-				ep_read_bin(b, bin, l);
-				TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-				ep_rand(a);
-				ep_dbl(a, a);
-				l = ep_size_bin(a, j);
-				ep_norm(a, a);
-				ep_write_bin(bin, l, a, j);
-				ep_read_bin(b, bin, l);
-				TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	return code;
-}
-
-static int addition(void) {
-	int code = RLC_ERR;
-	ep_t a, b, c, d, e;
-
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-	ep_null(d);
-	ep_null(e);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-		ep_new(d);
-		ep_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_add(d, a, b);
-			ep_add(e, b, a);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_rand(c);
-			ep_add(d, a, b);
-			ep_add(d, d, c);
-			ep_add(e, b, c);
-			ep_add(e, e, a);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			ep_rand(a);
-			ep_set_infty(d);
-			ep_add(e, a, d);
-			TEST_ASSERT(ep_cmp(a, e) == RLC_EQ, end);
-			ep_add(e, d, a);
-			TEST_ASSERT(ep_cmp(a, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			ep_rand(a);
-			ep_neg(d, a);
-			ep_add(e, a, d);
-			TEST_ASSERT(ep_is_infty(e), end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point addition in affine coordinates is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_add(d, a, b);
-			ep_add_basic(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-#if !defined(EP_MIXED) || !defined(STRIP)
-		TEST_CASE("point addition in projective coordinates is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_rand(c);
-			ep_add_projc(a, a, b);
-			ep_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			ep_add_projc(d, a, b);
-			/* normalize before mixing coordinates. */
-			ep_norm(a, a);
-			ep_norm(b, b);
-			ep_add(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point addition in mixed coordinates (z2 = 1) is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			/* a in projective, b in affine coordinates. */
-			ep_add_projc(a, a, b);
-			ep_add_projc(d, a, b);
-			/* a in affine coordinates. */
-			ep_norm(a, a);
-			ep_add(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition in mixed coordinates (z1,z2 = 1) is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			/* a and b in affine coordinates. */
-			ep_add(d, a, b);
-			ep_add_projc(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == JACOB || !defined(STRIP)
-#if !defined(EP_MIXED) || !defined(STRIP)
-		TEST_CASE("point addition in jacobian coordinates is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_rand(c);
-			ep_add_jacob(a, a, b);
-			ep_add_jacob(b, b, c);
-			/* a and b in projective coordinates. */
-			ep_add_jacob(d, a, b);
-			ep_norm(a, a);
-			ep_norm(b, b);
-			ep_add(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point addition in mixed coordinates (z2 = 1) is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			/* a in projective, b in affine coordinates. */
-			ep_add_jacob(a, a, b);
-			ep_add_jacob(d, a, b);
-			/* a in affine coordinates. */
-			ep_norm(a, a);
-			ep_add(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition in mixed coordinates (z1,z2 = 1) is correct") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_norm(a, a);
-			ep_norm(b, b);
-			/* a and b in affine coordinates. */
-			ep_add(d, a, b);
-			ep_add_jacob(e, a, b);
-			TEST_ASSERT(ep_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	ep_free(d);
-	ep_free(e);
-	return code;
-}
-
-static int subtraction(void) {
-	int code = RLC_ERR;
-	ep_t a, b, c, d;
-
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-	ep_null(d);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-		ep_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			ep_rand(a);
-			ep_rand(b);
-			ep_sub(c, a, b);
-			ep_sub(d, b, a);
-			ep_neg(d, d);
-			TEST_ASSERT(ep_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			ep_rand(a);
-			ep_set_infty(c);
-			ep_sub(d, a, c);
-			TEST_ASSERT(ep_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			ep_rand(a);
-			ep_sub(c, a, a);
-			TEST_ASSERT(ep_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	ep_free(d);
-	return code;
-}
-
-static int doubling(void) {
-	int code = RLC_ERR;
-	ep_t a, b, c;
-
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			ep_rand(a);
-			ep_add(b, a, a);
-			ep_dbl(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point doubling in affine coordinates is correct") {
-			ep_rand(a);
-			ep_dbl(b, a);
-			ep_dbl_basic(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in projective coordinates is correct") {
-			ep_rand(a);
-			/* a in projective coordinates. */
-			ep_dbl_projc(a, a);
-			ep_dbl_projc(b, a);
-			ep_norm(a, a);
-			ep_dbl(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ep_rand(a);
-			ep_dbl_projc(b, a);
-			ep_norm(b, b);
-			ep_dbl(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in jacobian coordinates is correct") {
-			ep_rand(a);
-			/* a in projective coordinates. */
-			ep_dbl_jacob(a, a);
-			ep_dbl_jacob(b, a);
-			ep_norm(a, a);
-			ep_dbl(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ep_rand(a);
-			ep_dbl_jacob(b, a);
-			ep_norm(b, b);
-			ep_dbl(c, a);
-			TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	return code;
-}
-
-static int endomorphism(void) {
-	int code = RLC_ERR;
-	bn_t l, n, v1[3], v2[3];
-	ep_t a, b, c;
-
-	bn_null(l);
-	bn_null(n);
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-
-	for (int k = 0; k < 3; k++) {
-		bn_null(v1[k]);
-		bn_null(v2[k]);
-	}
-
-	RLC_TRY {
-		bn_new(l);
-		bn_new(n);
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-
-		for (int k = 0; k < 3; k++) {
-			bn_new(v1[k]);
-			bn_new(v2[k]);
-		}
-
-#if defined(EP_ENDOM)
-		if (ep_curve_is_endom()) {
-			/* Recover lambda parameter. */
-			ep_curve_get_v1(v1);
-			ep_curve_get_v2(v2);
-			ep_curve_get_ord(v2[0]);
-			if (bn_cmp_dig(v1[2], 1) == RLC_EQ) {
-				bn_gcd_ext(v1[0], v2[1], NULL, v1[1], v2[0]);
-			} else {
-				bn_gcd_ext(v1[0], v2[1], NULL, v1[2], v2[0]);
-			}
-			if (bn_sign(v2[1]) == RLC_NEG) {
-				/* Negate modulo r. */
-				bn_add(v2[1], v2[0], v2[1]);
-			}
-			bn_mul(v1[0], v2[1], v1[1]);
-			bn_mod(l, v1[0], v2[0]);
-			bn_sub(v1[1], v2[0], l);
-			if (bn_cmp(v1[1], l) == RLC_LT) {
-				bn_copy(l, v1[1]);
-			}
-
-			TEST_CASE("endomorphism is correct") {
-				/* Test if \psi(P) = [l]P. */
-				ep_rand(a);
-				ep_psi(b, a);
-				ep_mul(c, a, l);
-				TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-
-#if EB_ADD == BASIC || !defined(STRIP)
-			TEST_CASE("endomorphism in affine coordinates is correct") {
-				ep_rand(a);
-				ep_psi(b, a);
-				ep_mul(c, a, l);
-				TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-#endif
-
-#if EB_ADD == PROJC || !defined(STRIP)
-			TEST_CASE("endomorphism in projective coordinates is correct") {
-				ep_rand(a);
-				ep_dbl_projc(a, a);
-				ep_norm(a, a);
-				ep_psi(b, a);
-				ep_mul(c, a, l);
-				TEST_ASSERT(ep_cmp(b, c) == RLC_EQ, end);
-			}
-			TEST_END;
-#endif
-		}
-#endif /* EP_ENDOM */
-	(void)a;
-	(void)b;
-	(void)c;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(l);
-	bn_free(n);
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	for (int k = 0; k < 3; k++) {
-		bn_free(v1[k]);
-		bn_free(v2[k]);
-	}
-
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	ep_null(p);
-	ep_null(q);
-	ep_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep_new(q);
-		ep_new(r);
-
-		ep_curve_get_gen(p);
-		ep_curve_get_ord(n);
-
-		TEST_ONCE("generator has the right order") {
-			TEST_ASSERT(ep_on_curve(p), end);
-			ep_mul(r, p, n);
-			TEST_ASSERT(ep_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			ep_mul_gen(r, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_gen(r, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_gen(r, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_gen(r, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_gen(q, k);
-			bn_add(k, k, n);
-			ep_mul_gen(r, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("binary point multiplication is correct") {
-			bn_zero(k);
-			ep_mul_basic(r, p, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_basic(r, p, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			ep_rand(p);
-			ep_mul_basic(r, p, n);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_basic(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_basic(r, p, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_basic(q, p, k);
-			bn_add(k, k, n);
-			ep_mul_basic(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("sliding window point multiplication is correct") {
-			bn_zero(k);
-			ep_mul_slide(r, p, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_slide(r, p, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			ep_rand(p);
-			ep_mul_slide(r, p, n);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_slide(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_slide(r, p, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_slide(q, p, k);
-			bn_add(k, k, n);
-			ep_mul_slide(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery ladder point multiplication is correct") {
-			bn_zero(k);
-			ep_mul_monty(r, p, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_monty(r, p, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			ep_rand(p);
-			ep_mul_monty(r, p, n);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_monty(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_monty(r, p, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_monty(q, p, k);
-			bn_add(k, k, n);
-			ep_mul_monty(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-		TEST_CASE("left-to-right w-naf point multiplication is correct") {
-			bn_zero(k);
-			ep_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			ep_rand(p);
-			ep_mul_lwnaf(r, p, n);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_lwnaf(r, p, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_lwnaf(q, p, k);
-			bn_add(k, k, n);
-			ep_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == LWREG || !defined(STRIP)
-		TEST_CASE("left-to-right regular point multiplication is correct") {
-			bn_zero(k);
-			ep_mul_lwreg(r, p, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_lwreg(r, p, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			ep_rand(p);
-			ep_mul_lwreg(r, p, n);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_lwreg(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_lwreg(r, p, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_lwreg(q, p, k);
-			bn_add(k, k, n);
-			ep_mul_lwreg(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-		TEST_CASE("point multiplication by digit is correct") {
-			ep_mul_dig(r, p, 0);
-			TEST_ASSERT(ep_is_infty(r), end);
-			ep_mul_dig(r, p, 1);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			ep_mul(q, p, k);
-			ep_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep_free(q);
-	ep_free(r);
-	return code;
-}
-
-static int fixed(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep_t p, q, r, t[RLC_EP_TABLE_MAX];
-
-	bn_null(n);
-	bn_null(k);
-	ep_null(p);
-	ep_null(q);
-	ep_null(r);
-
-	for (int i = 0; i < RLC_EP_TABLE_MAX; i++) {
-		ep_null(t[i]);
-	}
-
-	RLC_TRY {
-		ep_new(p);
-		ep_new(q);
-		ep_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		ep_curve_get_gen(p);
-		ep_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			ep_rand(p);
-			ep_mul_pre(t, p);
-			bn_zero(k);
-			ep_mul_fix(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_fix(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(q, p, k);
-			ep_mul_fix(q, (const ep_t *)t, k);
-			ep_mul(r, p, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_fix(r, (const ep_t *)t, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep_free(t[i]);
-		}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep_new(t[i]);
-		}
-		TEST_CASE("binary fixed point multiplication is correct") {
-			ep_rand(p);
-			ep_mul_pre_basic(t, p);
-			bn_zero(k);
-			ep_mul_fix_basic(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_fix_basic(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(r, p, k);
-			ep_mul_fix_basic(q, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_fix_basic(r, (const ep_t *)t, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_fix_basic(q, (const ep_t *)t, k);
-			bn_add(k, k, n);
-			ep_mul_fix_basic(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep_new(t[i]);
-		}
-		TEST_CASE("single-table comb fixed point multiplication is correct") {
-			ep_rand(p);
-			ep_mul_pre_combs(t, p);
-			bn_zero(k);
-			ep_mul_fix_combs(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_fix_combs(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(r, p, k);
-			ep_mul_fix_combs(q, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_fix_combs(r, (const ep_t *)t, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_fix_combs(q, (const ep_t *)t, k);
-			bn_add(k, k, n);
-			ep_mul_fix_combs(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep_new(t[i]);
-		}
-		TEST_CASE("double-table comb fixed point multiplication is correct") {
-			ep_rand(p);
-			ep_mul_pre_combd(t, p);
-			bn_zero(k);
-			ep_mul_fix_combd(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_fix_combd(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(r, p, k);
-			ep_mul_fix_combd(q, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_fix_combd(r, (const ep_t *)t, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_fix_combd(q, (const ep_t *)t, k);
-			bn_add(k, k, n);
-			ep_mul_fix_combd(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep_new(t[i]);
-		}
-		TEST_CASE("left-to-right w-naf fixed point multiplication is correct") {
-			ep_rand(p);
-			ep_mul_pre_lwnaf(t, p);
-			bn_zero(k);
-			ep_mul_fix_lwnaf(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep_mul_fix_lwnaf(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul(r, p, k);
-			ep_mul_fix_lwnaf(q, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep_mul_fix_lwnaf(r, (const ep_t *)t, k);
-			ep_neg(r, r);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep_mul_fix_lwnaf(q, (const ep_t *)t, k);
-			bn_add(k, k, n);
-			ep_mul_fix_lwnaf(r, (const ep_t *)t, k);
-			TEST_ASSERT(ep_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep_free(t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(p);
-	ep_free(q);
-	ep_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous(void) {
-	int code = RLC_ERR;
-	bn_t n, k[2];
-	ep_t p[2], r;
-
-	bn_null(n);
-	bn_null(k[0]);
-	bn_null(k[1]);
-	ep_null(p[0]);
-	ep_null(p[1]);
-	ep_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k[0]);
-		bn_new(k[1]);
-		ep_new(p[0]);
-		ep_new(p[1]);
-		ep_new(r);
-
-		ep_curve_get_gen(p[0]);
-		ep_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul(p[1], p[0], k[0]);
-			ep_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			ep_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep_mul_sim_lot(p[1], p, k, 2);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-		TEST_CASE("basic simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul(p[1], p[0], k[0]);
-			ep_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-		TEST_CASE("shamir's trick for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul(p[1], p[0], k[0]);
-			ep_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-		TEST_CASE("interleaving for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul(p[1], p[0], k[0]);
-			ep_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-		TEST_CASE("jsf for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul(p[1], p[0], k[0]);
-			ep_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep_mul(p[0], p[0], k[0]);
-			ep_mul(p[1], p[1], k[1]);
-			ep_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep_mul(p[1], p[0], k[1]);
-			ep_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep_mul_gen(p[1], k[0]);
-			ep_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep_curve_get_gen(p[0]);
-			ep_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep_curve_get_gen(p[0]);
-			ep_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep_curve_get_gen(p[0]);
-			ep_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep_curve_get_gen(p[0]);
-			ep_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k[0]);
-	bn_free(k[1]);
-	ep_free(p[0]);
-	ep_free(p[1]);
-	ep_free(r);
-	return code;
-}
-
-static int compression(void) {
-	int code = RLC_ERR;
-	ep_t a, b, c;
-
-	ep_null(a);
-	ep_null(b);
-	ep_null(c);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		ep_new(c);
-
-		TEST_CASE("point compression is correct") {
-			ep_rand(a);
-			ep_pck(b, a);
-			TEST_ASSERT(ep_upk(c, b) == 1, end);
-			TEST_ASSERT(ep_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	ep_free(c);
-	return code;
-}
-
-static int hashing(void) {
-	int code = RLC_ERR;
-	ep_t a;
-	ep_t b;
-	bn_t n;
-	uint8_t msg[5];
-
-	ep_null(a);
-	ep_null(b);
-	bn_null(n);
-
-	RLC_TRY {
-		ep_new(a);
-		ep_new(b);
-		bn_new(n);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			ep_map(a, msg, sizeof(msg));
-			TEST_ASSERT(ep_is_infty(a) == 0, end);
-			ep_map_dst(b, msg, sizeof(msg), (const uint8_t *)"RELIC", 5);
-			TEST_ASSERT(ep_cmp(a, b) == RLC_EQ, end);
-			ep_mul(a, a, n);
-			TEST_ASSERT(ep_is_infty(a) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep_free(a);
-	ep_free(b);
-	bn_free(n);
-	return code;
-}
-
-int test(void) {
-	ep_param_print();
-
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (endomorphism() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (compression() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (hashing() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int main(void) {
-	int r0 = RLC_ERR, r1 = RLC_ERR, r2 = RLC_ERR, r3 = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the EP module:", 0);
-
-#if defined(EP_PLAIN)
-	r0 = ep_param_set_any_plain();
-	if (r0 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-#if defined(EP_ENDOM)
-	r1 = ep_param_set_any_endom();
-	if (r1 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-	r2 = ep_param_set_any_pairf();
-	if (r2 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-#if defined(EP_SUPER)
-	r3 = ep_param_set_any_super();
-	if (r3 == RLC_OK) {
-		if (test() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-#endif
-
-	if (r0 == RLC_ERR && r1 == RLC_ERR && r2 == RLC_ERR && r3 == RLC_ERR) {
-		if (ep_param_set_any() == RLC_ERR) {
-			RLC_THROW(ERR_NO_CURVE);
-			core_clean();
-			return 0;
-		} else {
-			if (test() != RLC_OK) {
-				core_clean();
-				return 1;
-			}
-		}
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_epx.c b/src/dashbls/depends/relic/test/test_epx.c
deleted file mode 100644
index 7429ec424a73..000000000000
--- a/src/dashbls/depends/relic/test/test_epx.c
+++ /dev/null
@@ -1,2277 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for elliptic curves defined over extensions of prime fields.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory2(void) {
-	err_t e;
-	int code = RLC_ERR;
-	ep2_t a;
-
-	ep2_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			ep2_new(a);
-			ep2_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util2(void) {
-	int l, code = RLC_ERR;
-	ep2_t a, b, c;
-	uint8_t bin[4 * RLC_FP_BYTES + 1];
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-
-		TEST_CASE("copy and comparison are consistent") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_rand(c);
-			/* Compare points in affine coordinates. */
-			if (ep2_cmp(a, c) != RLC_EQ) {
-				ep2_copy(c, a);
-				TEST_ASSERT(ep2_cmp(c, a) == RLC_EQ, end);
-			}
-			if (ep2_cmp(b, c) != RLC_EQ) {
-				ep2_copy(c, b);
-				TEST_ASSERT(ep2_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			ep2_dbl(c, a);
-			ep2_norm(c, c);
-			ep2_dbl(a, a);
-			TEST_ASSERT(ep2_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep2_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			ep2_dbl(c, c);
-			ep2_dbl(a, a);
-			TEST_ASSERT(ep2_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep2_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			ep2_rand(a);
-			ep2_neg(b, a);
-			TEST_ASSERT(ep2_cmp(a, b) != RLC_EQ, end);
-			ep2_neg(b, b);
-			TEST_ASSERT(ep2_cmp(a, b) == RLC_EQ, end);
-			ep2_neg(b, a);
-			ep2_add(a, a, b);
-			ep2_set_infty(b);
-			TEST_ASSERT(ep2_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			ep2_rand(a);
-			ep2_set_infty(c);
-			TEST_ASSERT(ep2_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(ep2_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			ep2_set_infty(a);
-			TEST_ASSERT(ep2_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			ep2_set_infty(a);
-			TEST_ASSERT(ep2_on_curve(a), end);
-			ep2_rand(a);
-			TEST_ASSERT(ep2_on_curve(a), end);
-			fp2_rand(a->x);
-			TEST_ASSERT(!ep2_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			ep2_rand(a);
-			ep2_blind(a, a);
-			TEST_ASSERT(ep2_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				ep2_set_infty(a);
-				l = ep2_size_bin(a, j);
-				ep2_write_bin(bin, l, a, j);
-				ep2_read_bin(b, bin, l);
-				TEST_ASSERT(ep2_cmp(a, b) == RLC_EQ, end);
-				ep2_rand(a);
-				l = ep2_size_bin(a, j);
-				ep2_write_bin(bin, l, a, j);
-				ep2_read_bin(b, bin, l);
-				TEST_ASSERT(ep2_cmp(a, b) == RLC_EQ, end);
-				ep2_rand(a);
-				ep2_dbl(a, a);
-				l = ep2_size_bin(a, j);
-				ep2_norm(a, a);
-				ep2_write_bin(bin, l, a, j);
-				ep2_read_bin(b, bin, l);
-				TEST_ASSERT(ep2_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	return code;
-}
-
-static int addition2(void) {
-	int code = RLC_ERR;
-	ep2_t a, b, c, d, e;
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-	ep2_null(d);
-	ep2_null(e);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-		ep2_new(d);
-		ep2_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_add(d, a, b);
-			ep2_add(e, b, a);
-			TEST_ASSERT(ep2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_rand(c);
-			ep2_add(d, a, b);
-			ep2_add(d, d, c);
-			ep2_add(e, b, c);
-			ep2_add(e, e, a);
-			TEST_ASSERT(ep2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			ep2_rand(a);
-			ep2_set_infty(d);
-			ep2_add(e, a, d);
-			TEST_ASSERT(ep2_cmp(e, a) == RLC_EQ, end);
-			ep2_add(e, d, a);
-			TEST_ASSERT(ep2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			ep2_rand(a);
-			ep2_neg(d, a);
-			ep2_add(e, a, d);
-			TEST_ASSERT(ep2_is_infty(e), end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point addition in affine coordinates is correct") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_add(d, a, b);
-			ep2_add_basic(e, a, b);
-			TEST_ASSERT(ep2_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-#if !defined(EP_MIXED) || !defined(STRIP)
-		TEST_CASE("point addition in projective coordinates is correct") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_rand(c);
-			ep2_add_projc(a, a, b);
-			ep2_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			ep2_add_projc(d, a, b);
-			/* normalize before mixing coordinates. */
-			ep2_norm(a, a);
-			ep2_norm(b, b);
-			ep2_add(e, a, b);
-			TEST_ASSERT(ep2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point addition in mixed coordinates (z2 = 1) is correct") {
-			ep2_rand(a);
-			ep2_rand(b);
-			/* a in projective, b in affine coordinates. */
-			ep2_add_projc(a, a, b);
-			ep2_add_projc(d, a, b);
-			/* a in affine coordinates. */
-			ep2_norm(a, a);
-			ep2_add(e, a, b);
-			TEST_ASSERT(ep2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition in mixed coordinates (z1,z2 = 1) is correct") {
-			ep2_rand(a);
-			ep2_rand(b);
-			/* a and b in affine coordinates. */
-			ep2_add(d, a, b);
-			ep2_add_projc(e, a, b);
-			TEST_ASSERT(ep2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	ep2_free(d);
-	ep2_free(e);
-	return code;
-}
-
-static int subtraction2(void) {
-	int code = RLC_ERR;
-	ep2_t a, b, c, d;
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-	ep2_null(d);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-		ep2_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			ep2_rand(a);
-			ep2_rand(b);
-			ep2_sub(c, a, b);
-			ep2_sub(d, b, a);
-			ep2_neg(d, d);
-			TEST_ASSERT(ep2_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			ep2_rand(a);
-			ep2_set_infty(c);
-			ep2_sub(d, a, c);
-			TEST_ASSERT(ep2_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			ep2_rand(a);
-			ep2_sub(c, a, a);
-			TEST_ASSERT(ep2_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	ep2_free(d);
-	return code;
-}
-
-static int doubling2(void) {
-	int code = RLC_ERR;
-	ep2_t a, b, c;
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			ep2_rand(a);
-			ep2_add(b, a, a);
-			ep2_dbl(c, a);
-			TEST_ASSERT(ep2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point doubling in affine coordinates is correct") {
-			ep2_rand(a);
-			ep2_dbl(b, a);
-			ep2_dbl_basic(c, a);
-			TEST_ASSERT(ep2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in projective coordinates is correct") {
-			ep2_rand(a);
-			/* a in projective coordinates. */
-			ep2_dbl_projc(a, a);
-			ep2_dbl_projc(b, a);
-			ep2_norm(a, a);
-			ep2_dbl(c, a);
-			TEST_ASSERT(ep2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ep2_rand(a);
-			ep2_dbl_projc(b, a);
-			ep2_norm(b, b);
-			ep2_dbl(c, a);
-			TEST_ASSERT(ep2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	return code;
-}
-
-static int multiplication2(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep2_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	ep2_null(p);
-	ep2_null(q);
-	ep2_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep2_new(p);
-		ep2_new(q);
-		ep2_new(r);
-
-		ep2_curve_get_gen(p);
-		ep2_curve_get_ord(n);
-
-		TEST_ONCE("generator has the right order") {
-			TEST_ASSERT(ep2_on_curve(p), end);
-			ep2_mul(r, p, n);
-			TEST_ASSERT(ep2_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			ep2_mul_gen(r, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_gen(r, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_gen(r, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_gen(r, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("binary point multiplication is correct") {
-			bn_zero(k);
-			ep2_mul_basic(r, p, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_basic(r, p, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			ep2_rand(p);
-			ep2_mul_basic(r, p, n);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_basic(r, p, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_basic(r, p, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("sliding window point multiplication is correct") {
-			bn_zero(k);
-			ep2_mul_slide(r, p, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_slide(r, p, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			ep2_rand(p);
-			ep2_mul_slide(r, p, n);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_slide(r, p, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_slide(r, p, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery ladder point multiplication is correct") {
-			bn_zero(k);
-			ep2_mul_monty(r, p, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_monty(r, p, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			ep2_rand(p);
-			ep2_mul_monty(r, p, n);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_monty(r, p, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_monty(r, p, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-		TEST_CASE("left-to-right w-naf point multiplication is correct") {
-			bn_zero(k);
-			ep2_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			ep2_rand(p);
-			ep2_mul_lwnaf(r, p, n);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_lwnaf(r, p, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-		TEST_CASE("point multiplication by digit is correct") {
-			ep2_mul_dig(r, p, 0);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			ep2_mul_dig(r, p, 1);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			ep2_mul(q, p, k);
-			ep2_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep2_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	return code;
-}
-
-static int fixed2(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep2_t p, q, r, t[RLC_EPX_TABLE_MAX];
-
-	bn_null(n);
-	bn_null(k);
-	ep2_null(p);
-	ep2_null(q);
-	ep2_null(r);
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep2_null(t[i]);
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep2_new(p);
-		ep2_new(q);
-		ep2_new(r);
-
-		ep2_curve_get_gen(p);
-		ep2_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep2_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			ep2_rand(p);
-			ep2_mul_pre(t, p);
-			bn_zero(k);
-			ep2_mul_fix(r, t, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_fix(r, t, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(q, p, k);
-			ep2_mul_fix(q, t, k);
-			ep2_mul(r, p, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_fix(r, t, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep2_free(t[i]);
-		}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep2_new(t[i]);
-		}
-		TEST_CASE("binary fixed point multiplication is correct") {
-			ep2_rand(p);
-			ep2_mul_pre_basic(t, p);
-			bn_zero(k);
-			ep2_mul_fix_basic(r, t, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_fix_basic(r, t, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(r, p, k);
-			ep2_mul_fix_basic(q, t, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_fix_basic(r, t, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep2_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep2_new(t[i]);
-		}
-		TEST_CASE("single-table comb fixed point multiplication is correct") {
-			ep2_rand(p);
-			ep2_mul_pre_combs(t, p);
-			bn_zero(k);
-			ep2_mul_fix_combs(r, t, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_fix_combs(r, t, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(r, p, k);
-			ep2_mul_fix_combs(q, t, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_fix_combs(r, t, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep2_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep2_new(t[i]);
-		}
-		TEST_CASE("double-table comb fixed point multiplication is correct") {
-			ep2_rand(p);
-			ep2_mul_pre_combd(t, p);
-			bn_zero(k);
-			ep2_mul_fix_combd(r, t, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_fix_combd(r, t, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(r, p, k);
-			ep2_mul_fix_combd(q, t, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_fix_combd(r, t, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep2_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep2_new(t[i]);
-		}
-		TEST_CASE("left-to-right w-naf fixed point multiplication is correct") {
-			ep2_rand(p);
-			ep2_mul_pre_lwnaf(t, p);
-			bn_zero(k);
-			ep2_mul_fix_lwnaf(r, t, k);
-			TEST_ASSERT(ep2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep2_mul_fix_lwnaf(r, t, k);
-			TEST_ASSERT(ep2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep2_mul(r, p, k);
-			ep2_mul_fix_lwnaf(q, t, k);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep2_mul_fix_lwnaf(r, t, k);
-			ep2_neg(r, r);
-			TEST_ASSERT(ep2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep2_free(t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous2(void) {
-	int code = RLC_ERR;
-	bn_t n, k[2];
-	ep2_t p[2], r;
-
-	bn_null(n);
-	bn_null(k[0]);
-	bn_null(k[1]);
-	ep2_null(p[0]);
-	ep2_null(p[1]);
-	ep2_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k[0]);
-		bn_new(k[1]);
-		ep2_new(p[0]);
-		ep2_new(p[1]);
-		ep2_new(r);
-
-		ep2_curve_get_gen(p[0]);
-		ep2_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul(p[1], p[0], k[0]);
-			ep2_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			ep2_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep2_mul_sim_lot(p[1], p, k, 2);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			bn_add(k[0], k[0], n);
-			bn_add(k[1], k[1], n);
-			ep2_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-		TEST_CASE("basic simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul(p[1], p[0], k[0]);
-			ep2_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-		TEST_CASE("shamir's trick for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul(p[1], p[0], k[0]);
-			ep2_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-		TEST_CASE("interleaving for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul(p[1], p[0], k[0]);
-			ep2_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-		TEST_CASE("jsf for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul(p[1], p[0], k[0]);
-			ep2_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep2_mul(p[0], p[0], k[0]);
-			ep2_mul(p[1], p[1], k[1]);
-			ep2_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep2_mul(p[1], p[0], k[1]);
-			ep2_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep2_mul_gen(p[1], k[0]);
-			ep2_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep2_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep2_curve_get_gen(p[0]);
-			ep2_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep2_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep2_curve_get_gen(p[0]);
-			ep2_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep2_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep2_curve_get_gen(p[0]);
-			ep2_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep2_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k[0]);
-	bn_free(k[1]);
-	ep2_free(p[0]);
-	ep2_free(p[1]);
-	ep2_free(r);
-	return code;
-}
-
-static int compression2(void) {
-	int code = RLC_ERR;
-	ep2_t a, b, c;
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-
-		TEST_CASE("point compression is correct") {
-			ep2_rand(a);
-			ep2_pck(b, a);
-			TEST_ASSERT(ep2_upk(c, b) == 1, end);
-			TEST_ASSERT(ep2_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	return code;
-}
-
-static int hashing2(void) {
-	int code = RLC_ERR;
-	bn_t n;
-	ep2_t p;
-	ep2_t q;
-	uint8_t msg[5];
-
-	bn_null(n);
-	ep2_null(p);
-	ep2_null(q);
-
-	RLC_TRY {
-		bn_new(n);
-		ep2_new(p);
-		ep2_new(q);
-
-		ep2_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			ep2_map(p, msg, sizeof(msg));
-			TEST_ASSERT(ep2_is_infty(p) == 0, end);
-			ep2_map_dst(q, msg, sizeof(msg), (const uint8_t *)"RELIC", 5);
-			TEST_ASSERT(ep2_cmp(p, q) == RLC_EQ, end);
-			ep2_mul(p, p, n);
-			TEST_ASSERT(ep2_is_infty(p) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	ep2_free(p);
-	ep2_free(q);
-	return code;
-}
-
-static int frobenius2(void) {
-	int code = RLC_ERR;
-	ep2_t a, b, c;
-	bn_t d, n;
-
-	ep2_null(a);
-	ep2_null(b);
-	ep2_null(c);
-	bn_null(d);
-	bn_null(n);
-
-	RLC_TRY {
-		ep2_new(a);
-		ep2_new(b);
-		ep2_new(c);
-		bn_new(d);
-		bn_new(n);
-
-		ep2_curve_get_ord(n);
-
-		TEST_CASE("frobenius and point multiplication are consistent") {
-			ep2_rand(a);
-			ep2_frb(b, a, 1);
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			bn_mod(d, d, n);
-			ep2_mul(c, a, d);
-			TEST_ASSERT(ep2_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep2_free(a);
-	ep2_free(b);
-	ep2_free(c);
-	bn_free(d);
-	bn_free(n);
-	return code;
-}
-
-static int memory4(void) {
-	err_t e;
-	int code = RLC_ERR;
-	ep4_t a;
-
-	ep4_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			ep4_new(a);
-			ep4_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util4(void) {
-	int l, code = RLC_ERR;
-	ep4_t a, b, c;
-	uint8_t bin[8 * RLC_FP_BYTES + 1];
-
-	ep4_null(a);
-	ep4_null(b);
-	ep4_null(c);
-
-	RLC_TRY {
-		ep4_new(a);
-		ep4_new(b);
-		ep4_new(c);
-
-		TEST_CASE("copy and comparison are consistent") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_rand(c);
-			/* Compare points in affine coordinates. */
-			if (ep4_cmp(a, c) != RLC_EQ) {
-				ep4_copy(c, a);
-				TEST_ASSERT(ep4_cmp(c, a) == RLC_EQ, end);
-			}
-			if (ep4_cmp(b, c) != RLC_EQ) {
-				ep4_copy(c, b);
-				TEST_ASSERT(ep4_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			ep4_dbl(c, a);
-			ep4_norm(c, c);
-			ep4_dbl(a, a);
-			TEST_ASSERT(ep4_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep4_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			ep4_dbl(c, c);
-			ep4_dbl(a, a);
-			TEST_ASSERT(ep4_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(ep4_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			ep4_rand(a);
-			ep4_neg(b, a);
-			TEST_ASSERT(ep4_cmp(a, b) != RLC_EQ, end);
-			ep4_neg(b, b);
-			TEST_ASSERT(ep4_cmp(a, b) == RLC_EQ, end);
-			ep4_neg(b, a);
-			ep4_add(a, a, b);
-			ep4_set_infty(b);
-			TEST_ASSERT(ep4_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			ep4_rand(a);
-			ep4_set_infty(c);
-			TEST_ASSERT(ep4_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(ep4_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			ep4_set_infty(a);
-			TEST_ASSERT(ep4_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("validity test is correct") {
-			ep4_set_infty(a);
-			TEST_ASSERT(ep4_on_curve(a), end);
-			ep4_rand(a);
-			TEST_ASSERT(ep4_on_curve(a), end);
-			fp4_rand(a->x);
-			TEST_ASSERT(!ep4_on_curve(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			ep4_rand(a);
-			ep4_blind(a, a);
-			TEST_ASSERT(ep4_on_curve(a), end);
-		} TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			ep4_set_infty(a);
-			l = ep4_size_bin(a, 0);
-			ep4_write_bin(bin, l, a, 0);
-			ep4_read_bin(b, bin, l);
-			TEST_ASSERT(ep4_cmp(a, b) == RLC_EQ, end);
-			ep4_rand(a);
-			l = ep4_size_bin(a, 0);
-			ep4_write_bin(bin, l, a, 0);
-			ep4_read_bin(b, bin, l);
-			TEST_ASSERT(ep4_cmp(a, b) == RLC_EQ, end);
-			ep4_rand(a);
-			ep4_dbl(a, a);
-			l = ep4_size_bin(a, 0);
-			ep4_norm(a, a);
-			ep4_write_bin(bin, l, a, 0);
-			ep4_read_bin(b, bin, l);
-			TEST_ASSERT(ep4_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(a);
-	ep4_free(b);
-	ep4_free(c);
-	return code;
-}
-
-static int addition4(void) {
-	int code = RLC_ERR;
-	ep4_t a, b, c, d, e;
-
-	ep4_null(a);
-	ep4_null(b);
-	ep4_null(c);
-	ep4_null(d);
-	ep4_null(e);
-
-	RLC_TRY {
-		ep4_new(a);
-		ep4_new(b);
-		ep4_new(c);
-		ep4_new(d);
-		ep4_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_add(d, a, b);
-			ep4_add(e, b, a);
-			TEST_ASSERT(ep4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_rand(c);
-			ep4_add(d, a, b);
-			ep4_add(d, d, c);
-			ep4_add(e, b, c);
-			ep4_add(e, e, a);
-			TEST_ASSERT(ep4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			ep4_rand(a);
-			ep4_set_infty(d);
-			ep4_add(e, a, d);
-			TEST_ASSERT(ep4_cmp(e, a) == RLC_EQ, end);
-			ep4_add(e, d, a);
-			TEST_ASSERT(ep4_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			ep4_rand(a);
-			ep4_neg(d, a);
-			ep4_add(e, a, d);
-			TEST_ASSERT(ep4_is_infty(e), end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point addition in affine coordinates is correct") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_add(d, a, b);
-			ep4_add_basic(e, a, b);
-			TEST_ASSERT(ep4_cmp(e, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-#if !defined(EP_MIXED) || !defined(STRIP)
-		TEST_CASE("point addition in projective coordinates is correct") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_rand(c);
-			ep4_add_projc(a, a, b);
-			ep4_add_projc(b, b, c);
-			/* a and b in projective coordinates. */
-			ep4_add_projc(d, a, b);
-			/* normalize before mixing coordinates. */
-			ep4_norm(a, a);
-			ep4_norm(b, b);
-			ep4_add(e, a, b);
-			TEST_ASSERT(ep4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("point addition in mixed coordinates (z2 = 1) is correct") {
-			ep4_rand(a);
-			ep4_rand(b);
-			/* a in projective, b in affine coordinates. */
-			ep4_add_projc(a, a, b);
-			ep4_add_projc(d, a, b);
-			/* a in affine coordinates. */
-			ep4_norm(a, a);
-			ep4_add(e, a, b);
-			TEST_ASSERT(ep4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition in mixed coordinates (z1,z2 = 1) is correct") {
-			ep4_rand(a);
-			ep4_rand(b);
-			/* a and b in affine coordinates. */
-			ep4_add(d, a, b);
-			ep4_add_projc(e, a, b);
-			TEST_ASSERT(ep4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(a);
-	ep4_free(b);
-	ep4_free(c);
-	ep4_free(d);
-	ep4_free(e);
-	return code;
-}
-
-static int subtraction4(void) {
-	int code = RLC_ERR;
-	ep4_t a, b, c, d;
-
-	ep4_null(a);
-	ep4_null(b);
-	ep4_null(c);
-	ep4_null(d);
-
-	RLC_TRY {
-		ep4_new(a);
-		ep4_new(b);
-		ep4_new(c);
-		ep4_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			ep4_rand(a);
-			ep4_rand(b);
-			ep4_sub(c, a, b);
-			ep4_sub(d, b, a);
-			ep4_neg(d, d);
-			TEST_ASSERT(ep4_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			ep4_rand(a);
-			ep4_set_infty(c);
-			ep4_sub(d, a, c);
-			TEST_ASSERT(ep4_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			ep4_rand(a);
-			ep4_sub(c, a, a);
-			TEST_ASSERT(ep4_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(a);
-	ep4_free(b);
-	ep4_free(c);
-	ep4_free(d);
-	return code;
-}
-
-static int doubling4(void) {
-	int code = RLC_ERR;
-	ep4_t a, b, c;
-
-	ep4_null(a);
-	ep4_null(b);
-	ep4_null(c);
-
-	RLC_TRY {
-		ep4_new(a);
-		ep4_new(b);
-		ep4_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			ep4_rand(a);
-			ep4_add(b, a, a);
-			ep4_dbl(c, a);
-			TEST_ASSERT(ep4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("point doubling in affine coordinates is correct") {
-			ep4_rand(a);
-			ep4_dbl(b, a);
-			ep4_dbl_basic(c, a);
-			TEST_ASSERT(ep4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || !defined(STRIP)
-		TEST_CASE("point doubling in projective coordinates is correct") {
-			ep4_rand(a);
-			/* a in projective coordinates. */
-			ep4_dbl_projc(a, a);
-			ep4_dbl_projc(b, a);
-			ep4_norm(a, a);
-			ep4_dbl(c, a);
-			TEST_ASSERT(ep4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point doubling in mixed coordinates (z1 = 1) is correct") {
-			ep4_rand(a);
-			ep4_dbl_projc(b, a);
-			ep4_norm(b, b);
-			ep4_dbl(c, a);
-			TEST_ASSERT(ep4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(a);
-	ep4_free(b);
-	ep4_free(c);
-	return code;
-}
-
-static int multiplication4(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep4_t p, q, r;
-
-	bn_null(n);
-	bn_null(k);
-	ep4_null(p);
-	ep4_null(q);
-	ep4_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep4_new(p);
-		ep4_new(q);
-		ep4_new(r);
-
-		ep4_curve_get_gen(p);
-		ep4_curve_get_ord(n);
-
-		TEST_ONCE("generator has the right order") {
-			TEST_ASSERT(ep4_on_curve(p), end);
-			ep4_mul(r, p, n);
-			TEST_ASSERT(ep4_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			ep4_mul_gen(r, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_gen(r, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_gen(r, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_gen(r, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("binary point multiplication is correct") {
-			bn_zero(k);
-			ep4_mul_basic(r, p, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_basic(r, p, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			ep4_rand(p);
-			ep4_mul(r, p, n);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_basic(r, p, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_basic(r, p, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("sliding window point multiplication is correct") {
-			bn_zero(k);
-			ep4_mul_slide(r, p, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_slide(r, p, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			ep4_rand(p);
-			ep4_mul(r, p, n);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_slide(r, p, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_slide(r, p, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery ladder point multiplication is correct") {
-			bn_zero(k);
-			ep4_mul_monty(r, p, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_monty(r, p, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			ep4_rand(p);
-			ep4_mul(r, p, n);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_monty(r, p, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_monty(r, p, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if EP_MUL == LWNAF || !defined(STRIP)
-		TEST_CASE("left-to-right w-naf point multiplication is correct") {
-			bn_zero(k);
-			ep4_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			ep4_rand(p);
-			ep4_mul(r, p, n);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_lwnaf(r, p, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_lwnaf(r, p, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-		TEST_CASE("multiplication by digit is correct") {
-			ep4_mul_dig(r, p, 0);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			ep4_mul_dig(r, p, 1);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			ep4_mul(q, p, k);
-			ep4_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep4_free(p);
-	ep4_free(q);
-	ep4_free(r);
-	return code;
-}
-
-static int fixed4(void) {
-	int code = RLC_ERR;
-	bn_t n, k;
-	ep4_t p, q, r, t[RLC_EPX_TABLE_MAX];
-
-	bn_null(n);
-	bn_null(k);
-	ep4_null(p);
-	ep4_null(q);
-	ep4_null(r);
-
-	for (int i = 0; i < RLC_EPX_TABLE_MAX; i++) {
-		ep4_null(t[i]);
-	}
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep4_new(p);
-		ep4_new(q);
-		ep4_new(r);
-
-		ep4_curve_get_gen(p);
-		ep4_curve_get_ord(n);
-
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep4_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			ep4_rand(p);
-			ep4_mul_pre(t, p);
-			bn_zero(k);
-			ep4_mul_fix(r, t, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_fix(r, t, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(q, p, k);
-			ep4_mul_fix(q, t, k);
-			ep4_mul(r, p, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_fix(r, t, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE; i++) {
-			ep4_free(t[i]);
-		}
-
-#if EP_FIX == BASIC || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep4_new(t[i]);
-		}
-		TEST_CASE("binary fixed point multiplication is correct") {
-			ep4_rand(p);
-			ep4_mul_pre_basic(t, p);
-			bn_zero(k);
-			ep4_mul_fix_basic(r, t, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_fix_basic(r, t, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(r, p, k);
-			ep4_mul_fix_basic(q, t, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_fix_basic(r, t, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_BASIC; i++) {
-			ep4_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBS || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep4_new(t[i]);
-		}
-		TEST_CASE("single-table comb fixed point multiplication is correct") {
-			ep4_rand(p);
-			ep4_mul_pre_combs(t, p);
-			bn_zero(k);
-			ep4_mul_fix_combs(r, t, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_fix_combs(r, t, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(r, p, k);
-			ep4_mul_fix_combs(q, t, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_fix_combs(r, t, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBS; i++) {
-			ep4_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == COMBD || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep4_new(t[i]);
-		}
-		TEST_CASE("double-table comb fixed point multiplication is correct") {
-			ep4_rand(p);
-			ep4_mul_pre_combd(t, p);
-			bn_zero(k);
-			ep4_mul_fix_combd(r, t, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_fix_combd(r, t, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(r, p, k);
-			ep4_mul_fix_combd(q, t, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_fix_combd(r, t, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_COMBD; i++) {
-			ep4_free(t[i]);
-		}
-#endif
-
-#if EP_FIX == LWNAF || !defined(STRIP)
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep4_new(t[i]);
-		}
-		TEST_CASE("left-to-right w-naf fixed point multiplication is correct") {
-			ep4_rand(p);
-			ep4_mul_pre_lwnaf(t, p);
-			bn_zero(k);
-			ep4_mul_fix_lwnaf(r, t, k);
-			TEST_ASSERT(ep4_is_infty(r), end);
-			bn_set_dig(k, 1);
-			ep4_mul_fix_lwnaf(r, t, k);
-			TEST_ASSERT(ep4_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			ep4_mul(r, p, k);
-			ep4_mul_fix_lwnaf(q, t, k);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			ep4_mul_fix_lwnaf(r, t, k);
-			ep4_neg(r, r);
-			TEST_ASSERT(ep4_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_EP_TABLE_LWNAF; i++) {
-			ep4_free(t[i]);
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(p);
-	ep4_free(q);
-	ep4_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous4(void) {
-	int code = RLC_ERR;
-	bn_t n, k[2];
-	ep4_t p[2], r;
-
-	bn_null(n);
-	bn_null(k[0]);
-	bn_null(k[1]);
-	ep4_null(p[0]);
-	ep4_null(p[1]);
-	ep4_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k[0]);
-		bn_new(k[1]);
-		ep4_new(p[0]);
-		ep4_new(p[1]);
-		ep4_new(r);
-
-		ep4_curve_get_gen(p[0]);
-		ep4_curve_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul(p[1], p[0], k[0]);
-			ep4_mul_sim(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			ep4_mul_sim(r, p[0], k[0], p[1], k[1]);
-			ep4_mul_sim_lot(p[1], p, k, 2);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_SIM == BASIC || !defined(STRIP)
-		TEST_CASE("basic simultaneous point multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul(p[1], p[0], k[0]);
-			ep4_mul_sim_basic(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim_basic(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == TRICK || !defined(STRIP)
-		TEST_CASE("shamir's trick for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul(p[1], p[0], k[0]);
-			ep4_mul_sim_trick(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim_trick(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == INTER || !defined(STRIP)
-		TEST_CASE("interleaving for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul(p[1], p[0], k[0]);
-			ep4_mul_sim_inter(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim_inter(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_SIM == JOINT || !defined(STRIP)
-		TEST_CASE("jsf for simultaneous multiplication is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul(p[1], p[0], k[0]);
-			ep4_mul_sim_joint(r, p[0], k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim_joint(r, p[0], k[0], p[1], k[1]);
-			ep4_mul(p[0], p[0], k[0]);
-			ep4_mul(p[1], p[1], k[1]);
-			ep4_add(p[1], p[1], p[0]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k[0]);
-			bn_rand_mod(k[1], n);
-			ep4_mul(p[1], p[0], k[1]);
-			ep4_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_zero(k[1]);
-			ep4_mul_gen(p[1], k[0]);
-			ep4_mul_sim_gen(r, k[0], p[0], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_rand_mod(k[0], n);
-			bn_rand_mod(k[1], n);
-			ep4_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep4_curve_get_gen(p[0]);
-			ep4_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[0], k[0]);
-			ep4_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep4_curve_get_gen(p[0]);
-			ep4_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-			bn_neg(k[1], k[1]);
-			ep4_mul_sim_gen(r, k[0], p[1], k[1]);
-			ep4_curve_get_gen(p[0]);
-			ep4_mul_sim(p[1], p[0], k[0], p[1], k[1]);
-			TEST_ASSERT(ep4_cmp(p[1], r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k[0]);
-	bn_free(k[1]);
-	ep4_free(p[0]);
-	ep4_free(p[1]);
-	ep4_free(r);
-	return code;
-}
-
-static int hashing4(void) {
-	int code = RLC_ERR;
-	bn_t n;
-	ep4_t p;
-	uint8_t msg[5];
-
-	bn_null(n);
-	ep4_null(p);
-
-	RLC_TRY {
-		bn_new(n);
-		ep4_new(p);
-
-		ep4_curve_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			ep4_map(p, msg, sizeof(msg));
-			TEST_ASSERT(ep4_is_infty(p) == 0, end);
-			ep4_mul(p, p, n);
-			TEST_ASSERT(ep4_is_infty(p) == 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	ep4_free(p);
-	return code;
-}
-
-static int frobenius4(void) {
-	int code = RLC_ERR;
-	ep4_t a, b, c;
-	bn_t d, n;
-
-	ep4_null(a);
-	ep4_null(b);
-	ep4_null(c);
-	bn_null(d);
-	bn_null(n);
-
-	RLC_TRY {
-		ep4_new(a);
-		ep4_new(b);
-		ep4_new(c);
-		bn_new(d);
-		bn_new(n);
-
-		ep4_curve_get_ord(n);
-
-		TEST_CASE("frobenius and point multiplication are consistent") {
-			ep4_rand(a);
-			ep4_frb(b, a, 1);
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			bn_mod(d, d, n);
-			ep4_mul(c, a, d);
-			TEST_ASSERT(ep4_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	ep4_free(a);
-	ep4_free(b);
-	ep4_free(c);
-	bn_free(d);
-	bn_free(n);
-	return code;
-}
-
-int main(void) {
-	int r0, r1;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the EPX module", 0);
-
-	if (ep_param_set_any_pairf() == RLC_ERR) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	if ((r0 = ep2_curve_is_twist())) {
-		ep_param_print();
-
-		util_banner("Utilities:", 1);
-
-		if (memory2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (fixed2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (simultaneous2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (compression2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (hashing2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (frobenius2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if ((r1 = ep4_curve_is_twist())) {
-		ep_param_print();
-
-		util_banner("Utilities:", 1);
-
-		if (memory4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (fixed4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (simultaneous4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (hashing4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (frobenius4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (!r0 && !r1) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_err.c b/src/dashbls/depends/relic/test/test_err.c
deleted file mode 100644
index b87ea2c2607d..000000000000
--- a/src/dashbls/depends/relic/test/test_err.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for the error-management routines.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_err.h"
-#include "relic_test.h"
-
-static void dummy(void);
-static void dummy2(void);
-
-int j;
-
-static void dummy(void) {
-	j++;
-	if (j < 6)
-		dummy2();
-}
-
-static void dummy2(void) {
-	j++;
-	if (j < 5)
-		dummy();
-	else {
-		RLC_THROW(ERR_NO_MEMORY);
-	}
-}
-
-static void dummy3(void) {
-	bn_t a;
-
-	bn_null(a);
-
-	RLC_TRY {
-		bn_new(a);
-		RLC_THROW(ERR_NO_MEMORY);
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-		bn_free(a);
-	}
-}
-
-static void dummy4(void) {
-	RLC_TRY {
-		dummy3();
-	} RLC_CATCH_ANY {
-		RLC_THROW(ERR_CAUGHT);
-	} RLC_FINALLY {
-	}
-}
-
-
-int main(void) {
-	err_t e;
-	char *msg = NULL;
-	int code = RLC_ERR;
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the ERR module:\n", 0);
-
-	TEST_ONCE("not using try-catch is correct") {
-		dummy();
-		if (err_get_code() == RLC_ERR) {
-			err_get_msg(&e, &msg);
-			TEST_ASSERT(msg == core_get()->reason[ERR_NO_MEMORY], end);
-			TEST_ASSERT(err_get_code() != RLC_ERR, end);
-		}
-	} TEST_END;
-
-	j = 0;
-
-	TEST_ONCE("try-catch is correct and error message is printed") {
-		RLC_TRY {
-			dummy();
-		}
-		RLC_CATCH(e) {
-			switch (e) {
-				case ERR_NO_MEMORY:
-					TEST_END;
-					break;
-			}
-		}
-	}
-
-#ifdef WITH_BN
-	TEST_ONCE("throw in try-catch is correct and error message is printed") {
-		bn_t a;
-		bn_null(a);
-
-		RLC_TRY {
-			bn_new(a);
-			dummy3();
-		}
-		RLC_CATCH(e) {
-			bn_free(a);
-			switch (e) {
-				case ERR_NO_MEMORY:
-					TEST_END;
-					break;
-			}
-		}
-	}
-
-	TEST_ONCE("throw in deep try-catch is correct and functions are printed") {
-		bn_t a;
-		bn_null(a);
-
-		RLC_TRY {
-			bn_new(a);
-			dummy4();
-		}
-		RLC_CATCH(e) {
-			bn_free(a);
-			switch (e) {
-				case ERR_NO_MEMORY:
-					TEST_END;
-					RLC_ERROR(end);
-					break;
-			}
-		}
-	}
-#endif
-
-	code = RLC_OK;
-	
-  end:
-	core_clean();
-	if (code == RLC_ERR) {
-		util_banner("All tests have passed.\n", 0);
-		return 0;
-	} else {
-		return 1;
-	}
-}
diff --git a/src/dashbls/depends/relic/test/test_fb.c b/src/dashbls/depends/relic/test/test_fb.c
deleted file mode 100644
index 4c153f340271..000000000000
--- a/src/dashbls/depends/relic/test/test_fb.c
+++ /dev/null
@@ -1,1136 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for binary field arithmetic.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_fb_low.h"
-#include "relic_test.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fb_t a;
-
-	fb_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fb_new(a);
-			fb_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util(void) {
-	int bits, code = RLC_ERR;
-	fb_t a, b;
-	char str[RLC_FB_BITS + 1];
-	uint8_t bin[RLC_FB_BYTES];
-	dig_t d;
-
-	fb_null(a);
-	fb_null(b);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-
-		TEST_CASE("copy and comparison are consistent") {
-			fb_rand(a);
-			fb_rand(b);
-			if (fb_cmp(a, b) != RLC_EQ) {
-				fb_copy(b, a);
-				TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("assignment and comparison are consistent") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_zero(b);
-			TEST_ASSERT(fb_cmp(a, b) == RLC_NE, end);
-			TEST_ASSERT(fb_cmp(b, a) == RLC_NE, end);
-			TEST_ASSERT(fb_is_zero(b), end);
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fb_set_dig(a, d);
-			TEST_ASSERT(fb_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		bits = 0;
-		TEST_CASE("bit setting and getting are consistent") {
-			fb_zero(a);
-			fb_set_bit(a, bits, 1);
-			TEST_ASSERT(fb_get_bit(a, bits) == 1, end);
-			fb_set_bit(a, bits, 0);
-			TEST_ASSERT(fb_get_bit(a, bits) == 0, end);
-			bits = (bits + 1) % RLC_FB_BITS;
-		}
-		TEST_END;
-
-		bits = 0;
-		TEST_CASE("bit assignment and counting are consistent") {
-			fb_zero(a);
-			fb_set_bit(a, bits, 1);
-			TEST_ASSERT(fb_bits(a) == bits + 1, end);
-			bits = (bits + 1) % RLC_FB_BITS;
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a binary field element are consistent") {
-			fb_rand(a);
-			for (int j = 1; j < 7; j++) {
-				bits = fb_size_str(a, 1 << j);
-				fb_write_str(str, bits, a, 1 << j);
-				fb_read_str(b, str, bits, 1 << j);
-				TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-			}
-			fb_write_bin(bin, sizeof(bin), a);
-			fb_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a binary field element is correct") {
-			fb_rand(a);
-			TEST_ASSERT(fb_size_str(a, 2) == (1 + fb_bits(a)), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	return code;
-}
-
-static int addition(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c, d, e;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	fb_null(d);
-	fb_null(e);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		fb_new(d);
-		fb_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_add(d, a, b);
-			fb_add(e, b, a);
-			TEST_ASSERT(fb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_rand(c);
-			fb_add(d, a, b);
-			fb_add(d, d, c);
-			fb_add(e, b, c);
-			fb_add(e, a, e);
-			TEST_ASSERT(fb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fb_rand(a);
-			fb_zero(d);
-			fb_add(e, a, d);
-			TEST_ASSERT(fb_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fb_rand(a);
-			fb_copy(d, a);
-			fb_add(e, a, d);
-			TEST_ASSERT(fb_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("addition of the modulo f(z) is correct") {
-			fb_rand(a);
-			fb_poly_add(d, a);
-			fb_add(e, a, fb_poly_get());
-			TEST_ASSERT(fb_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	fb_free(d);
-	fb_free(e);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c, d;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	fb_null(d);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		fb_new(d);
-
-		TEST_CASE("multiplication is commutative") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_mul(c, a, b);
-			fb_mul(d, b, a);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_rand(c);
-			fb_mul(d, a, b);
-			fb_mul(d, d, c);
-			fb_mul(b, b, c);
-			fb_mul(c, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_rand(c);
-			fb_add(d, a, b);
-			fb_mul(d, c, d);
-			fb_mul(a, c, a);
-			fb_mul(b, c, b);
-			fb_add(c, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fb_rand(a);
-			fb_zero(c);
-			fb_set_bit(c, 0, 1);
-			fb_mul(d, a, c);
-			TEST_ASSERT(fb_cmp(d, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fb_rand(a);
-			fb_zero(b);
-			fb_mul(c, a, b);
-			TEST_ASSERT(fb_is_zero(c), end);
-		} TEST_END;
-
-#if FB_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_mul(c, a, b);
-			fb_mul_basic(d, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FB_MUL == LODAH || !defined(STRIP)
-		TEST_CASE("lopez-dahab multiplication is correct") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_mul(c, a, b);
-			fb_mul_lodah(d, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FB_MUL == INTEG || !defined(STRIP)
-		TEST_CASE("integrated multiplication is correct") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_mul(c, a, b);
-			fb_mul_integ(d, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FB_KARAT > 0 || !defined(STRIP)
-		TEST_CASE("karatsuba multiplication is correct") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_mul(c, a, b);
-			fb_mul_karat(d, a, b);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	fb_free(d);
-	return code;
-}
-
-static int squaring(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fb_rand(a);
-			fb_mul(b, a, a);
-			fb_sqr(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_SQR == BASIC || !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fb_rand(a);
-			fb_sqr(b, a);
-			fb_sqr_basic(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_SQR == QUICK || !defined(STRIP)
-		TEST_CASE("table squaring is correct") {
-			fb_rand(a);
-			fb_sqr(b, a);
-			fb_sqr_quick(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_SQR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated squaring is correct") {
-			fb_rand(a);
-			fb_sqr(b, a);
-			fb_sqr_integ(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	return code;
-}
-
-static int square_root(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-
-		TEST_CASE("square root extraction is correct") {
-			fb_rand(a);
-			fb_sqr(c, a);
-			fb_srt(b, c);
-			TEST_ASSERT(fb_cmp(b, a) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_SRT == BASIC || !defined(STRIP)
-		TEST_CASE("basic square root extraction is correct") {
-			fb_rand(a);
-			fb_srt(b, a);
-			fb_srt_basic(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_SRT == QUICK || !defined(STRIP)
-		TEST_CASE("fast square root extraction is correct") {
-			fb_rand(a);
-			fb_srt(b, a);
-			fb_srt_quick(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	return code;
-}
-
-static int shifting(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-
-		TEST_CASE("shifting by 1 bit is consistent") {
-			fb_rand(a);
-			a[RLC_FB_DIGS - 1] = 0;
-			fb_lsh(b, a, 1);
-			fb_rsh(c, b, 1);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 2 bits is consistent") {
-			fb_rand(a);
-			a[RLC_FB_DIGS - 1] = 0;
-			fb_lsh(b, a, 2);
-			fb_rsh(c, b, 2);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by half digit is consistent") {
-			fb_rand(a);
-			a[RLC_FB_DIGS - 1] = 0;
-			fb_lsh(b, a, RLC_DIG / 2);
-			fb_rsh(c, b, RLC_DIG / 2);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 1 digit is consistent") {
-			fb_rand(a);
-			a[RLC_FB_DIGS - 1] = 0;
-			fb_lsh(b, a, RLC_DIG);
-			fb_rsh(c, b, RLC_DIG);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		if (RLC_FB_DIGS > 1) {
-			TEST_CASE("shifting by 2 digits is consistent") {
-				fb_rand(a);
-				a[RLC_FB_DIGS - 1] = 0;
-				a[RLC_FB_DIGS - 2] = 0;
-				fb_lsh(b, a, 2 * RLC_DIG);
-				fb_rsh(c, b, 2 * RLC_DIG);
-				TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-			} TEST_END;
-
-			TEST_CASE("shifting by 1 digit and half is consistent") {
-				fb_rand(a);
-				a[RLC_FB_DIGS - 1] = 0;
-				a[RLC_FB_DIGS - 2] = 0;
-				fb_lsh(b, a, RLC_DIG + RLC_DIG / 2);
-				fb_rsh(c, b, (RLC_DIG + RLC_DIG / 2));
-				TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-			} TEST_END;
-		}
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	return code;
-}
-
-static int reduction(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-	dv_t t0, t1;
-	dig_t carry;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	dv_null(t0);
-	dv_null(t1);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		dv_new(t0);
-		dv_new(t1);
-
-		TEST_CASE("modular reduction is correct") {
-			if (FB_POLYN % RLC_DIG == 0) {
-				/* Test if a * f(z) mod f(z) == 0. */
-				fb_rand(a);
-				fb_mul(b, a, fb_poly_get());
-				fb_copy(t0, b);
-				fb_copy(t0 + RLC_FB_DIGS, a);
-				fb_rdc(a, t0);
-			} else {
-				/* Test if f(z) * z^(m-1) mod f(z) == 0. */
-				dv_zero(t0, RLC_FB_DIGS);
-				carry = fb_lshb_low(t0 + RLC_FB_DIGS - 1, fb_poly_get(),
-						FB_POLYN % RLC_DIG - 1);
-				t0[2 * RLC_FB_DIGS - 1] = carry;
-				fb_rdc(a, t0);
-			}
-			TEST_ASSERT(fb_is_zero(a) == 1, end);
-		}
-		TEST_END;
-
-#if FB_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic modular reduction is correct") {
-			dv_zero(t0, 2 * RLC_FB_DIGS);
-			dv_zero(t1, 2 * RLC_FB_DIGS);
-			fb_rand(a);
-			fb_copy(t0 + RLC_FB_DIGS - 1, a);
-			fb_copy(t1 + RLC_FB_DIGS - 1, a);
-			fb_rdc(b, t0);
-			fb_rdc_basic(c, t1);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FB_RDC == QUICK || !defined(STRIP)
-		TEST_CASE("fast modular reduction is correct") {
-			dv_zero(t0, 2 * RLC_FB_DIGS);
-			dv_zero(t1, 2 * RLC_FB_DIGS);
-			fb_rand(a);
-			fb_copy(t0 + RLC_FB_DIGS - 1, a);
-			fb_copy(t1 + RLC_FB_DIGS - 1, a);
-			fb_rdc(b, t0);
-			fb_rdc_quick(c, t1);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	dv_free(t0);
-	dv_free(t1);
-	return code;
-}
-
-static int trace(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-
-		TEST_CASE("trace is linear") {
-			fb_rand(a);
-			fb_rand(b);
-			fb_add(c, a, b);
-			TEST_ASSERT(fb_trc(c) == (fb_trc(a) ^ fb_trc(b)), end);
-		} TEST_END;
-
-#if FB_TRC == BASIC || !defined(STRIP)
-		TEST_CASE("basic trace is correct") {
-			fb_rand(a);
-			TEST_ASSERT(fb_trc(a) == fb_trc_basic(a), end);
-		} TEST_END;
-#endif
-
-#if FB_TRC == QUICK || !defined(STRIP)
-		TEST_CASE("fast trace is correct") {
-			fb_rand(a);
-			TEST_ASSERT(fb_trc(a) == fb_trc_quick(a), end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	return code;
-}
-
-static int solve(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-
-		TEST_CASE("solving a quadratic equation is correct") {
-			fb_rand(a);
-			fb_rand(b);
-			/* Make Tr(a) = 0. */
-			fb_add_dig(a, a, fb_trc(a));
-			fb_slv(b, a);
-			/* Verify the solution. */
-			fb_sqr(c, b);
-			fb_add(c, c, b);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_SLV == BASIC || !defined(STRIP)
-		TEST_CASE("basic solve is correct") {
-			fb_rand(a);
-			/* Make Tr(a) = 0. */
-			fb_add_dig(a, a, fb_trc(a));
-			fb_slv(c, a);
-			fb_slv_basic(b, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_SLV == QUICK || !defined(STRIP)
-		TEST_CASE("fast solve is correct") {
-			fb_rand(a);
-			/* Make Tr(a) = 0. */
-			fb_add_dig(a, a, fb_trc(a));
-			fb_slv(b, a);
-			fb_slv_quick(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	return code;
-}
-
-static int inversion(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c, d[2];
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	fb_null(d[0]);
-	fb_null(d[1]);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		fb_new(d[0]);
-		fb_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_mul(c, a, b);
-			TEST_ASSERT(fb_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_INV == BASIC || !defined(STRIP)
-		TEST_CASE("basic inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_basic(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == BINAR || !defined(STRIP)
-		TEST_CASE("binary inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_binar(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == ALMOS || !defined(STRIP)
-		TEST_CASE("almost inverse is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_almos(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == EXGCD || !defined(STRIP)
-		TEST_CASE("euclidean inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_exgcd(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == BRUCH || !defined(STRIP)
-		TEST_CASE("brunner inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_bruch(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == ITOHT || !defined(STRIP)
-		TEST_CASE("itoh-tsuji inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_itoht(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == CTAIA || !defined(STRIP)
-		TEST_CASE("constant-time almost inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_ctaia(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_INV == LOWER || !defined(STRIP)
-		TEST_CASE("lower inversion is correct") {
-			do {
-				fb_rand(a);
-			} while (fb_is_zero(a));
-			fb_inv(b, a);
-			fb_inv_lower(c, a);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fb_rand(a);
-				fb_rand(b);
-			} while (fb_is_zero(a) || fb_is_zero(b));
-			fb_copy(d[0], a);
-			fb_copy(d[1], b);
-			fb_inv(a, a);
-			fb_inv(b, b);
-			fb_inv_sim(d, (const fb_t *)d, 2);
-			TEST_ASSERT(fb_cmp(d[0], a) == RLC_EQ &&
-					fb_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	fb_free(d[0]);
-	fb_free(d[1]);
-	return code;
-}
-
-static int exponentiation(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c;
-	fb_st t[RLC_FB_TABLE_MAX];
-	bn_t d;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fb_rand(a);
-			bn_zero(d);
-			fb_exp(c, a, d);
-			TEST_ASSERT(fb_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fb_exp(c, a, d);
-			TEST_ASSERT(fb_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FB_BITS);
-			fb_exp(b, a, d);
-			bn_neg(d, d);
-			fb_exp(c, a, d);
-			fb_inv(c, c);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-			bn_set_2b(d, RLC_FB_BITS);
-			fb_exp(c, a, d);
-			TEST_ASSERT(fb_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_EXP == BASIC || !defined(STRIP)
-		TEST_CASE("basic exponentiation is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, RLC_FB_BITS);
-			fb_exp(c, a, d);
-			fb_exp_basic(b, a, d);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_EXP == SLIDE || !defined(STRIP)
-		TEST_CASE("sliding window exponentiation is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, RLC_FB_BITS);
-			fb_exp(c, a, d);
-			fb_exp_slide(b, a, d);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_EXP == MONTY || !defined(STRIP)
-		TEST_CASE("constant-time exponentiation is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, RLC_FB_BITS);
-			fb_exp(c, a, d);
-			fb_exp_monty(b, a, d);
-			TEST_ASSERT(fb_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("iterated squaring is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_pre(t, d->dp[0]);
-			fb_itr(b, a, d->dp[0], (const fb_st *)t);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_sqr(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("iterated square-root is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_pre(t, -d->dp[0]);
-			fb_itr(b, a, -d->dp[0], (const fb_st *)t);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_srt(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-#if FB_ITR == BASIC || !defined(STRIP)
-		TEST_CASE("basic iterated squaring is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_basic(b, a, d->dp[0]);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_sqr(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("basic iterated square-root is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_basic(b, a, -d->dp[0]);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_srt(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FB_ITR == QUICK || !defined(STRIP)
-		TEST_CASE("fast iterated squaring is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_pre_quick(t, d->dp[0]);
-			fb_itr_quick(b, a, (const fb_st *)t);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_sqr(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("fast iterated square-root is correct") {
-			fb_rand(a);
-			bn_rand(d, RLC_POS, 4);
-			fb_itr_pre_quick(t, -d->dp[0]);
-			fb_itr_quick(b, a, (const fb_st *)t);
-			for (int j = 0; j < d->dp[0]; j++) {
-				fb_srt(a, a);
-			}
-			TEST_ASSERT(fb_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int digit(void) {
-	int code = RLC_ERR;
-	fb_t a, b, c, d;
-	dig_t g;
-
-	fb_null(a);
-	fb_null(b);
-	fb_null(c);
-	fb_null(d);
-
-	RLC_TRY {
-		fb_new(a);
-		fb_new(b);
-		fb_new(c);
-		fb_new(d);
-
-		TEST_CASE("addition of a single digit is consistent") {
-			fb_rand(a);
-			fb_rand(b);
-			for (int j = 1; j < RLC_FB_DIGS; j++)
-				b[j] = 0;
-			g = b[0];
-			fb_add(c, a, b);
-			fb_add_dig(d, a, g);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by a single digit is consistent") {
-			fb_rand(a);
-			fb_rand(b);
-			for (int j = 1; j < RLC_FB_DIGS; j++) {
-				b[j] = 0;
-			}
-			g = b[0];
-			fb_mul(c, a, b);
-			fb_mul_dig(d, a, g);
-			TEST_ASSERT(fb_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	fb_free(c);
-	fb_free(d);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the FB module", 0);
-
-	RLC_TRY {
-		fb_param_set_any();
-		fb_param_print();
-	}
-	RLC_CATCH_ANY {
-		core_clean();
-		return 0;
-	}
-
-	util_banner("Utilities", 1);
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Arithmetic", 1);
-
-	if (addition() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (multiplication() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (squaring() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (square_root() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (shifting() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (reduction() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (trace() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (RLC_FB_BITS % 2 != 0) {
-		if (solve() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (inversion() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (exponentiation() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (digit() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_fbx.c b/src/dashbls/depends/relic/test/test_fbx.c
deleted file mode 100644
index 744cad0d4cf9..000000000000
--- a/src/dashbls/depends/relic/test/test_fbx.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for extensions defined over binary fields.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory2(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fb2_t a;
-
-	fb2_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fb2_new(a);
-			fb2_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b;
-
-	fb2_null(a);
-	fb2_null(b);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-
-		TEST_CASE("comparison is consistent") {
-			fb2_rand(a);
-			fb2_rand(b);
-			if (fb2_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fb2_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fb2_rand(a);
-			fb2_rand(b);
-			if (fb2_cmp(a, b) != RLC_EQ) {
-				fb2_copy(b, a);
-				TEST_ASSERT(fb2_cmp(b, a) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("assignment and comparison are consistent") {
-			do {
-				fb2_rand(a);
-			} while (fb2_is_zero(a));
-			fb2_zero(b);
-			TEST_ASSERT(fb2_cmp(a, b) == RLC_NE, end);
-			TEST_ASSERT(fb2_cmp(b, a) == RLC_NE, end);
-			TEST_ASSERT(fb2_is_zero(b), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	return code;
-}
-
-static int addition2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b, c, d, e;
-
-	fb2_null(a);
-	fb2_null(b);
-	fb2_null(c);
-	fb2_null(d);
-	fb2_null(e);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-		fb2_new(c);
-		fb2_new(d);
-		fb2_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fb2_rand(a);
-			fb2_rand(b);
-			fb2_add(d, a, b);
-			fb2_add(e, b, a);
-			TEST_ASSERT(fb2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fb2_rand(a);
-			fb2_rand(b);
-			fb2_rand(c);
-			fb2_add(d, a, b);
-			fb2_add(d, d, c);
-			fb2_add(e, b, c);
-			fb2_add(e, a, e);
-			TEST_ASSERT(fb2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fb2_rand(a);
-			fb2_zero(d);
-			fb2_add(e, a, d);
-			TEST_ASSERT(fb2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fb2_rand(a);
-			fb2_copy(d, a);
-			fb2_add(e, a, d);
-			TEST_ASSERT(fb2_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-	fb2_free(d);
-	fb2_free(e);
-	return code;
-}
-
-static int multiplication2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b, c, d, e, f;
-
-	fb2_null(a);
-	fb2_null(b);
-	fb2_null(c);
-	fb2_null(d);
-	fb2_null(e);
-	fb2_null(f);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-		fb2_new(c);
-		fb2_new(d);
-		fb2_new(e);
-		fb2_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fb2_rand(a);
-			fb2_rand(b);
-			fb2_mul(d, a, b);
-			fb2_mul(e, b, a);
-			TEST_ASSERT(fb2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fb2_rand(a);
-			fb2_rand(b);
-			fb2_rand(c);
-			fb2_mul(d, a, b);
-			fb2_mul(d, d, c);
-			fb2_mul(e, b, c);
-			fb2_mul(e, a, e);
-			TEST_ASSERT(fb2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fb2_rand(a);
-			fb2_rand(b);
-			fb2_rand(c);
-			fb2_add(d, a, b);
-			fb2_mul(d, c, d);
-			fb2_mul(e, c, a);
-			fb2_mul(f, c, b);
-			fb2_add(e, e, f);
-			TEST_ASSERT(fb2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fb2_zero(d);
-			fb_set_bit(d[0], 0, 1);
-			fb2_rand(a);
-			fb2_mul(e, a, d);
-			TEST_ASSERT(fb2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fb2_zero(d);
-			fb2_rand(a);
-			fb2_mul(e, a, d);
-			TEST_ASSERT(fb2_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-	fb2_free(d);
-	fb2_free(e);
-	fb2_free(f);
-	return code;
-}
-
-static int squaring2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b, c;
-
-	fb2_null(a);
-	fb2_null(b);
-	fb2_null(c);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-		fb2_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fb2_rand(a);
-			fb2_mul(b, a, a);
-			fb2_sqr(c, a);
-			TEST_ASSERT(fb2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-	return code;
-}
-
-static int solve2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b, c;
-
-	fb2_null(a);
-	fb2_null(b);
-	fb2_null(c);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-		fb2_new(c);
-
-		TEST_CASE("solving a quadratic equation is correct") {
-			fb2_rand(a);
-			fb2_rand(b);
-			/* Make Tr(a_1) = 0. */
-			fb_add_dig(a[0], a[0], fb_trc(a[0]));
-			fb_add_dig(a[1], a[1], fb_trc(a[1]));
-			fb2_slv(b, a);
-			/* Verify the solution. */
-			fb2_sqr(c, b);
-			fb2_add(c, c, b);
-			TEST_ASSERT(fb2_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-	return code;
-}
-
-static int inversion2(void) {
-	int code = RLC_ERR;
-	fb2_t a, b, c;
-
-	fb2_null(a);
-	fb2_null(b);
-	fb2_null(c);
-
-	RLC_TRY {
-		fb2_new(a);
-		fb2_new(b);
-		fb2_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fb2_rand(a);
-			} while (fb2_is_zero(a));
-			fb2_inv(b, a);
-			fb2_mul(c, a, b);
-			TEST_ASSERT(fb_cmp_dig(c[0], 1) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb2_free(a);
-	fb2_free(b);
-	fb2_free(c);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the FBX module", 0);
-
-	RLC_TRY {
-		fb_param_set_any();
-	} RLC_CATCH_ANY {
-		core_clean();
-		return 0;
-	}
-
-	util_banner("Quadratic extension:", 0);
-	util_banner("Utilities:", 1);
-
-	if (memory2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (multiplication2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (squaring2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (solve2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (inversion2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_fp.c b/src/dashbls/depends/relic/test/test_fp.c
deleted file mode 100644
index 291829f8b2bf..000000000000
--- a/src/dashbls/depends/relic/test/test_fp.c
+++ /dev/null
@@ -1,1169 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for prime field arithmetic.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-#include "relic_fp_low.h"
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp_t a;
-
-	fp_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp_new(a);
-			fp_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util(void) {
-	int bits, code = RLC_ERR;
-	/* Allocate two extra for sign and null terminator. */
-	char str[RLC_FP_BITS + 2];
-	uint8_t bin[RLC_FP_BYTES];
-	fp_t a, b;
-	bn_t c, e;
-	dig_t d;
-
-	fp_null(a);
-	fp_null(b);
-	bn_null(c);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		bn_new(c);
-		bn_new(e);
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp_rand(a);
-			fp_rand(b);
-			if (fp_cmp(a, b) != RLC_EQ) {
-				fp_copy(b, a);
-				TEST_ASSERT(fp_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp_zero(a);
-			fp_neg(b, a);
-			TEST_ASSERT(dv_cmp(a, b, RLC_FP_DIGS) == RLC_EQ, end);
-			fp_rand(a);
-			fp_neg(b, a);
-			if (fp_cmp(a, b) != RLC_EQ) {
-				if (dv_cmp(a, b, RLC_FP_DIGS) == RLC_GT) {
-					TEST_ASSERT(dv_cmp(b, a, RLC_FP_DIGS) == RLC_LT, end);
-				} else {
-					TEST_ASSERT(dv_cmp(b, a, RLC_FP_DIGS) == RLC_GT, end);
-				}
-			}
-			fp_neg(b, b);
-			TEST_ASSERT(dv_cmp(a, b, RLC_FP_DIGS) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment and comparison are consistent") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_zero(b);
-			TEST_ASSERT(fp_cmp(a, b) == RLC_NE, end);
-			TEST_ASSERT(fp_cmp(b, a) == RLC_NE, end);
-			TEST_ASSERT(fp_is_zero(b), end);
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp_set_dig(a, d);
-			TEST_ASSERT(fp_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		bits = 0;
-		TEST_CASE("bit setting and getting are consistent") {
-			fp_zero(a);
-			fp_set_bit(a, bits, 1);
-			TEST_ASSERT(fp_get_bit(a, bits) == 1, end);
-			fp_set_bit(a, bits, 0);
-			TEST_ASSERT(fp_get_bit(a, bits) == 0, end);
-			bits = (bits + 1) % RLC_FP_BITS;
-		}
-		TEST_END;
-
-		bits = 0;
-		TEST_CASE("bit assignment and counting are consistent") {
-			fp_zero(a);
-			fp_set_bit(a, bits, 1);
-			TEST_ASSERT(fp_bits(a) == bits + 1, end);
-			bits = (bits + 1) % RLC_FP_BITS;
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a prime field element are consistent") {
-			for (int j = 2; j <= 64; j++) {
-				fp_rand(a);
-				bits = fp_size_str(a, j);
-				fp_write_str(str, bits, a, j);
-				fp_read_str(b, str, strlen(str), j);
-				TEST_ASSERT(fp_cmp(a, b) == RLC_EQ, end);
-				/* Test also negative integers. */
-				memmove(str + 1, str, strlen(str) + 1);
-				str[0] = '-';
-				fp_read_str(b, str, strlen(str), j);
-				fp_neg(a, a);
-				TEST_ASSERT(fp_cmp(a, b) == RLC_EQ, end);
-			}
-			fp_write_bin(bin, sizeof(bin), a);
-			fp_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp_rand(a);
-			fp_prime_back(c, a);
-			TEST_ASSERT(fp_size_str(a, 2) == (1 + bn_bits(c)), end);
-		}
-		TEST_END;
-
-		TEST_CASE("converting to and from a prime field element are consistent") {
-			bn_rand(c, RLC_POS, FP_PRIME);
-			bn_mod(c, c, &core_get()->prime);
-			fp_prime_conv(a, c);
-			fp_prime_back(e, a);
-			TEST_ASSERT(bn_cmp(c, e) == RLC_EQ, end);
-			bn_rand(c, RLC_POS, FP_PRIME / 2);
-			bn_mod(c, c, &core_get()->prime);
-			fp_prime_conv(a, c);
-			fp_prime_back(e, a);
-			TEST_ASSERT(bn_cmp(c, e) == RLC_EQ, end);
-			fp_prime_conv_dig(a, c->dp[0]);
-			fp_prime_back(e, a);
-			TEST_ASSERT(bn_cmp_dig(e, c->dp[0]) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	bn_free(c);
-	bn_free(e);
-	return code;
-}
-
-static int addition(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c, d, e;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	fp_null(d);
-	fp_null(e);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		fp_new(d);
-		fp_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_add(d, a, b);
-			fp_add(e, b, a);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_rand(c);
-			fp_add(d, a, b);
-			fp_add(d, d, c);
-			fp_add(e, b, c);
-			fp_add(e, a, e);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp_rand(a);
-			fp_zero(d);
-			fp_add(e, a, d);
-			TEST_ASSERT(fp_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp_rand(a);
-			fp_neg(d, a);
-			fp_add(e, a, d);
-			TEST_ASSERT(fp_is_zero(e), end);
-		} TEST_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("basic addition is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_add(d, a, b);
-			fp_add_basic(e, a, b);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-		TEST_CASE("integrated addition is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_add(d, a, b);
-			fp_add_integ(e, a, b);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	fp_free(d);
-	fp_free(e);
-	return code;
-}
-
-static int subtraction(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c, d;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	fp_null(d);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		fp_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_sub(c, a, b);
-			fp_sub(d, b, a);
-			fp_neg(d, d);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp_rand(a);
-			fp_zero(c);
-			fp_sub(d, a, c);
-			TEST_ASSERT(fp_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp_rand(a);
-			fp_sub(c, a, a);
-			TEST_ASSERT(fp_is_zero(c), end);
-		}
-		TEST_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("basic subtraction is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_sub(c, a, b);
-			fp_sub_basic(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-		TEST_CASE("integrated subtraction is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_sub(c, a, b);
-			fp_sub_integ(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("basic negation is correct") {
-			fp_rand(a);
-			fp_neg(c, a);
-			fp_neg_basic(d, a);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-		TEST_CASE("integrated negation is correct") {
-			fp_rand(a);
-			fp_neg(c, a);
-			fp_neg_integ(d, a);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	fp_free(d);
-	return code;
-}
-
-static int multiplication(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c, d, e, f;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	fp_null(d);
-	fp_null(e);
-	fp_null(f);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		fp_new(d);
-		fp_new(e);
-		fp_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_mul(d, a, b);
-			fp_mul(e, b, a);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_rand(c);
-			fp_mul(d, a, b);
-			fp_mul(d, d, c);
-			fp_mul(e, b, c);
-			fp_mul(e, a, e);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_rand(c);
-			fp_add(d, a, b);
-			fp_mul(d, c, d);
-			fp_mul(e, c, a);
-			fp_mul(f, c, b);
-			fp_add(e, e, f);
-			TEST_ASSERT(fp_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp_rand(a);
-			fp_set_dig(d, 1);
-			fp_mul(e, a, d);
-			TEST_ASSERT(fp_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp_rand(a);
-			fp_zero(d);
-			fp_mul(e, a, d);
-			TEST_ASSERT(fp_is_zero(e), end);
-		} TEST_END;
-
-#if FP_MUL == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_mul(c, a, b);
-			fp_mul_basic(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FP_MUL == INTEG || !defined(STRIP)
-		TEST_CASE("integrated multiplication is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_mul(c, a, b);
-			fp_mul_integ(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FP_MUL == COMBA || !defined(STRIP)
-		TEST_CASE("comba multiplication is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_mul(c, a, b);
-			fp_mul_comba(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FP_KARAT > 0 || !defined(STRIP)
-		TEST_CASE("karatsuba multiplication is correct") {
-			fp_rand(a);
-			fp_rand(b);
-			fp_mul(c, a, b);
-			fp_mul_karat(d, a, b);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	fp_free(d);
-	fp_free(e);
-	fp_free(f);
-	return code;
-}
-
-static int squaring(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp_rand(a);
-			fp_mul(b, a, a);
-			fp_sqr(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FP_SQR == BASIC || !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp_rand(a);
-			fp_sqr(b, a);
-			fp_sqr_basic(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_SQR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated squaring is correct") {
-			fp_rand(a);
-			fp_sqr(b, a);
-			fp_sqr_integ(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_SQR == COMBA || !defined(STRIP)
-		TEST_CASE("comba squaring is correct") {
-			fp_rand(a);
-			fp_sqr(b, a);
-			fp_sqr_comba(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_KARAT > 0 || !defined(STRIP)
-		TEST_CASE("karatsuba squaring is correct") {
-			fp_rand(a);
-			fp_sqr(b, a);
-			fp_sqr_karat(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	return code;
-}
-
-static int doubling_halving(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-
-		TEST_CASE("doubling is consistent") {
-			fp_rand(a);
-			fp_add(b, a, a);
-			fp_dbl(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("basic doubling is correct") {
-			fp_rand(a);
-			fp_dbl(b, a);
-			fp_dbl_basic(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-		TEST_CASE("integrated doubling is correct") {
-			fp_rand(a);
-			fp_dbl(b, a);
-			fp_dbl_integ(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("halving is consistent") {
-			fp_rand(a);
-			fp_dbl(b, a);
-			fp_hlv(c, b);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-#if FP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("basic halving is correct") {
-			fp_rand(a);
-			fp_hlv(b, a);
-			fp_hlv_basic(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_ADD == INTEG || !defined(STRIP)
-		TEST_CASE("integrated halving is correct") {
-			fp_rand(a);
-			fp_hlv(b, a);
-			fp_hlv_integ(c, a);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	return code;
-}
-
-static int shifting(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-
-		TEST_CASE("shifting by 1 bit is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			fp_lsh(b, a, 1);
-			fp_rsh(c, b, 1);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 2 bits is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			fp_lsh(b, a, 2);
-			fp_rsh(c, b, 2);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by half digit is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			fp_lsh(b, a, RLC_DIG / 2);
-			fp_rsh(c, b, RLC_DIG / 2);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 1 digit is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			fp_lsh(b, a, RLC_DIG);
-			fp_rsh(c, b, RLC_DIG);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 2 digits is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			a[RLC_FP_DIGS - 2] = 0;
-			fp_lsh(b, a, 2 * RLC_DIG);
-			fp_rsh(c, b, 2 * RLC_DIG);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("shifting by 1 digit and half is consistent") {
-			fp_rand(a);
-			a[RLC_FP_DIGS - 1] = 0;
-			a[RLC_FP_DIGS - 2] = 0;
-			fp_lsh(b, a, RLC_DIG + RLC_DIG / 2);
-			fp_rsh(c, b, (RLC_DIG + RLC_DIG / 2));
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	return code;
-}
-
-static int reduction(void) {
-	int code = RLC_ERR;
-	fp_t a, b;
-	dv_t t;
-
-	fp_null(a);
-	fp_null(b);
-	dv_null(t);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		dv_new(t);
-		dv_zero(t, 2 * RLC_FP_DIGS);
-
-		TEST_CASE("modular reduction is correct") {
-			fp_rand(a);
-			dv_copy(t, fp_prime_get(), RLC_FP_DIGS);
-			/* Test if a * p mod p == 0. */
-			fp_mul(b, a, t);
-			TEST_ASSERT(fp_is_zero(b) == 1, end);
-		} TEST_END;
-
-#if FP_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic modular reduction is correct") {
-			fp_rand(a);
-			fp_muln_low(t, a, fp_prime_get());
-			fp_rdc_basic(b, t);
-			TEST_ASSERT(fp_is_zero(b), end);
-		} TEST_END;
-#endif
-
-#if FP_RDC == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery modular reduction is correct") {
-			fp_rand(a);
-			fp_muln_low(t, a, fp_prime_get());
-			fp_rdc_monty(b, t);
-			TEST_ASSERT(fp_is_zero(b), end);
-		} TEST_END;
-#endif
-
-#if FP_RDC == QUICK || !defined(STRIP)
-		if (fp_prime_get_sps(NULL) != NULL) {
-			TEST_CASE("fast modular reduction is correct") {
-				fp_rand(a);
-				fp_muln_low(t, a, fp_prime_get());
-				fp_rdc_quick(b, t);
-				TEST_ASSERT(fp_is_zero(b), end);
-			}
-			TEST_END;
-		}
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fb_free(a);
-	fb_free(b);
-	dv_free(t);
-	return code;
-}
-
-static int inversion(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c, d[2];
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	fp_null(d[0]);
-	fp_null(d[1]);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		fp_new(d[0]);
-		fp_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_mul(c, a, b);
-			fp_set_dig(b, 1);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-
-#if FP_INV == BASIC || !defined(STRIP)
-		TEST_CASE("basic inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_basic(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_INV == BINAR || !defined(STRIP)
-		TEST_CASE("binary inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_binar(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_INV == MONTY || !defined(STRIP)
-		TEST_CASE("montgomery inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_monty(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_INV == EXGCD || !defined(STRIP)
-		TEST_CASE("euclidean inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_exgcd(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_INV == DIVST || !defined(STRIP)
-		TEST_CASE("division step inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_divst(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FP_INV == LOWER || !defined(STRIP)
-		TEST_CASE("lower inversion is correct") {
-			do {
-				fp_rand(a);
-			} while (fp_is_zero(a));
-			fp_inv(b, a);
-			fp_inv_lower(c, a);
-			TEST_ASSERT(fp_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp_rand(a);
-				fp_rand(b);
-			} while (fp_is_zero(a) || fp_is_zero(b));
-			fp_copy(d[0], a);
-			fp_copy(d[1], b);
-			fp_inv(a, a);
-			fp_inv(b, b);
-			fp_inv_sim(d, (const fp_t *)d, 2);
-			TEST_ASSERT(fp_cmp(d[0], a) == RLC_EQ &&
-					fp_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	fp_free(d[0]);
-	fp_free(d[1]);
-	return code;
-}
-
-static int exponentiation(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c;
-	bn_t d;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp_rand(a);
-			bn_zero(d);
-			fp_exp(c, a, d);
-			TEST_ASSERT(fp_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp_exp(c, a, d);
-			TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp_exp(b, a, d);
-			bn_neg(d, d);
-			fp_exp(c, a, d);
-			fp_inv(c, c);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp_exp(c, a, d);
-			TEST_ASSERT(fp_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-#if FP_EXP == BASIC || !defined(STRIP)
-		TEST_CASE("basic exponentiation is correct") {
-			fp_rand(a);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp_exp(c, a, d);
-			fp_exp_basic(b, a, d);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FP_EXP == SLIDE || !defined(STRIP)
-		TEST_CASE("sliding window exponentiation is correct") {
-			fp_rand(a);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp_exp(c, a, d);
-			fp_exp_slide(b, a, d);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if FP_EXP == MONTY || !defined(STRIP)
-		TEST_CASE("constant-time exponentiation is correct") {
-			fp_rand(a);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp_exp(c, a, d);
-			fp_exp_monty(b, a, d);
-			TEST_ASSERT(fp_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int square_root(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-
-		TEST_CASE("square root extraction is correct") {
-			fp_rand(a);
-			fp_sqr(c, a);
-			TEST_ASSERT(fp_srt(b, c), end);
-			fp_neg(c, b);
-			TEST_ASSERT(fp_cmp(b, a) == RLC_EQ || fp_cmp(c, a) == RLC_EQ, end);
-			fp_rand(a);
-			if (fp_srt(b, a)) {
-				fp_sqr(c, b);
-				TEST_ASSERT(fp_cmp(c, a) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	return code;
-}
-
-static int digit(void) {
-	int code = RLC_ERR;
-	fp_t a, b, c, d;
-	dig_t g;
-
-	fp_null(a);
-	fp_null(b);
-	fp_null(c);
-	fp_null(d);
-
-	RLC_TRY {
-		fp_new(a);
-		fp_new(b);
-		fp_new(c);
-		fp_new(d);
-
-		TEST_CASE("addition of a single digit is consistent") {
-			fp_rand(a);
-			fp_rand(b);
-			for (int j = 1; j < RLC_FP_DIGS; j++)
-				b[j] = 0;
-			g = b[0];
-			fp_set_dig(b, g);
-			fp_add(c, a, b);
-			fp_add_dig(d, a, g);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("subtraction of a single digit is consistent") {
-			fp_rand(a);
-			fp_rand(b);
-			for (int j = 1; j < RLC_FP_DIGS; j++)
-				b[j] = 0;
-			g = b[0];
-			fp_set_dig(b, g);
-			fp_sub(c, a, b);
-			fp_sub_dig(d, a, g);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by a single digit is consistent") {
-			fp_rand(a);
-			fp_rand(b);
-			for (int j = 1; j < RLC_FP_DIGS; j++)
-				b[j] = 0;
-			g = b[0];
-			fp_set_dig(b, g);
-			fp_mul(c, a, b);
-			fp_mul_dig(d, a, g);
-			TEST_ASSERT(fp_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp_free(a);
-	fp_free(b);
-	fp_free(c);
-	fp_free(d);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the FP module", 0);
-
-	RLC_TRY {
-		fp_param_set_any();
-		fp_param_print();
-	} RLC_CATCH_ANY {
-		core_clean();
-		return 0;
-	}
-
-	util_banner("Utilities", 1);
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Arithmetic", 1);
-	if (addition() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (subtraction() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (multiplication() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (squaring() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (doubling_halving() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (shifting() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (reduction() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (inversion() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (exponentiation() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (square_root() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (digit() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_fpx.c b/src/dashbls/depends/relic/test/test_fpx.c
deleted file mode 100644
index a7c8eaa23c55..000000000000
--- a/src/dashbls/depends/relic/test/test_fpx.c
+++ /dev/null
@@ -1,7949 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2012 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for extensions defined over prime fields.
- *
- * @ingroup test
- */
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory2(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp2_t a;
-
-	fp2_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp2_new(a);
-			fp2_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util2(void) {
-	int code = RLC_ERR;
-	uint8_t bin[2 * RLC_FP_BYTES];
-	fp2_t a, b, c;
-	dig_t d;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp2_rand(a);
-			fp2_rand(b);
-			if (fp2_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp2_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_rand(c);
-			if (fp2_cmp(a, c) != RLC_EQ) {
-				fp2_copy(c, a);
-				TEST_ASSERT(fp2_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp2_cmp(b, c) != RLC_EQ) {
-				fp2_copy(c, b);
-				TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp2_rand(a);
-			fp2_neg(b, a);
-			if (fp2_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp2_cmp(b, a) == RLC_NE, end);
-			}
-			fp2_neg(b, b);
-			TEST_ASSERT(fp2_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp2_rand(a);
-			} while (fp2_is_zero(a));
-			fp2_zero(c);
-			TEST_ASSERT(fp2_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp2_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp2_rand(a);
-			} while (fp2_is_zero(a));
-			fp2_rand(c);
-			TEST_ASSERT(fp2_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp2_zero(a);
-			TEST_ASSERT(fp2_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp2_set_dig(a, d);
-			TEST_ASSERT(fp2_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp2_rand(a);
-			fp2_write_bin(bin, sizeof(bin), a, 0);
-			fp2_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp2_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp2_rand(a);
-			TEST_ASSERT(fp2_size_bin(a, 0) == 2 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	return code;
-}
-
-static int addition2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c, d, e;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-	fp2_null(d);
-	fp2_null(e);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		fp2_new(d);
-		fp2_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_add(d, a, b);
-			fp2_add(e, b, a);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_rand(c);
-			fp2_add(d, a, b);
-			fp2_add(d, d, c);
-			fp2_add(e, b, c);
-			fp2_add(e, a, e);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp2_rand(a);
-			fp2_zero(d);
-			fp2_add(e, a, d);
-			TEST_ASSERT(fp2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp2_rand(a);
-			fp2_neg(d, a);
-			fp2_add(e, a, d);
-			TEST_ASSERT(fp2_is_zero(e), end);
-		} TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic addition is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_add(d, a, b);
-			fp2_add_basic(e, a, b);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated addition is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_add(d, a, b);
-			fp2_add_integ(e, a, b);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d);
-	fp2_free(e);
-	return code;
-}
-
-static int subtraction2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c, d;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-	fp2_null(d);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		fp2_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_sub(c, a, b);
-			fp2_sub(d, b, a);
-			fp2_neg(d, d);
-			TEST_ASSERT(fp2_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp2_rand(a);
-			fp2_zero(c);
-			fp2_sub(d, a, c);
-			TEST_ASSERT(fp2_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp2_rand(a);
-			fp2_sub(c, a, a);
-			TEST_ASSERT(fp2_is_zero(c), end);
-		}
-		TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic subtraction is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_sub(c, a, b);
-			fp2_sub_basic(d, a, b);
-			TEST_ASSERT(fp2_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated subtraction is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_sub(c, a, b);
-			fp2_sub_integ(d, a, b);
-			TEST_ASSERT(fp2_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d);
-	return code;
-}
-
-static int doubling2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp2_rand(a);
-			fp2_dbl(b, a);
-			fp2_add(c, a, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic doubling is correct") {
-			fp2_rand(a);
-			fp2_dbl(b, a);
-			fp2_dbl_basic(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated doubling is correct") {
-			fp2_rand(a);
-			fp2_dbl(b, a);
-			fp2_dbl_integ(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	return code;
-}
-
-static int multiplication2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c, d, e, f;
-	bn_t g;
-
-	bn_null(g);
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-	fp2_null(d);
-	fp2_null(e);
-	fp2_null(f);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		fp2_new(d);
-		fp2_new(e);
-		fp2_new(f);
-		bn_new(g);
-
-		TEST_CASE("multiplication is commutative") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_mul(d, a, b);
-			fp2_mul(e, b, a);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_rand(c);
-			fp2_mul(d, a, b);
-			fp2_mul(d, d, c);
-			fp2_mul(e, b, c);
-			fp2_mul(e, a, e);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_rand(c);
-			fp2_add(d, a, b);
-			fp2_mul(d, c, d);
-			fp2_mul(e, c, a);
-			fp2_mul(f, c, b);
-			fp2_add(e, e, f);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp2_rand(a);
-			fp2_set_dig(d, 1);
-			fp2_mul(e, a, d);
-			TEST_ASSERT(fp2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp2_rand(a);
-			fp2_zero(d);
-			fp2_mul(e, a, d);
-			TEST_ASSERT(fp2_is_zero(e), end);
-		} TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_mul(d, a, b);
-			fp2_mul_basic(e, b, a);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated multiplication is correct") {
-			fp2_rand(a);
-			fp2_rand(b);
-			fp2_mul(d, a, b);
-			fp2_mul_integ(e, b, a);
-			TEST_ASSERT(fp2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp2_rand(a);
-			fp2_zero(b);
-			fp_set_dig(b[1], 1);
-			fp2_mul(c, a, b);
-			fp2_mul_art(d, a);
-			TEST_ASSERT(fp2_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by quadratic non-residue is correct") {
-			fp2_rand(a);
-			fp2_mul_nor(b, a);
-			switch (fp_prime_get_mod8()) {
-				case 5:
-					fp2_mul_art(c, a);
-					break;
-				case 3:
-					fp_set_dig(c[0], 1);
-					fp_set_dig(c[1], 1);
-					fp2_mul(c, a, c);
-					break;
-				case 7:
-					fp_set_dig(c[0], fp2_field_get_qnr());
-					fp_set_dig(c[1], 1);
-					fp2_mul(c, a, c);
-					break;
-				default:
-					fp2_copy(c, b);
-					break;
-			}
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication by qnr/cnr is correct") {
-			fp2_rand(a);
-			fp2_mul_nor(b, a);
-			fp2_mul_nor_basic(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated multiplication by qnr/cnr is correct") {
-			fp2_rand(a);
-			fp2_mul_nor(b, a);
-			fp2_mul_nor_integ(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		}
-		TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d);
-	fp2_free(e);
-	fp2_free(f);
-	bn_free(g);
-	return code;
-}
-
-static int squaring2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp2_rand(a);
-			fp2_mul(b, a, a);
-			fp2_sqr(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_QDR == BASIC || !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp2_rand(a);
-			fp2_sqr(b, a);
-			fp2_sqr_basic(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_QDR == INTEG || !defined(STRIP)
-		TEST_CASE("integrated squaring is correct") {
-			fp2_rand(a);
-			fp2_sqr(b, a);
-			fp2_sqr_integ(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	return code;
-}
-
-static int inversion2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c, d[2];
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		fp2_new(d[0]);
-		fp2_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp2_rand(a);
-			} while (fp2_is_zero(a));
-			fp2_inv(b, a);
-			fp2_mul(c, a, b);
-			TEST_ASSERT(fp2_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("inversion of a unitary element is correct") {
-			do {
-				fp2_rand(a);
-			} while (fp2_is_zero(a));
-			fp2_conv_cyc(a, a);
-			fp2_inv(b, a);
-			fp2_inv_cyc(c, a);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp2_rand(a);
-				fp2_rand(b);
-			} while (fp2_is_zero(a) || fp2_is_zero(b));
-			fp2_copy(d[0], a);
-			fp2_copy(d[1], b);
-			fp2_inv(a, a);
-			fp2_inv(b, b);
-			fp2_inv_sim(d, d, 2);
-			TEST_ASSERT(fp2_cmp(d[0], a) == RLC_EQ &&
-					fp2_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d[0]);
-	fp2_free(d[1]);
-	return code;
-}
-
-static int exponentiation2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c;
-	bn_t d;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp2_rand(a);
-			bn_zero(d);
-			fp2_exp(c, a, d);
-			TEST_ASSERT(fp2_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp2_exp(c, a, d);
-			TEST_ASSERT(fp2_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp2_exp(b, a, d);
-			bn_neg(d, d);
-			fp2_exp(c, a, d);
-			fp2_inv(c, c);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			fp2_exp_dig(b, a, d->dp[0]);
-			fp2_exp(c, a, d);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp2_rand(a);
-			fp2_frb(b, a, 0);
-			TEST_ASSERT(fp2_cmp(a, b) == RLC_EQ, end);
-			fp2_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp2_exp(c, a, d);
-			TEST_ASSERT(fp2_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-
-        TEST_CASE("exponentiation of cyclotomic element is correct") {
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp2_rand(a);
-			fp2_conv_cyc(a, a);
-			fp2_exp(b, a, d);
-			fp2_exp_cyc(c, a, d);
-			TEST_ASSERT(fp2_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	bn_free(d);
-	return code;
-}
-
-#ifdef FP_QNRES
-
-static int compression2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c, d;
-	uint8_t bin[2 * RLC_FP_BYTES];
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-	fp2_null(d);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-		fp2_new(d);
-
-		TEST_CASE("compression is consistent") {
-			fp2_rand(a);
-			fp2_pck(b, a);
-			TEST_ASSERT(fp2_upk(c, b) == 1, end);
-			TEST_ASSERT(fp2_cmp(a, c) == RLC_EQ, end);
-			fp2_rand(a);
-			fp2_conv_cyc(b, a);
-			fp2_pck(c, b);
-			TEST_ASSERT(fp2_upk(d, c) == 1, end);
-			TEST_ASSERT(fp2_cmp(b, d) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("compression is consistent with reading and writing") {
-			fp2_rand(a);
-			fp2_conv_cyc(a, a);
-			fp2_write_bin(bin, RLC_FP_BYTES + 1, a, 1);
-			fp2_read_bin(b, bin, RLC_FP_BYTES + 1);
-			TEST_ASSERT(fp2_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a compressed field element is correct") {
-			fp2_rand(a);
-			TEST_ASSERT(fp2_size_bin(a, 0) == 2 * RLC_FP_BYTES, end);
-			fp2_conv_cyc(a, a);
-			TEST_ASSERT(fp2_size_bin(a, 1) == RLC_FP_BYTES + 1, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	fp2_free(d);
-	return code;
-}
-
-#endif
-
-static int square_root2(void) {
-	int code = RLC_ERR;
-	fp2_t a, b, c;
-	int r;
-
-	fp2_null(a);
-	fp2_null(b);
-	fp2_null(c);
-
-	RLC_TRY {
-		fp2_new(a);
-		fp2_new(b);
-		fp2_new(c);
-
-		TEST_CASE("square root extraction is correct") {
-			fp2_zero(a);
-			fp2_sqr(c, a);
-			r = fp2_srt(b, c);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp2_cmp(b, a) == RLC_EQ ||
-					fp2_cmp(c, a) == RLC_EQ, end);
-			fp_rand(a[0]);
-			fp_zero(a[1]);
-			fp2_sqr(c, a);
-			r = fp2_srt(b, c);
-			fp2_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp2_cmp(b, a) == RLC_EQ ||
-					fp2_cmp(c, a) == RLC_EQ, end);
-			fp_zero(a[0]);
-			fp_rand(a[1]);
-			fp2_sqr(c, a);
-			r = fp2_srt(b, c);
-			fp2_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp2_cmp(b, a) == RLC_EQ ||
-					fp2_cmp(c, a) == RLC_EQ, end);
-			fp2_rand(a);
-			fp2_sqr(c, a);
-			r = fp2_srt(b, c);
-			fp2_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp2_cmp(b, a) == RLC_EQ ||
-					fp2_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp2_free(a);
-	fp2_free(b);
-	fp2_free(c);
-	return code;
-}
-
-static int memory3(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp3_t a;
-
-	fp3_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp3_new(a);
-			fp3_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util3(void) {
-	int code = RLC_ERR;
-	uint8_t bin[3 * RLC_FP_BYTES];
-	fp3_t a, b, c;
-	dig_t d;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp3_rand(a);
-			fp3_rand(b);
-			if (fp3_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp3_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_rand(c);
-			if (fp3_cmp(a, c) != RLC_EQ) {
-				fp3_copy(c, a);
-				TEST_ASSERT(fp3_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp3_cmp(b, c) != RLC_EQ) {
-				fp3_copy(c, b);
-				TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp3_rand(a);
-			fp3_neg(b, a);
-			if (fp3_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp3_cmp(b, a) == RLC_NE, end);
-			}
-			fp3_neg(b, b);
-			TEST_ASSERT(fp3_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp3_rand(a);
-			} while (fp3_is_zero(a));
-			fp3_zero(c);
-			TEST_ASSERT(fp3_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp3_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp3_rand(a);
-			} while (fp3_is_zero(a));
-			fp3_zero(c);
-			TEST_ASSERT(fp3_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp3_zero(a);
-			TEST_ASSERT(fp3_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp3_set_dig(a, d);
-			TEST_ASSERT(fp3_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp3_rand(a);
-			fp3_write_bin(bin, sizeof(bin), a);
-			fp3_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp3_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp3_rand(a);
-			TEST_ASSERT(fp3_size_bin(a) == 3 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	return code;
-}
-
-static int addition3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c, d, e;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-	fp3_null(d);
-	fp3_null(e);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-		fp3_new(d);
-		fp3_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_add(d, a, b);
-			fp3_add(e, b, a);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_rand(c);
-			fp3_add(d, a, b);
-			fp3_add(d, d, c);
-			fp3_add(e, b, c);
-			fp3_add(e, a, e);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp3_rand(a);
-			fp3_zero(d);
-			fp3_add(e, a, d);
-			TEST_ASSERT(fp3_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp3_rand(a);
-			fp3_neg(d, a);
-			fp3_add(e, a, d);
-			TEST_ASSERT(fp3_is_zero(e), end);
-		} TEST_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-		TEST_CASE("basic addition is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_add(d, a, b);
-			fp3_add_basic(e, a, b);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-		TEST_CASE("integrated addition is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_add(d, a, b);
-			fp3_add_integ(e, a, b);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	fp3_free(d);
-	fp3_free(e);
-	return code;
-}
-
-static int subtraction3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c, d;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-	fp3_null(d);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-		fp3_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_sub(c, a, b);
-			fp3_sub(d, b, a);
-			fp3_neg(d, d);
-			TEST_ASSERT(fp3_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp3_rand(a);
-			fp3_zero(c);
-			fp3_sub(d, a, c);
-			TEST_ASSERT(fp3_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp3_rand(a);
-			fp3_sub(c, a, a);
-			TEST_ASSERT(fp3_is_zero(c), end);
-		}
-		TEST_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-		TEST_CASE("basic subtraction is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_sub(c, a, b);
-			fp3_sub_basic(d, a, b);
-			TEST_ASSERT(fp3_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-		TEST_CASE("integrated subtraction is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_sub(c, a, b);
-			fp3_sub_integ(d, a, b);
-			TEST_ASSERT(fp3_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	fp3_free(d);
-	return code;
-}
-
-static int doubling3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp3_rand(a);
-			fp3_dbl(b, a);
-			fp3_add(c, a, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-		TEST_CASE("basic doubling is correct") {
-			fp3_rand(a);
-			fp3_dbl(b, a);
-			fp3_dbl_basic(c, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-		TEST_CASE("integrated doubling is correct") {
-			fp3_rand(a);
-			fp3_dbl(b, a);
-			fp3_dbl_integ(c, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	return code;
-}
-
-static int multiplication3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c, d, e, f;
-	bn_t g;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-	fp3_null(d);
-	fp3_null(e);
-	fp3_null(f);
-	bn_null(g);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-		fp3_new(d);
-		fp3_new(e);
-		fp3_new(f);
-		bn_new(g);
-
-		TEST_CASE("multiplication is commutative") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_mul(d, a, b);
-			fp3_mul(e, b, a);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_rand(c);
-			fp3_mul(d, a, b);
-			fp3_mul(d, d, c);
-			fp3_mul(e, b, c);
-			fp3_mul(e, a, e);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_rand(c);
-			fp3_add(d, a, b);
-			fp3_mul(d, c, d);
-			fp3_mul(e, c, a);
-			fp3_mul(f, c, b);
-			fp3_add(e, e, f);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp3_rand(a);
-			fp3_set_dig(d, 1);
-			fp3_mul(e, a, d);
-			TEST_ASSERT(fp3_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp3_rand(a);
-			fp3_zero(d);
-			fp3_mul(e, a, d);
-			TEST_ASSERT(fp3_is_zero(e), end);
-		} TEST_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_mul(d, a, b);
-			fp3_mul_basic(e, b, a);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-		TEST_CASE("integrated multiplication is correct") {
-			fp3_rand(a);
-			fp3_rand(b);
-			fp3_mul(d, a, b);
-			fp3_mul_integ(e, b, a);
-			TEST_ASSERT(fp3_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("multiplication by cubic non-residue is correct") {
-			fp3_rand(a);
-			fp3_zero(b);
-			fp_set_dig(b[1], 1);
-			fp3_mul(c, a, b);
-			fp3_mul_nor(d, a);
-			TEST_ASSERT(fp3_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	fp3_free(d);
-	fp3_free(e);
-	fp3_free(f);
-	bn_free(g);
-	return code;
-}
-
-static int squaring3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp3_rand(a);
-			fp3_mul(b, a, a);
-			fp3_sqr(c, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_CBC == BASIC || !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp3_rand(a);
-			fp3_sqr(b, a);
-			fp3_sqr_basic(c, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_CBC == INTEG || !defined(STRIP)
-		TEST_CASE("integrated squaring is correct") {
-			fp3_rand(a);
-			fp3_sqr(b, a);
-			fp3_sqr_integ(c, a);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	return code;
-}
-
-static int inversion3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c, d[2];
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-	fp3_null(d[0]);
-	fp3_null(d[1]);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-		fp3_new(d[0]);
-		fp3_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp3_rand(a);
-			} while (fp3_is_zero(a));
-			fp3_inv(b, a);
-			fp3_mul(c, a, b);
-			TEST_ASSERT(fp3_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp3_rand(a);
-				fp3_rand(b);
-			} while (fp2_is_zero(a) || fp2_is_zero(b));
-			fp3_copy(d[0], a);
-			fp3_copy(d[1], b);
-			fp3_inv(a, a);
-			fp3_inv(b, b);
-			fp3_inv_sim(d, d, 2);
-			TEST_ASSERT(fp3_cmp(d[0], a) == RLC_EQ &&
-					fp3_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	fp3_free(d[0]);
-	fp3_free(d[1]);
-	return code;
-}
-
-static int exponentiation3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c;
-	bn_t d;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp3_rand(a);
-			bn_zero(d);
-			fp3_exp(c, a, d);
-			TEST_ASSERT(fp3_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp3_exp(c, a, d);
-			TEST_ASSERT(fp3_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp3_exp(b, a, d);
-			bn_neg(d, d);
-			fp3_exp(c, a, d);
-			fp3_inv(c, c);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp3_rand(a);
-			fp3_frb(b, a, 0);
-			TEST_ASSERT(fp3_cmp(a, b) == RLC_EQ, end);
-			fp3_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp3_exp(c, a, d);
-			TEST_ASSERT(fp3_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int square_root3(void) {
-	int code = RLC_ERR;
-	fp3_t a, b, c;
-	int r;
-
-	fp3_null(a);
-	fp3_null(b);
-	fp3_null(c);
-
-	RLC_TRY {
-		fp3_new(a);
-		fp3_new(b);
-		fp3_new(c);
-
-		TEST_CASE("square root extraction is correct") {
-			fp3_rand(a);
-			fp3_sqr(c, a);
-			r = fp3_srt(b, c);
-			fp3_sqr(b, b);
-			TEST_ASSERT(r == 1, end);
-			TEST_ASSERT(fp3_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp3_free(a);
-	fp3_free(b);
-	fp3_free(c);
-	return code;
-}
-
-static int memory4(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp4_t a;
-
-	fp4_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp4_new(a);
-			fp4_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util4(void) {
-	int code = RLC_ERR;
-	uint8_t bin[4 * RLC_FP_BYTES];
-	fp4_t a, b, c;
-	dig_t d;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp4_rand(a);
-			fp4_rand(b);
-			if (fp4_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp4_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_rand(c);
-			if (fp4_cmp(a, c) != RLC_EQ) {
-				fp4_copy(c, a);
-				TEST_ASSERT(fp4_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp4_cmp(b, c) != RLC_EQ) {
-				fp4_copy(c, b);
-				TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp4_rand(a);
-			fp4_neg(b, a);
-			if (fp4_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp4_cmp(b, a) == RLC_NE, end);
-			}
-			fp4_neg(b, b);
-			TEST_ASSERT(fp4_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp4_rand(a);
-			} while (fp4_is_zero(a));
-			fp4_zero(c);
-			TEST_ASSERT(fp4_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp4_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp4_rand(a);
-			} while (fp4_is_zero(a));
-			fp4_zero(c);
-			TEST_ASSERT(fp4_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp4_zero(a);
-			TEST_ASSERT(fp4_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp4_set_dig(a, d);
-			TEST_ASSERT(fp4_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp4_rand(a);
-			fp4_write_bin(bin, sizeof(bin), a);
-			fp4_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp4_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp4_rand(a);
-			TEST_ASSERT(fp4_size_bin(a) == 4 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	return code;
-}
-
-static int addition4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c, d, e;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-	fp4_null(d);
-	fp4_null(e);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-		fp4_new(d);
-		fp4_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_add(d, a, b);
-			fp4_add(e, b, a);
-			TEST_ASSERT(fp4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_rand(c);
-			fp4_add(d, a, b);
-			fp4_add(d, d, c);
-			fp4_add(e, b, c);
-			fp4_add(e, a, e);
-			TEST_ASSERT(fp4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp4_rand(a);
-			fp4_zero(d);
-			fp4_add(e, a, d);
-			TEST_ASSERT(fp4_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp4_rand(a);
-			fp4_neg(d, a);
-			fp4_add(e, a, d);
-			TEST_ASSERT(fp4_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	fp4_free(d);
-	fp4_free(e);
-	return code;
-}
-
-static int subtraction4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c, d;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-	fp4_null(d);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-		fp4_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_sub(c, a, b);
-			fp4_sub(d, b, a);
-			fp4_neg(d, d);
-			TEST_ASSERT(fp4_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp4_rand(a);
-			fp4_zero(c);
-			fp4_sub(d, a, c);
-			TEST_ASSERT(fp4_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp4_rand(a);
-			fp4_sub(c, a, a);
-			TEST_ASSERT(fp4_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	fp4_free(d);
-	return code;
-}
-
-static int doubling4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp4_rand(a);
-			fp4_dbl(b, a);
-			fp4_add(c, a, a);
-			TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	return code;
-}
-
-static int multiplication4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c, d, e, f;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-	fp4_null(d);
-	fp4_null(e);
-	fp4_null(f);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-		fp4_new(d);
-		fp4_new(e);
-		fp4_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_mul(d, a, b);
-			fp4_mul(e, b, a);
-			TEST_ASSERT(fp4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_rand(c);
-			fp4_mul(d, a, b);
-			fp4_mul(d, d, c);
-			fp4_mul(e, b, c);
-			fp4_mul(e, a, e);
-			TEST_ASSERT(fp4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_rand(c);
-			fp4_add(d, a, b);
-			fp4_mul(d, c, d);
-			fp4_mul(e, c, a);
-			fp4_mul(f, c, b);
-			fp4_add(e, e, f);
-			TEST_ASSERT(fp4_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp4_set_dig(d, 1);
-			fp4_mul(e, a, d);
-			TEST_ASSERT(fp4_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp4_zero(d);
-			fp4_mul(e, a, d);
-			TEST_ASSERT(fp4_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp4_rand(a);
-			fp4_zero(b);
-			fp2_set_dig(b[1], 1);
-			fp4_mul(c, a, b);
-			fp4_mul_art(d, a);
-			TEST_ASSERT(fp4_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_mul(c, a, b);
-			fp4_mul_basic(d, a, b);
-			TEST_ASSERT(fp4_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp4_rand(a);
-			fp4_rand(b);
-			fp4_mul(c, a, b);
-			fp4_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp4_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	fp4_free(d);
-	fp4_free(e);
-	fp4_free(f);
-	return code;
-}
-
-static int squaring4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp4_rand(a);
-			fp4_mul(b, a, a);
-			fp4_sqr(c, a);
-			TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp4_rand(a);
-			fp4_sqr(b, a);
-			fp4_sqr_basic(c, a);
-			TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp4_rand(a);
-			fp4_sqr(b, a);
-			fp4_sqr_lazyr(c, a);
-			TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	return code;
-}
-
-static int inversion4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c, d[2];
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-		fp4_new(d[0]);
-		fp4_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp4_rand(a);
-			} while (fp4_is_zero(a));
-			fp4_inv(b, a);
-			fp4_mul(c, a, b);
-			TEST_ASSERT(fp4_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp4_rand(a);
-				fp4_rand(b);
-			} while (fp4_is_zero(a) || fp4_is_zero(b));
-			fp4_copy(d[0], a);
-			fp4_copy(d[1], b);
-			fp4_inv(a, a);
-			fp4_inv(b, b);
-			fp4_inv_sim(d, d, 2);
-			TEST_ASSERT(fp4_cmp(d[0], a) == RLC_EQ &&
-					fp4_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	fp4_free(d[0]);
-	fp4_free(d[1]);
-	return code;
-}
-
-static int exponentiation4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c;
-	bn_t d;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp4_rand(a);
-			bn_zero(d);
-			fp4_exp(c, a, d);
-			TEST_ASSERT(fp4_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp4_exp(c, a, d);
-			TEST_ASSERT(fp4_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp4_exp(b, a, d);
-			bn_neg(d, d);
-			fp4_exp(c, a, d);
-			fp4_inv(c, c);
-			TEST_ASSERT(fp4_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp4_rand(a);
-			fp4_frb(b, a, 0);
-			TEST_ASSERT(fp4_cmp(a, b) == RLC_EQ, end);
-			fp4_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp4_exp(c, a, d);
-			TEST_ASSERT(fp4_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int square_root4(void) {
-	int code = RLC_ERR;
-	fp4_t a, b, c;
-	int r;
-
-	fp4_null(a);
-	fp4_null(b);
-	fp4_null(c);
-
-	RLC_TRY {
-		fp4_new(a);
-		fp4_new(b);
-		fp4_new(c);
-
-		TEST_CASE("square root extraction is correct") {
-			fp4_zero(a);
-			fp4_sqr(c, a);
-			r = fp4_srt(b, c);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp4_cmp(b, a) == RLC_EQ ||
-					fp4_cmp(c, a) == RLC_EQ, end);
-			fp2_rand(a[0]);
-			fp2_zero(a[1]);
-			fp4_sqr(c, a);
-			r = fp4_srt(b, c);
-			fp4_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp4_cmp(b, a) == RLC_EQ ||
-					fp4_cmp(c, a) == RLC_EQ, end);
-			fp2_zero(a[0]);
-			fp2_rand(a[1]);
-			fp4_sqr(c, a);
-			r = fp4_srt(b, c);
-			fp4_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp4_cmp(b, a) == RLC_EQ ||
-					fp4_cmp(c, a) == RLC_EQ, end);
-			fp4_rand(a);
-			fp4_sqr(c, a);
-			r = fp4_srt(b, c);
-			fp4_neg(c, b);
-			TEST_ASSERT(r, end);
-			TEST_ASSERT(fp4_cmp(b, a) == RLC_EQ ||
-					fp4_cmp(c, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp4_free(a);
-	fp4_free(b);
-	fp4_free(c);
-	return code;
-}
-
-static int memory6(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp6_t a;
-
-	fp6_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp6_new(a);
-			fp6_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util6(void) {
-	int code = RLC_ERR;
-	uint8_t bin[6 * RLC_FP_BYTES];
-	fp6_t a, b, c;
-	dig_t d;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp6_rand(a);
-			fp6_rand(b);
-			if (fp6_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp6_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_rand(c);
-			if (fp6_cmp(a, c) != RLC_EQ) {
-				fp6_copy(c, a);
-				TEST_ASSERT(fp6_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp6_cmp(b, c) != RLC_EQ) {
-				fp6_copy(c, b);
-				TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp6_rand(a);
-			fp6_neg(b, a);
-			if (fp6_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp6_cmp(b, a) == RLC_NE, end);
-			}
-			fp6_neg(b, b);
-			TEST_ASSERT(fp6_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp6_rand(a);
-			} while (fp6_is_zero(a));
-			fp6_zero(c);
-			TEST_ASSERT(fp6_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp6_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp6_rand(a);
-			} while (fp6_is_zero(a));
-			fp6_zero(c);
-			TEST_ASSERT(fp6_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp6_zero(a);
-			TEST_ASSERT(fp6_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp6_set_dig(a, d);
-			TEST_ASSERT(fp6_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp6_rand(a);
-			fp6_write_bin(bin, sizeof(bin), a);
-			fp6_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp6_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp6_rand(a);
-			TEST_ASSERT(fp6_size_bin(a) == 6 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	return code;
-}
-
-static int addition6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c, d, e;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-	fp6_null(d);
-	fp6_null(e);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-		fp6_new(d);
-		fp6_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_add(d, a, b);
-			fp6_add(e, b, a);
-			TEST_ASSERT(fp6_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_rand(c);
-			fp6_add(d, a, b);
-			fp6_add(d, d, c);
-			fp6_add(e, b, c);
-			fp6_add(e, a, e);
-			TEST_ASSERT(fp6_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp6_rand(a);
-			fp6_zero(d);
-			fp6_add(e, a, d);
-			TEST_ASSERT(fp6_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp6_rand(a);
-			fp6_neg(d, a);
-			fp6_add(e, a, d);
-			TEST_ASSERT(fp6_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	fp6_free(d);
-	fp6_free(e);
-	return code;
-}
-
-static int subtraction6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c, d;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-	fp6_null(d);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-		fp6_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_sub(c, a, b);
-			fp6_sub(d, b, a);
-			fp6_neg(d, d);
-			TEST_ASSERT(fp6_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp6_rand(a);
-			fp6_zero(c);
-			fp6_sub(d, a, c);
-			TEST_ASSERT(fp6_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp6_rand(a);
-			fp6_sub(c, a, a);
-			TEST_ASSERT(fp6_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	fp6_free(d);
-	return code;
-}
-
-static int doubling6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp6_rand(a);
-			fp6_dbl(b, a);
-			fp6_add(c, a, a);
-			TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	return code;
-}
-
-static int multiplication6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c, d, e, f;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-	fp6_null(d);
-	fp6_null(e);
-	fp6_null(f);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-		fp6_new(d);
-		fp6_new(e);
-		fp6_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_mul(d, a, b);
-			fp6_mul(e, b, a);
-			TEST_ASSERT(fp6_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_rand(c);
-			fp6_mul(d, a, b);
-			fp6_mul(d, d, c);
-			fp6_mul(e, b, c);
-			fp6_mul(e, a, e);
-			TEST_ASSERT(fp6_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_rand(c);
-			fp6_add(d, a, b);
-			fp6_mul(d, c, d);
-			fp6_mul(e, c, a);
-			fp6_mul(f, c, b);
-			fp6_add(e, e, f);
-			TEST_ASSERT(fp6_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp6_set_dig(d, 1);
-			fp6_mul(e, a, d);
-			TEST_ASSERT(fp6_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp6_zero(d);
-			fp6_mul(e, a, d);
-			TEST_ASSERT(fp6_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp6_rand(a);
-			fp6_zero(b);
-			fp2_set_dig(b[1], 1);
-			fp6_mul(c, a, b);
-			fp6_mul_art(d, a);
-			TEST_ASSERT(fp6_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_mul(c, a, b);
-			fp6_mul_basic(d, a, b);
-			TEST_ASSERT(fp6_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp6_rand(a);
-			fp6_rand(b);
-			fp6_mul(c, a, b);
-			fp6_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp6_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	fp6_free(d);
-	fp6_free(e);
-	fp6_free(f);
-	return code;
-}
-
-static int squaring6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp6_rand(a);
-			fp6_mul(b, a, a);
-			fp6_sqr(c, a);
-			TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp6_rand(a);
-			fp6_sqr(b, a);
-			fp6_sqr_basic(c, a);
-			TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp6_rand(a);
-			fp6_sqr(b, a);
-			fp6_sqr_lazyr(c, a);
-			TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	return code;
-}
-
-static int inversion6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp6_rand(a);
-			} while (fp6_is_zero(a));
-			fp6_inv(b, a);
-			fp6_mul(c, a, b);
-			TEST_ASSERT(fp6_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	return code;
-}
-
-static int exponentiation6(void) {
-	int code = RLC_ERR;
-	fp6_t a, b, c;
-	bn_t d;
-
-	fp6_null(a);
-	fp6_null(b);
-	fp6_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp6_new(a);
-		fp6_new(b);
-		fp6_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp6_rand(a);
-			bn_zero(d);
-			fp6_exp(c, a, d);
-			TEST_ASSERT(fp6_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp6_exp(c, a, d);
-			TEST_ASSERT(fp6_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp6_exp(b, a, d);
-			bn_neg(d, d);
-			fp6_exp(c, a, d);
-			fp6_inv(c, c);
-			TEST_ASSERT(fp6_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp6_rand(a);
-			fp6_frb(b, a, 0);
-			TEST_ASSERT(fp6_cmp(a, b) == RLC_EQ, end);
-			fp6_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp6_exp(c, a, d);
-			TEST_ASSERT(fp6_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp6_free(a);
-	fp6_free(b);
-	fp6_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int memory8(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp8_t a;
-
-	fp8_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp8_new(a);
-			fp8_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util8(void) {
-	int code = RLC_ERR;
-	uint8_t bin[8 * RLC_FP_BYTES];
-	fp8_t a, b, c;
-	dig_t d;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp8_rand(a);
-			fp8_rand(b);
-			if (fp8_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp8_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_rand(c);
-			if (fp8_cmp(a, c) != RLC_EQ) {
-				fp8_copy(c, a);
-				TEST_ASSERT(fp8_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp8_cmp(b, c) != RLC_EQ) {
-				fp8_copy(c, b);
-				TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp8_rand(a);
-			fp8_neg(b, a);
-			if (fp8_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp8_cmp(b, a) == RLC_NE, end);
-			}
-			fp8_neg(b, b);
-			TEST_ASSERT(fp8_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp8_rand(a);
-			} while (fp8_is_zero(a));
-			fp8_zero(c);
-			TEST_ASSERT(fp8_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp8_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp8_rand(a);
-			} while (fp8_is_zero(a));
-			fp8_zero(c);
-			TEST_ASSERT(fp8_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp8_zero(a);
-			TEST_ASSERT(fp8_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp8_set_dig(a, d);
-			TEST_ASSERT(fp8_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp8_rand(a);
-			fp8_write_bin(bin, sizeof(bin), a);
-			fp8_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp8_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp8_rand(a);
-			TEST_ASSERT(fp8_size_bin(a, 0) == 8 * RLC_FP_BYTES, end);
-			fp8_conv_cyc(a, a);
-			TEST_ASSERT(fp8_size_bin(a, 1) == 4 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	return code;
-}
-
-static int addition8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c, d, e;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	fp8_null(d);
-	fp8_null(e);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		fp8_new(d);
-		fp8_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_add(d, a, b);
-			fp8_add(e, b, a);
-			TEST_ASSERT(fp8_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_rand(c);
-			fp8_add(d, a, b);
-			fp8_add(d, d, c);
-			fp8_add(e, b, c);
-			fp8_add(e, a, e);
-			TEST_ASSERT(fp8_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp8_rand(a);
-			fp8_zero(d);
-			fp8_add(e, a, d);
-			TEST_ASSERT(fp8_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp8_rand(a);
-			fp8_neg(d, a);
-			fp8_add(e, a, d);
-			TEST_ASSERT(fp8_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	fp8_free(d);
-	fp8_free(e);
-	return code;
-}
-
-static int subtraction8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c, d;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	fp8_null(d);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		fp8_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_sub(c, a, b);
-			fp8_sub(d, b, a);
-			fp8_neg(d, d);
-			TEST_ASSERT(fp8_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp8_rand(a);
-			fp8_zero(c);
-			fp8_sub(d, a, c);
-			TEST_ASSERT(fp8_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp8_rand(a);
-			fp8_sub(c, a, a);
-			TEST_ASSERT(fp8_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	fp8_free(d);
-	return code;
-}
-
-static int doubling8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp8_rand(a);
-			fp8_dbl(b, a);
-			fp8_add(c, a, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	return code;
-}
-
-static int multiplication8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c, d, e, f;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	fp8_null(d);
-	fp8_null(e);
-	fp8_null(f);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		fp8_new(d);
-		fp8_new(e);
-		fp8_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_mul(d, a, b);
-			fp8_mul(e, b, a);
-			TEST_ASSERT(fp8_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_rand(c);
-			fp8_mul(d, a, b);
-			fp8_mul(d, d, c);
-			fp8_mul(e, b, c);
-			fp8_mul(e, a, e);
-			TEST_ASSERT(fp8_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_rand(c);
-			fp8_add(d, a, b);
-			fp8_mul(d, c, d);
-			fp8_mul(e, c, a);
-			fp8_mul(f, c, b);
-			fp8_add(e, e, f);
-			TEST_ASSERT(fp8_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp8_set_dig(d, 1);
-			fp8_mul(e, a, d);
-			TEST_ASSERT(fp8_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp8_zero(d);
-			fp8_mul(e, a, d);
-			TEST_ASSERT(fp8_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp8_rand(a);
-			fp8_zero(b);
-			fp4_set_dig(b[1], 1);
-			fp8_mul(c, a, b);
-			fp8_mul_art(d, a);
-			TEST_ASSERT(fp8_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_mul(c, a, b);
-			fp8_mul_basic(d, a, b);
-			TEST_ASSERT(fp8_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp8_rand(a);
-			fp8_rand(b);
-			fp8_mul(c, a, b);
-			fp8_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp8_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	fp8_free(d);
-	fp8_free(e);
-	fp8_free(f);
-	return code;
-}
-
-static int squaring8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp8_rand(a);
-			fp8_mul(b, a, a);
-			fp8_sqr(c, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp8_rand(a);
-			fp8_sqr(b, a);
-			fp8_sqr_basic(c, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp8_rand(a);
-			fp8_sqr(b, a);
-			fp8_sqr_lazyr(c, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	return code;
-}
-
-static int cyclotomic8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c;
-	bn_t f;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	bn_null(f);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		bn_new(f);
-
-		TEST_CASE("cyclotomic test is correct") {
-			fp8_rand(a);
-			fp8_conv_cyc(a, a);
-			TEST_ASSERT(fp8_test_cyc(a) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("cyclotomic squaring is correct") {
-			fp8_rand(a);
-			fp8_conv_cyc(a, a);
-			fp8_sqr(b, a);
-			fp8_sqr_cyc(c, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-        TEST_CASE("cyclotomic exponentiation is correct") {
-			fp8_rand(a);
-			fp8_conv_cyc(a, a);
-			bn_zero(f);
-			fp8_exp_cyc(c, a, f);
-			TEST_ASSERT(fp8_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(f, 1);
-			fp8_exp_cyc(c, a, f);
-			TEST_ASSERT(fp8_cmp(c, a) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp8_exp(b, a, f);
-			fp8_exp_cyc(c, a, f);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp8_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp8_exp_cyc(c, a, f);
-			fp8_inv_cyc(c, c);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	bn_free(f);
-	return code;
-}
-
-static int inversion8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c, d[2];
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	fp8_null(d[0]);
-	fp8_null(d[1]);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		fp8_new(d[0]);
-		fp8_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp8_rand(a);
-			} while (fp8_is_zero(a));
-			fp8_inv(b, a);
-			fp8_mul(c, a, b);
-			TEST_ASSERT(fp8_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("inversion of a unitary element is correct") {
-			do {
-				fp8_rand(a);
-			} while (fp8_is_zero(a));
-			fp8_conv_cyc(a, a);
-			fp8_inv(b, a);
-			fp8_inv_cyc(c, a);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp8_rand(a);
-				fp8_rand(b);
-			} while (fp8_is_zero(a) || fp8_is_zero(b));
-			fp8_copy(d[0], a);
-			fp8_copy(d[1], b);
-			fp8_inv(a, a);
-			fp8_inv(b, b);
-			fp8_inv_sim(d, d, 2);
-			TEST_ASSERT(fp8_cmp(d[0], a) == RLC_EQ &&
-					fp8_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	fp8_free(d[0]);
-	fp8_free(d[1]);
-	return code;
-}
-
-static int exponentiation8(void) {
-	int code = RLC_ERR;
-	fp8_t a, b, c;
-	bn_t d;
-
-	fp8_null(a);
-	fp8_null(b);
-	fp8_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp8_new(a);
-		fp8_new(b);
-		fp8_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp8_rand(a);
-			bn_zero(d);
-			fp8_exp(c, a, d);
-			TEST_ASSERT(fp8_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp8_exp(c, a, d);
-			TEST_ASSERT(fp8_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp8_exp(b, a, d);
-			bn_neg(d, d);
-			fp8_exp(c, a, d);
-			fp8_inv(c, c);
-			TEST_ASSERT(fp8_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp8_rand(a);
-			fp8_frb(b, a, 0);
-			TEST_ASSERT(fp8_cmp(a, b) == RLC_EQ, end);
-			fp8_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp8_exp(c, a, d);
-			TEST_ASSERT(fp8_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp8_free(a);
-	fp8_free(b);
-	fp8_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int memory12(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp12_t a;
-
-	fp12_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp12_new(a);
-			fp12_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int memory9(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp9_t a;
-
-	fp9_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp9_new(a);
-			fp9_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util9(void) {
-	int code = RLC_ERR;
-	uint8_t bin[9 * RLC_FP_BYTES];
-	fp9_t a, b, c;
-	dig_t d;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp9_rand(a);
-			fp9_rand(b);
-			if (fp9_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp9_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_rand(c);
-			if (fp9_cmp(a, c) != RLC_EQ) {
-				fp9_copy(c, a);
-				TEST_ASSERT(fp9_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp9_cmp(b, c) != RLC_EQ) {
-				fp9_copy(c, b);
-				TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp9_rand(a);
-			fp9_neg(b, a);
-			if (fp9_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp9_cmp(b, a) == RLC_NE, end);
-			}
-			fp9_neg(b, b);
-			TEST_ASSERT(fp9_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp9_rand(a);
-			} while (fp9_is_zero(a));
-			fp9_zero(c);
-			TEST_ASSERT(fp9_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp9_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp9_rand(a);
-			} while (fp9_is_zero(a));
-			fp9_zero(c);
-			TEST_ASSERT(fp9_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp9_zero(a);
-			TEST_ASSERT(fp9_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp9_set_dig(a, d);
-			TEST_ASSERT(fp9_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp9_rand(a);
-			fp9_write_bin(bin, sizeof(bin), a);
-			fp9_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp9_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a prime field element is correct") {
-			fp9_rand(a);
-			TEST_ASSERT(fp9_size_bin(a) == 9 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	return code;
-}
-
-static int addition9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c, d, e;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-	fp9_null(d);
-	fp9_null(e);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-		fp9_new(d);
-		fp9_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_add(d, a, b);
-			fp9_add(e, b, a);
-			TEST_ASSERT(fp9_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_rand(c);
-			fp9_add(d, a, b);
-			fp9_add(d, d, c);
-			fp9_add(e, b, c);
-			fp9_add(e, a, e);
-			TEST_ASSERT(fp9_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp9_rand(a);
-			fp9_zero(d);
-			fp9_add(e, a, d);
-			TEST_ASSERT(fp9_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp9_rand(a);
-			fp9_neg(d, a);
-			fp9_add(e, a, d);
-			TEST_ASSERT(fp9_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	fp9_free(d);
-	fp9_free(e);
-	return code;
-}
-
-static int subtraction9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c, d;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-	fp9_null(d);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-		fp9_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_sub(c, a, b);
-			fp9_sub(d, b, a);
-			fp9_neg(d, d);
-			TEST_ASSERT(fp9_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp9_rand(a);
-			fp9_zero(c);
-			fp9_sub(d, a, c);
-			TEST_ASSERT(fp9_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp9_rand(a);
-			fp9_sub(c, a, a);
-			TEST_ASSERT(fp9_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	fp9_free(d);
-	return code;
-}
-
-static int doubling9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-
-		TEST_CASE("doubling is correct") {
-			fp9_rand(a);
-			fp9_dbl(b, a);
-			fp9_add(c, a, a);
-			TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	return code;
-}
-
-static int multiplication9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c, d, e, f;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-	fp9_null(d);
-	fp9_null(e);
-	fp9_null(f);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-		fp9_new(d);
-		fp9_new(e);
-		fp9_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_mul(d, a, b);
-			fp9_mul(e, b, a);
-			TEST_ASSERT(fp9_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_rand(c);
-			fp9_mul(d, a, b);
-			fp9_mul(d, d, c);
-			fp9_mul(e, b, c);
-			fp9_mul(e, a, e);
-			TEST_ASSERT(fp9_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_rand(c);
-			fp9_add(d, a, b);
-			fp9_mul(d, c, d);
-			fp9_mul(e, c, a);
-			fp9_mul(f, c, b);
-			fp9_add(e, e, f);
-			TEST_ASSERT(fp9_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp9_set_dig(d, 1);
-			fp9_mul(e, a, d);
-			TEST_ASSERT(fp9_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp9_zero(d);
-			fp9_mul(e, a, d);
-			TEST_ASSERT(fp9_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp9_rand(a);
-			fp9_zero(b);
-			fp2_set_dig(b[1], 1);
-			fp9_mul(c, a, b);
-			fp9_mul_art(d, a);
-			TEST_ASSERT(fp9_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_mul(c, a, b);
-			fp9_mul_basic(d, a, b);
-			TEST_ASSERT(fp9_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp9_rand(a);
-			fp9_rand(b);
-			fp9_mul(c, a, b);
-			fp9_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp9_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	fp9_free(d);
-	fp9_free(e);
-	fp9_free(f);
-	return code;
-}
-
-static int squaring9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp9_rand(a);
-			fp9_mul(b, a, a);
-			fp9_sqr(c, a);
-			TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp9_rand(a);
-			fp9_sqr(b, a);
-			fp9_sqr_basic(c, a);
-			TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp9_rand(a);
-			fp9_sqr(b, a);
-			fp9_sqr_lazyr(c, a);
-			TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	return code;
-}
-
-static int inversion9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c, d[2];
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-	fp9_null(d[0]);
-	fp9_null(d[1]);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-		fp9_new(d[0]);
-		fp9_new(d[1]);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp9_rand(a);
-			} while (fp9_is_zero(a));
-			fp9_inv(b, a);
-			fp9_mul(c, a, b);
-			TEST_ASSERT(fp9_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous inversion is correct") {
-			do {
-				fp9_rand(a);
-				fp9_rand(b);
-			} while (fp9_is_zero(a) || fp9_is_zero(b));
-			fp9_copy(d[0], a);
-			fp9_copy(d[1], b);
-			fp9_inv(a, a);
-			fp9_inv(b, b);
-			fp9_inv_sim(d, d, 2);
-			TEST_ASSERT(fp9_cmp(d[0], a) == RLC_EQ &&
-					fp9_cmp(d[1], b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	fp9_free(d[0]);
-	fp9_free(d[1]);
-	return code;
-}
-
-static int exponentiation9(void) {
-	int code = RLC_ERR;
-	fp9_t a, b, c;
-	bn_t d;
-
-	fp9_null(a);
-	fp9_null(b);
-	fp9_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp9_new(a);
-		fp9_new(b);
-		fp9_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp9_rand(a);
-			bn_zero(d);
-			fp9_exp(c, a, d);
-			TEST_ASSERT(fp9_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp9_exp(c, a, d);
-			TEST_ASSERT(fp9_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp9_exp(b, a, d);
-			bn_neg(d, d);
-			fp9_exp(c, a, d);
-			fp9_inv(c, c);
-			TEST_ASSERT(fp9_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp9_rand(a);
-			fp9_frb(b, a, 0);
-			TEST_ASSERT(fp9_cmp(a, b) == RLC_EQ, end);
-			fp9_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp9_exp(c, a, d);
-			TEST_ASSERT(fp9_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp9_free(a);
-	fp9_free(b);
-	fp9_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int util12(void) {
-	int code = RLC_ERR;
-	uint8_t bin[12 * RLC_FP_BYTES];
-	fp12_t a, b, c;
-	dig_t d;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp12_rand(a);
-			fp12_rand(b);
-			if (fp12_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp12_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_rand(c);
-			if (fp12_cmp(a, c) != RLC_EQ) {
-				fp12_copy(c, a);
-				TEST_ASSERT(fp12_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp12_cmp(b, c) != RLC_EQ) {
-				fp12_copy(c, b);
-				TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp12_rand(a);
-			fp12_neg(b, a);
-			if (fp12_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp12_cmp(b, a) == RLC_NE, end);
-			}
-			fp12_neg(b, b);
-			TEST_ASSERT(fp12_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp12_rand(a);
-			} while (fp12_is_zero(a));
-			fp12_zero(c);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp12_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp12_rand(a);
-			} while (fp12_is_zero(a));
-			fp12_zero(c);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp12_zero(a);
-			TEST_ASSERT(fp12_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp12_set_dig(a, d);
-			TEST_ASSERT(fp12_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp12_rand(a);
-			fp12_write_bin(bin, sizeof(bin), a, 0);
-			fp12_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp12_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp12_rand(a);
-			TEST_ASSERT(fp12_size_bin(a, 0) == 12 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	return code;
-}
-
-static int addition12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c, d, e;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-	fp12_null(d);
-	fp12_null(e);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-		fp12_new(d);
-		fp12_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_add(d, a, b);
-			fp12_add(e, b, a);
-			TEST_ASSERT(fp12_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_rand(c);
-			fp12_add(d, a, b);
-			fp12_add(d, d, c);
-			fp12_add(e, b, c);
-			fp12_add(e, a, e);
-			TEST_ASSERT(fp12_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp12_rand(a);
-			fp12_zero(d);
-			fp12_add(e, a, d);
-			TEST_ASSERT(fp12_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp12_rand(a);
-			fp12_neg(d, a);
-			fp12_add(e, a, d);
-			TEST_ASSERT(fp12_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	fp12_free(d);
-	fp12_free(e);
-	return code;
-}
-
-static int subtraction12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c, d;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-	fp12_null(d);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-		fp12_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_sub(c, a, b);
-			fp12_sub(d, b, a);
-			fp12_neg(d, d);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp12_rand(a);
-			fp12_zero(c);
-			fp12_sub(d, a, c);
-			TEST_ASSERT(fp12_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp12_rand(a);
-			fp12_sub(c, a, a);
-			TEST_ASSERT(fp12_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	fp12_free(d);
-	return code;
-}
-
-static int multiplication12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c, d, e, f;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-	fp12_null(d);
-	fp12_null(e);
-	fp12_null(f);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-		fp12_new(d);
-		fp12_new(e);
-		fp12_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_mul(d, a, b);
-			fp12_mul(e, b, a);
-			TEST_ASSERT(fp12_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_rand(c);
-			fp12_mul(d, a, b);
-			fp12_mul(d, d, c);
-			fp12_mul(e, b, c);
-			fp12_mul(e, a, e);
-			TEST_ASSERT(fp12_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_rand(c);
-			fp12_add(d, a, b);
-			fp12_mul(d, c, d);
-			fp12_mul(e, c, a);
-			fp12_mul(f, c, b);
-			fp12_add(e, e, f);
-			TEST_ASSERT(fp12_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp12_set_dig(d, 1);
-			fp12_mul(e, a, d);
-			TEST_ASSERT(fp12_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp12_zero(d);
-			fp12_mul(e, a, d);
-			TEST_ASSERT(fp12_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp12_rand(a);
-			fp12_zero(b);
-			fp6_set_dig(b[1], 1);
-			fp12_mul(c, a, b);
-			fp12_mul_art(d, a);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_mul(c, a, b);
-			fp12_mul_basic(d, a, b);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp12_mul(c, a, b);
-			fp12_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("sparse multiplication is correct") {
-			fp12_rand(a);
-			fp12_rand(b);
-			/* Test common case among configurations. */
-			fp2_zero(b[0][1]);
-			fp_zero(b[0][0][1]);
-			fp2_zero(b[0][2]);
-			fp2_zero(b[1][0]);
-			fp_zero(b[1][1][1]);
-			fp2_zero(b[1][2]);
-			fp12_mul(c, a, b);
-			fp12_mul_dxs(d, a, b);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic sparse multiplication is correct") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp2_zero(b[0][1]);
-			fp2_zero(b[0][2]);
-			fp2_zero(b[1][2]);
-			fp12_mul_dxs(c, a, b);
-			fp12_mul_dxs_basic(d, a, b);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced sparse multiplication is correct") {
-			fp12_rand(a);
-			fp12_rand(b);
-			fp2_zero(b[0][1]);
-			fp2_zero(b[0][2]);
-			fp2_zero(b[1][2]);
-			fp12_mul_dxs(c, a, b);
-			fp12_mul_dxs_lazyr(d, a, b);
-			TEST_ASSERT(fp12_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	fp12_free(d);
-	fp12_free(e);
-	fp12_free(f);
-	return code;
-}
-
-static int squaring12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp12_rand(a);
-			fp12_mul(b, a, a);
-			fp12_sqr(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp12_rand(a);
-			fp12_sqr(b, a);
-			fp12_sqr_basic(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp12_rand(a);
-			fp12_sqr(b, a);
-			fp12_sqr_lazyr(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	return code;
-}
-
-static int cyclotomic12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c, d[2], e[2];
-	bn_t f;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-	fp12_null(d[0]);
-	fp12_null(d[1])
-	fp12_null(e[0]);
-	bn_null(f);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-		fp12_new(d[0]);
-		fp12_new(d[1]);
-		fp12_new(e[0]);
-		fp12_new(e[1]);
-		bn_new(f);
-
-		TEST_CASE("cyclotomic test is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			TEST_ASSERT(fp12_test_cyc(a) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("compression in cyclotomic subgroup is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_back_cyc(c, a);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous decompression in cyclotomic subgroup is correct") {
-			fp12_rand(d[0]);
-			fp12_rand(d[1]);
-			fp12_conv_cyc(d[0], d[0]);
-			fp12_conv_cyc(d[1], d[1]);
-			fp12_back_cyc_sim(e, d, 2);
-			TEST_ASSERT(fp12_cmp(d[0], e[0]) == RLC_EQ &&
-					fp12_cmp(d[1], e[1]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("cyclotomic squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_sqr(b, a);
-			fp12_sqr_cyc(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic cyclotomic squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_sqr_cyc(b, a);
-			fp12_sqr_cyc_basic(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced cyclotomic squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_sqr_cyc(b, a);
-			fp12_sqr_cyc_lazyr(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("compressed squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp2_zero(b[0][0]);
-			fp2_zero(b[1][1]);
-			fp2_zero(c[0][0]);
-			fp2_zero(c[1][1]);
-			fp12_sqr(b, a);
-			fp12_sqr_pck(c, a);
-			fp12_back_cyc(c, c);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic compressed squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp2_zero(b[0][0]);
-			fp2_zero(b[1][1]);
-			fp2_zero(c[0][0]);
-			fp2_zero(c[1][1]);
-			fp12_sqr_pck(b, a);
-			fp12_sqr_pck_basic(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced compressed squaring is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp2_zero(b[0][0]);
-			fp2_zero(b[1][1]);
-			fp2_zero(c[0][0]);
-			fp2_zero(c[1][1]);
-			fp12_sqr_pck(b, a);
-			fp12_sqr_pck_lazyr(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-        TEST_CASE("cyclotomic exponentiation is correct") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			bn_zero(f);
-			fp12_exp_cyc(c, a, f);
-			TEST_ASSERT(fp12_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(f, 1);
-			fp12_exp_cyc(c, a, f);
-			TEST_ASSERT(fp12_cmp(c, a) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp12_exp(b, a, f);
-			fp12_exp_cyc(c, a, f);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp12_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp12_exp_cyc(c, a, f);
-			fp12_inv_cyc(c, c);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-			/* Try sparse exponents as well. */
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, RLC_FP_BITS / 2, 1);
-			bn_set_bit(f, 0, 1);
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp12_exp_cyc(c, a, f);
-			fp12_inv_cyc(c, c);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-
-		TEST_CASE("sparse cyclotomic exponentiation is correct") {
-			int g[3] = {0, 0, RLC_FP_BITS - 1};
-			do {
-				bn_rand(f, RLC_POS, RLC_DIG);
-				g[1] = f->dp[0] % RLC_FP_BITS;
-			} while (g[1] == 0 || g[1] == RLC_FP_BITS - 1);
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, g[1], 1);
-			bn_set_bit(f, 0, 1);
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_exp(b, a, f);
-			fp12_exp_cyc_sps(c, a, g, 3, RLC_POS);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-			g[0] = 0;
-			fp12_exp_cyc_sps(c, a, g, 0, RLC_POS);
-			TEST_ASSERT(fp12_cmp_dig(c, 1) == RLC_EQ, end);
-			g[0] = 0;
-			fp12_exp_cyc_sps(c, a, g, 1, RLC_POS);
-			TEST_ASSERT(fp12_cmp(c, a) == RLC_EQ, end);
-			g[0] = -1;
-			fp12_exp_cyc_sps(b, a, g, 1, RLC_POS);
-			fp12_inv(b, b);
-			fp12_sqr_cyc(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	fp12_free(d[0]);
-	fp12_free(d[1]);
-	fp12_free(e[0]);
-	fp12_free(e[1]);
-	bn_free(f);
-	return code;
-}
-
-static int inversion12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp12_rand(a);
-			} while (fp12_is_zero(a));
-			fp12_inv(b, a);
-			fp12_mul(c, a, b);
-			TEST_ASSERT(fp12_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("inversion of a unitary element is correct") {
-			do {
-				fp12_rand(a);
-			} while (fp12_is_zero(a));
-			fp12_conv_cyc(a, a);
-			fp12_inv(b, a);
-			fp12_inv_cyc(c, a);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	return code;
-}
-
-static int exponentiation12(void) {
-	int code = RLC_ERR;
-	fp12_t a, b, c;
-	bn_t d;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp12_rand(a);
-			bn_zero(d);
-			fp12_exp(c, a, d);
-			TEST_ASSERT(fp12_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp12_exp(c, a, d);
-			TEST_ASSERT(fp12_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp12_exp(b, a, d);
-			bn_neg(d, d);
-			fp12_exp(c, a, d);
-			fp12_inv(c, c);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			fp12_exp_dig(b, a, d->dp[0]);
-			fp12_exp(c, a, d);
-			TEST_ASSERT(fp12_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp12_rand(a);
-			fp12_frb(b, a, 0);
-			TEST_ASSERT(fp12_cmp(a, b) == RLC_EQ, end);
-			fp12_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp12_exp(c, a, d);
-			TEST_ASSERT(fp12_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int compression12(void) {
-	int code = RLC_ERR;
-	uint8_t bin[12 * RLC_FP_BYTES];
-	fp12_t a, b, c;
-
-	fp12_null(a);
-	fp12_null(b);
-	fp12_null(c);
-
-	RLC_TRY {
-		fp12_new(a);
-		fp12_new(b);
-		fp12_new(c);
-
-		TEST_CASE("compression is consistent") {
-			fp12_rand(a);
-			fp12_pck(b, a);
-			TEST_ASSERT(fp12_upk(c, b) == 1, end);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_EQ, end);
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_pck(b, a);
-			TEST_ASSERT(fp12_upk(c, b) == 1, end);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_EQ, end);
-			fp12_pck_max(b, a);
-			TEST_ASSERT(fp12_upk_max(c, b) == 1, end);
-			TEST_ASSERT(fp12_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("compression is consistent with reading and writing") {
-			fp12_rand(a);
-			fp12_conv_cyc(a, a);
-			fp12_write_bin(bin, 8 * RLC_FP_BYTES, a, 1);
-			fp12_read_bin(b, bin, 8 * RLC_FP_BYTES);
-			TEST_ASSERT(fp12_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a compressed field element is correct") {
-			fp12_rand(a);
-			TEST_ASSERT(fp12_size_bin(a, 0) == 12 * RLC_FP_BYTES, end);
-			fp12_conv_cyc(a, a);
-			TEST_ASSERT(fp12_size_bin(a, 1) == 8 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp12_free(a);
-	fp12_free(b);
-	fp12_free(c);
-	return code;
-}
-
-static int memory18(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp18_t a;
-
-	fp18_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp18_new(a);
-			fp18_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util18(void) {
-	int code = RLC_ERR;
-	uint8_t bin[18 * RLC_FP_BYTES];
-	fp18_t a, b, c;
-	dig_t d;
-
-	fp18_null(a);
-	fp18_null(b);
-	fp18_null(c);
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp18_rand(a);
-			fp18_rand(b);
-			if (fp18_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp18_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_rand(c);
-			if (fp18_cmp(a, c) != RLC_EQ) {
-				fp18_copy(c, a);
-				TEST_ASSERT(fp18_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp18_cmp(b, c) != RLC_EQ) {
-				fp18_copy(c, b);
-				TEST_ASSERT(fp18_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp18_rand(a);
-			fp18_neg(b, a);
-			if (fp18_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp18_cmp(b, a) == RLC_NE, end);
-			}
-			fp18_neg(b, b);
-			TEST_ASSERT(fp18_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp18_rand(a);
-			} while (fp18_is_zero(a));
-			fp18_zero(c);
-			TEST_ASSERT(fp18_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp18_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp18_rand(a);
-			} while (fp18_is_zero(a));
-			fp18_zero(c);
-			TEST_ASSERT(fp18_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp18_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp18_rand(a);
-			} while (fp18_is_zero(a));
-			fp18_zero(c);
-			TEST_ASSERT(fp18_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp18_zero(a);
-			TEST_ASSERT(fp18_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp18_set_dig(a, d);
-			TEST_ASSERT(fp18_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp18_rand(a);
-			fp18_write_bin(bin, sizeof(bin), a);
-			fp18_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp18_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp18_rand(a);
-			TEST_ASSERT(fp18_size_bin(a) == 18 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	return code;
-}
-
-static int addition18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c, d, e;
-
-	fp18_null(a);
-	fp18_null(b);
-	fp18_null(c);
-	fp18_null(d);
-	fp18_null(e);
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-		fp18_new(d);
-		fp18_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_add(d, a, b);
-			fp18_add(e, b, a);
-			TEST_ASSERT(fp18_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_rand(c);
-			fp18_add(d, a, b);
-			fp18_add(d, d, c);
-			fp18_add(e, b, c);
-			fp18_add(e, a, e);
-			TEST_ASSERT(fp18_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp18_rand(a);
-			fp18_zero(d);
-			fp18_add(e, a, d);
-			TEST_ASSERT(fp18_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp18_rand(a);
-			fp18_neg(d, a);
-			fp18_add(e, a, d);
-			TEST_ASSERT(fp18_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	fp18_free(d);
-	fp18_free(e);
-	return code;
-}
-
-static int subtraction18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c, d;
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-		fp18_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_sub(c, a, b);
-			fp18_sub(d, b, a);
-			fp18_neg(d, d);
-			TEST_ASSERT(fp18_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp18_rand(a);
-			fp18_zero(c);
-			fp18_sub(d, a, c);
-			TEST_ASSERT(fp18_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp18_rand(a);
-			fp18_sub(c, a, a);
-			TEST_ASSERT(fp18_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	fp18_free(d);
-	return code;
-}
-
-static int multiplication18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c, d, e, f;
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-		fp18_new(d);
-		fp18_new(e);
-		fp18_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_mul(d, a, b);
-			fp18_mul(e, b, a);
-			TEST_ASSERT(fp18_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_rand(c);
-			fp18_mul(d, a, b);
-			fp18_mul(d, d, c);
-			fp18_mul(e, b, c);
-			fp18_mul(e, a, e);
-			TEST_ASSERT(fp18_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_rand(c);
-			fp18_add(d, a, b);
-			fp18_mul(d, c, d);
-			fp18_mul(e, c, a);
-			fp18_mul(f, c, b);
-			fp18_add(e, e, f);
-			TEST_ASSERT(fp18_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp18_set_dig(d, 1);
-			fp18_mul(e, a, d);
-			TEST_ASSERT(fp18_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp18_zero(d);
-			fp18_mul(e, a, d);
-			TEST_ASSERT(fp18_is_zero(e), end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_mul(c, a, b);
-			fp18_mul_basic(d, a, b);
-			TEST_ASSERT(fp18_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp18_rand(a);
-			fp18_rand(b);
-			fp18_mul(c, a, b);
-			fp18_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp18_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	fp18_free(d);
-	fp18_free(e);
-	fp18_free(f);
-	return code;
-}
-
-static int squaring18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c;
-
-	fp18_null(a);
-	fp18_null(b);
-	fp18_null(c);
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp18_rand(a);
-			fp18_mul(b, a, a);
-			fp18_sqr(c, a);
-			TEST_ASSERT(fp18_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp18_rand(a);
-			fp18_sqr(b, a);
-			fp18_sqr_basic(c, a);
-			TEST_ASSERT(fp18_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp18_rand(a);
-			fp18_sqr(b, a);
-			fp18_sqr_lazyr(c, a);
-			TEST_ASSERT(fp18_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	return code;
-}
-
-static int inversion18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c;
-
-	fp18_null(a);
-	fp18_null(b);
-	fp18_null(c);
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp18_rand(a);
-			} while (fp18_is_zero(a));
-			fp18_inv(b, a);
-			fp18_mul(c, a, b);
-			TEST_ASSERT(fp18_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	return code;
-}
-
-static int exponentiation18(void) {
-	int code = RLC_ERR;
-	fp18_t a, b, c;
-	bn_t d;
-
-	fp18_null(a);
-	fp18_null(b);
-	fp18_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp18_new(a);
-		fp18_new(b);
-		fp18_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp18_rand(a);
-			bn_zero(d);
-			fp18_exp(c, a, d);
-			TEST_ASSERT(fp18_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp18_exp(c, a, d);
-			TEST_ASSERT(fp18_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp18_exp(b, a, d);
-			bn_neg(d, d);
-			fp18_exp(c, a, d);
-			fp18_inv(c, c);
-			TEST_ASSERT(fp18_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp18_rand(a);
-			fp18_frb(b, a, 0);
-			TEST_ASSERT(fp18_cmp(a, b) == RLC_EQ, end);
-			fp18_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp18_exp(c, a, d);
-			TEST_ASSERT(fp18_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp18_free(a);
-	fp18_free(b);
-	fp18_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int memory24(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp24_t a;
-
-	fp24_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp24_new(a);
-			fp24_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util24(void) {
-	int code = RLC_ERR;
-	uint8_t bin[24 * RLC_FP_BYTES];
-	fp24_t a, b, c;
-	dig_t d;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp24_rand(a);
-			fp24_rand(b);
-			if (fp24_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp24_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_rand(c);
-			if (fp24_cmp(a, c) != RLC_EQ) {
-				fp24_copy(c, a);
-				TEST_ASSERT(fp24_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp24_cmp(b, c) != RLC_EQ) {
-				fp24_copy(c, b);
-				TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp24_rand(a);
-			fp24_neg(b, a);
-			if (fp24_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp24_cmp(b, a) == RLC_NE, end);
-			}
-			fp24_neg(b, b);
-			TEST_ASSERT(fp24_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp24_rand(a);
-			} while (fp24_is_zero(a));
-			fp24_zero(c);
-			TEST_ASSERT(fp24_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp24_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp24_rand(a);
-			} while (fp24_is_zero(a));
-			fp24_zero(c);
-			TEST_ASSERT(fp24_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp24_zero(a);
-			TEST_ASSERT(fp24_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp24_set_dig(a, d);
-			TEST_ASSERT(fp24_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp24_rand(a);
-			fp24_write_bin(bin, sizeof(bin), a, 0);
-			fp24_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp24_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp24_rand(a);
-			TEST_ASSERT(fp24_size_bin(a, 0) == 24 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	return code;
-}
-
-static int addition24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c, d, e;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-	fp24_null(d);
-	fp24_null(e);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-		fp24_new(d);
-		fp24_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_add(d, a, b);
-			fp24_add(e, b, a);
-			TEST_ASSERT(fp24_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_rand(c);
-			fp24_add(d, a, b);
-			fp24_add(d, d, c);
-			fp24_add(e, b, c);
-			fp24_add(e, a, e);
-			TEST_ASSERT(fp24_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp24_rand(a);
-			fp24_zero(d);
-			fp24_add(e, a, d);
-			TEST_ASSERT(fp24_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp24_rand(a);
-			fp24_neg(d, a);
-			fp24_add(e, a, d);
-			TEST_ASSERT(fp24_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	fp24_free(d);
-	fp24_free(e);
-	return code;
-}
-
-static int subtraction24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c, d;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-	fp24_null(d);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-		fp24_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_sub(c, a, b);
-			fp24_sub(d, b, a);
-			fp24_neg(d, d);
-			TEST_ASSERT(fp24_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp24_rand(a);
-			fp24_zero(c);
-			fp24_sub(d, a, c);
-			TEST_ASSERT(fp24_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp24_rand(a);
-			fp24_sub(c, a, a);
-			TEST_ASSERT(fp24_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	fp24_free(d);
-	return code;
-}
-
-static int multiplication24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c, d, e, f;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-	fp24_null(d);
-	fp24_null(e);
-	fp24_null(f);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-		fp24_new(d);
-		fp24_new(e);
-		fp24_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_mul(d, a, b);
-			fp24_mul(e, b, a);
-			TEST_ASSERT(fp24_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_rand(c);
-			fp24_mul(d, a, b);
-			fp24_mul(d, d, c);
-			fp24_mul(e, b, c);
-			fp24_mul(e, a, e);
-			TEST_ASSERT(fp24_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_rand(c);
-			fp24_add(d, a, b);
-			fp24_mul(d, c, d);
-			fp24_mul(e, c, a);
-			fp24_mul(f, c, b);
-			fp24_add(e, e, f);
-			TEST_ASSERT(fp24_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp24_set_dig(d, 1);
-			fp24_mul(e, a, d);
-			TEST_ASSERT(fp24_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp24_zero(d);
-			fp24_mul(e, a, d);
-			TEST_ASSERT(fp24_is_zero(e), end);
-		} TEST_END;
-
-		TEST_CASE("multiplication by adjoined root is correct") {
-			fp24_rand(a);
-			fp24_zero(b);
-			fp8_set_dig(b[1], 1);
-			fp24_mul(c, a, b);
-			fp24_mul_art(d, a);
-			TEST_ASSERT(fp24_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_mul(c, a, b);
-			fp24_mul_basic(d, a, b);
-			TEST_ASSERT(fp24_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp24_rand(a);
-			fp24_rand(b);
-			fp24_mul(c, a, b);
-			fp24_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp24_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	fp24_free(d);
-	fp24_free(e);
-	fp24_free(f);
-	return code;
-}
-
-static int squaring24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp24_rand(a);
-			fp24_mul(b, a, a);
-			fp24_sqr(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp24_rand(a);
-			fp24_sqr(b, a);
-			fp24_sqr_basic(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp24_rand(a);
-			fp24_sqr(b, a);
-			fp24_sqr_lazyr(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	return code;
-}
-
-static int cyclotomic24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c, d[2], e[2];
-	bn_t f;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-	fp24_null(d[0]);
-	fp24_null(d[1])
-	fp24_null(e[0]);
-	fp24_null(e[1]);
-	bn_null(f);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-		fp24_new(d[0]);
-		fp24_new(d[1]);
-		fp24_new(e[0]);
-		fp24_new(e[1]);
-		bn_new(f);
-
-		TEST_CASE("cyclotomic test is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			TEST_ASSERT(fp24_test_cyc(a) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("compression in cyclotomic subgroup is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_back_cyc(c, a);
-			TEST_ASSERT(fp24_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous decompression in cyclotomic subgroup is correct") {
-			fp24_rand(d[0]);
-			fp24_rand(d[1]);
-			fp24_conv_cyc(d[0], d[0]);
-			fp24_conv_cyc(d[1], d[1]);
-			fp24_back_cyc_sim(e, d, 2);
-			TEST_ASSERT(fp24_cmp(d[0], e[0]) == RLC_EQ &&
-					fp24_cmp(d[1], e[1]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("cyclotomic squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_sqr(b, a);
-			fp24_sqr_cyc(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic cyclotomic squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_sqr_cyc(b, a);
-			fp24_sqr_cyc_basic(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced cyclotomic squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_sqr_cyc(b, a);
-			fp24_sqr_cyc_lazyr(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("compressed squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp4_zero(b[0][0]);
-			fp4_zero(b[1][1]);
-			fp4_zero(c[0][0]);
-			fp4_zero(c[1][1]);
-			fp24_sqr(b, a);
-			fp24_sqr_pck(c, a);
-			fp24_back_cyc(c, c);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic compressed squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp4_zero(b[0][0]);
-			fp4_zero(b[1][1]);
-			fp4_zero(c[0][0]);
-			fp4_zero(c[1][1]);
-			fp24_sqr_pck(b, a);
-			fp24_sqr_pck_basic(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced compressed squaring is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp4_zero(b[0][0]);
-			fp4_zero(b[1][1]);
-			fp4_zero(c[0][0]);
-			fp4_zero(c[1][1]);
-			fp24_sqr_pck(b, a);
-			fp24_sqr_pck_lazyr(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-        TEST_CASE("cyclotomic exponentiation is correct") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			bn_zero(f);
-			fp24_exp_cyc(c, a, f);
-			TEST_ASSERT(fp24_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(f, 1);
-			fp24_exp_cyc(c, a, f);
-			TEST_ASSERT(fp24_cmp(c, a) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_DIG);
-			fp24_exp(b, a, f);
-			fp24_exp_cyc(c, a, f);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp24_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp24_exp_cyc(c, a, f);
-			fp24_inv_cyc(c, c);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-			/* Try sparse exponents as well. */
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, RLC_FP_BITS / 2, 1);
-			bn_set_bit(f, 0, 1);
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp24_exp_cyc(c, a, f);
-			fp24_inv_cyc(c, c);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-
-		TEST_CASE("sparse cyclotomic exponentiation is correct") {
-			int g[3] = {0, 0, RLC_FP_BITS - 1};
-			do {
-				bn_rand(f, RLC_POS, RLC_DIG);
-				g[1] = f->dp[0] % RLC_FP_BITS;
-			} while (g[1] == 0 || g[1] == RLC_FP_BITS - 1);
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, g[1], 1);
-			bn_set_bit(f, 0, 1);
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_exp(b, a, f);
-			fp24_exp_cyc_sps(c, a, g, 3, RLC_POS);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-			g[0] = 0;
-			fp24_exp_cyc_sps(c, a, g, 0, RLC_POS);
-			TEST_ASSERT(fp24_cmp_dig(c, 1) == RLC_EQ, end);
-			g[0] = 0;
-			fp24_exp_cyc_sps(c, a, g, 1, RLC_POS);
-			TEST_ASSERT(fp24_cmp(c, a) == RLC_EQ, end);
-			g[0] = -1;
-			fp24_exp_cyc_sps(b, a, g, 1, RLC_POS);
-			fp24_inv(b, b);
-			fp24_sqr_cyc(c, a);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	fp24_free(d[0]);
-	fp24_free(d[1]);
-	fp24_free(e[0]);
-	fp24_free(e[1]);
-	bn_free(f);
-	return code;
-}
-
-static int inversion24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp24_rand(a);
-			} while (fp24_is_zero(a));
-			fp24_inv(b, a);
-			fp24_mul(c, a, b);
-			TEST_ASSERT(fp24_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	return code;
-}
-
-static int exponentiation24(void) {
-	int code = RLC_ERR;
-	fp24_t a, b, c;
-	bn_t d;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp24_rand(a);
-			bn_zero(d);
-			fp24_exp(c, a, d);
-			TEST_ASSERT(fp24_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp24_exp(c, a, d);
-			TEST_ASSERT(fp24_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp24_exp(b, a, d);
-			bn_neg(d, d);
-			fp24_exp(c, a, d);
-			fp24_inv(c, c);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			fp24_exp_dig(b, a, d->dp[0]);
-			fp24_exp(c, a, d);
-			TEST_ASSERT(fp24_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp24_rand(a);
-			fp24_frb(b, a, 0);
-			TEST_ASSERT(fp24_cmp(a, b) == RLC_EQ, end);
-			fp24_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp24_exp(c, a, d);
-			TEST_ASSERT(fp24_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int compression24(void) {
-	int code = RLC_ERR;
-	uint8_t bin[24 * RLC_FP_BYTES];
-	fp24_t a, b, c;
-
-	fp24_null(a);
-	fp24_null(b);
-	fp24_null(c);
-
-	RLC_TRY {
-		fp24_new(a);
-		fp24_new(b);
-		fp24_new(c);
-
-		TEST_CASE("compression is consistent") {
-			fp24_rand(a);
-			fp24_pck(b, a);
-			TEST_ASSERT(fp24_upk(c, b) == 1, end);
-			TEST_ASSERT(fp24_cmp(a, c) == RLC_EQ, end);
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_pck(b, a);
-			TEST_ASSERT(fp24_upk(c, b) == 1, end);
-			TEST_ASSERT(fp24_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("compression is consistent with reading and writing") {
-			fp24_rand(a);
-			fp24_conv_cyc(a, a);
-			fp24_write_bin(bin, 16 * RLC_FP_BYTES, a, 1);
-			fp24_read_bin(b, bin, 16 * RLC_FP_BYTES);
-			TEST_ASSERT(fp24_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a compressed field element is correct") {
-			fp24_rand(a);
-			TEST_ASSERT(fp24_size_bin(a, 0) == 24 * RLC_FP_BYTES, end);
-			fp24_conv_cyc(a, a);
-			TEST_ASSERT(fp24_size_bin(a, 1) == 16 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp24_free(a);
-	fp24_free(b);
-	fp24_free(c);
-	return code;
-}
-
-static int memory48(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp48_t a;
-
-	fp48_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp48_new(a);
-			fp48_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util48(void) {
-	int code = RLC_ERR;
-	uint8_t bin[48 * RLC_FP_BYTES];
-	fp48_t a, b, c;
-	dig_t d;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp48_rand(a);
-			fp48_rand(b);
-			if (fp48_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp48_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_rand(c);
-			if (fp48_cmp(a, c) != RLC_EQ) {
-				fp48_copy(c, a);
-				TEST_ASSERT(fp48_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp48_cmp(b, c) != RLC_EQ) {
-				fp48_copy(c, b);
-				TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp48_rand(a);
-			fp48_neg(b, a);
-			if (fp48_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp48_cmp(b, a) == RLC_NE, end);
-			}
-			fp48_neg(b, b);
-			TEST_ASSERT(fp48_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp48_rand(a);
-			} while (fp48_is_zero(a));
-			fp48_zero(c);
-			TEST_ASSERT(fp48_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp48_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp48_rand(a);
-			} while (fp48_is_zero(a));
-			fp48_zero(c);
-			TEST_ASSERT(fp48_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp48_zero(a);
-			TEST_ASSERT(fp48_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp48_set_dig(a, d);
-			TEST_ASSERT(fp48_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp48_rand(a);
-			fp48_write_bin(bin, sizeof(bin), a, 0);
-			fp48_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp48_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp48_rand(a);
-			TEST_ASSERT(fp48_size_bin(a, 0) == 48 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	return code;
-}
-
-static int addition48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c, d, e;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-	fp48_null(d);
-	fp48_null(e);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-		fp48_new(d);
-		fp48_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_add(d, a, b);
-			fp48_add(e, b, a);
-			TEST_ASSERT(fp48_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_rand(c);
-			fp48_add(d, a, b);
-			fp48_add(d, d, c);
-			fp48_add(e, b, c);
-			fp48_add(e, a, e);
-			TEST_ASSERT(fp48_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp48_rand(a);
-			fp48_zero(d);
-			fp48_add(e, a, d);
-			TEST_ASSERT(fp48_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp48_rand(a);
-			fp48_neg(d, a);
-			fp48_add(e, a, d);
-			TEST_ASSERT(fp48_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	fp48_free(d);
-	fp48_free(e);
-	return code;
-}
-
-static int subtraction48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c, d;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-	fp48_null(d);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-		fp48_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_sub(c, a, b);
-			fp48_sub(d, b, a);
-			fp48_neg(d, d);
-			TEST_ASSERT(fp48_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp48_rand(a);
-			fp48_zero(c);
-			fp48_sub(d, a, c);
-			TEST_ASSERT(fp48_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp48_rand(a);
-			fp48_sub(c, a, a);
-			TEST_ASSERT(fp48_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	fp48_free(d);
-	return code;
-}
-
-static int multiplication48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c, d, e, f;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-	fp48_null(d);
-	fp48_null(e);
-	fp48_null(f);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-		fp48_new(d);
-		fp48_new(e);
-		fp48_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_mul(d, a, b);
-			fp48_mul(e, b, a);
-			TEST_ASSERT(fp48_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_rand(c);
-			fp48_mul(d, a, b);
-			fp48_mul(d, d, c);
-			fp48_mul(e, b, c);
-			fp48_mul(e, a, e);
-			TEST_ASSERT(fp48_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_rand(c);
-			fp48_add(d, a, b);
-			fp48_mul(d, c, d);
-			fp48_mul(e, c, a);
-			fp48_mul(f, c, b);
-			fp48_add(e, e, f);
-			TEST_ASSERT(fp48_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp48_set_dig(d, 1);
-			fp48_mul(e, a, d);
-			TEST_ASSERT(fp48_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp48_zero(d);
-			fp48_mul(e, a, d);
-			TEST_ASSERT(fp48_is_zero(e), end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_mul(c, a, b);
-			fp48_mul_basic(d, a, b);
-			TEST_ASSERT(fp48_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp48_rand(a);
-			fp48_rand(b);
-			fp48_mul(c, a, b);
-			fp48_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp48_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	fp48_free(d);
-	fp48_free(e);
-	fp48_free(f);
-	return code;
-}
-
-static int squaring48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp48_rand(a);
-			fp48_mul(b, a, a);
-			fp48_sqr(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp48_rand(a);
-			fp48_sqr(b, a);
-			fp48_sqr_basic(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp48_rand(a);
-			fp48_sqr(b, a);
-			fp48_sqr_lazyr(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	return code;
-}
-
-static int compression48(void) {
-	int code = RLC_ERR;
-	uint8_t bin[48 * RLC_FP_BYTES];
-	fp48_t a, b, c;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-
-		TEST_CASE("compression is consistent") {
-			fp48_rand(a);
-			fp48_pck(b, a);
-			TEST_ASSERT(fp48_upk(c, b) == 1, end);
-			TEST_ASSERT(fp48_cmp(a, c) == RLC_EQ, end);
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_pck(b, a);
-			TEST_ASSERT(fp48_upk(c, b) == 1, end);
-			TEST_ASSERT(fp48_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("compression is consistent with reading and writing") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_write_bin(bin, 32 * RLC_FP_BYTES, a, 1);
-			fp48_read_bin(b, bin, 32 * RLC_FP_BYTES);
-			TEST_ASSERT(fp48_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a compressed field element is correct") {
-			fp48_rand(a);
-			TEST_ASSERT(fp48_size_bin(a, 0) == 48 * RLC_FP_BYTES, end);
-			fp48_conv_cyc(a, a);
-			TEST_ASSERT(fp48_size_bin(a, 1) == 32 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	return code;
-}
-
-static int cyclotomic48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c, d[2], e[2];
-	bn_t f;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-	fp48_null(d[0]);
-	fp48_null(d[1])
-	fp48_null(e[0]);
-	fp48_null(e[1]);
-	bn_null(f);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-		fp48_new(d[0]);
-		fp48_new(d[1]);
-		fp48_new(e[0]);
-		fp48_new(e[1]);
-		bn_new(f);
-
-		TEST_CASE("cyclotomic test is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			TEST_ASSERT(fp48_test_cyc(a) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("compression in cyclotomic subgroup is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_back_cyc(c, a);
-			TEST_ASSERT(fp48_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous decompression in cyclotomic subgroup is correct") {
-			fp48_rand(d[0]);
-			fp48_rand(d[1]);
-			fp48_conv_cyc(d[0], d[0]);
-			fp48_conv_cyc(d[1], d[1]);
-			fp48_back_cyc_sim(e, d, 2);
-			TEST_ASSERT(fp48_cmp(d[0], e[0]) == RLC_EQ &&
-					fp48_cmp(d[1], e[1]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("cyclotomic squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_sqr(b, a);
-			fp48_sqr_cyc(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic cyclotomic squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_sqr_cyc(b, a);
-			fp48_sqr_cyc_basic(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced cyclotomic squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_sqr_cyc(b, a);
-			fp48_sqr_cyc_lazyr(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("compressed squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp8_zero(b[0][0]);
-			fp8_zero(b[1][1]);
-			fp8_zero(c[0][0]);
-			fp8_zero(c[1][1]);
-			fp48_sqr(b, a);
-			fp48_sqr_pck(c, a);
-			fp48_back_cyc(c, c);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic compressed squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp8_zero(b[0][0]);
-			fp8_zero(b[1][1]);
-			fp8_zero(c[0][0]);
-			fp8_zero(c[1][1]);
-			fp48_sqr_pck(b, a);
-			fp48_sqr_pck_basic(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced compressed squaring is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp8_zero(b[0][0]);
-			fp8_zero(b[1][1]);
-			fp8_zero(c[0][0]);
-			fp8_zero(c[1][1]);
-			fp48_sqr_pck(b, a);
-			fp48_sqr_pck_lazyr(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-        TEST_CASE("cyclotomic exponentiation is correct") {
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			bn_zero(f);
-			fp48_exp_cyc(c, a, f);
-			TEST_ASSERT(fp48_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(f, 1);
-			fp48_exp_cyc(c, a, f);
-			TEST_ASSERT(fp48_cmp(c, a) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp48_exp(b, a, f);
-			fp48_exp_cyc(c, a, f);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp48_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp48_exp_cyc(c, a, f);
-			fp48_inv_cyc(c, c);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-			/* Try sparse exponents as well. */
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, RLC_FP_BITS / 2, 1);
-			bn_set_bit(f, 0, 1);
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp48_exp_cyc(c, a, f);
-			fp48_inv_cyc(c, c);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-
-		TEST_CASE("sparse cyclotomic exponentiation is correct") {
-			int g[3] = {0, 0, RLC_FP_BITS - 1};
-			do {
-				bn_rand(f, RLC_POS, RLC_DIG);
-				g[1] = f->dp[0] % RLC_FP_BITS;
-			} while (g[1] == 0 || g[1] == RLC_FP_BITS - 1);
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, g[1], 1);
-			bn_set_bit(f, 0, 1);
-			fp48_rand(a);
-			fp48_conv_cyc(a, a);
-			fp48_exp(b, a, f);
-			fp48_exp_cyc_sps(c, a, g, 3, RLC_POS);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-			g[0] = 0;
-			fp48_exp_cyc_sps(c, a, g, 0, RLC_POS);
-			TEST_ASSERT(fp48_cmp_dig(c, 1) == RLC_EQ, end);
-			g[0] = 0;
-			fp48_exp_cyc_sps(c, a, g, 1, RLC_POS);
-			TEST_ASSERT(fp48_cmp(c, a) == RLC_EQ, end);
-			g[0] = -1;
-			fp48_exp_cyc_sps(b, a, g, 1, RLC_POS);
-			fp48_inv(b, b);
-			fp48_sqr_cyc(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	fp48_free(d[0]);
-	fp48_free(d[1]);
-	fp48_free(e[0]);
-	fp48_free(e[1]);
-	bn_free(f);
-	return code;
-}
-
-static int inversion48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp48_rand(a);
-			} while (fp48_is_zero(a));
-			fp48_inv(b, a);
-			fp48_mul(c, a, b);
-			TEST_ASSERT(fp48_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("inversion of a unitary element is correct") {
-			do {
-				fp48_rand(a);
-			} while (fp48_is_zero(a));
-			fp48_conv_cyc(a, a);
-			fp48_inv(b, a);
-			fp48_inv_cyc(c, a);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	return code;
-}
-
-static int exponentiation48(void) {
-	int code = RLC_ERR;
-	fp48_t a, b, c;
-	bn_t d;
-
-	fp48_null(a);
-	fp48_null(b);
-	fp48_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp48_new(a);
-		fp48_new(b);
-		fp48_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp48_rand(a);
-			bn_zero(d);
-			fp48_exp(c, a, d);
-			TEST_ASSERT(fp48_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp48_exp(c, a, d);
-			TEST_ASSERT(fp48_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp48_exp(b, a, d);
-			bn_neg(d, d);
-			fp48_exp(c, a, d);
-			fp48_inv(c, c);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			fp48_exp_dig(b, a, d->dp[0]);
-			fp48_exp(c, a, d);
-			TEST_ASSERT(fp48_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp48_rand(a);
-			fp48_frb(b, a, 0);
-			TEST_ASSERT(fp48_cmp(a, b) == RLC_EQ, end);
-			fp48_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp48_exp(c, a, d);
-			TEST_ASSERT(fp48_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp48_free(a);
-	fp48_free(b);
-	fp48_free(c);
-	bn_free(d);
-	return code;
-}
-
-static int memory54(void) {
-	err_t e;
-	int code = RLC_ERR;
-	fp54_t a;
-
-	fp54_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			fp54_new(a);
-			fp54_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-static int util54(void) {
-	int code = RLC_ERR;
-	uint8_t bin[54 * RLC_FP_BYTES];
-	fp54_t a, b, c;
-	dig_t d;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			fp54_rand(a);
-			fp54_rand(b);
-			if (fp54_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp54_cmp(b, a) == RLC_NE, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_rand(c);
-			if (fp54_cmp(a, c) != RLC_EQ) {
-				fp54_copy(c, a);
-				TEST_ASSERT(fp54_cmp(c, a) == RLC_EQ, end);
-			}
-			if (fp54_cmp(b, c) != RLC_EQ) {
-				fp54_copy(c, b);
-				TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("negation is consistent") {
-			fp54_rand(a);
-			fp54_neg(b, a);
-			if (fp54_cmp(a, b) != RLC_EQ) {
-				TEST_ASSERT(fp54_cmp(b, a) == RLC_NE, end);
-			}
-			fp54_neg(b, b);
-			TEST_ASSERT(fp54_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and comparison are consistent") {
-			do {
-				fp54_rand(a);
-			} while (fp54_is_zero(a));
-			fp54_zero(c);
-			TEST_ASSERT(fp54_cmp(a, c) == RLC_NE, end);
-			TEST_ASSERT(fp54_cmp(c, a) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to random and comparison are consistent") {
-			do {
-				fp54_rand(a);
-			} while (fp54_is_zero(a));
-			fp54_zero(c);
-			TEST_ASSERT(fp54_cmp(a, c) == RLC_NE, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to zero and zero test are consistent") {
-			fp54_zero(a);
-			TEST_ASSERT(fp54_is_zero(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to a constant and comparison are consistent") {
-			rand_bytes((uint8_t *)&d, (RLC_DIG / 8));
-			fp54_set_dig(a, d);
-			TEST_ASSERT(fp54_cmp_dig(a, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a finite field element are consistent") {
-			fp54_rand(a);
-			fp54_write_bin(bin, sizeof(bin), a, 0);
-			fp54_read_bin(b, bin, sizeof(bin));
-			TEST_ASSERT(fp54_cmp(a, b) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("getting the size of a finite field element is correct") {
-			fp54_rand(a);
-			TEST_ASSERT(fp54_size_bin(a, 0) == 54 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	return code;
-}
-
-static int addition54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c, d, e;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-	fp54_null(d);
-	fp54_null(e);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-		fp54_new(d);
-		fp54_new(e);
-
-		TEST_CASE("addition is commutative") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_add(d, a, b);
-			fp54_add(e, b, a);
-			TEST_ASSERT(fp54_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition is associative") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_rand(c);
-			fp54_add(d, a, b);
-			fp54_add(d, d, c);
-			fp54_add(e, b, c);
-			fp54_add(e, a, e);
-			TEST_ASSERT(fp54_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has identity") {
-			fp54_rand(a);
-			fp54_zero(d);
-			fp54_add(e, a, d);
-			TEST_ASSERT(fp54_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("addition has inverse") {
-			fp54_rand(a);
-			fp54_neg(d, a);
-			fp54_add(e, a, d);
-			TEST_ASSERT(fp54_is_zero(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	fp54_free(d);
-	fp54_free(e);
-	return code;
-}
-
-static int subtraction54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c, d;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-	fp54_null(d);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-		fp54_new(d);
-
-		TEST_CASE("subtraction is anti-commutative") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_sub(c, a, b);
-			fp54_sub(d, b, a);
-			fp54_neg(d, d);
-			TEST_ASSERT(fp54_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has identity") {
-			fp54_rand(a);
-			fp54_zero(c);
-			fp54_sub(d, a, c);
-			TEST_ASSERT(fp54_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("subtraction has inverse") {
-			fp54_rand(a);
-			fp54_sub(c, a, a);
-			TEST_ASSERT(fp54_is_zero(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	fp54_free(d);
-	return code;
-}
-
-static int multiplication54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c, d, e, f;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-	fp54_null(d);
-	fp54_null(e);
-	fp54_null(f);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-		fp54_new(d);
-		fp54_new(e);
-		fp54_new(f);
-
-		TEST_CASE("multiplication is commutative") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_mul(d, a, b);
-			fp54_mul(e, b, a);
-			TEST_ASSERT(fp54_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_rand(c);
-			fp54_mul(d, a, b);
-			fp54_mul(d, d, c);
-			fp54_mul(e, b, c);
-			fp54_mul(e, a, e);
-			TEST_ASSERT(fp54_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is distributive") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_rand(c);
-			fp54_add(d, a, b);
-			fp54_mul(d, c, d);
-			fp54_mul(e, c, a);
-			fp54_mul(f, c, b);
-			fp54_add(e, e, f);
-			TEST_ASSERT(fp54_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			fp54_set_dig(d, 1);
-			fp54_mul(e, a, d);
-			TEST_ASSERT(fp54_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has zero property") {
-			fp54_zero(d);
-			fp54_mul(e, a, d);
-			TEST_ASSERT(fp54_is_zero(e), end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic multiplication is correct") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_mul(c, a, b);
-			fp54_mul_basic(d, a, b);
-			TEST_ASSERT(fp54_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced multiplication is correct") {
-			fp54_rand(a);
-			fp54_rand(b);
-			fp54_mul(c, a, b);
-			fp54_mul_lazyr(d, a, b);
-			TEST_ASSERT(fp54_cmp(c, d) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	fp54_free(d);
-	fp54_free(e);
-	fp54_free(f);
-	return code;
-}
-
-static int squaring54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-
-		TEST_CASE("squaring is correct") {
-			fp54_rand(a);
-			fp54_mul(b, a, a);
-			fp54_sqr(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC | !defined(STRIP)
-		TEST_CASE("basic squaring is correct") {
-			fp54_rand(a);
-			fp54_sqr(b, a);
-			fp54_sqr_basic(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced squaring is correct") {
-			fp54_rand(a);
-			fp54_sqr(b, a);
-			fp54_sqr_lazyr(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	return code;
-}
-
-static int compression54(void) {
-	int code = RLC_ERR;
-	uint8_t bin[54 * RLC_FP_BYTES];
-	fp54_t a, b, c;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-
-		TEST_CASE("compression is consistent") {
-			fp54_rand(a);
-			fp54_pck(b, a);
-			TEST_ASSERT(fp54_upk(c, b) == 1, end);
-			TEST_ASSERT(fp54_cmp(a, c) == RLC_EQ, end);
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_pck(b, a);
-			TEST_ASSERT(fp54_upk(c, b) == 1, end);
-			TEST_ASSERT(fp54_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("compression is consistent with reading and writing") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_write_bin(bin, 36 * RLC_FP_BYTES, a, 1);
-			fp54_read_bin(b, bin, 36 * RLC_FP_BYTES);
-			TEST_ASSERT(fp54_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("getting the size of a compressed field element is correct") {
-			fp54_rand(a);
-			TEST_ASSERT(fp54_size_bin(a, 0) == 54 * RLC_FP_BYTES, end);
-			fp54_conv_cyc(a, a);
-			TEST_ASSERT(fp54_size_bin(a, 1) == 36 * RLC_FP_BYTES, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	return code;
-}
-
-static int cyclotomic54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c, d[2], e[2];
-	bn_t f;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-	fp54_null(d[0]);
-	fp54_null(d[1])
-	fp54_null(e[0]);
-	fp54_null(e[1]);
-	bn_null(f);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-		fp54_new(d[0]);
-		fp54_new(d[1]);
-		fp54_new(e[0]);
-		fp54_new(e[1]);
-		bn_new(f);
-
-		TEST_CASE("cyclotomic test is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			TEST_ASSERT(fp54_test_cyc(a) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("compression in cyclotomic subgroup is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_back_cyc(c, a);
-			TEST_ASSERT(fp54_cmp(a, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous decompression in cyclotomic subgroup is correct") {
-			fp54_rand(d[0]);
-			fp54_rand(d[1]);
-			fp54_conv_cyc(d[0], d[0]);
-			fp54_conv_cyc(d[1], d[1]);
-			fp54_back_cyc_sim(e, d, 2);
-			TEST_ASSERT(fp54_cmp(d[0], e[0]) == RLC_EQ &&
-					fp54_cmp(d[1], e[1]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("cyclotomic squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_sqr(b, a);
-			fp54_sqr_cyc(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic cyclotomic squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_sqr_cyc(b, a);
-			fp54_sqr_cyc_basic(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced cyclotomic squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_sqr_cyc(b, a);
-			fp54_sqr_cyc_lazyr(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-		TEST_CASE("compressed squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp9_zero(b[0][0]);
-			fp9_zero(b[1][1]);
-			fp9_zero(c[0][0]);
-			fp9_zero(c[1][1]);
-			fp54_sqr(b, a);
-			fp54_sqr_pck(c, a);
-			fp54_back_cyc(c, c);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-#if FPX_RDC == BASIC || !defined(STRIP)
-		TEST_CASE("basic compressed squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp9_zero(b[0][0]);
-			fp9_zero(b[1][1]);
-			fp9_zero(c[0][0]);
-			fp9_zero(c[1][1]);
-			fp54_sqr_pck(b, a);
-			fp54_sqr_pck_basic(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if FPX_RDC == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced compressed squaring is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp9_zero(b[0][0]);
-			fp9_zero(b[1][1]);
-			fp9_zero(c[0][0]);
-			fp9_zero(c[1][1]);
-			fp54_sqr_pck(b, a);
-			fp54_sqr_pck_lazyr(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-        TEST_CASE("cyclotomic exponentiation is correct") {
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			bn_zero(f);
-			fp54_exp_cyc(c, a, f);
-			TEST_ASSERT(fp54_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(f, 1);
-			fp54_exp_cyc(c, a, f);
-			TEST_ASSERT(fp54_cmp(c, a) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp54_exp(b, a, f);
-			fp54_exp_cyc(c, a, f);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-			bn_rand(f, RLC_POS, RLC_FP_BITS);
-			fp54_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp54_exp_cyc(c, a, f);
-			fp54_inv_cyc(c, c);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-			/* Try sparse exponents as well. */
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, RLC_FP_BITS / 2, 1);
-			bn_set_bit(f, 0, 1);
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_exp_cyc(b, a, f);
-			bn_neg(f, f);
-			fp54_exp_cyc(c, a, f);
-			fp54_inv_cyc(c, c);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-        } TEST_END;
-
-		TEST_CASE("sparse cyclotomic exponentiation is correct") {
-			int g[3] = {0, 0, RLC_FP_BITS - 1};
-			do {
-				bn_rand(f, RLC_POS, RLC_DIG);
-				g[1] = f->dp[0] % RLC_FP_BITS;
-			} while (g[1] == 0 || g[1] == RLC_FP_BITS - 1);
-			bn_set_2b(f, RLC_FP_BITS - 1);
-			bn_set_bit(f, g[1], 1);
-			bn_set_bit(f, 0, 1);
-			fp54_rand(a);
-			fp54_conv_cyc(a, a);
-			fp54_exp(b, a, f);
-			fp54_exp_cyc_sps(c, a, g, 3, RLC_POS);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-			g[0] = 0;
-			fp54_exp_cyc_sps(c, a, g, 0, RLC_POS);
-			TEST_ASSERT(fp54_cmp_dig(c, 1) == RLC_EQ, end);
-			g[0] = 0;
-			fp54_exp_cyc_sps(c, a, g, 1, RLC_POS);
-			TEST_ASSERT(fp54_cmp(c, a) == RLC_EQ, end);
-			g[0] = -1;
-			fp54_exp_cyc_sps(b, a, g, 1, RLC_POS);
-			fp54_inv(b, b);
-			fp54_sqr_cyc(c, a);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	fp54_free(d[0]);
-	fp54_free(d[1]);
-	fp54_free(e[0]);
-	fp54_free(e[1]);
-	bn_free(f);
-	return code;
-}
-
-static int inversion54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-
-		TEST_CASE("inversion is correct") {
-			do {
-				fp54_rand(a);
-			} while (fp54_is_zero(a));
-			fp54_inv(b, a);
-			fp54_mul(c, a, b);
-			TEST_ASSERT(fp54_cmp_dig(c, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("inversion of a unitary element is correct") {
-			do {
-				fp54_rand(a);
-			} while (fp54_is_zero(a));
-			fp54_conv_cyc(a, a);
-			fp54_inv(b, a);
-			fp54_inv_cyc(c, a);
-			//TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	return code;
-}
-
-static int exponentiation54(void) {
-	int code = RLC_ERR;
-	fp54_t a, b, c;
-	bn_t d;
-
-	fp54_null(a);
-	fp54_null(b);
-	fp54_null(c);
-	bn_null(d);
-
-	RLC_TRY {
-		fp54_new(a);
-		fp54_new(b);
-		fp54_new(c);
-		bn_new(d);
-
-		TEST_CASE("exponentiation is correct") {
-			fp54_rand(a);
-			bn_zero(d);
-			fp54_exp(c, a, d);
-			TEST_ASSERT(fp54_cmp_dig(c, 1) == RLC_EQ, end);
-			bn_set_dig(d, 1);
-			fp54_exp(c, a, d);
-			TEST_ASSERT(fp54_cmp(c, a) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_FP_BITS);
-			fp54_exp(b, a, d);
-			bn_neg(d, d);
-			fp54_exp(c, a, d);
-			fp54_inv(c, c);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			fp54_exp_dig(b, a, d->dp[0]);
-			fp54_exp(c, a, d);
-			TEST_ASSERT(fp54_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("frobenius and exponentiation are consistent") {
-			fp54_rand(a);
-			fp54_frb(b, a, 0);
-			TEST_ASSERT(fp54_cmp(a, b) == RLC_EQ, end);
-			fp54_frb(b, a, 1);
-			d->sign = RLC_POS;
-			d->used = RLC_FP_DIGS;
-			dv_copy(d->dp, fp_prime_get(), RLC_FP_DIGS);
-			fp54_exp(c, a, d);
-			TEST_ASSERT(fp54_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	fp54_free(a);
-	fp54_free(b);
-	fp54_free(c);
-	bn_free(d);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the FPX module", 0);
-
-	/* Try using a pairing-friendly curve for faster exponentiation method. */
-	if (pc_param_set_any() != RLC_OK) {
-		/* If it does not work, try a tower-friendly field. */
-		if (fp_param_set_any_tower() == RLC_ERR) {
-			RLC_THROW(ERR_NO_FIELD);
-			core_clean();
-			return 0;
-		}
-	}
-
-	/* Only execute these if there is an assigned quadratic non-residue. */
-	if (fp_prime_get_qnr()) {
-		util_print("\n-- Quadratic extension: %d as QNR\n", fp_prime_get_qnr());
-		util_banner("Utilities:", 1);
-
-		if (memory2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-#ifdef FP_QNRES
-		/* Restrict compression to p = 3 mod 4 for the moment. */
-		if (compression2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-#endif
-
-		if (square_root2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	/* Only execute these if there is an assigned cubic non-residue. */
-	if (fp_prime_get_cnr()) {
-		util_print("\n-- Cubic extension: %d as CNR\n", fp_prime_get_cnr());
-		util_banner("Utilities:", 1);
-
-		if (memory3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (square_root3() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	/* Fp^4 is defined as a quadratic extension of Fp^2. */
-	if (fp_prime_get_qnr()) {
-		util_print("\n-- Quartic extension: (i + %d) as QNR\n",
-				fp2_field_get_qnr());
-		util_banner("Utilities:", 1);
-
-		if (memory4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (square_root4() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	/* Fp^6 is defined as a cubic extension of Fp^2. */
-	if (fp_prime_get_qnr()) {
-		util_print("\n-- Sextic extension: (i + %d) as CNR\n",
-				fp2_field_get_qnr());
-		util_banner("Utilities:", 1);
-
-		if (memory6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation6() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Octic extension: (j) as CNR", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cyclotomic8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	/* Only execute these if there is an assigned cubic non-residue. */
-	if (fp_prime_get_cnr()) {
-		util_print("\n-- Nonic extension: (j) as CNR\n");
-		util_banner("Utilities:", 1);
-
-		if (memory9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (doubling9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation9() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Dodecic extension:", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cyclotomic12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (compression12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Octdecic extension:", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation18() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (fp_prime_get_qnr()) {
-		util_banner("Extension of degree 24:", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cyclotomic24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (compression24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Extension of degree 48:", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cyclotomic48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (compression48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (fp_prime_get_cnr()) {
-		util_banner("Extension of degree 54:", 0);
-		util_banner("Utilities:", 1);
-
-		if (memory54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (util54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		util_banner("Arithmetic:", 1);
-
-		if (addition54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (subtraction54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (multiplication54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (squaring54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (inversion54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (exponentiation54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (cyclotomic54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (compression54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_md.c b/src/dashbls/depends/relic/test/test_md.c
deleted file mode 100644
index 10a7862588d5..000000000000
--- a/src/dashbls/depends/relic/test/test_md.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for hash functions.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-#if ARCH == AVR || ARCH == MSP || ARCH == ARM
-#define MSG_SIZE	112
-#define TEST_MAX	2
-#else
-#define MSG_SIZE	1000001
-#define TEST_MAX	3
-#endif
-
-/*
- *  Define patterns for testing
- */
-#define TEST1   "abc"
-
-#define TEST2a  "abcdbcdecdefdefgefghfghighijhi"
-#define TEST2b  "jkijkljklmklmnlmnomnopnopq"
-
-#define TEST3a	"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-#define TEST3b	"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-
-#define TEST4a	"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-#define TEST4b	"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-
-char *tests[3] = {
-	TEST1,
-	TEST2a TEST2b,
-	TEST3a TEST3b,
-};
-
-long int count[3] = { 1, 1, 10000 };
-
-#if MD_MAP == SH224 || !defined(STRIP)
-
-uint8_t result224[3][28] = {
-	{0x23, 0x09, 0x7D, 0x22, 0x34, 0x05, 0xD8, 0x22, 0x86, 0x42, 0xA4, 0x77,
-			0xBD, 0xA2, 0x55, 0xB3, 0x2A, 0xAD, 0xBC, 0xE4, 0xBD, 0xA0,
-			0xB3, 0xF7, 0xE3, 0x6C, 0x9D, 0xA7},
-	{0x75, 0x38, 0x8B, 0x16, 0x51, 0x27, 0x76, 0xCC, 0x5D, 0xBA, 0x5D, 0xA1,
-			0xFD, 0x89, 0x01, 0x50, 0xB0, 0xC6, 0x45, 0x5C, 0xB4, 0xF5,
-			0x8B, 0x19, 0x52, 0x52, 0x25, 0x25},
-	{0x20, 0x79, 0x46, 0x55, 0x98, 0x0C, 0x91, 0xD8, 0xBB, 0xB4, 0xC1, 0xEA,
-			0x97, 0x61, 0x8A, 0x4B, 0xF0, 0x3F, 0x42, 0x58, 0x19, 0x48,
-			0xB2, 0xEE, 0x4E, 0xE7, 0xAD, 0x67},
-};
-
-uint8_t result_xmd_sha224[4][75] = {
-	{0x8A, 0x96, 0x42, 0x30, 0x80, 0x8F, 0xC6, 0xC7, 0xB3, 0xD9, 0xC4,
-	 0x85, 0xC6, 0x84, 0xEC, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x9E, 0xF3, 0xB9, 0xE9, 0xDE, 0x45, 0x0B, 0xCF, 0xB7, 0xDA, 0x27,
-	 0xD3, 0x57, 0xD3, 0x61, 0x7C, 0x7E, 0xEA, 0x0F, 0x06, 0x03, 0xC1,
-	 0x3C, 0x3D, 0xA2, 0xD3, 0xB1, 0xFD, 0xCE, 0x4B, 0xC5, 0x57, 0x41,
-	 0xF5, 0xD7, 0xC0, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0xCC, 0x1C, 0xB2, 0x35, 0x08, 0x64, 0x0B, 0xB4, 0x64, 0x28, 0x14,
-	 0x3E, 0x25, 0xF2, 0x69, 0x95, 0x32, 0x3C, 0xAA, 0x78, 0xE3, 0xBB,
-	 0x17, 0x38, 0xFF, 0xEA, 0x3E, 0x92, 0x8D, 0xD6, 0xC5, 0x36, 0x9A,
-	 0x12, 0xDB, 0x64, 0x62, 0x7C, 0x4D, 0xA8, 0xD9, 0xB4, 0xC9, 0xA1,
-	 0x65, 0x44, 0xA0, 0xA5, 0xB0, 0xC2, 0xDD, 0xB7, 0xC1, 0x04, 0xE8,
-	 0x11, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0xDE, 0xCA, 0x1A, 0xC0, 0x56, 0x68, 0x98, 0x01, 0xB4, 0xA9, 0x7D,
-	 0x46, 0x51, 0xE7, 0xD8, 0x77, 0xD9, 0xFD, 0x34, 0xED, 0xF1, 0x40,
-	 0xF6, 0x3D, 0xE7, 0x7A, 0xA2, 0xF7, 0x9D, 0x84, 0xC8, 0x8F, 0x27,
-	 0x5E, 0xE0, 0xB0, 0xA2, 0x09, 0x2F, 0x45, 0xD2, 0x98, 0x46, 0x82,
-	 0x24, 0x8C, 0x4D, 0x66, 0x12, 0xC1, 0x8C, 0xE2, 0x6E, 0x15, 0x7D,
-	 0x04, 0x16, 0x52, 0x46, 0x64, 0x29, 0x8F, 0x4B, 0xF3, 0x8F, 0xBB,
-	 0x0A, 0x3D, 0xBC, 0x51, 0x7D, 0xD8, 0xB6, 0x16, 0xC8},
-};
-
-static int sha224(void) {
-	int code = RLC_ERR;
-	int i, j;
-	uint8_t message[MSG_SIZE], digest[28];
-
-	TEST_ONCE("sha224 hash function is correct") {
-		for (i = 0; i < TEST_MAX; i++) {
-			memset(message, 0, MSG_SIZE);
-			for (j = 0; j < count[i]; j++) {
-				strcat((char *)message, tests[i]);
-			}
-			md_map_sh224(digest, message, strlen((char *)message));
-			TEST_ASSERT(memcmp(digest, result224[i], 28) == 0, end);
-		}
-	}
-	TEST_END;
-
-	TEST_ONCE("sha224 xmd function is correct") {
-		uint8_t buf[75] = {0,};
-		md_xmd_sh224(buf, 16, (uint8_t *)TEST1, strlen(TEST1), (uint8_t *)"", 0);
-		TEST_ASSERT(memcmp(buf, result_xmd_sha224[0], 16) == 0, end);
-		md_xmd_sh224(buf, 37, (uint8_t *)TEST2a, strlen(TEST2a), (uint8_t *)TEST2b, strlen(TEST2b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha224[1], 37) == 0, end);
-		md_xmd_sh224(buf, 57, (uint8_t *)TEST3a, strlen(TEST3a), (uint8_t *)TEST3b, strlen(TEST3b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha224[2], 57) == 0, end);
-		md_xmd_sh224(buf, 75, (uint8_t *)TEST4a, strlen(TEST4a), (uint8_t *)TEST4b, strlen(TEST4b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha224[3], 75) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#endif
-
-#if MD_MAP == SH256 || !defined(STRIP)
-
-uint8_t result256[3][32] = {
-	{0xBA, 0x78, 0x16, 0xBF, 0x8F, 0x01, 0xCF, 0xEA, 0x41, 0x41, 0x40, 0xDE,
-			0x5D, 0xAE, 0x22, 0x23, 0xB0, 0x03, 0x61, 0xA3, 0x96, 0x17,
-			0x7A, 0x9C, 0xB4, 0x10, 0xFF, 0x61, 0xF2, 0x00, 0x15, 0xAD},
-	{0x24, 0x8d, 0x6A, 0x61, 0xd2, 0x06, 0x38, 0xb8, 0xE5, 0xc0, 0x26, 0x93,
-			0x0c, 0x3E, 0x60, 0x39, 0xA3, 0x3c, 0xE4, 0x59, 0x64, 0xFF,
-			0x21, 0x67, 0xF6, 0xEc, 0xEd, 0xd4, 0x19, 0xdB, 0x06, 0xc1},
-	{0xCD, 0xC7, 0x6E, 0x5C, 0x99, 0x14, 0xFB, 0x92, 0x81, 0xA1, 0xC7, 0xE2,
-			0x84, 0xd7, 0x3E, 0x67, 0xF1, 0x80, 0x9A, 0x48, 0xA4, 0x97,
-			0x20, 0x0E, 0x04, 0x6D, 0x39, 0xCC, 0xC7, 0x11, 0x2C, 0xD0}
-};
-
-uint8_t result_xmd_sha256[4][75] = {
-	{0x94, 0x77, 0xB7, 0xE5, 0xCA, 0x5E, 0xF7, 0x57, 0x6C, 0xF8, 0xF1,
-	 0x18, 0x26, 0xAA, 0x86, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x39, 0x65, 0x3C, 0xBF, 0x00, 0x21, 0xBE, 0x81, 0x5C, 0x84, 0xD6,
-	 0x9D, 0xF1, 0xB1, 0xF3, 0x0D, 0x70, 0xE1, 0x4D, 0xB9, 0xF2, 0x45,
-	 0xC7, 0x6D, 0xEF, 0x80, 0x6D, 0x6A, 0x3E, 0x6F, 0x67, 0xAF, 0xB5,
-	 0xB7, 0x2A, 0x51, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x37, 0x73, 0x2D, 0x66, 0xE2, 0x1B, 0x59, 0x48, 0xF0, 0x10, 0xFA,
-	 0x57, 0xDA, 0xC9, 0x8A, 0x08, 0x6E, 0x73, 0x0B, 0x67, 0xEF, 0x32,
-	 0x52, 0xB0, 0x6E, 0x5A, 0x9C, 0x85, 0xCE, 0x22, 0x6B, 0x2F, 0x60,
-	 0x7B, 0x35, 0x14, 0xA1, 0x39, 0x2E, 0x64, 0x81, 0xF8, 0xCE, 0xA3,
-	 0xF0, 0x41, 0x55, 0x41, 0xFA, 0x3F, 0x8F, 0x38, 0x5D, 0x95, 0xCC,
-	 0x2A, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x9B, 0xF5, 0xCA, 0x1E, 0x5E, 0x91, 0x75, 0x14, 0xB4, 0x31, 0xCD,
-	 0xFC, 0x72, 0x35, 0x61, 0x9C, 0x4D, 0xC4, 0x13, 0xAD, 0x69, 0xE8,
-	 0x2D, 0x8D, 0x1E, 0xF0, 0x03, 0xC3, 0xA7, 0x86, 0xD9, 0xC7, 0x17,
-	 0x47, 0x01, 0x07, 0xD3, 0x69, 0x8C, 0x06, 0x9D, 0xEB, 0x48, 0x3A,
-	 0x01, 0x13, 0x17, 0xD3, 0x8D, 0x1F, 0xAD, 0x85, 0x5F, 0x8E, 0xFF,
-	 0x90, 0xBA, 0x44, 0xBC, 0xB3, 0xBC, 0xAC, 0xED, 0x1F, 0x8F, 0x21,
-	 0x4C, 0xCF, 0xB7, 0x31, 0x0D, 0x41, 0x21, 0x7D, 0x94},
-};
-
-static int sha256(void) {
-	int code = RLC_ERR;
-	int i, j;
-	uint8_t message[MSG_SIZE], digest[32];
-
-	TEST_ONCE("sha256 hash function is correct") {
-		for (i = 0; i < TEST_MAX; i++) {
-			memset(message, 0, MSG_SIZE);
-			for (j = 0; j < count[i]; j++) {
-				strcat((char *)message, tests[i]);
-			}
-			md_map_sh256(digest, message, strlen((char *)message));
-			TEST_ASSERT(memcmp(digest, result256[i], 32) == 0, end);
-		}
-	}
-	TEST_END;
-
-	TEST_ONCE("sha256 xmd function is correct") {
-		uint8_t buf[75] = {0,};
-		md_xmd_sh256(buf, 16, (uint8_t *)TEST1, strlen(TEST1), (uint8_t *)"", 0);
-		TEST_ASSERT(memcmp(buf, result_xmd_sha256[0], 16) == 0, end);
-		md_xmd_sh256(buf, 37, (uint8_t *)TEST2a, strlen(TEST2a), (uint8_t *)TEST2b, strlen(TEST2b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha256[1], 37) == 0, end);
-		md_xmd_sh256(buf, 57, (uint8_t *)TEST3a, strlen(TEST3a), (uint8_t *)TEST3b, strlen(TEST3b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha256[2], 57) == 0, end);
-		md_xmd_sh256(buf, 75, (uint8_t *)TEST4a, strlen(TEST4a), (uint8_t *)TEST4b, strlen(TEST4b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha256[3], 75) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#endif
-
-#if MD_MAP == SH384 || !defined(STRIP)
-
-char *tests2[3] = {
-	TEST1,
-	TEST4a TEST4b,
-	TEST3a TEST3b
-};
-
-long int count2[3] = { 1, 1, 10000 };
-
-uint8_t result384[4][48] = {
-	{0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B, 0xB5, 0xA0, 0x3D, 0x69,
-			0x9A, 0xC6, 0x50, 0x07, 0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE,
-			0xD1, 0x63, 0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
-			0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23, 0x58, 0xBA,
-			0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7},
-	{0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8, 0x3D, 0x19, 0x2F, 0xC7,
-			0x82, 0xCD, 0x1B, 0x47, 0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B,
-			0x05, 0xD2, 0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
-			0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9, 0x66, 0xC3,
-			0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39},
-	{0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB, 0x08, 0x6E, 0x83, 0x4E,
-			0x31, 0x0A, 0x4A, 0x1C, 0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2,
-			0x48, 0x52, 0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
-			0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB, 0xAE, 0x97,
-			0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85},
-};
-
-uint8_t result_xmd_sha384[4][75] = {
-	{0x08, 0xB9, 0x33, 0x36, 0xAE, 0x29, 0x19, 0x5A, 0x13, 0x4F, 0x70,
-	 0x7C, 0x96, 0x60, 0x3A, 0x8E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x69, 0x57, 0x2F, 0x76, 0xF3, 0xB7, 0x4B, 0x4A, 0xA3, 0x88, 0x99,
-	 0x79, 0x95, 0x43, 0x41, 0x15, 0xF9, 0xBB, 0xF8, 0x15, 0x43, 0x82,
-	 0x6C, 0x87, 0xF2, 0x64, 0xB0, 0x3C, 0x67, 0x43, 0x3C, 0x41, 0xCA,
-	 0x60, 0xD0, 0x08, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x14, 0xE8, 0xD1, 0x13, 0xF8, 0xBC, 0x63, 0xF4, 0x07, 0x05, 0x07,
-	 0x91, 0xE9, 0xF8, 0x6C, 0xAD, 0x44, 0x5B, 0x9E, 0xCF, 0x88, 0xF5,
-	 0x79, 0x55, 0x27, 0xEB, 0x63, 0x77, 0x9B, 0xC4, 0x72, 0xBE, 0x89,
-	 0xAF, 0x1E, 0xAD, 0x3F, 0x38, 0x2E, 0x21, 0x0B, 0x82, 0x6A, 0xC5,
-	 0x12, 0xC6, 0x81, 0x9A, 0xE6, 0x13, 0xDD, 0x76, 0xF5, 0x10, 0x16,
-	 0x1E, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x73, 0xDF, 0xE1, 0xDC, 0xCD, 0x24, 0x7C, 0xDB, 0xC7, 0x89, 0xE3,
-	 0xD3, 0x4E, 0x54, 0x56, 0xF4, 0x31, 0xF3, 0xDE, 0x11, 0xDC, 0x42,
-	 0x05, 0x35, 0xB0, 0xD2, 0x44, 0x65, 0x7F, 0x64, 0xC8, 0xF2, 0xBD,
-	 0xC6, 0x90, 0x87, 0x98, 0xA7, 0x66, 0xDF, 0xC6, 0x80, 0x2D, 0x85,
-	 0x70, 0x34, 0x15, 0x56, 0xED, 0xAC, 0x4F, 0x2B, 0xB2, 0xB1, 0xFB,
-	 0x59, 0xED, 0x09, 0x23, 0xE8, 0xB8, 0x60, 0x43, 0x5E, 0x77, 0x25,
-	 0xB9, 0x91, 0x25, 0x19, 0xF2, 0x1B, 0x92, 0xC9, 0x09},
-};
-
-static int sha384(void) {
-	int code = RLC_ERR;
-	int i, j;
-	uint8_t message[MSG_SIZE], digest[48];
-
-	TEST_ONCE("sha384 hash function is correct") {
-		for (i = 0; i < TEST_MAX; i++) {
-			memset(message, 0, MSG_SIZE);
-			for (j = 0; j < count2[i]; j++) {
-				strcat((char *)message, tests2[i]);
-			}
-			md_map_sh384(digest, message, strlen((char *)message));
-			TEST_ASSERT(memcmp(digest, result384[i], 48) == 0, end);
-		}
-	}
-	TEST_END;
-
-	TEST_ONCE("sha384 xmd function is correct") {
-		uint8_t buf[75] = {0,};
-		md_xmd_sh384(buf, 16, (uint8_t *)TEST1, strlen(TEST1), (uint8_t *)"", 0);
-		TEST_ASSERT(memcmp(buf, result_xmd_sha384[0], 16) == 0, end);
-		md_xmd_sh384(buf, 37, (uint8_t *)TEST2a, strlen(TEST2a), (uint8_t *)TEST2b, strlen(TEST2b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha384[1], 37) == 0, end);
-		md_xmd_sh384(buf, 57, (uint8_t *)TEST3a, strlen(TEST3a), (uint8_t *)TEST3b, strlen(TEST3b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha384[2], 57) == 0, end);
-		md_xmd_sh384(buf, 75, (uint8_t *)TEST4a, strlen(TEST4a), (uint8_t *)TEST4b, strlen(TEST4b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha384[3], 75) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#endif
-
-#if MD_MAP == SH512 || !defined(STRIP)
-
-uint8_t result512[4][64] = {
-	{0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA, 0xCC, 0x41, 0x73, 0x49,
-			0xAE, 0x20, 0x41, 0x31, 0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9,
-			0x7E, 0xA2, 0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
-			0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8, 0x36, 0xBA,
-			0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD, 0x45, 0x4D, 0x44, 0x23,
-			0x64, 0x3C, 0xE8, 0x0E, 0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C,
-			0xA4, 0x9F},
-	{0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA, 0x8C, 0xF4, 0xF7, 0x28,
-			0x14, 0xFC, 0x14, 0x3F, 0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F,
-			0x7F, 0xA1, 0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
-			0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4, 0x33, 0x1B,
-			0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A, 0xC7, 0xD3, 0x29, 0xEE,
-			0xB6, 0xDD, 0x26, 0x54, 0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B,
-			0xE9, 0x09},
-	{0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64, 0x4E, 0x2E, 0x42, 0xC7,
-			0xBC, 0x15, 0xB4, 0x63, 0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20,
-			0x44, 0x28, 0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
-			0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A, 0x4C, 0xB0,
-			0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B, 0xEB, 0x00, 0x9C, 0x5C,
-			0x2C, 0x49, 0xAA, 0x2E, 0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C,
-			0xC0, 0x9B},
-};
-
-uint8_t result_xmd_sha512[4][75] = {
-	{0x59, 0xDB, 0xF2, 0x0C, 0x8A, 0x4C, 0xCA, 0xA9, 0x92, 0xA9, 0x69,
-	 0xEE, 0xFA, 0x7B, 0x75, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x22, 0xAA, 0x25, 0xD0, 0x0E, 0xC9, 0x80, 0x2A, 0xA0, 0xE5, 0x29,
-	 0x72, 0x1C, 0xB1, 0xAE, 0x81, 0xED, 0x6A, 0x16, 0x4D, 0xB5, 0xDB,
-	 0x1D, 0x02, 0x4E, 0x5E, 0xF7, 0x74, 0xCF, 0x68, 0x4E, 0x5B, 0x38,
-	 0x8D, 0x90, 0xD2, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0xB6, 0xCE, 0x3B, 0x44, 0x93, 0x98, 0x01, 0x23, 0xDD, 0x41, 0xDD,
-	 0xAF, 0x69, 0x4F, 0xD0, 0xB5, 0xE3, 0xD9, 0xE7, 0xE6, 0x21, 0x32,
-	 0xD5, 0x0A, 0x86, 0xE0, 0xA2, 0x83, 0x60, 0x2A, 0x02, 0x1A, 0x53,
-	 0xC3, 0x88, 0xF1, 0x32, 0xE9, 0x20, 0xFC, 0x17, 0xDC, 0x2A, 0x6C,
-	 0x84, 0xC8, 0x85, 0x73, 0x19, 0x90, 0xEC, 0x5E, 0xC0, 0xAD, 0x94,
-	 0x92, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x2F, 0xAA, 0x1C, 0x16, 0x7B, 0x33, 0xD4, 0x3C, 0xB0, 0xC4, 0x35,
-	 0xA3, 0x89, 0x46, 0x74, 0xB2, 0x5E, 0x1D, 0x90, 0xB9, 0x6B, 0xB8,
-	 0xDC, 0x63, 0xAD, 0x40, 0xB5, 0xB3, 0xD4, 0x28, 0x1C, 0x72, 0xEB,
-	 0xF1, 0xC5, 0xE6, 0x3D, 0x6D, 0x8C, 0x52, 0x0B, 0x96, 0xD6, 0x8F,
-	 0xCD, 0x94, 0x22, 0xEE, 0x11, 0x21, 0x64, 0x70, 0x6E, 0x2B, 0x2D,
-	 0x91, 0x95, 0x8A, 0x6E, 0x76, 0xEB, 0x3B, 0x15, 0x2E, 0x0E, 0xF0,
-	 0x34, 0x66, 0x45, 0x49, 0xD0, 0x1E, 0xA3, 0x97, 0xC2},
-};
-
-static int sha512(void) {
-	int code = RLC_ERR;
-	int i, j;
-	uint8_t message[MSG_SIZE], digest[64];
-
-	TEST_ONCE("sha512 hash function is correct") {
-		for (i = 0; i < TEST_MAX; i++) {
-			memset(message, 0, MSG_SIZE);
-			for (j = 0; j < count2[i]; j++) {
-				strcat((char *)message, tests2[i]);
-			}
-			md_map_sh512(digest, message, strlen((char *)message));
-			TEST_ASSERT(memcmp(digest, result512[i], 64) == 0, end);
-		}
-	}
-	TEST_END;
-
-	TEST_ONCE("sha512 xmd function is correct") {
-		uint8_t buf[75] = {0,};
-		md_xmd_sh512(buf, 16, (uint8_t *)TEST1, strlen(TEST1), (uint8_t *)"", 0);
-		TEST_ASSERT(memcmp(buf, result_xmd_sha512[0], 16) == 0, end);
-		md_xmd_sh512(buf, 37, (uint8_t *)TEST2a, strlen(TEST2a), (uint8_t *)TEST2b, strlen(TEST2b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha512[1], 37) == 0, end);
-		md_xmd_sh512(buf, 57, (uint8_t *)TEST3a, strlen(TEST3a), (uint8_t *)TEST3b, strlen(TEST3b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha512[2], 57) == 0, end);
-		md_xmd_sh512(buf, 75, (uint8_t *)TEST4a, strlen(TEST4a), (uint8_t *)TEST4b, strlen(TEST4b));
-		TEST_ASSERT(memcmp(buf, result_xmd_sha512[3], 75) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#endif
-
-#if MD_MAP == SH256
-
-/* Test vector #1, ANSI X9.63 */
-
-uint8_t key2[] = {
-	0x44, 0x30, 0x24, 0xC3, 0xDA, 0xE6, 0x6B, 0x95, 0xE6, 0xF5, 0x67, 0x06,
-	0x01, 0x55, 0x8F, 0x71
-};
-
-#endif
-
-static int kdf(void) {
-	int code = RLC_ERR;
-	uint8_t message[] = { 0x96, 0xC0, 0x56, 0x19, 0xD5, 0x6C, 0x32, 0x8A, 0xB9,
-		0x5F, 0xE8, 0x4B, 0x18, 0x26, 0x4B, 0x08, 0x72, 0x5B, 0x85, 0xE3, 0x3F,
-		0xD3, 0x4F, 0x08 };
-	uint8_t key[32];
-
-#if MD_MAP == SH256
-	TEST_ONCE("key derivation function (sha256) is correct") {
-		md_kdf(key, sizeof(key2), message, sizeof(message));
-		TEST_ASSERT(memcmp(key, key2, sizeof(key2)) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-
-#else
-	(void)message;
-	(void)code;
-	(void)key;
-	return RLC_OK;
-#endif
-}
-
-static int hmac(void) {
-	int code = RLC_ERR;
-	uint8_t mac[RLC_MD_LEN];
-
-#if MD_MAP == SH256
-	uint8_t key[131];
-	char *msg[] = {
-		"Hi There", "what do ya want for nothing?", "Test With Truncation",
-		"Test Using Larger Than Block-Size Key - Hash Key First",
-		"This is a test using a larger than block-size key and a larger "
-				"than block-size data. The key needs to be hashed before being "
-				"used by the HMAC algorithm."
-	};
-
-	uint8_t result[][64] = {
-		{ 0xB0, 0x34, 0x4C, 0x61, 0xD8, 0xDB, 0x38, 0x53, 0x5C, 0xA8, 0xAF,
-			0xCE, 0xAF, 0x0B, 0xF1, 0x2B, 0x88, 0x1D, 0xC2, 0x00, 0xC9, 0x83,
-			0x3D, 0xA7, 0x26, 0xE9, 0x37, 0x6C, 0x2E, 0x32, 0xCF, 0xF7 },
-		{ 0x5B, 0xDC, 0xC1, 0x46, 0xBF, 0x60, 0x75, 0x4E, 0x6A, 0x04, 0x24,
-			0x26, 0x08, 0x95, 0x75, 0xC7, 0x5A, 0x00, 0x3F, 0x08, 0x9D, 0x27,
-			0x39, 0x83, 0x9D, 0xEC, 0x58, 0xB9, 0x64, 0xEC, 0x38, 0x43 },
-		{ 0x77, 0x3E, 0xA9, 0x1E, 0x36, 0x80, 0x0E, 0x46, 0x85, 0x4D, 0xB8,
-			0xEB, 0xD0, 0x91, 0x81, 0xA7, 0x29, 0x59, 0x09, 0x8B, 0x3E, 0xF8,
-			0xC1, 0x22, 0xD9, 0x63, 0x55, 0x14, 0xCE, 0xD5, 0x65, 0xFE },
-		{ 0x82, 0x55, 0x8A, 0x38, 0x9A, 0x44, 0x3C, 0x0E, 0xA4, 0xCC, 0x81,
-			0x98, 0x99, 0xF2, 0x08, 0x3a, 0x85, 0xF0, 0xFA, 0xA3, 0xE5, 0x78,
-			0xF8, 0x07, 0x7A, 0x2E, 0x3F, 0xF4, 0x67, 0x29, 0x66, 0x5B },
-		{ 0xA3, 0xB6, 0x16, 0x74, 0x73, 0x10, 0x0E, 0xE0, 0x6E, 0x0C, 0x79,
-			0x6C, 0x29, 0x55, 0x55, 0x2B },
-		{ 0x60, 0xE4, 0x31, 0x59, 0x1E, 0xE0, 0xB6, 0x7F, 0x0D, 0x8A, 0x26,
-			0xAA, 0xCB, 0xF5, 0xB7, 0x7F, 0x8E, 0x0B, 0xC6, 0x21, 0x37, 0x28,
-			0xC5, 0x14, 0x05, 0x46, 0x04, 0x0F, 0x0E, 0xE3, 0x7F, 0x54 },
-		{ 0x9B, 0x09, 0xFF, 0xA7, 0x1B, 0x94, 0x2F, 0xCB, 0x27, 0x63, 0x5F, 0xBC,
-			0xD5, 0xB0, 0xE9, 0x44, 0xBF, 0xDC, 0x63, 0x64, 0x4F, 0x07,
-			0x13, 0x93, 0x8A, 0x7F, 0x51, 0x53, 0x5C, 0x3A, 0x35, 0xE2 },
-	};
-
-	TEST_ONCE("hmac (sha256) is correct") {
-		memset(key, 0x0B, 20);
-		md_hmac(mac, (uint8_t *)msg[0], strlen(msg[0]), key, 20);
-		TEST_ASSERT(memcmp(mac, result[0], RLC_MD_LEN) == 0, end);
-		strncpy((char *)key, "Jefe", 5);
-		md_hmac(mac, (uint8_t *)msg[1], strlen(msg[1]), key, 4);
-		TEST_ASSERT(memcmp(mac, result[1], RLC_MD_LEN) == 0, end);
-		memset(key, 0xAA, 20);
-		memset(key + 20, 0xDD, 50);
-		md_hmac(mac, key + 20, 50, key, 20);
-		TEST_ASSERT(memcmp(mac, result[2], RLC_MD_LEN) == 0, end);
-		for (int j = 0; j < 25; j++) {
-			key[j] = j + 1;
-		}
-		memset(key + 25, 0xCD, 50);
-		md_hmac(mac, key + 25, 50, key, 25);
-		TEST_ASSERT(memcmp(mac, result[3], RLC_MD_LEN) == 0, end);
-		memset(key, 0x0C, 20);
-		md_hmac(mac, (uint8_t *)msg[2], strlen(msg[2]), key, 20);
-		TEST_ASSERT(memcmp(mac, result[4], 16) == 0, end);
-		memset(key, 0xAA, 131);
-		md_hmac(mac, (uint8_t *)msg[3], strlen(msg[3]), key, 131);
-		TEST_ASSERT(memcmp(mac, result[5], RLC_MD_LEN) == 0, end);
-		md_hmac(mac, (uint8_t *)msg[4], strlen(msg[4]), key, 131);
-		TEST_ASSERT(memcmp(mac, result[6], RLC_MD_LEN) == 0, end);
-	}
-	TEST_END;
-#endif
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the MD module:\n", 0);
-
-#if MD_MAP == SH224 || !defined(STRIP)
-	if (sha224() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-#if MD_MAP == SH256 || !defined(STRIP)
-	if (sha256() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-#if MD_MAP == SH384 || !defined(STRIP)
-	if (sha384() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-#if MD_MAP == SH512 || !defined(STRIP)
-	if (sha512() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-	if (kdf() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (hmac() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_mpc.c b/src/dashbls/depends/relic/test/test_mpc.c
deleted file mode 100644
index c554d69af307..000000000000
--- a/src/dashbls/depends/relic/test/test_mpc.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2020 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for the error-management routines.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_err.h"
-#include "relic_test.h"
-
-static int triple(void) {
-	int code = RLC_ERR;
-	bn_t n, t, u;
-	bn_t d[2], e[2], x[2], y[2];
-	mt_t tri[2];
-
-	bn_null(n);
-	bn_null(t);
-	bn_null(u);
-	mt_null(tri[0]);
-	mt_null(tri[1]);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(t);
-		bn_new(u);
-		mt_new(tri[0]);
-		mt_new(tri[1]);
-
-		for (int j = 0; j < 2; j++) {
-			bn_null(d[j]);
-			bn_null(e[j]);
-			bn_null(x[j]);
-			bn_null(y[j]);
-			bn_new(d[j]);
-			bn_new(e[j]);
-			bn_new(x[j]);
-			bn_new(y[j]);
-		}
-
-		bn_gen_prime(n, RLC_BN_BITS);
-
-		TEST_CASE("multiplication triples are generated correctly") {
-			mt_gen(tri, n);
-			bn_add(t, tri[0]->a, tri[1]->a);
-			bn_mod(t, t, n);
-			bn_add(u, tri[0]->b, tri[1]->b);
-			bn_mod(u, u, n);
-			bn_mul(t, t, u);
-			bn_mod(t, t, n);
-			bn_add(u, tri[0]->c, tri[1]->c);
-			bn_mod(u, u, n);
-			TEST_ASSERT(bn_cmp(t, u) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication triples are consistent") {
-			mt_gen(tri, n);
-			/* Generate random inputs. */
-			bn_rand_mod(x[0], n);
-			bn_rand_mod(y[0], n);
-			bn_mul(t, x[0], y[0]);
-			bn_mod(t, t, n);
-			/* Secret share inputs. */
-			bn_rand_mod(x[1], n);
-			bn_sub(x[0], x[0], x[1]);
-			if (bn_sign(x[0]) == RLC_NEG) {
-				bn_add(x[0], x[0], n);
-			}
-			bn_mod(x[0], x[0], n);
-			bn_rand_mod(y[1], n);
-			bn_sub(y[0], y[0], y[1]);
-			if (bn_sign(y[0]) == RLC_NEG) {
-				bn_add(y[0], y[0], n);
-			}
-			bn_mod(y[0], y[0], n);
-
-			/* Compute public values locally. */
-			mt_mul_lcl(d[0], e[0], x[0], y[0], n, tri[0]);
-			mt_mul_lcl(d[1], e[1], x[1], y[1], n, tri[1]);
-			/* Broadcast public values. */
-			mt_mul_bct(d, e, n);
-			TEST_ASSERT(bn_cmp(d[0], d[1]) == RLC_EQ, end);
-			TEST_ASSERT(bn_cmp(e[0], e[1]) == RLC_EQ, end);
-			mt_mul_mpc(d[0], d[0], e[0], n, tri[0], 0);
-			mt_mul_mpc(d[1], d[1], e[1], n, tri[1], 1);
-			bn_add(d[0], d[0], d[1]);
-			bn_mod(d[0], d[0], n);
-			TEST_ASSERT(bn_cmp(t, d[0]) == RLC_EQ, end);
-		} TEST_END;
-	} RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(t);
-	bn_free(u);
-	mt_free(tri[0]);
-	mt_free(tri[1]);
-	for (int j = 0; j < 2; j++) {
-	  bn_free(d[j]);
-	  bn_free(e[j]);
-	  bn_free(x[j]);
-	  bn_free(y[j]);
-	}
-	return code;
-}
-
-static int pairing(void) {
-	int j, code = RLC_ERR;
-	g1_t b1[2], c1[2], d[2], p[2], _p;
-	g2_t b2[2], c2[2], e[2], q[2], _q;
-	gt_t bt[2], ct[2], f[2], r[2], _r;
-	bn_t k[2], l[2], n;
-	mt_t tri[2];
-	pt_t t[2];
-
-	g1_null(_p);
-	g2_null(_q);
-	gt_null(_r);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(_p);
-		g2_new(_q);
-		gt_new(_r);
-		bn_new(n);
-
-		for (j = 0; j < 2; j++) {
-			g1_null(b1[j]);
-			g2_null(b2[j]);
-			gt_null(bt[j]);
-			g1_null(c1[j]);
-			g2_null(c2[j]);
-			gt_null(ct[j]);
-			g1_null(d[j]);
-			g2_null(e[j]);
-			bn_null(k[j]);
-			bn_null(l[j]);
-			g1_null(p[j]);
-			g2_null(q[j]);
-			gt_null(r[j]);
-			gt_null(f[j]);
-			mt_null(tri[j]);
-			pt_null(t[j]);
-			g1_new(b1[j]);
-			g2_new(b2[j]);
-			gt_new(bt[j]);
-			g1_new(c1[j]);
-			g2_new(c2[j]);
-			gt_new(ct[j]);
-			g1_new(d[j]);
-			g2_new(e[j]);
-			bn_new(k[j]);
-			bn_new(l[j]);
-			g1_new(p[j]);
-			g2_new(q[j]);
-			gt_new(r[j]);
-			gt_new(f[j]);
-			mt_new(tri[j]);
-			pt_new(t[j]);
-		}
-
-		g1_get_ord(n);
-
-		TEST_CASE("scalar multiplication triples in g1 are consistent") {
-			mt_gen(tri, n);
-			/* Generate random inputs. */
-			g1_rand(p[0]);
-			bn_rand_mod(k[0], n);
-			g1_mul(_p, p[0], k[0]);
-			/* Secret share inputs. */
-			g1_rand(p[1]);
-			g1_sub(p[0], p[0], p[1]);
-			g1_norm(p[0], p[0]);
-			bn_rand_mod(k[1], n);
-			bn_sub(k[0], k[0], k[1]);
-			if (bn_sign(k[0]) == RLC_NEG) {
-				bn_add(k[0], k[0], n);
-			}
-			bn_mod(k[0], k[0], n);
-
-			g1_mul_gen(b1[0], tri[0]->b);
-			g1_mul_gen(b1[1], tri[1]->b);
-			g1_mul_gen(c1[0], tri[0]->c);
-			g1_mul_gen(c1[1], tri[1]->c);
-			tri[0]->b1 = &b1[0];
-			tri[1]->b1 = &b1[1];
-			tri[0]->c1 = &c1[0];
-			tri[1]->c1 = &c1[1];
-
-			/* Compute public values locally. */
-			g1_mul_lcl(l[0], d[0], k[0], p[0], tri[0]);
-			g1_mul_lcl(l[1], d[1], k[1], p[1], tri[1]);
-			/* Broadcast public values. */
-			g1_mul_bct(l, d);
-			TEST_ASSERT(bn_cmp(l[0], l[1]) == RLC_EQ, end);
-			TEST_ASSERT(g1_cmp(d[0], d[1]) == RLC_EQ, end);
-			g1_mul_mpc(d[0], l[0], d[0], tri[0], 0);
-			g1_mul_mpc(d[1], l[1], d[1], tri[1], 1);
-			g1_add(d[0], d[0], d[1]);
-			g1_norm(d[0], d[0]);
-			TEST_ASSERT(g1_cmp(_p, d[0]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("scalar multiplication triples in g2 are consistent") {
-			/* Generate random inputs. */
-			g2_rand(q[0]);
-			bn_rand_mod(k[0], n);
-			g2_mul(_q, q[0], k[0]);
-			/* Secret share inputs. */
-			g2_rand(q[1]);
-			g2_sub(q[0], q[0], q[1]);
-			g2_norm(q[0], q[0]);
-			bn_rand_mod(k[1], n);
-			bn_sub(k[0], k[0], k[1]);
-			if (bn_sign(k[0]) == RLC_NEG) {
-				bn_add(k[0], k[0], n);
-			}
-			bn_mod(k[0], k[0], n);
-
-			g2_mul_gen(b2[0], tri[0]->b);
-			g2_mul_gen(b2[1], tri[1]->b);
-			g2_mul_gen(c2[0], tri[0]->c);
-			g2_mul_gen(c2[1], tri[1]->c);
-			tri[0]->b2 = &b2[0];
-			tri[1]->b2 = &b2[1];
-			tri[0]->c2 = &c2[0];
-			tri[1]->c2 = &c2[1];
-
-			/* Compute public values locally. */
-			g2_mul_lcl(l[0], e[0], k[0], q[0], tri[0]);
-			g2_mul_lcl(l[1], e[1], k[1], q[1], tri[1]);
-			/* Broadcast public values. */
-			g2_mul_bct(l, e);
-			TEST_ASSERT(bn_cmp(l[0], l[1]) == RLC_EQ, end);
-			TEST_ASSERT(g2_cmp(e[0], e[1]) == RLC_EQ, end);
-			g2_mul_gen(c2[0], tri[0]->c);
-			g2_mul_gen(c2[1], tri[1]->c);
-			g2_mul_mpc(e[0], l[0], e[0], tri[0], 0);
-			g2_mul_mpc(e[1], l[1], e[1], tri[1], 1);
-			g2_add(e[0], e[0], e[1]);
-			g2_norm(e[0], e[0]);
-			TEST_ASSERT(g2_cmp(_q, e[0]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("exponentiation triples in target group are consistent") {
-			/* Generate random inputs. */
-			gt_rand(r[0]);
-			bn_rand_mod(k[0], n);
-			gt_exp(_r, r[0], k[0]);
-			/* Secret share inputs. */
-			gt_rand(r[1]);
-			gt_mul(r[0], r[0], r[1]);
-			gt_inv(r[1], r[1]);
-			bn_rand_mod(k[1], n);
-			bn_sub(k[0], k[0], k[1]);
-			if (bn_sign(k[0]) == RLC_NEG) {
-				bn_add(k[0], k[0], n);
-			}
-			bn_mod(k[0], k[0], n);
-
-			gt_exp_gen(bt[0], tri[0]->b);
-			gt_exp_gen(bt[1], tri[1]->b);
-			gt_exp_gen(ct[0], tri[0]->c);
-			gt_exp_gen(ct[1], tri[1]->c);
-			tri[0]->bt = &bt[0];
-			tri[1]->bt = &bt[1];
-			tri[0]->ct = &ct[0];
-			tri[1]->ct = &ct[1];
-
-			/* Compute public values locally. */
-			gt_exp_lcl(l[0], f[0], k[0], r[0], tri[0]);
-			gt_exp_lcl(l[1], f[1], k[1], r[1], tri[1]);
-			/* Broadcast public values. */
-			gt_exp_bct(l, f);
-			TEST_ASSERT(bn_cmp(l[0], l[1]) == RLC_EQ, end);
-			TEST_ASSERT(gt_cmp(f[0], f[1]) == RLC_EQ, end);
-			gt_exp_mpc(f[0], l[0], f[0], tri[0], 0);
-			gt_exp_mpc(f[1], l[1], f[1], tri[1], 1);
-			gt_mul(f[0], f[0], f[1]);
-			TEST_ASSERT(gt_cmp(_r, f[0]) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing triples are consistent") {
-			pc_map_tri(t);
-			g1_add(t[0]->a, t[0]->a, t[1]->a);
-			g1_norm(t[0]->a, t[0]->a);
-			g2_add(t[0]->b, t[0]->b, t[1]->b);
-			g2_norm(t[0]->b, t[0]->b);
-			gt_mul(t[1]->c, t[0]->c, t[1]->c);
-			pc_map(t[0]->c, t[0]->a, t[0]->b);
-			TEST_ASSERT(gt_cmp(t[0]->c, t[1]->c) == RLC_EQ, end);
-			/* Regenerate triple. */
-			pc_map_tri(t);
-			/* Generate random inputs. */
-			g1_rand(p[0]);
-			g2_rand(q[0]);
-			pc_map(f[0], p[0], q[0]);
-			/* Secret share inputs. */
-			g1_rand(p[1]);
-			g1_sub(p[0], p[0], p[1]);
-			g1_norm(p[0], p[0]);
-			g2_rand(q[1]);
-			g2_sub(q[0], q[0], q[1]);
-			g2_norm(q[0], q[0]);
-			/* Compute public values locally. */
-			pc_map_lcl(d[0], e[0], p[0], q[0], t[0]);
-			pc_map_lcl(d[1], e[1], p[1], q[1], t[1]);
-			/* Broadcast public values. */
-			pc_map_bct(d, e);
-			TEST_ASSERT(g1_cmp(d[0], d[1]) == RLC_EQ, end);
-			TEST_ASSERT(g2_cmp(e[0], e[1]) == RLC_EQ, end);
-			pc_map_mpc(r[0], d[0], e[0], t[0], 0);
-			pc_map_mpc(r[1], d[1], e[1], t[1], 1);
-			gt_mul(f[1], r[0], r[1]);
-			TEST_ASSERT(gt_cmp(f[0], f[1]) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(_p);
-	g2_free(_q);
-	gt_free(_r);
-	bn_free(n);
-	for (j = 0; j < 2; j++) {
-		g1_free(b1[j]);
-		g2_free(b2[j]);
-		gt_free(bt[j]);
-		g1_free(c1[j]);
-		g2_free(c2[j]);
-		gt_free(ct[j]);
-		g1_free(d[j]);
-		g2_free(e[j]);
-		bn_free(k[j]);
-		bn_free(l[j]);
-		g1_free(p[j]);
-		g2_free(q[j]);
-		gt_free(r[j]);
-		gt_free(f[j]);
-		pt_free(t[j]);
-		mt_free(tri[j]);
-	}
-	return code;
-}
-
-int main(void) {
-
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the MPC module:\n", 0);
-	util_banner("Utilities:", 1);
-
-#if defined(WITH_BN)
-	if (triple()) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-#if defined(WITH_PC)
-	if (pc_param_set_any() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	pc_param_print();
-
-	util_banner("Arithmetic:", 1);
-
-	if (pairing()) {
-		core_clean();
-		return 1;
-	}
-#endif
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_pc.c b/src/dashbls/depends/relic/test/test_pc.c
deleted file mode 100644
index 01b4b13e00d7..000000000000
--- a/src/dashbls/depends/relic/test/test_pc.c
+++ /dev/null
@@ -1,1836 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2010 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for the Pairing-Based Cryptography module.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-static int memory1(void) {
-	err_t e;
-	int code = RLC_ERR;
-	g1_t a;
-
-	g1_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			g1_new(a);
-			g1_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-int util1(void) {
-	int l, code = RLC_ERR;
-	g1_t a, b, c;
-	uint8_t bin[2 * RLC_PC_BYTES + 1];
-
-	g1_null(a);
-	g1_null(b);
-	g1_null(c);
-
-	RLC_TRY {
-		g1_new(a);
-		g1_new(b);
-		g1_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			g1_rand(a);
-			g1_rand(b);
-			TEST_ASSERT(g1_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			g1_rand(a);
-			g1_rand(b);
-			g1_rand(c);
-			/* Compare points in affine coordinates. */
-			if (g1_cmp(a, c) != RLC_EQ) {
-				g1_copy(c, a);
-				TEST_ASSERT(g1_cmp(c, a) == RLC_EQ, end);
-			}
-			if (g1_cmp(b, c) != RLC_EQ) {
-				g1_copy(c, b);
-				TEST_ASSERT(g1_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			g1_dbl(c, a);
-			g1_norm(c, c);
-			g1_dbl(a, a);
-			TEST_ASSERT(g1_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(g1_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			g1_dbl(c, c);
-			g1_dbl(a, a);
-			TEST_ASSERT(g1_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(g1_cmp(a, c) == RLC_EQ, end);
-			g1_neg(b, a);
-			g1_add(a, a, b);
-			g1_set_infty(b);
-			TEST_ASSERT(g1_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("inversion and comparison are consistent") {
-			g1_rand(a);
-			g1_neg(b, a);
-			TEST_ASSERT(g1_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE
-				("assignment to random/infinity and comparison are consistent")
-		{
-			g1_rand(a);
-			g1_set_infty(c);
-			TEST_ASSERT(g1_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(g1_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			g1_set_infty(a);
-			TEST_ASSERT(g1_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				g1_set_infty(a);
-				l = g1_size_bin(a, j);
-				g1_write_bin(bin, l, a, j);
-				g1_read_bin(b, bin, l);
-				TEST_ASSERT(g1_cmp(a, b) == RLC_EQ, end);
-				g1_rand(a);
-				l = g1_size_bin(a, j);
-				g1_write_bin(bin, l, a, j);
-				g1_read_bin(b, bin, l);
-				TEST_ASSERT(g1_cmp(a, b) == RLC_EQ, end);
-				g1_rand(a);
-				g1_dbl(a, a);
-				l = g1_size_bin(a, j);
-				g1_norm(a, a);
-				g1_write_bin(bin, l, a, j);
-				g1_read_bin(b, bin, l);
-				TEST_ASSERT(g1_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	g1_free(b);
-	g1_free(c);
-	return code;
-}
-
-int addition1(void) {
-	int code = RLC_ERR;
-
-	g1_t a, b, c, d, e;
-
-	g1_null(a);
-	g1_null(b);
-	g1_null(c);
-	g1_null(d);
-	g1_null(e);
-
-	RLC_TRY {
-		g1_new(a);
-		g1_new(b);
-		g1_new(c);
-		g1_new(d);
-		g1_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			g1_rand(a);
-			g1_rand(b);
-			g1_add(d, a, b);
-			g1_add(e, b, a);
-			TEST_ASSERT(g1_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			g1_rand(a);
-			g1_rand(b);
-			g1_rand(c);
-			g1_add(d, a, b);
-			g1_add(d, d, c);
-			g1_add(e, b, c);
-			g1_add(e, e, a);
-			TEST_ASSERT(g1_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			g1_rand(a);
-			g1_set_infty(d);
-			g1_add(e, a, d);
-			TEST_ASSERT(g1_cmp(e, a) == RLC_EQ, end);
-			g1_add(e, d, a);
-			TEST_ASSERT(g1_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			g1_rand(a);
-			g1_neg(d, a);
-			g1_add(e, a, d);
-			TEST_ASSERT(g1_is_infty(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	g1_free(b);
-	g1_free(c);
-	g1_free(d);
-	g1_free(e);
-	return code;
-}
-
-int subtraction1(void) {
-	int code = RLC_ERR;
-	g1_t a, b, c, d;
-
-	g1_null(a);
-	g1_null(b);
-	g1_null(c);
-	g1_null(d);
-
-	RLC_TRY {
-		g1_new(a);
-		g1_new(b);
-		g1_new(c);
-		g1_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			g1_rand(a);
-			g1_rand(b);
-			g1_sub(c, a, b);
-			g1_sub(d, b, a);
-			g1_neg(d, d);
-			TEST_ASSERT(g1_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			g1_rand(a);
-			g1_set_infty(c);
-			g1_sub(d, a, c);
-			TEST_ASSERT(g1_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			g1_rand(a);
-			g1_sub(c, a, a);
-			TEST_ASSERT(g1_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	g1_free(b);
-	g1_free(c);
-	g1_free(d);
-	return code;
-}
-
-int doubling1(void) {
-	int code = RLC_ERR;
-	g1_t a, b, c;
-
-	g1_null(a);
-	g1_null(b);
-	g1_null(c);
-
-	RLC_TRY {
-		g1_new(a);
-		g1_new(b);
-		g1_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			g1_rand(a);
-			g1_add(b, a, a);
-			g1_dbl(c, a);
-			TEST_ASSERT(g1_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	g1_free(b);
-	g1_free(c);
-	return code;
-}
-
-static int multiplication1(void) {
-	int code = RLC_ERR;
-	g1_t p, q, r;
-	bn_t n, k;
-
-	bn_null(n);
-	bn_null(k);
-	g1_null(p);
-	g1_null(q);
-	g1_null(r);
-
-	RLC_TRY {
-		g1_new(p);
-		g1_new(q);
-		g1_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		g1_get_gen(p);
-		pc_get_ord(n);
-
-		TEST_CASE("generator has the right order") {
-			g1_mul(r, p, n);
-			TEST_ASSERT(g1_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			g1_mul_gen(r, k);
-			TEST_ASSERT(g1_is_infty(r), end);
-			bn_set_dig(k, 1);
-			g1_mul_gen(r, k);
-			TEST_ASSERT(g1_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			g1_mul(q, p, k);
-			g1_mul_gen(r, k);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g1_mul_gen(r, k);
-			g1_neg(r, r);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("random element has the right order") {
-			g1_rand(p);
-			g1_mul(r, p, n);
-			TEST_ASSERT(g1_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("point multiplication by digit is correct") {
-			g1_mul_dig(r, p, 0);
-			TEST_ASSERT(g1_is_infty(r), end);
-			g1_mul_dig(r, p, 1);
-			TEST_ASSERT(g1_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			g1_mul(q, p, k);
-			g1_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(p);
-	g1_free(q);
-	g1_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int fixed1(void) {
-	int code = RLC_ERR;
-	g1_t p, q, r;
-	g1_t t[RLC_G1_TABLE];
-	bn_t n, k;
-
-	bn_null(n);
-	bn_null(k);
-	g1_null(p);
-	g1_null(q);
-	g1_null(r);
-
-	for (int i = 0; i < RLC_G1_TABLE; i++) {
-		g1_null(t[i]);
-	}
-
-	RLC_TRY {
-		g1_new(p);
-		g1_new(q);
-		g1_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		g1_get_gen(p);
-		pc_get_ord(n);
-
-		for (int i = 0; i < RLC_G1_TABLE; i++) {
-			g1_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			g1_rand(p);
-			g1_mul_pre(t, p);
-			bn_zero(k);
-			g1_mul_fix(r, (const g1_t *)t, k);
-			TEST_ASSERT(g1_is_infty(r), end);
-			bn_set_dig(k, 1);
-			g1_mul_fix(r, (const g1_t *)t, k);
-			TEST_ASSERT(g1_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			g1_mul(q, p, k);
-			g1_mul_fix(q, (const g1_t *)t, k);
-			g1_mul(r, p, k);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g1_mul_fix(r, (const g1_t *)t, k);
-			g1_neg(r, r);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_G1_TABLE; i++) {
-			g1_free(t[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(p);
-	g1_free(q);
-	g1_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous1(void) {
-	int code = RLC_ERR;
-	g1_t p, q, r;
-	bn_t n, k, l;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(l);
-	g1_null(p);
-	g1_null(q);
-	g1_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(l);
-		g1_new(p);
-		g1_new(q);
-		g1_new(r);
-
-		g1_get_gen(p);
-		pc_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			g1_mul(q, p, l);
-			g1_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			g1_mul(q, p, k);
-			g1_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			g1_mul_sim(r, p, k, q, l);
-			g1_mul(p, p, k);
-			g1_mul(q, q, l);
-			g1_add(q, q, p);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g1_mul_sim(r, p, k, q, l);
-			g1_mul(p, p, k);
-			g1_mul(q, q, l);
-			g1_add(q, q, p);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			g1_mul_sim(r, p, k, q, l);
-			g1_mul(p, p, k);
-			g1_mul(q, q, l);
-			g1_add(q, q, p);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			g1_mul(q, p, l);
-			g1_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			g1_mul_gen(q, k);
-			g1_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			g1_mul_sim_gen(r, k, q, l);
-			g1_get_gen(p);
-			g1_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g1_mul_sim_gen(r, k, q, l);
-			g1_get_gen(p);
-			g1_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			g1_mul_sim_gen(r, k, q, l);
-			g1_get_gen(p);
-			g1_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g1_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	bn_free(l);
-	g1_free(p);
-	g1_free(q);
-	g1_free(r);
-	return code;
-}
-
-static int validity1(void) {
-	int code = RLC_ERR;
-	g1_t a;
-
-	g1_null(a);
-
-	RLC_TRY {
-		g1_new(a);
-
-		TEST_CASE("validity test is correct") {
-			g1_set_infty(a);
-			TEST_ASSERT(!g1_is_valid(a), end);
-			g1_rand(a);
-			TEST_ASSERT(g1_is_valid(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			g1_rand(a);
-			g1_blind(a, a);
-			TEST_ASSERT(g1_is_valid(a), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	return code;
-}
-
-static int hashing1(void) {
-	int code = RLC_ERR;
-	g1_t a;
-	bn_t n;
-	uint8_t msg[5];
-
-	g1_null(a);
-	bn_null(n);
-
-	RLC_TRY {
-		g1_new(a);
-		bn_new(n);
-
-		pc_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			g1_map(a, msg, sizeof(msg));
-			TEST_ASSERT(g1_is_valid(a), end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g1_free(a);
-	bn_free(n);
-	return code;
-}
-
-static int memory2(void) {
-	err_t e;
-	int code = RLC_ERR;
-	g2_t a;
-
-	g2_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			g2_new(a);
-			g2_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-int util2(void) {
-	int l, code = RLC_ERR;
-	g2_t a, b, c;
-	uint8_t bin[8 * RLC_PC_BYTES + 1];
-
-	g2_null(a);
-	g2_null(b);
-	g2_null(c);
-
-	RLC_TRY {
-		g2_new(a);
-		g2_new(b);
-		g2_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			g2_rand(a);
-			g2_rand(b);
-			TEST_ASSERT(g2_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			g2_rand(a);
-			g2_rand(b);
-			g2_rand(c);
-			/* Compare points in affine coordinates. */
-			if (g2_cmp(a, c) != RLC_EQ) {
-				g2_copy(c, a);
-				TEST_ASSERT(g2_cmp(c, a) == RLC_EQ, end);
-			}
-			if (g2_cmp(b, c) != RLC_EQ) {
-				g2_copy(c, b);
-				TEST_ASSERT(g2_cmp(b, c) == RLC_EQ, end);
-			}
-			/* Compare with one point in projective. */
-			g2_dbl(c, a);
-			g2_norm(c, c);
-			g2_dbl(a, a);
-			TEST_ASSERT(g2_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(g2_cmp(a, c) == RLC_EQ, end);
-			/* Compare with two points in projective. */
-			g2_dbl(c, c);
-			g2_dbl(a, a);
-			TEST_ASSERT(g2_cmp(c, a) == RLC_EQ, end);
-			TEST_ASSERT(g2_cmp(a, c) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("negation and comparison are consistent") {
-			g2_rand(a);
-			g2_neg(b, a);
-			TEST_ASSERT(g2_cmp(a, b) != RLC_EQ, end);
-			g2_neg(b, a);
-			g2_add(a, a, b);
-			g2_set_infty(b);
-			TEST_ASSERT(g2_cmp(a, b) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE
-				("assignment to random/infinity and comparison are consistent")
-		{
-			g2_rand(a);
-			g2_set_infty(c);
-			TEST_ASSERT(g2_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(g2_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to infinity and infinity test are consistent") {
-			g2_set_infty(a);
-			TEST_ASSERT(g2_is_infty(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("reading and writing a point are consistent") {
-			for (int j = 0; j < 2; j++) {
-				g2_set_infty(a);
-				l = g2_size_bin(a, j);
-				g2_write_bin(bin, l, a, j);
-				g2_read_bin(b, bin, l);
-				TEST_ASSERT(g2_cmp(a, b) == RLC_EQ, end);
-				g2_rand(a);
-				l = g2_size_bin(a, j);
-				g2_write_bin(bin, l, a, j);
-				g2_read_bin(b, bin, l);
-				TEST_ASSERT(g2_cmp(a, b) == RLC_EQ, end);
-				g2_rand(a);
-				g2_dbl(a, a);
-				l = g2_size_bin(a, j);
-				g2_norm(a, a);
-				g2_write_bin(bin, l, a, j);
-				g2_read_bin(b, bin, l);
-				TEST_ASSERT(g2_cmp(a, b) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	g2_free(b);
-	g2_free(c);
-	return code;
-}
-
-int addition2(void) {
-	int code = RLC_ERR;
-
-	g2_t a, b, c, d, e;
-
-	g2_null(a);
-	g2_null(b);
-	g2_null(c);
-	g2_null(d);
-	g2_null(e);
-
-	RLC_TRY {
-		g2_new(a);
-		g2_new(b);
-		g2_new(c);
-		g2_new(d);
-		g2_new(e);
-
-		TEST_CASE("point addition is commutative") {
-			g2_rand(a);
-			g2_rand(b);
-			g2_add(d, a, b);
-			g2_add(e, b, a);
-			TEST_ASSERT(g2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition is associative") {
-			g2_rand(a);
-			g2_rand(b);
-			g2_rand(c);
-			g2_add(d, a, b);
-			g2_add(d, d, c);
-			g2_add(e, b, c);
-			g2_add(e, e, a);
-			TEST_ASSERT(g2_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has identity") {
-			g2_rand(a);
-			g2_set_infty(d);
-			g2_add(e, a, d);
-			TEST_ASSERT(g2_cmp(e, a) == RLC_EQ, end);
-			g2_add(e, d, a);
-			TEST_ASSERT(g2_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("point addition has inverse") {
-			g2_rand(a);
-			g2_neg(d, a);
-			g2_add(e, a, d);
-			TEST_ASSERT(g2_is_infty(e), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	g2_free(b);
-	g2_free(c);
-	g2_free(d);
-	g2_free(e);
-	return code;
-}
-
-int subtraction2(void) {
-	int code = RLC_ERR;
-	g2_t a, b, c, d;
-
-	g2_null(a);
-	g2_null(b);
-	g2_null(c);
-	g2_null(d);
-
-	RLC_TRY {
-		g2_new(a);
-		g2_new(b);
-		g2_new(c);
-		g2_new(d);
-
-		TEST_CASE("point subtraction is anti-commutative") {
-			g2_rand(a);
-			g2_rand(b);
-			g2_sub(c, a, b);
-			g2_sub(d, b, a);
-			g2_neg(d, d);
-			TEST_ASSERT(g2_cmp(c, d) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has identity") {
-			g2_rand(a);
-			g2_set_infty(c);
-			g2_sub(d, a, c);
-			TEST_ASSERT(g2_cmp(d, a) == RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("point subtraction has inverse") {
-			g2_rand(a);
-			g2_sub(c, a, a);
-			TEST_ASSERT(g2_is_infty(c), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	g2_free(b);
-	g2_free(c);
-	g2_free(d);
-	return code;
-}
-
-int doubling2(void) {
-	int code = RLC_ERR;
-	g2_t a, b, c;
-
-	g2_null(a);
-	g2_null(b);
-	g2_null(c);
-
-	RLC_TRY {
-		g2_new(a);
-		g2_new(b);
-		g2_new(c);
-
-		TEST_CASE("point doubling is correct") {
-			g2_rand(a);
-			g2_add(b, a, a);
-			g2_dbl(c, a);
-			TEST_ASSERT(g2_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	g2_free(b);
-	g2_free(c);
-	return code;
-}
-
-static int multiplication2(void) {
-	int code = RLC_ERR;
-	g2_t p, q, r;
-	bn_t n, k;
-
-	bn_null(n);
-	bn_null(k);
-	g2_null(p);
-	g2_null(q);
-	g2_null(r);
-
-	RLC_TRY {
-		g2_new(p);
-		g2_new(q);
-		g2_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		g2_get_gen(p);
-		pc_get_ord(n);
-
-		TEST_CASE("generator has the right order") {
-			g2_mul(r, p, n);
-			TEST_ASSERT(g2_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("generator multiplication is correct") {
-			bn_zero(k);
-			g2_mul_gen(r, k);
-			TEST_ASSERT(g2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			g2_mul_gen(r, k);
-			TEST_ASSERT(g2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			g2_mul(q, p, k);
-			g2_mul_gen(r, k);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g2_mul_gen(r, k);
-			g2_neg(r, r);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("random element has the right order") {
-			g2_rand(p);
-			g2_mul(r, p, n);
-			TEST_ASSERT(g2_is_infty(r) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("point multiplication by digit is correct") {
-			g2_mul_dig(r, p, 0);
-			TEST_ASSERT(g2_is_infty(r), end);
-			g2_mul_dig(r, p, 1);
-			TEST_ASSERT(g2_cmp(p, r) == RLC_EQ, end);
-			bn_rand(k, RLC_POS, RLC_DIG);
-			g2_mul(q, p, k);
-			g2_mul_dig(r, p, k->dp[0]);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(p);
-	g2_free(q);
-	g2_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int fixed2(void) {
-	int code = RLC_ERR;
-	g2_t p, q, r;
-	g2_t t[RLC_G2_TABLE];
-	bn_t n, k;
-
-	bn_null(n);
-	bn_null(k);
-	g2_null(p);
-	g2_null(q);
-	g2_null(r);
-
-	for (int i = 0; i < RLC_G2_TABLE; i++) {
-		g2_null(t[i]);
-	}
-
-	RLC_TRY {
-		g2_new(p);
-		g2_new(q);
-		g2_new(r);
-		bn_new(n);
-		bn_new(k);
-
-		g2_get_gen(p);
-		pc_get_ord(n);
-
-		for (int i = 0; i < RLC_G2_TABLE; i++) {
-			g2_new(t[i]);
-		}
-		TEST_CASE("fixed point multiplication is correct") {
-			g2_rand(p);
-			g2_mul_pre(t, p);
-			bn_zero(k);
-			g2_mul_fix(r, t, k);
-			TEST_ASSERT(g2_is_infty(r), end);
-			bn_set_dig(k, 1);
-			g2_mul_fix(r, t, k);
-			TEST_ASSERT(g2_cmp(p, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			g2_mul(q, p, k);
-			g2_mul_fix(q, t, k);
-			g2_mul(r, p, k);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g2_mul_fix(r, t, k);
-			g2_neg(r, r);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-		for (int i = 0; i < RLC_G2_TABLE; i++) {
-			g2_free(t[i]);
-		}
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(p);
-	g2_free(q);
-	g2_free(r);
-	bn_free(n);
-	bn_free(k);
-	return code;
-}
-
-static int simultaneous2(void) {
-	int code = RLC_ERR;
-	g2_t p, q, r;
-	bn_t n, k, l;
-
-	bn_null(n);
-	bn_null(k);
-	bn_null(l);
-	g2_null(p);
-	g2_null(q);
-	g2_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		bn_new(l);
-		g2_new(p);
-		g2_new(q);
-		g2_new(r);
-
-		g2_get_gen(p);
-		pc_get_ord(n);
-
-		TEST_CASE("simultaneous point multiplication is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			g2_mul(q, p, l);
-			g2_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			g2_mul(q, p, k);
-			g2_mul_sim(r, p, k, p, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			g2_mul_sim(r, p, k, q, l);
-			g2_mul(p, p, k);
-			g2_mul(q, q, l);
-			g2_add(q, q, p);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g2_mul_sim(r, p, k, q, l);
-			g2_mul(p, p, k);
-			g2_mul(q, q, l);
-			g2_add(q, q, p);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			g2_mul_sim(r, p, k, q, l);
-			g2_mul(p, p, k);
-			g2_mul(q, q, l);
-			g2_add(q, q, p);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("simultaneous multiplication with generator is correct") {
-			bn_zero(k);
-			bn_rand_mod(l, n);
-			g2_mul(q, p, l);
-			g2_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_zero(l);
-			g2_mul_gen(q, k);
-			g2_mul_sim_gen(r, k, p, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_rand_mod(k, n);
-			bn_rand_mod(l, n);
-			g2_mul_sim_gen(r, k, q, l);
-			g2_get_gen(p);
-			g2_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(k, k);
-			g2_mul_sim_gen(r, k, q, l);
-			g2_get_gen(p);
-			g2_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-			bn_neg(l, l);
-			g2_mul_sim_gen(r, k, q, l);
-			g2_get_gen(p);
-			g2_mul_sim(q, p, k, q, l);
-			TEST_ASSERT(g2_cmp(q, r) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	bn_free(l);
-	g2_free(p);
-	g2_free(q);
-	g2_free(r);
-	return code;
-}
-
-static int validity2(void) {
-	int code = RLC_ERR;
-	g2_t a;
-
-	g2_null(a);
-
-	RLC_TRY {
-		g2_new(a);
-
-		TEST_CASE("validity test is correct") {
-			g2_set_infty(a);
-			TEST_ASSERT(!g2_is_valid(a), end);
-			g2_rand(a);
-			TEST_ASSERT(g2_is_valid(a), end);
-		}
-		TEST_END;
-
-		TEST_CASE("blinding is consistent") {
-			g2_rand(a);
-			g2_blind(a, a);
-			TEST_ASSERT(g2_is_valid(a), end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	return code;
-}
-
-#if FP_PRIME != 509
-
-static int hashing2(void) {
-	int code = RLC_ERR;
-	g2_t a;
-	bn_t n;
-	uint8_t msg[5];
-
-	g2_null(a);
-	bn_null(n);
-
-	RLC_TRY {
-		g2_new(a);
-		bn_new(n);
-
-		pc_get_ord(n);
-
-		TEST_CASE("point hashing is correct") {
-			rand_bytes(msg, sizeof(msg));
-			g2_map(a, msg, sizeof(msg));
-			TEST_ASSERT(g2_is_valid(a), end);
-		}
-		TEST_END;
-
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	g2_free(a);
-	bn_free(n);
-	return code;
-}
-
-#endif
-
-static int memory(void) {
-	err_t e;
-	int code = RLC_ERR;
-	gt_t a;
-
-	gt_null(a);
-
-	RLC_TRY {
-		TEST_CASE("memory can be allocated") {
-			gt_new(a);
-			gt_free(a);
-		} TEST_END;
-	} RLC_CATCH(e) {
-		switch (e) {
-			case ERR_NO_MEMORY:
-				util_print("FATAL ERROR!\n");
-				RLC_ERROR(end);
-				break;
-		}
-	}
-	(void)a;
-	code = RLC_OK;
-  end:
-	return code;
-}
-
-int util(void) {
-	int code = RLC_ERR;
-	gt_t a, b, c;
-
-	gt_null(a);
-	gt_null(b);
-	gt_null(c);
-
-	RLC_TRY {
-		gt_new(a);
-		gt_new(b);
-		gt_new(c);
-
-		TEST_CASE("comparison is consistent") {
-			gt_rand(a);
-			gt_rand(b);
-			TEST_ASSERT(gt_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("copy and comparison are consistent") {
-			gt_rand(a);
-			gt_rand(b);
-			gt_rand(c);
-			if (gt_cmp(a, c) != RLC_EQ) {
-				gt_copy(c, a);
-				TEST_ASSERT(gt_cmp(c, a) == RLC_EQ, end);
-			}
-			if (gt_cmp(b, c) != RLC_EQ) {
-				gt_copy(c, b);
-				TEST_ASSERT(gt_cmp(b, c) == RLC_EQ, end);
-			}
-		}
-		TEST_END;
-
-		TEST_CASE("inversion and comparison are consistent") {
-			gt_rand(a);
-			gt_inv(b, a);
-			TEST_ASSERT(gt_cmp(a, b) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE
-				("assignment to random/infinity and comparison are consistent")
-		{
-			gt_rand(a);
-			gt_set_unity(c);
-			TEST_ASSERT(gt_cmp(a, c) != RLC_EQ, end);
-			TEST_ASSERT(gt_cmp(c, a) != RLC_EQ, end);
-		}
-		TEST_END;
-
-		TEST_CASE("assignment to unity and unity test are consistent") {
-			gt_set_unity(a);
-			TEST_ASSERT(gt_is_unity(a), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	return code;
-}
-
-int multiplication(void) {
-	int code = RLC_ERR;
-
-	gt_t a, b, c, d, e;
-
-	gt_null(a);
-	gt_null(b);
-	gt_null(c);
-	gt_null(d);
-	gt_null(e);
-
-	RLC_TRY {
-		gt_new(a);
-		gt_new(b);
-		gt_new(c);
-		gt_new(d);
-		gt_new(e);
-
-		TEST_CASE("multiplication is commutative") {
-			gt_rand(a);
-			gt_rand(b);
-			gt_mul(d, a, b);
-			gt_mul(e, b, a);
-			TEST_ASSERT(gt_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication is associative") {
-			gt_rand(a);
-			gt_rand(b);
-			gt_rand(c);
-			gt_mul(d, a, b);
-			gt_mul(d, d, c);
-			gt_mul(e, b, c);
-			gt_mul(e, e, a);
-			TEST_ASSERT(gt_cmp(d, e) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multiplication has identity") {
-			gt_rand(a);
-			gt_set_unity(d);
-			gt_mul(e, a, d);
-			TEST_ASSERT(gt_cmp(e, a) == RLC_EQ, end);
-			gt_mul(e, d, a);
-			TEST_ASSERT(gt_cmp(e, a) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	gt_free(d);
-	gt_free(e);
-	return code;
-}
-
-int squaring(void) {
-	int code = RLC_ERR;
-	gt_t a, b, c;
-
-	gt_null(a);
-	gt_null(b);
-	gt_null(c);
-
-	RLC_TRY {
-		gt_new(a);
-		gt_new(b);
-		gt_new(c);
-
-		TEST_CASE("squaring is correct") {
-			gt_rand(a);
-			gt_mul(b, a, a);
-			gt_sqr(c, a);
-			TEST_ASSERT(gt_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	return code;
-}
-
-static int inversion(void) {
-	int code = RLC_ERR;
-	gt_t a, b, c;
-
-	RLC_TRY {
-		gt_new(a);
-		gt_new(b);
-		gt_new(c);
-
-		TEST_CASE("inversion is correct") {
-			gt_rand(a);
-			gt_inv(b, a);
-			gt_mul(c, a, b);
-			gt_set_unity(b);
-			TEST_ASSERT(gt_cmp(c, b) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	return code;
-}
-
-int exponentiation(void) {
-	int code = RLC_ERR;
-	gt_t a, b, c;
-	bn_t n, d, e;
-
-	gt_null(a);
-	gt_null(b);
-	gt_null(c);
-	bn_null(d);
-	bn_null(e);
-	bn_null(n);
-
-	RLC_TRY {
-		gt_new(a);
-		gt_new(b);
-		gt_new(c);
-		bn_new(d);
-		bn_new(e);
-		bn_new(n);
-
-		gt_get_gen(a);
-		pc_get_ord(n);
-
-		TEST_CASE("generator has the right order") {
-			gt_exp(c, a, n);
-			TEST_ASSERT(gt_is_unity(c), end);
-		} TEST_END;
-
-		TEST_CASE("generator exponentiation is correct") {
-			bn_zero(d);
-			gt_exp_gen(c, d);
-			TEST_ASSERT(gt_is_unity(c), end);
-			bn_set_dig(d, 1);
-			gt_exp_gen(c, d);
-			TEST_ASSERT(gt_cmp(c, a) == RLC_EQ, end);
-			bn_add_dig(d, n, 1);
-			gt_exp_gen(c, d);
-			TEST_ASSERT(gt_cmp(c, a) == RLC_EQ, end);
-			gt_exp_gen(c, n);
-			TEST_ASSERT(gt_is_unity(c), end);
-			bn_rand_mod(d, n);
-			gt_exp_gen(b, d);
-			bn_neg(d, d);
-			gt_exp_gen(c, d);
-			gt_inv(c, c);
-			TEST_ASSERT(gt_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("random element has the right order") {
-			gt_rand(a);
-			gt_exp(c, a, n);
-			TEST_ASSERT(gt_is_unity(c) == 1, end);
-		} TEST_END;
-
-		TEST_CASE("exponentiation is correct") {
-			gt_rand(a);
-			gt_rand(b);
-			bn_rand_mod(d, n);
-			bn_rand_mod(e, n);
-			gt_exp_sim(c, a, d, b, e);
-			gt_exp(a, a, d);
-			gt_exp(b, b, e);
-			gt_mul(b, a, b);
-			TEST_ASSERT(gt_cmp(b, c) == RLC_EQ, end);
-			gt_exp_dig(b, a, 0);
-			TEST_ASSERT(gt_is_unity(b), end);
-			gt_exp_dig(b, a, 1);
-			TEST_ASSERT(gt_cmp(a, b) == RLC_EQ, end);
-			bn_rand(d, RLC_POS, RLC_DIG);
-			gt_exp(b, a, d);
-			gt_exp_dig(c, a, d->dp[0]);
-			TEST_ASSERT(gt_cmp(b, c) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	gt_free(b);
-	gt_free(c);
-	bn_free(d);
-	bn_free(e);
-	bn_free(n);
-	return code;
-}
-
-static int validity(void) {
-	int code = RLC_ERR;
-	gt_t a;
-
-	gt_null(a);
-
-	RLC_TRY {
-		gt_new(a);
-
-		TEST_CASE("validity check is correct") {
-			gt_set_unity(a);
-			TEST_ASSERT(!gt_is_valid(a), end);
-			gt_rand(a);
-			TEST_ASSERT(gt_is_valid(a), end);
-		}
-		TEST_END;
-	}
-	RLC_CATCH_ANY {
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(a);
-	return code;
-}
-
-static int pairing(void) {
-	int j, code = RLC_ERR;
-	g1_t p[2];
-	g2_t q[2];
-	gt_t e1, e2;
-	bn_t k, n;
-
-	gt_null(e1);
-	gt_null(e2);
-	bn_null(k);
-	bn_null(n);
-
-	RLC_TRY {
-		gt_new(e1);
-		gt_new(e2);
-		bn_new(k);
-		bn_new(n);
-
-		for (j = 0; j < 2; j++) {
-			g1_null(p[j]);
-			g2_null(q[j]);
-			g1_new(p[j]);
-			g2_new(q[j]);
-		}
-
-		pc_get_ord(n);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			g1_rand(p[0]);
-			g2_rand(q[0]);
-			pc_map(e1, p[0], q[0]);
-			TEST_ASSERT(gt_cmp_dig(e1, 1) != RLC_EQ, end);
-			g1_set_infty(p[0]);
-			pc_map(e1, p[0], q[0]);
-			TEST_ASSERT(gt_cmp_dig(e1, 1) == RLC_EQ, end);
-			g1_rand(p[0]);
-			g2_set_infty(q[0]);
-			pc_map(e1, p[0], q[0]);
-			TEST_ASSERT(gt_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			g1_rand(p[0]);
-			g2_rand(q[0]);
-			bn_rand_mod(k, n);
-			g2_mul(q[1], q[0], k);
-			pc_map(e1, p[0], q[1]);
-			pc_map(e2, p[0], q[0]);
-			gt_exp(e2, e2, k);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-			g1_mul(p[0], p[0], k);
-			pc_map(e2, p[0], q[0]);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-			g1_dbl(p[0], p[0]);
-			pc_map(e2, p[0], q[0]);
-			gt_sqr(e1, e1);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-			g2_dbl(q[0], q[0]);
-			pc_map(e2, p[0], q[0]);
-			gt_sqr(e1, e1);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multi-pairing is correct") {
-			g1_rand(p[i % 2]);
-			g2_rand(q[i % 2]);
-			pc_map(e1, p[i % 2], q[i % 2]);
-			g1_rand(p[1 - (i % 2)]);
-			g2_set_infty(q[1 - (i % 2)]);
-			pc_map_sim(e2, p, q, 2);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-			g1_set_infty(p[1 - (i % 2)]);
-			g2_rand(q[1 - (i % 2)]);
-			pc_map_sim(e2, p, q, 2);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-			g2_set_infty(q[i % 2]);
-			pc_map_sim(e2, p, q, 2);
-			TEST_ASSERT(gt_cmp_dig(e2, 1) == RLC_EQ, end);
-			g1_rand(p[0]);
-			g2_rand(q[0]);
-			pc_map(e1, p[0], q[0]);
-			g1_rand(p[1]);
-			g2_rand(q[1]);
-			pc_map(e2, p[1], q[1]);
-			gt_mul(e1, e1, e2);
-			pc_map_sim(e2, p, q, 2);
-			TEST_ASSERT(gt_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	gt_free(e1);
-	gt_free(e2);
-	bn_free(k);
-	bn_free(n);
-	for (j = 0; j < 2; j++) {
-		g1_free(p[j]);
-		g2_free(q[j]);
-	}
-	return code;
-}
-
-int test1(void) {
-	util_banner("Utilities:", 1);
-
-	if (memory1() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (validity1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (hashing1() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int test2(void) {
-	util_banner("Utilities:", 1);
-
-	if (memory2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (addition2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (subtraction2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (doubling2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (multiplication2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (fixed2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (simultaneous2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (validity2() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-#if FP_PRIME != 509
-	if (hashing2() != RLC_OK) {
-		return RLC_ERR;
-	}
-#endif
-
-	return RLC_OK;
-}
-
-int test(void) {
-	util_banner("Utilities:", 1);
-
-	if (memory() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	if (util() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	util_banner("Arithmetic:", 1);
-
-	if (multiplication() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (squaring() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (inversion() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (exponentiation() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (validity() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	if (pairing() != RLC_OK) {
-		return RLC_ERR;
-	}
-
-	return RLC_OK;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the PC module:", 0);
-
-	if (pc_param_set_any() != RLC_OK) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	pc_param_print();
-
-	util_banner("Group G_1:", 0);
-	if (test1() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Group G_2:", 0);
-	if (test2() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Group G_T:", 0);
-	if (test() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_pp.c b/src/dashbls/depends/relic/test/test_pp.c
deleted file mode 100644
index e706a2a91947..000000000000
--- a/src/dashbls/depends/relic/test/test_pp.c
+++ /dev/null
@@ -1,2580 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for pairings defined over prime elliptic curves.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-#include "relic_bench.h"
-
-static int addition2(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p, q, r, s;
-	fp2_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep_null(q);
-	ep_null(r);
-	ep_null(s);
-	fp2_null(e1);
-	fp2_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep_new(q);
-		ep_new(r);
-		ep_new(s);
-		fp2_new(e1);
-		fp2_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			ep_copy(s, r);
-			pp_add_k2(e1, r, q, p);
-			pp_norm_k2(r, r);
-			ep_add(s, s, q);
-			ep_norm(s, s);
-			TEST_ASSERT(ep_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			ep_copy(s, r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_add_k2(e1, r, q, p);
-			pp_exp_k2(e1, e1);
-			pp_add_k2_basic(e2, s, q, p);
-			pp_exp_k2(e2, e2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			ep_copy(s, r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_add_k2(e1, r, q, p);
-			pp_exp_k2(e1, e1);
-			pp_add_k2_projc(e2, s, q, p);
-			pp_exp_k2(e2, e2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-		TEST_CASE("basic projective miller addition is consistent") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			ep_copy(s, r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_add_k2_projc(e1, r, q, p);
-			pp_add_k2_projc_basic(e2, s, q, p);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced projective miller addition is consistent") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			ep_copy(s, r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_add_k2_projc(e1, r, q, p);
-			pp_add_k2_projc_lazyr(e2, s, q, p);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-#endif /* EP_ADD = PROJC */
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep_free(q);
-	ep_free(r);
-	ep_free(s);
-	fp2_free(e1);
-	fp2_free(e2);
-	return code;
-}
-
-static int doubling2(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p, q, r, s;
-	fp2_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep_null(q);
-	ep_null(r);
-	ep_null(s);
-	fp2_null(e1);
-	fp2_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep_new(q);
-		ep_new(r);
-		ep_new(s);
-		fp2_new(e1);
-		fp2_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			pp_dbl_k2(e1, r, q, p);
-			pp_norm_k2(r, r);
-			ep_dbl(s, q);
-			ep_norm(s, s);
-			TEST_ASSERT(ep_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_dbl_k2(e1, r, q, p);
-			pp_exp_k2(e1, e1);
-			pp_dbl_k2_basic(e2, r, q, p);
-			pp_exp_k2(e2, e2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_dbl_k2(e1, r, q, p);
-			pp_exp_k2(e1, e1);
-			pp_dbl_k2_projc(e2, r, q, p);
-			pp_exp_k2(e2, e2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-		TEST_CASE("basic projective miller doubling is correct") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_dbl_k2_projc(e1, r, q, p);
-			pp_dbl_k2_projc_basic(e2, r, q, p);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced projective miller doubling is consistent") {
-			ep_rand(p);
-			ep_rand(q);
-			ep_rand(r);
-			fp2_zero(e1);
-			fp2_zero(e2);
-			pp_dbl_k2_projc(e1, r, q, p);
-			pp_dbl_k2_projc_lazyr(e2, r, q, p);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-#endif /* EP_ADD = PROJC */
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep_free(q);
-	ep_free(r);
-	ep_free(s);
-	fp2_free(e1);
-	fp2_free(e2);
-	return code;
-}
-
-static int pairing2(void) {
-	int j, code = RLC_ERR;
-	bn_t k, n;
-	ep_t p[2], q[2], r;
-	fp2_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(r);
-	fp2_null(e1);
-	fp2_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(r);
-		fp2_new(e1);
-		fp2_new(e2);
-
-		for (j = 0; j < 2; j++) {
-			ep_null(p[j]);
-			ep_null(q[j]);
-			ep_new(p[j]);
-			ep_new(q[j]);
-		}
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			pp_map_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep_set_infty(q[0]);
-			pp_map_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep_mul(r, q[0], k);
-			pp_map_k2(e1, p[0], r);
-			pp_map_k2(e2, p[0], q[0]);
-			fp2_exp(e2, e2, k);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_k2(e2, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(q[0], q[0]);
-			pp_map_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-        TEST_CASE("multi-pairing is correct") {
-                ep_rand(p[i % 2]);
-                ep_rand(q[i % 2]);
-                pp_map_k2(e1, p[i % 2], q[i % 2]);
-                ep_rand(p[1 - (i % 2)]);
-                ep_set_infty(q[1 - (i % 2)]);
-                pp_map_sim_k2(e2, p, q, 2);
-                TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-                ep_set_infty(p[1 - (i % 2)]);
-                ep_rand(q[1 - (i % 2)]);
-                pp_map_sim_k2(e2, p, q, 2);
-                TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-                ep_set_infty(q[i % 2]);
-                pp_map_sim_k2(e2, p, q, 2);
-                TEST_ASSERT(fp2_cmp_dig(e2, 1) == RLC_EQ, end);
-                ep_rand(p[0]);
-                ep_rand(q[0]);
-                pp_map_k2(e1, p[0], q[0]);
-                ep_rand(p[1]);
-                ep_rand(q[1]);
-                pp_map_k2(e2, p[1], q[1]);
-                fp2_mul(e1, e1, e2);
-                pp_map_sim_k2(e2, p, q, 2);
-                TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-        } TEST_END;
-
-#if PP_MAP == TATEP || PP_MAP == OATEP || !defined(STRIP)
-		TEST_CASE("tate pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			pp_map_tatep_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_tatep_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep_set_infty(q[0]);
-			pp_map_tatep_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("tate pairing is bilinear") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep_mul(r, q[0], k);
-			pp_map_tatep_k2(e1, p[0], r);
-			pp_map_tatep_k2(e2, p[0], q[0]);
-			fp2_exp(e2, e2, k);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_tatep_k2(e2, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_tatep_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(q[0], q[0]);
-			pp_map_tatep_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("tate multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep_rand(q[i % 2]);
-			pp_map_tatep_k2(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_tatep_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep_rand(q[1 - (i % 2)]);
-			pp_map_sim_tatep_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(q[i % 2]);
-			pp_map_sim_tatep_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			pp_map_tatep_k2(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep_rand(q[1]);
-			pp_map_tatep_k2(e2, p[1], q[1]);
-			fp2_mul(e1, e1, e2);
-			pp_map_sim_tatep_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_MAP == WEIL || !defined(STRIP)
-		TEST_CASE("weil pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			pp_map_weilp_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_weilp_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep_set_infty(q[0]);
-			pp_map_weilp_k2(e1, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("weil pairing is bilinear") {
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep_mul(r, q[0], k);
-			pp_map_weilp_k2(e1, p[0], r);
-			pp_map_weilp_k2(e2, p[0], q[0]);
-			fp2_exp(e2, e2, k);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_weilp_k2(e2, p[0], q[0]);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_weilp_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(q[0], q[0]);
-			pp_map_weilp_k2(e2, p[0], q[0]);
-			fp2_sqr(e1, e1);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("weil multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep_rand(q[i % 2]);
-			pp_map_weilp_k2(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_weilp_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep_rand(q[1 - (i % 2)]);
-			pp_map_sim_weilp_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(q[i % 2]);
-			pp_map_sim_weilp_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep_rand(q[0]);
-			pp_map_weilp_k2(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep_rand(q[1]);
-			pp_map_weilp_k2(e2, p[1], q[1]);
-			fp2_mul(e1, e1, e2);
-			pp_map_sim_weilp_k2(e2, p, q, 2);
-			TEST_ASSERT(fp2_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(r);
-	fp2_free(e1);
-	fp2_free(e2);
-
-	for (j = 0; j < 2; j++) {
-		ep_free(p[j]);
-		ep2_free(q[j]);
-	}
-
-    return code;
-}
-
-static int doubling8(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep2_t q, r, s;
-	fp8_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep2_null(q);
-	ep2_null(r);
-	ep2_null(s);
-	fp8_null(e1);
-	fp8_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep2_new(q);
-		ep2_new(r);
-		ep2_new(s);
-		fp8_new(e1);
-		fp8_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_rand(r);
-			pp_dbl_k8(e1, r, q, p);
-			pp_norm_k8(r, r);
-			ep2_dbl(s, q);
-			ep2_norm(s, s);
-			TEST_ASSERT(ep2_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_rand(r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-			fp_neg(p->y, p->y);
-			pp_dbl_k8_basic(e2, r, q, p);
-			pp_exp_k8(e2, e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_neg(p->y, p->y);
-			fp_neg(p->x, p->x);
-#endif
-			pp_dbl_k8(e1, r, q, p);
-			pp_exp_k8(e1, e1);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_rand(r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-			/* Precompute. */
-			fp_neg(p->x, p->x);
-			pp_dbl_k8_projc(e2, r, q, p);
-			pp_exp_k8(e2, e2);
-#if EP_ADD == BASIC
-			/* Revert and fix precomputing. */
-			fp_neg(p->x, p->x);
-			fp_neg(p->y, p->y);
-#endif
-			pp_dbl_k8(e1, r, q, p);
-			pp_exp_k8(e1, e1);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-		TEST_CASE("basic projective miller doubling is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-			pp_dbl_k8_projc(e1, r, q, p);
-			pp_dbl_k8_projc_basic(e2, r, q, p);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced projective miller doubling is consistent") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-			pp_dbl_k8_projc(e1, r, q, p);
-			pp_dbl_k8_projc_lazyr(e2, r, q, p);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-#endif /* EP_ADD = PROJC */
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	ep2_free(s);
-	fp8_free(e1);
-	fp8_free(e2);
-	return code;
-}
-
-static int addition8(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep2_t q, r, s;
-	fp8_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep2_null(q);
-	ep2_null(r);
-	ep2_null(s);
-	fp8_null(e1);
-	fp8_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep2_new(q);
-		ep2_new(r);
-		ep2_new(s);
-		fp8_new(e1);
-		fp8_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_dbl(r, q);
-			ep2_norm(r, r);
-			ep2_copy(s, r);
-			pp_add_k8(e1, r, q, p);
-			pp_norm_k8(r, r);
-			ep2_add(s, s, q);
-			ep2_norm(s, s);
-			TEST_ASSERT(ep2_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_dbl(r, q);
-			ep2_norm(r, r);
-			ep2_copy(s, r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_neg(p->x, p->x);
-#else
-			fp_neg(p->y, p->y);
-#endif
-			pp_add_k8(e1, r, q, p);
-			pp_exp_k8(e1, e1);
-#if EP_ADD == PROJC
-			/* Revert precompute. */
-			fp_neg(p->x, p->x);
-			fp_neg(p->y, p->y);
-#endif
-			pp_add_k8_basic(e2, s, q, p);
-			pp_exp_k8(e2, e2);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			ep2_curve_get_gen(q);
-			ep2_dbl(r, q);
-			ep2_norm(r, r);
-			ep2_copy(s, r);
-			fp8_zero(e1);
-			fp8_zero(e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_neg(p->x, p->x);
-#else
-			fp_neg(p->y, p->y);
-#endif
-			pp_add_k8(e1, r, q, p);
-			pp_exp_k8(e1, e1);
-#if EP_ADD == BASIC
-			fp_neg(p->x, p->x);
-			fp_neg(p->y, p->y);
-#endif
-			pp_add_k8_projc(e2, s, q, p);
-			pp_exp_k8(e2, e2);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	ep2_free(s);
-	fp8_free(e1);
-	fp8_free(e2);
-	return code;
-}
-
-static int pairing8(void) {
-	int j, code = RLC_ERR;
-	bn_t k, n;
-	ep_t p[2];
-	ep2_t q[2], r;
-	fp8_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	fp8_null(e1);
-	fp8_null(e2);
-	ep2_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		fp8_new(e1);
-		fp8_new(e2);
-		ep2_new(r);
-
-		for (j = 0; j < 2; j++) {
-			ep_null(p[j]);
-			ep2_null(q[j]);
-			ep_new(p[j]);
-			ep2_new(q[j]);
-		}
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep2_curve_get_gen(q[0]);
-			pp_map_oatep_k8(e1, p[0], q[0]);
-			TEST_ASSERT(fp8_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_oatep_k8(e1, p[0], q[0]);
-			TEST_ASSERT(fp8_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_set_infty(q[0]);
-			pp_map_oatep_k8(e1, p[0], q[0]);
-			TEST_ASSERT(fp8_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p[0]);
-			ep2_curve_get_gen(q[0]);
-			bn_rand_mod(k, n);
-			ep2_mul_basic(r, q[0], k);
-			pp_map_oatep_k8(e1, p[0], r);
-			pp_map_oatep_k8(e2, p[0], q[0]);
-			fp8_exp(e2, e2, k);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_oatep_k8(e2, p[0], q[0]);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_oatep_k8(e2, p[0], q[0]);
-			fp8_sqr(e1, e1);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-			ep2_dbl(q[0], q[0]);
-			pp_map_oatep_k8(e2, p[0], q[0]);
-			fp8_sqr(e1, e1);
-			TEST_ASSERT(fp8_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	fp8_free(e1);
-	fp8_free(e2);
-	ep2_free(r);
-
-	for (j = 0; j < 2; j++) {
-		ep_free(p[j]);
-		ep2_free(q[j]);
-	}
-	return code;
-}
-
-static int doubling12(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep2_t q, r, s;
-	fp12_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep2_null(q);
-	ep2_null(r);
-	ep2_null(s);
-	fp12_null(e1);
-	fp12_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep2_new(q);
-		ep2_new(r);
-		ep2_new(s);
-		fp12_new(e1);
-		fp12_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			pp_dbl_k12(e1, r, q, p);
-			pp_norm_k12(r, r);
-			ep2_dbl(s, q);
-			ep2_norm(s, s);
-			TEST_ASSERT(ep2_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			fp_neg(p->y, p->y);
-			pp_dbl_k12_basic(e2, r, q, p);
-			pp_exp_k12(e2, e2);
-#if EP_ADD == PROJC || EP_ADD == JACOB
-			/* Precompute. */
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-#endif
-			pp_dbl_k12(e1, r, q, p);
-			pp_exp_k12(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			/* Precompute. */
-			fp_neg(p->y, p->y);
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-			pp_dbl_k12_projc(e2, r, q, p);
-			pp_exp_k12(e2, e2);
-#if EP_ADD == BASIC
-			/* Revert precomputing. */
-			fp_hlv(p->x, p->z);
-#endif
-			pp_dbl_k12(e1, r, q, p);
-			pp_exp_k12(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-		TEST_CASE("basic projective miller doubling is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_dbl_k12_projc(e1, r, q, p);
-			pp_dbl_k12_projc_basic(e2, r, q, p);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced projective miller doubling is consistent") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_dbl_k12_projc(e1, r, q, p);
-			pp_dbl_k12_projc_lazyr(e2, r, q, p);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-#endif /* EP_ADD = PROJC */
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	ep2_free(s);
-	fp12_free(e1);
-	fp12_free(e2);
-	return code;
-}
-
-static int addition12(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep2_t q, r, s;
-	fp12_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep2_null(q);
-	ep2_null(r);
-	ep2_null(s);
-	fp12_null(e1);
-	fp12_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep2_new(q);
-		ep2_new(r);
-		ep2_new(s);
-		fp12_new(e1);
-		fp12_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			ep2_copy(s, r);
-			pp_add_k12(e1, r, q, p);
-			pp_norm_k12(r, r);
-			ep2_add(s, s, q);
-			ep2_norm(s, s);
-			TEST_ASSERT(ep2_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			ep2_copy(s, r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_add_k12(e1, r, q, p);
-			pp_exp_k12(e1, e1);
-			pp_add_k12_basic(e2, s, q, p);
-			pp_exp_k12(e2, e2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			ep2_copy(s, r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_add_k12(e1, r, q, p);
-			pp_exp_k12(e1, e1);
-			pp_add_k12_projc(e2, s, q, p);
-			pp_exp_k12(e2, e2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_EXT == BASIC || !defined(STRIP)
-		TEST_CASE("basic projective miller addition is consistent") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			ep2_copy(s, r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_add_k12_projc(e1, r, q, p);
-			pp_add_k12_projc_basic(e2, s, q, p);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_EXT == LAZYR || !defined(STRIP)
-		TEST_CASE("lazy-reduced projective miller addition is consistent") {
-			ep_rand(p);
-			ep2_rand(q);
-			ep2_rand(r);
-			ep2_copy(s, r);
-			fp12_zero(e1);
-			fp12_zero(e2);
-			pp_add_k12_projc(e1, r, q, p);
-			pp_add_k12_projc_lazyr(e2, s, q, p);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-#endif /* EP_ADD = PROJC */
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep2_free(q);
-	ep2_free(r);
-	ep2_free(s);
-	fp12_free(e1);
-	fp12_free(e2);
-	return code;
-}
-
-static int pairing12(void) {
-	int j, code = RLC_ERR;
-	bn_t k, n;
-	ep_t p[2];
-	ep2_t q[2], r;
-	fp12_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	fp12_null(e1);
-	fp12_null(e2);
-	ep2_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		fp12_new(e1);
-		fp12_new(e2);
-		ep2_new(r);
-
-		for (j = 0; j < 2; j++) {
-			ep_null(p[j]);
-			ep2_null(q[j]);
-			ep_new(p[j]);
-			ep2_new(q[j]);
-		}
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_set_infty(q[0]);
-			pp_map_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep2_mul(r, q[0], k);
-			pp_map_k12(e1, p[0], r);
-			pp_map_k12(e2, p[0], q[0]);
-			fp12_exp(e2, e2, k);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_k12(e2, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_dbl(q[0], q[0]);
-			pp_map_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep2_rand(q[i % 2]);
-			pp_map_k12(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep2_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep2_rand(q[1 - (i % 2)]);
-			pp_map_sim_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_set_infty(q[i % 2]);
-			pp_map_sim_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_k12(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep2_rand(q[1]);
-			pp_map_k12(e2, p[1], q[1]);
-			fp12_mul(e1, e1, e2);
-			pp_map_sim_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-#if PP_MAP == TATEP || !defined(STRIP)
-		TEST_CASE("tate pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_tatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_tatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_set_infty(q[0]);
-			pp_map_tatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("tate pairing is bilinear") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep2_mul(r, q[0], k);
-			pp_map_tatep_k12(e1, p[0], r);
-			pp_map_tatep_k12(e2, p[0], q[0]);
-			fp12_exp(e2, e2, k);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_tatep_k12(e2, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_tatep_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_dbl(q[0], q[0]);
-			pp_map_tatep_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("tate multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep2_rand(q[i % 2]);
-			pp_map_tatep_k12(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep2_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_tatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep2_rand(q[1 - (i % 2)]);
-			pp_map_sim_tatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_set_infty(q[i % 2]);
-			pp_map_sim_tatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_tatep_k12(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep2_rand(q[1]);
-			pp_map_tatep_k12(e2, p[1], q[1]);
-			fp12_mul(e1, e1, e2);
-			pp_map_sim_tatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_MAP == WEIL || !defined(STRIP)
-		TEST_CASE("weil pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_weilp_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_weilp_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_set_infty(q[0]);
-			pp_map_weilp_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("weil pairing is bilinear") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep2_mul(r, q[0], k);
-			pp_map_weilp_k12(e1, p[0], r);
-			pp_map_weilp_k12(e2, p[0], q[0]);
-			fp12_exp(e2, e2, k);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_weilp_k12(e2, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_weilp_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_dbl(q[0], q[0]);
-			pp_map_weilp_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("weil multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep2_rand(q[i % 2]);
-			pp_map_weilp_k12(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep2_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_weilp_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep2_rand(q[1 - (i % 2)]);
-			pp_map_sim_weilp_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_set_infty(q[i % 2]);
-			pp_map_sim_weilp_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_weilp_k12(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep2_rand(q[1]);
-			pp_map_weilp_k12(e2, p[1], q[1]);
-			fp12_mul(e1, e1, e2);
-			pp_map_sim_weilp_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if PP_MAP == OATEP || !defined(STRIP)
-		TEST_CASE("optimal ate pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_oatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_oatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_set_infty(q[0]);
-			pp_map_oatep_k12(e1, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("optimal ate pairing is bilinear") {
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep2_mul(r, q[0], k);
-			pp_map_oatep_k12(e1, p[0], r);
-			ep_mul(p[0], p[0], k);
-			pp_map_oatep_k12(e2, p[0], q[0]);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_oatep_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_dbl(q[0], q[0]);
-			pp_map_oatep_k12(e2, p[0], q[0]);
-			fp12_sqr(e1, e1);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("optimal ate multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep2_rand(q[i % 2]);
-			pp_map_oatep_k12(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep2_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_oatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep2_rand(q[1 - (i % 2)]);
-			pp_map_sim_oatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-			ep2_set_infty(q[i % 2]);
-			pp_map_sim_oatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep2_rand(q[0]);
-			pp_map_oatep_k12(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep2_rand(q[1]);
-			pp_map_oatep_k12(e2, p[1], q[1]);
-			fp12_mul(e1, e1, e2);
-			pp_map_sim_oatep_k12(e2, p, q, 2);
-			TEST_ASSERT(fp12_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	fp12_free(e1);
-	fp12_free(e2);
-	ep2_free(r);
-
-	for (j = 0; j < 2; j++) {
-		ep_free(p[j]);
-		ep2_free(q[j]);
-	}
-	return code;
-}
-
-static int doubling24(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep4_t q, r, s;
-	fp24_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep4_null(q);
-	ep4_null(r);
-	ep4_null(s);
-	fp24_null(e1);
-	fp24_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep4_new(q);
-		ep4_new(r);
-		ep4_new(s);
-		fp24_new(e1);
-		fp24_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			ep4_rand(r);
-			pp_dbl_k24(e1, r, q, p);
-			pp_norm_k24(r, r);
-			ep4_dbl(s, q);
-			ep4_norm(s, s);
-			TEST_ASSERT(ep4_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			fp24_zero(e1);
-			fp24_zero(e2);
-			fp_neg(p->y, p->y);
-			pp_dbl_k24_basic(e2, r, q, p);
-			pp_exp_k24(e2, e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-#endif
-			pp_dbl_k24(e1, r, q, p);
-			pp_exp_k24(e1, e1);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			fp24_zero(e1);
-			fp24_zero(e2);
-			/* Precompute. */
-			fp_neg(p->y, p->y);
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-			pp_dbl_k24_projc(e2, r, q, p);
-			pp_exp_k24(e2, e2);
-#if EP_ADD == BASIC
-			/* Revert precomputing. */
-			fp_hlv(p->x, p->z);
-#endif
-			pp_dbl_k24(e1, r, q, p);
-			pp_exp_k24(e1, e1);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep4_free(q);
-	ep4_free(r);
-	ep4_free(s);
-	fp24_free(e1);
-	fp24_free(e2);
-	return code;
-}
-
-static int addition24(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	ep4_t q, r, s;
-	fp24_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	ep4_null(q);
-	ep4_null(r);
-	ep4_null(s);
-	fp24_null(e1);
-	fp24_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		ep4_new(q);
-		ep4_new(r);
-		ep4_new(s);
-		fp24_new(e1);
-		fp24_new(e2);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			ep4_rand(r);
-			ep4_copy(s, r);
-			pp_add_k24(e1, r, q, p);
-			pp_norm_k24(r, r);
-			ep4_add(s, s, q);
-			ep4_norm(s, s);
-			TEST_ASSERT(ep4_cmp(r, s) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			ep4_rand(r);
-			ep4_copy(s, r);
-			fp24_zero(e1);
-			fp24_zero(e2);
-			pp_add_k24(e1, r, q, p);
-			pp_exp_k24(e1, e1);
-			pp_add_k24_basic(e2, s, q, p);
-			pp_exp_k24(e2, e2);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			ep4_rand(q);
-			ep4_rand(r);
-			ep4_copy(s, r);
-			fp24_zero(e1);
-			fp24_zero(e2);
-			pp_add_k24(e1, r, q, p);
-			pp_exp_k24(e1, e1);
-			pp_add_k24_projc(e2, s, q, p);
-			pp_exp_k24(e2, e2);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	ep4_free(q);
-	ep4_free(r);
-	ep4_free(s);
-	fp24_free(e1);
-	fp24_free(e2);
-	return code;
-}
-
-static int pairing24(void) {
-	int j, code = RLC_ERR;
-	bn_t k, n;
-	ep_t p[2];
-	ep4_t q[2], r;
-	fp24_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	fp24_null(e1);
-	fp24_null(e2);
-	ep4_null(r);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		fp24_new(e1);
-		fp24_new(e2);
-		ep4_new(r);
-
-		for (j = 0; j < 2; j++) {
-			ep_null(p[j]);
-			ep4_null(q[j]);
-			ep_new(p[j]);
-			ep4_new(q[j]);
-		}
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p[0]);
-			ep4_rand(q[0]);
-			pp_map_k24(e1, p[0], q[0]);
-			TEST_ASSERT(fp24_cmp_dig(e1, 1) != RLC_EQ, end);
-			ep_set_infty(p[0]);
-			pp_map_k24(e1, p[0], q[0]);
-			TEST_ASSERT(fp24_cmp_dig(e1, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep4_set_infty(q[0]);
-			pp_map_k24(e1, p[0], q[0]);
-			TEST_ASSERT(fp24_cmp_dig(e1, 1) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p[0]);
-			ep4_rand(q[0]);
-			bn_rand_mod(k, n);
-			ep4_mul(r, q[0], k);
-			pp_map_k24(e1, p[0], r);
-			pp_map_k24(e2, p[0], q[0]);
-			fp24_exp(e2, e2, k);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-			ep_mul(p[0], p[0], k);
-			pp_map_k24(e2, p[0], q[0]);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-			ep_dbl(p[0], p[0]);
-			pp_map_k24(e2, p[0], q[0]);
-			fp24_sqr(e1, e1);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-			ep4_dbl(q[0], q[0]);
-			pp_map_k24(e2, p[0], q[0]);
-			fp24_sqr(e1, e1);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("multi-pairing is correct") {
-			ep_rand(p[i % 2]);
-			ep4_rand(q[i % 2]);
-			pp_map_k24(e1, p[i % 2], q[i % 2]);
-			ep_rand(p[1 - (i % 2)]);
-			ep4_set_infty(q[1 - (i % 2)]);
-			pp_map_sim_k24(e2, p, q, 2);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-			ep_set_infty(p[1 - (i % 2)]);
-			ep4_rand(q[1 - (i % 2)]);
-			pp_map_sim_k24(e2, p, q, 2);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-			ep4_set_infty(q[i % 2]);
-			pp_map_sim_k24(e2, p, q, 2);
-			TEST_ASSERT(fp24_cmp_dig(e2, 1) == RLC_EQ, end);
-			ep_rand(p[0]);
-			ep4_rand(q[0]);
-			pp_map_k24(e1, p[0], q[0]);
-			ep_rand(p[1]);
-			ep4_rand(q[1]);
-			pp_map_k24(e2, p[1], q[1]);
-			fp24_mul(e1, e1, e2);
-			pp_map_sim_k24(e2, p, q, 2);
-			TEST_ASSERT(fp24_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	fp24_free(e1);
-	fp24_free(e2);
-	ep4_free(r);
-
-	for (j = 0; j < 2; j++) {
-		ep_free(p[j]);
-		ep4_free(q[j]);
-	}
-	return code;
-}
-
-/* Put test vectors here until we implement E(Fp^8). */
-#define QX000 "266A6ACAA4B8DDCFBF97F09DFBEB01999BFBFF872276FA7700114F761E8971C6C25A53CC77E96BCC9579F63D8A39D641B8070B07EF40E93C301A5B49CE87110CC30E044BEE5A2D43"
-#define QX001 "5009EEB2A67C52B79D0727B408A193FFCE76B4F80C8DCF4D61ECEE5471601CD7A94341F697CE9D375DB5470EA055B73C256CCC0AC12F52EAD276C26E001DDCE02DE634BEFCB9CC7C"
-#define QX010 "11A8DDB59724C01696BE52862B5AC2C7E1C0C42EFCAF456A80F6C6D9F95F89649D5575DE3BA8D28D1012E14308DE1D8F15CE1617611F961032B0B5DFA27EF3E3670B9B537ACC66B9"
-#define QX011 "4E8BDED03587581A173AD008DFF600EB24054E4CDDCA8D7BFABA2898822DB5ED701BF59BD3F108AD7C714B6A6C7ECB11A1BC5DEEC1D49AE7FCA597C43943A66441B03164975D9BE0"
-#define QX100 "29E2751CAC7D0FBA8E12CC818BDE6F2A7173D3C2ED74EC1991B936071DEB1AED1E07CDF71EA3501BEB4645C86BDC8A575898303FF6A058C7062F079F594E5B865626D0C031CF7E44"
-#define QX101 "2F3A1BE54DFFB814DA4AE6311B9B1EEE6198CDB9F36CE92084272416462F4D0AC9ACAC025FDA6D3D0D1C239FE8CE4B7F22A1D0F65582DDA36EEB328843FDE5C0BDA02E871796CC8E"
-#define QX110 "2FEE7B15EB22B05476A462374860140DCC9F00910E0555918D6357F6E32E623B88B893647AD07B615F364093D6F6D2A7B7614590A8833385B5A833563C0DD6C89AF89D06428E8AFE"
-#define QX111 "005082322BB5E610DC0E61E3D01B8BFF23D195117F58B1FA68EC04A6769FEB754A58742C7F729E2A684386C40EFB871CB3D32A040966155649DC45C49E6FB5DEE58DB1586CBFD33E"
-
-#define QY000 "3B603A4C408A402FB885B607C4A661BF92354D22F46945F222C6F51CCDEBF4006640346AE6BFD60F7E22240D4BF83EFDA1B575267A89597D7BC54FA4899BFBAAC4138E30C8DA55C0"
-#define QY001 "35D3ECCC1F3C69A921E57CCDEA6C794A5ED01A53E19208854EA3B10D519CCCE64A30007CD7A57673567F2FFA070E5CE01C4E5C8BF1C61225DAC36A93C6524F4D0350C6358C67F85B"
-#define QY010 "4228DA69A29E14E2CF00EC8FDD877CA9049DA161778A6ACE8DC275D4CE94C90AD9176280703AD9C6714A4865EF6160ED2FA7A5FC601025CF096AB6CF21B8FAA41421C7913DECF3B5"
-#define QY011 "5273C1679E18D316C6988820E06335094FCCCD5E8FD870492EB96FCBC5B5494B2B9D0869C18309FF2D49CD80CF6E6FE1A660027A6E924831F8D5A070645A7B794BA7AE72507809AE"
-#define QY100 "0ABD2F582F0D4C3C89770C13F02FF17CDEA5B22CDD661B6F82905ADCDC44E59900C5D09F8CAC90760CCC57D1987DE4BA21F34455E5B7394B68A7883E3F8D918AF308F0C3E6F98F4B"
-#define QY101 "36FAE1DE9DD31FFE238526F618C14E5CB61EEA8E8E6D82235E43E45E306C5E60B4E5499BF4663516CE1202EF6CDE3B2E098E406B3186937483FC104A173707C6419F460A23ADF628"
-#define QY110 "09E1BB455FCB47E98C5263B5098E2D148EC2EDEE5634B8F94F10AF9221D09BD60D28920342C11B1987A24B7F56AC4F5E290E7EA483727ED16FFC88C0F5EAD00892FDA66BA68FACE4"
-#define QY111 "4F781C32F5CAFD446F299BE6BC600BF3482DF6ECAF4ABE3D410A7255B18A88DB77CC539CAC4A0D30A00690CCA8CC7661BCE042D0AC40FF8DC9171847A8E42696E4EF9DD8A5907A3D"
-
-static int doubling48(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp8_t qx, qy, qz, rx, ry, rz;
-	fp48_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp8_null(qx);
-	fp8_null(qy);
-	fp8_null(qz);
-	fp8_null(rx);
-	fp8_null(ry);
-	fp8_null(rz);
-	fp48_null(e1);
-	fp48_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp8_new(qx);
-		fp8_new(qy);
-		fp8_new(qz);
-		fp8_new(rx);
-		fp8_new(ry);
-		fp8_new(rz);
-		fp48_new(e1);
-		fp48_new(e2);
-
-		fp_read_str(qx[0][0][0], QX000, strlen(QX000), 16);
-		fp_read_str(qx[0][0][1], QX001, strlen(QX001), 16);
-		fp_read_str(qx[0][1][0], QX010, strlen(QX010), 16);
-		fp_read_str(qx[0][1][1], QX011, strlen(QX011), 16);
-		fp_read_str(qx[1][0][0], QX100, strlen(QX100), 16);
-		fp_read_str(qx[1][0][1], QX101, strlen(QX101), 16);
-		fp_read_str(qx[1][1][0], QX110, strlen(QX110), 16);
-		fp_read_str(qx[1][1][1], QX111, strlen(QX111), 16);
-
-		fp_read_str(qy[0][0][0], QY000, strlen(QY000), 16);
-		fp_read_str(qy[0][0][1], QY001, strlen(QY001), 16);
-		fp_read_str(qy[0][1][0], QY010, strlen(QY010), 16);
-		fp_read_str(qy[0][1][1], QY011, strlen(QY011), 16);
-		fp_read_str(qy[1][0][0], QY100, strlen(QY100), 16);
-		fp_read_str(qy[1][0][1], QY101, strlen(QY101), 16);
-		fp_read_str(qy[1][1][0], QY110, strlen(QY110), 16);
-		fp_read_str(qy[1][1][1], QY111, strlen(QY111), 16);
-
-		fp8_set_dig(qz, 1);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48_projc(e1, rx, ry, rz, p);
-			fp8_inv(rz, rz);
-			fp8_mul(rx, rx, rz);
-			fp8_mul(ry, ry, rz);
-			pp_dbl_k48_basic(e2, qx, qy, p);
-			TEST_ASSERT(fp8_cmp(rx, qx) == RLC_EQ && fp8_cmp(ry, qy) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			fp48_zero(e1);
-			fp48_zero(e2);
-			fp_neg(p->y, p->y);
-			pp_dbl_k48_basic(e2, rx, ry, p);
-			pp_exp_k48(e2, e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-#endif
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e1, rx, ry, rz, p);
-			pp_exp_k48(e1, e1);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			fp48_zero(e1);
-			fp48_zero(e2);
-			/* Precompute. */
-			fp_neg(p->y, p->y);
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-			pp_dbl_k48_projc(e2, rx, ry, rz, p);
-			pp_exp_k48(e2, e2);
-#if EP_ADD == BASIC
-			/* Revert precomputing. */
-			fp_hlv(p->x, p->z);
-#endif
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e1, rx, ry, rz, p);
-			pp_exp_k48(e1, e1);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp8_free(qx);
-	fp8_free(qy);
-	fp8_free(qz);
-	fp8_free(rx);
-	fp8_free(ry);
-	fp8_free(rz);
-	fp48_free(e1);
-	fp48_free(e2);
-	return code;
-}
-
-static int addition48(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp8_t qx, qy, qz, rx, ry, rz;
-	fp48_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp8_null(qx);
-	fp8_null(qy);
-	fp8_null(qz);
-	fp8_null(rx);
-	fp8_null(ry);
-	fp8_null(rz);
-	fp48_null(e1);
-	fp48_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp8_new(qx);
-		fp8_new(qy);
-		fp8_new(qz);
-		fp8_new(rx);
-		fp8_new(ry);
-		fp8_new(rz);
-		fp48_new(e1);
-		fp48_new(e2);
-
-		fp_read_str(qx[0][0][0], QX000, strlen(QX000), 16);
-		fp_read_str(qx[0][0][1], QX001, strlen(QX001), 16);
-		fp_read_str(qx[0][1][0], QX010, strlen(QX010), 16);
-		fp_read_str(qx[0][1][1], QX011, strlen(QX011), 16);
-		fp_read_str(qx[1][0][0], QX100, strlen(QX100), 16);
-		fp_read_str(qx[1][0][1], QX101, strlen(QX101), 16);
-		fp_read_str(qx[1][1][0], QX110, strlen(QX110), 16);
-		fp_read_str(qx[1][1][1], QX111, strlen(QX111), 16);
-
-		fp_read_str(qy[0][0][0], QY000, strlen(QY000), 16);
-		fp_read_str(qy[0][0][1], QY001, strlen(QY001), 16);
-		fp_read_str(qy[0][1][0], QY010, strlen(QY010), 16);
-		fp_read_str(qy[0][1][1], QY011, strlen(QY011), 16);
-		fp_read_str(qy[1][0][0], QY100, strlen(QY100), 16);
-		fp_read_str(qy[1][0][1], QY101, strlen(QY101), 16);
-		fp_read_str(qy[1][1][0], QY110, strlen(QY110), 16);
-		fp_read_str(qy[1][1][1], QY111, strlen(QY111), 16);
-
-		fp8_set_dig(qz, 1);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e1, rx, ry, rz, p);
-			pp_add_k48_projc(e1, rx, ry, rz, qx, qy, p);
-			fp8_inv(rz, rz);
-			fp8_mul(rx, rx, rz);
-			fp8_mul(ry, ry, rz);
-			fp8_copy(e1[0][0], rx);
-			fp8_copy(e1[0][1], ry);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e2, rx, ry, rz, p);
-#if EP_ADD == PROJC
-			fp8_inv(rz, rz);
-			fp8_mul(rx, rx, rz);
-			fp8_mul(ry, ry, rz);
-#endif
-			pp_add_k48_basic(e2, rx, ry, qx, qy, p);
-			TEST_ASSERT(fp8_cmp(rx, e1[0][0]) == RLC_EQ && fp8_cmp(ry, e1[0][1]) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			fp48_zero(e1);
-			fp48_zero(e2);
-			pp_dbl_k48(e1, rx, ry, rz, p);
-			pp_add_k48(e1, rx, ry, rz, qx, qy, p);
-			pp_exp_k48(e1, e1);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e2, rx, ry, rz, p);
-#if EP_ADD == PROJC
-			fp8_inv(rz, rz);
-			fp8_mul(rx, rx, rz);
-			fp8_mul(ry, ry, rz);
-#endif
-			pp_add_k48_basic(e2, rx, ry, qx, qy, p);
-			pp_exp_k48(e2, e2);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			fp48_zero(e1);
-			fp48_zero(e2);
-			pp_dbl_k48(e1, rx, ry, rz, p);
-			pp_add_k48(e1, rx, ry, rz, qx, qy, p);
-			pp_exp_k48(e1, e1);
-			fp8_copy(rx, qx);
-			fp8_copy(ry, qy);
-			fp8_copy(rz, qz);
-			pp_dbl_k48(e2, rx, ry, rz, p);
-			pp_add_k48_projc(e2, rx, ry, rz, qx, qy, p);
-			pp_exp_k48(e2, e2);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp8_free(qx);
-	fp8_free(qy);
-	fp8_free(qz);
-	fp8_free(rx);
-	fp8_free(ry);
-	fp8_free(rz);
-	fp48_free(e1);
-	fp48_free(e2);
-	return code;
-}
-
-static int pairing48(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp8_t qx, qy, qz;
-	fp48_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp8_null(qx);
-	fp8_null(qy);
-	fp8_null(qz);
-	fp48_null(e1);
-	fp48_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp8_new(qx);
-		fp8_new(qy);
-		fp8_new(qz);
-		fp48_new(e1);
-		fp48_new(e2);
-
-		ep_curve_get_ord(n);
-
-		fp_read_str(qx[0][0][0], QX000, strlen(QX000), 16);
-		fp_read_str(qx[0][0][1], QX001, strlen(QX001), 16);
-		fp_read_str(qx[0][1][0], QX010, strlen(QX010), 16);
-		fp_read_str(qx[0][1][1], QX011, strlen(QX011), 16);
-		fp_read_str(qx[1][0][0], QX100, strlen(QX100), 16);
-		fp_read_str(qx[1][0][1], QX101, strlen(QX101), 16);
-		fp_read_str(qx[1][1][0], QX110, strlen(QX110), 16);
-		fp_read_str(qx[1][1][1], QX111, strlen(QX111), 16);
-
-		fp_read_str(qy[0][0][0], QY000, strlen(QY000), 16);
-		fp_read_str(qy[0][0][1], QY001, strlen(QY001), 16);
-		fp_read_str(qy[0][1][0], QY010, strlen(QY010), 16);
-		fp_read_str(qy[0][1][1], QY011, strlen(QY011), 16);
-		fp_read_str(qy[1][0][0], QY100, strlen(QY100), 16);
-		fp_read_str(qy[1][0][1], QY101, strlen(QY101), 16);
-		fp_read_str(qy[1][1][0], QY110, strlen(QY110), 16);
-		fp_read_str(qy[1][1][1], QY111, strlen(QY111), 16);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p);
-			pp_map_k48(e1, p, qx, qy);
-			TEST_ASSERT(fp48_cmp_dig(e1, 1) != RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p);
-			bn_rand_mod(k, n);
-			pp_map_k48(e1, p, qx, qy);
-			ep_mul(p, p, k);
-			pp_map_k48(e2, p, qx, qy);
-			fp48_exp(e1, e1, k);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-			fp8_set_dig(qz, 1);
-			pp_dbl_k48(e2, qx, qy, qz, p);
-			fp8_inv(qz, qz);
-			fp8_mul(qx, qx, qz);
-			fp8_mul(qy, qy, qz);
-			fp8_set_dig(qz, 1);
-			pp_map_k48(e2, p, qx, qy);
-			fp48_sqr(e1, e1);
-			TEST_ASSERT(fp48_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp8_free(qx);
-	fp8_free(qy);
-	fp8_free(qz);
-	fp48_free(e1);
-	fp48_free(e2);
-	return code;
-}
-
-/* Put test vectors here until we implement E(Fp^9). */
-#define QX00 "1E389F332DF2021EA1184765A5F47349F170E9230ED98CF5F35AC4DD7491E0244A2CEA197FBF7527505DD4A8455DD23C042567F3E33393A01DB07985DC2DD27826D19522060E01"
-#define QX01 "BAE3E7B243BE1100DAED0C041346351C0937F37E71E57A18B90311457F5AEEC704B9E6697FB246AEE22CF7A5BA48F6821ACDAE053CDF35A9A32FDF789673C8F15F837035F0FE52"
-#define QX02 "194C03CC03E3D13996CD05B07F4026FC89017EC2B8B257FE567E164A418FD42958BF835F3395D2085F7B8FE92F0048F8FB5629F9D70EF56AB2FC7495999A8EA4FEE35F34A73075"
-#define QX10 "B068EC27D441FC14583F57494CBF3AD7117A72CF8AFBFC3B5D046E0BD0849352CF23A0E5505F25A3B17936B789803AFA7AAE3D14BDFA9CB3C9804D7516CF7295E2656F921A08B4"
-#define QX11 "0F3350C3168AB6A4A8F0D35D6F10CB4CB56440CEC4D3E826BB5492CD370712F0D13F73B197A3F7E9BECF46F8B0FB02B354ED86A4506A1AEBBF063A1FFC3BB519AAEBDFC96637EB"
-#define QX12 "56881E19298D0DB323F4054BEF75803E917EA9332D2A5278713FCF68AF5BFBFCF0A07AAFFB3FAEFAB271BCA40A34C489DF9E23D3235FD3C15045AD797C1C10C9261EC6006ACE11"
-#define QX20 "E75291962F8B6069888AE07BA7B8FBFF0F6C5D82CF1B240C983F3D2FC220B90D0C52E9194B55395FBE55BF66BF6178494F0B9CC16B9ED3A0924A4A225083086D850531FF47768C"
-#define QX21 "4F0BE29A5B0B20CC998F84BE209F1007A56A5742BEDBC9EA5768131E15EC5316B97A5A41C7F118224933BF1C170A79739153EE1DEC5A084E13DF783E14EBF34096605E181EF35A"
-#define QX22 "3B8F6AAF5067AF990974F8BEC58E3B8151DC61646C6E523CCFDD3A27B1588993607EF700D3F8A27DDA71E3CED9324282E9F6E394433921F655BECAB2E5AC08DBA9207A8DB99D39"
-
-#define QY00 "FB32F805837AC53F50C4E9238B2808AA35A854DBF610BEF72A180B54E4BCDBFEC5706A41CF43258C6AC1DD857F3B94AE58C2F80CAB0E977B33145E481A1E8F848D15448006FF55"
-#define QY01 "2864D2E200BCC3383F58BFFB73A81C177343F4661A1B8CE3723EDC1AB71C89AE240B587A654E7D555DD7BFB211A43C4C463312A8A82FEBCE6B1797FE047A84265C7FD70FC00D81"
-#define QY02 "B1A5A2A4CD6CD5238E684B24DA6579ADC41A9EBE499524154B7F14DF2F05F08D0A296930488786F0F47523961D9AF607A924530A88F8842D420181FA8DF94EDDB5092A6B678119"
-#define QY10 "51BE5155AC3DB6B20222CAA2F6F115798F6D56E7C294C64B8D182FEF03FCFAB57E791C464B38CFFA81905211FADE928914B888C6CB000040EAF53CF700ED4A405E3146D63335E4"
-#define QY11 "08ABC2FAC0D87900C653C1279AAAD421D36571F0F1F49C126F4AA3610C72704E6E986C088350044CF9D715649015559147B3B6B80A5C45519B84AF4C302953302FE4445731F4C4"
-#define QY12 "C1A69378BF81042E108345F93026D0452BD9EF72262A6CFD8BF28ECEF6C80242192CFFEF77737AA474D62E5FFF1B4BFE8F8378256A2854D0B7C8B199621C22D22F827729A50F52"
-#define QY20 "53CBD42DF27B32598712C729913FC1E5ACDFE16063CCC1A8EDE887223B2891407917B37D811E1A93AB716693E9D04A6AD35819E5F383CC5A22B1848BADD0FEB18CBD44055858D4"
-#define QY21 "16DC6C7F1A5FB6FDCFBAA0944CC98398245EABA7CA607DDA5EEC6A2FBDF6DA1D6EB29A0E6941704AAF932810FEF372FE0FF7AA55C1F7EDE06B317DDED4B53D7D7F6D9A09A099D9"
-#define QY22 "86C9BA4E7DDA70BB3FC1CE8245638F06CABC723A31CEC1427E6627AB6BBC716C54C5B30DB951BF2C1D7E07E74CD9E15837E79BC354DA011517BEE5395BA38F32E0C2C75F089FDC"
-
-static int doubling54(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp9_t qx, qy, qz, rx, ry, rz;
-	fp54_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp9_null(qx);
-	fp9_null(qy);
-	fp9_null(qz);
-	fp9_null(rx);
-	fp9_null(ry);
-	fp9_null(rz);
-	fp54_null(e1);
-	fp54_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp9_new(qx);
-		fp9_new(qy);
-		fp9_new(qz);
-		fp9_new(rx);
-		fp9_new(ry);
-		fp9_new(rz);
-		fp54_new(e1);
-		fp54_new(e2);
-
-		fp_read_str(qx[0][0], QX00, strlen(QX00), 16);
-		fp_read_str(qx[0][1], QX01, strlen(QX01), 16);
-		fp_read_str(qx[0][2], QX02, strlen(QX02), 16);
-		fp_read_str(qx[1][0], QX10, strlen(QX10), 16);
-		fp_read_str(qx[1][1], QX11, strlen(QX11), 16);
-		fp_read_str(qx[1][2], QX12, strlen(QX12), 16);
-		fp_read_str(qx[2][0], QX20, strlen(QX20), 16);
-		fp_read_str(qx[2][1], QX21, strlen(QX21), 16);
-		fp_read_str(qx[2][2], QX22, strlen(QX22), 16);
-
-		fp_read_str(qy[0][0], QY00, strlen(QY00), 16);
-		fp_read_str(qy[0][1], QY01, strlen(QY01), 16);
-		fp_read_str(qy[0][2], QY02, strlen(QY02), 16);
-		fp_read_str(qy[1][0], QY10, strlen(QY10), 16);
-		fp_read_str(qy[1][1], QY11, strlen(QY11), 16);
-		fp_read_str(qy[1][2], QY12, strlen(QY12), 16);
-		fp_read_str(qy[2][0], QY20, strlen(QY20), 16);
-		fp_read_str(qy[2][1], QY21, strlen(QY21), 16);
-		fp_read_str(qy[2][2], QY22, strlen(QY22), 16);
-
-		fp9_set_dig(qz, 1);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller doubling is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54_projc(e1, rx, ry, rz, p);
-			fp9_inv(rz, rz);
-			fp9_mul(rx, rx, rz);
-			fp9_mul(ry, ry, rz);
-			pp_dbl_k54_basic(e2, qx, qy, p);
-			TEST_ASSERT(fp9_cmp(rx, qx) == RLC_EQ && fp9_cmp(ry, qy) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller doubling in affine coordinates is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			fp54_zero(e1);
-			fp54_zero(e2);
-			fp_neg(p->y, p->y);
-			pp_dbl_k54_basic(e2, rx, ry, p);
-			pp_exp_k54(e2, e2);
-#if EP_ADD == PROJC
-			/* Precompute. */
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-#endif
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e1, rx, ry, rz, p);
-			pp_exp_k54(e1, e1);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == PROJC || EP_ADD == JACOB || !defined(STRIP)
-		TEST_CASE("miller doubling in projective coordinates is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			fp54_zero(e1);
-			fp54_zero(e2);
-			/* Precompute. */
-			fp_neg(p->y, p->y);
-			fp_dbl(p->z, p->x);
-			fp_add(p->x, p->z, p->x);
-			pp_dbl_k54_projc(e2, rx, ry, rz, p);
-			pp_exp_k54(e2, e2);
-#if EP_ADD == BASIC
-			/* Revert precomputing. */
-			fp_hlv(p->x, p->z);
-#endif
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e1, rx, ry, rz, p);
-			pp_exp_k54(e1, e1);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp9_free(qx);
-	fp9_free(qy);
-	fp9_free(qz);
-	fp9_free(rx);
-	fp9_free(ry);
-	fp9_free(rz);
-	fp54_free(e1);
-	fp54_free(e2);
-	return code;
-}
-
-static int addition54(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp9_t qx, qy, qz, rx, ry, rz;
-	fp54_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp9_null(qx);
-	fp9_null(qy);
-	fp9_null(qz);
-	fp9_null(rx);
-	fp9_null(ry);
-	fp9_null(rz);
-	fp54_null(e1);
-	fp54_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp9_new(qx);
-		fp9_new(qy);
-		fp9_new(qz);
-		fp9_new(rx);
-		fp9_new(ry);
-		fp9_new(rz);
-		fp54_new(e1);
-		fp54_new(e2);
-
-		fp_read_str(qx[0][0], QX00, strlen(QX00), 16);
-		fp_read_str(qx[0][1], QX01, strlen(QX01), 16);
-		fp_read_str(qx[0][2], QX02, strlen(QX02), 16);
-		fp_read_str(qx[1][0], QX10, strlen(QX10), 16);
-		fp_read_str(qx[1][1], QX11, strlen(QX11), 16);
-		fp_read_str(qx[1][2], QX12, strlen(QX12), 16);
-		fp_read_str(qx[2][0], QX20, strlen(QX20), 16);
-		fp_read_str(qx[2][1], QX21, strlen(QX21), 16);
-		fp_read_str(qx[2][2], QX22, strlen(QX22), 16);
-
-		fp_read_str(qy[0][0], QY00, strlen(QY00), 16);
-		fp_read_str(qy[0][1], QY01, strlen(QY01), 16);
-		fp_read_str(qy[0][2], QY02, strlen(QY02), 16);
-		fp_read_str(qy[1][0], QY10, strlen(QY10), 16);
-		fp_read_str(qy[1][1], QY11, strlen(QY11), 16);
-		fp_read_str(qy[1][2], QY12, strlen(QY12), 16);
-		fp_read_str(qy[2][0], QY20, strlen(QY20), 16);
-		fp_read_str(qy[2][1], QY21, strlen(QY21), 16);
-		fp_read_str(qy[2][2], QY22, strlen(QY22), 16);
-
-		fp9_set_dig(qz, 1);
-
-		ep_curve_get_ord(n);
-
-		TEST_CASE("miller addition is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e1, rx, ry, rz, p);
-			pp_add_k54_projc(e1, rx, ry, rz, qx, qy, p);
-			fp9_inv(rz, rz);
-			fp9_mul(rx, rx, rz);
-			fp9_mul(ry, ry, rz);
-			fp9_copy(e1[0][0], rx);
-			fp9_copy(e1[0][1], ry);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e2, rx, ry, rz, p);
-#if EP_ADD == PROJC
-			fp9_inv(rz, rz);
-			fp9_mul(rx, rx, rz);
-			fp9_mul(ry, ry, rz);
-#endif
-			pp_add_k54_basic(e2, rx, ry, qx, qy, p);
-			TEST_ASSERT(fp9_cmp(rx, e1[0][0]) == RLC_EQ && fp9_cmp(ry, e1[0][1]) == RLC_EQ, end);
-		} TEST_END;
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in affine coordinates is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			fp54_zero(e1);
-			fp54_zero(e2);
-			pp_dbl_k54(e1, rx, ry, rz, p);
-			pp_add_k54(e1, rx, ry, rz, qx, qy, p);
-			pp_exp_k54(e1, e1);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e2, rx, ry, rz, p);
-#if EP_ADD == PROJC
-			fp9_inv(rz, rz);
-			fp9_mul(rx, rx, rz);
-			fp9_mul(ry, ry, rz);
-#endif
-			pp_add_k54_basic(e2, rx, ry, qx, qy, p);
-			pp_exp_k54(e2, e2);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-
-#if EP_ADD == BASIC || !defined(STRIP)
-		TEST_CASE("miller addition in projective coordinates is correct") {
-			ep_rand(p);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			fp54_zero(e1);
-			fp54_zero(e2);
-			pp_dbl_k54(e1, rx, ry, rz, p);
-			pp_add_k54(e1, rx, ry, rz, qx, qy, p);
-			pp_exp_k54(e1, e1);
-			fp9_copy(rx, qx);
-			fp9_copy(ry, qy);
-			fp9_copy(rz, qz);
-			pp_dbl_k54(e2, rx, ry, rz, p);
-			pp_add_k54_projc(e2, rx, ry, rz, qx, qy, p);
-			pp_exp_k54(e2, e2);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-#endif
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp9_free(qx);
-	fp9_free(qy);
-	fp9_free(qz);
-	fp9_free(rx);
-	fp9_free(ry);
-	fp9_free(rz);
-	fp54_free(e1);
-	fp54_free(e2);
-	return code;
-}
-
-static int pairing54(void) {
-	int code = RLC_ERR;
-	bn_t k, n;
-	ep_t p;
-	fp9_t qx, qy, qz;
-	fp54_t e1, e2;
-
-	bn_null(k);
-	bn_null(n);
-	ep_null(p);
-	fp9_null(qx);
-	fp9_null(qy);
-	fp9_null(qz);
-	fp54_null(e1);
-	fp54_null(e2);
-
-	RLC_TRY {
-		bn_new(n);
-		bn_new(k);
-		ep_new(p);
-		fp9_new(qx);
-		fp9_new(qy);
-		fp9_new(qz);
-		fp54_new(e1);
-		fp54_new(e2);
-
-		ep_curve_get_ord(n);
-
-		fp_read_str(qx[0][0], QX00, strlen(QX00), 16);
-		fp_read_str(qx[0][1], QX01, strlen(QX01), 16);
-		fp_read_str(qx[0][2], QX02, strlen(QX02), 16);
-		fp_read_str(qx[1][0], QX10, strlen(QX10), 16);
-		fp_read_str(qx[1][1], QX11, strlen(QX11), 16);
-		fp_read_str(qx[1][2], QX12, strlen(QX12), 16);
-		fp_read_str(qx[2][0], QX20, strlen(QX20), 16);
-		fp_read_str(qx[2][1], QX21, strlen(QX21), 16);
-		fp_read_str(qx[2][2], QX22, strlen(QX22), 16);
-
-		fp_read_str(qy[0][0], QY00, strlen(QY00), 16);
-		fp_read_str(qy[0][1], QY01, strlen(QY01), 16);
-		fp_read_str(qy[0][2], QY02, strlen(QY02), 16);
-		fp_read_str(qy[1][0], QY10, strlen(QY10), 16);
-		fp_read_str(qy[1][1], QY11, strlen(QY11), 16);
-		fp_read_str(qy[1][2], QY12, strlen(QY12), 16);
-		fp_read_str(qy[2][0], QY20, strlen(QY20), 16);
-		fp_read_str(qy[2][1], QY21, strlen(QY21), 16);
-		fp_read_str(qy[2][2], QY22, strlen(QY22), 16);
-
-		TEST_CASE("pairing non-degeneracy is correct") {
-			ep_rand(p);
-			pp_map_k54(e1, p, qx, qy);
-			TEST_ASSERT(fp54_cmp_dig(e1, 1) != RLC_EQ, end);
-		} TEST_END;
-
-		TEST_CASE("pairing is bilinear") {
-			ep_rand(p);
-			bn_rand_mod(k, n);
-			pp_map_k54(e1, p, qx, qy);
-			ep_mul(p, p, k);
-			pp_map_k54(e2, p, qx, qy);
-			fp54_exp(e1, e1, k);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-			fp9_set_dig(qz, 1);
-			pp_dbl_k54(e2, qx, qy, qz, p);
-			fp9_inv(qz, qz);
-			fp9_mul(qx, qx, qz);
-			fp9_mul(qy, qy, qz);
-			fp9_set_dig(qz, 1);
-			pp_map_k54(e2, p, qx, qy);
-			fp54_sqr(e1, e1);
-			TEST_ASSERT(fp54_cmp(e1, e2) == RLC_EQ, end);
-		} TEST_END;
-	}
-	RLC_CATCH_ANY {
-		util_print("FATAL ERROR!\n");
-		RLC_ERROR(end);
-	}
-	code = RLC_OK;
-  end:
-	bn_free(n);
-	bn_free(k);
-	ep_free(p);
-	fp9_free(qx);
-	fp9_free(qy);
-	fp9_free(qz);
-	fp54_free(e1);
-	fp54_free(e2);
-	return code;
-}
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the PP module", 0);
-
-	if (ep_param_set_any_pairf() == RLC_ERR) {
-		RLC_THROW(ERR_NO_CURVE);
-		core_clean();
-		return 0;
-	}
-
-	ep_param_print();
-
-	util_banner("Arithmetic", 1);
-
-	if (ep_param_embed() == 2) {
-		if (doubling2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing2() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (ep_param_embed() == 8) {
-		if (doubling8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing8() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (ep_param_embed() == 24) {
-		if (doubling24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing24() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (ep_param_embed() == 12) {
-		if (doubling12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing12() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (ep_param_embed() == 48) {
-		if (doubling48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing48() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	if (ep_param_embed() == 54) {
-		if (doubling54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (addition54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-
-		if (pairing54() != RLC_OK) {
-			core_clean();
-			return 1;
-		}
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/test/test_rand.c b/src/dashbls/depends/relic/test/test_rand.c
deleted file mode 100644
index e3de369d3691..000000000000
--- a/src/dashbls/depends/relic/test/test_rand.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Tests for random number generation.
- *
- * @ingroup test
- */
-
-#include <stdio.h>
-
-#include "relic.h"
-#include "relic_test.h"
-
-#if RAND == HASHD
-
-/*
- * Test vectors taken from:
- * - http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/Hash_DRBG.pdf
- */
-
-#if MD_MAP == SH224
-
-#define FUNCTION "sha-224"
-
-uint8_t seed1[62];
-
-uint8_t result1[] = {
-	0x5E, 0x68, 0xBD, 0xE0, 0x9A, 0xAA, 0x08, 0xBC, 0x11, 0xB3,
-	0x27, 0x90, 0x2C, 0x82, 0xF0, 0x11, 0x4C, 0xBA, 0x0F, 0x9C,
-	0xCC, 0xA6, 0x20, 0x3B, 0xA3, 0x94, 0x00, 0x91, 0x3E, 0xCD,
-	0x36, 0x71, 0xA5, 0xB6, 0x0E, 0xF9, 0x22, 0x99, 0x9D, 0x90,
-	0xFC, 0xEE, 0xEC, 0x5C, 0x22, 0x7E, 0x5D, 0x25, 0xC5, 0x69,
-	0x21, 0xEE, 0x57, 0x2E, 0xD4, 0x72, 0xDC, 0x05, 0x6F, 0xCB,
-	0x35, 0xFF, 0x51, 0xD7, 0xD9, 0xFB, 0x72, 0xFD, 0x4F, 0xD1,
-	0xB1, 0xD2, 0x46, 0x45, 0x1D, 0xB5, 0x6C, 0xD4, 0xF8, 0x89,
-	0xE4, 0x32, 0xE3, 0x27, 0x3F, 0x9E, 0xD8, 0x2D, 0xE3, 0xEF,
-	0x7C, 0xD2, 0x8B, 0x6A, 0x9C, 0x0F, 0x4D, 0x78, 0xE5, 0xC8,
-	0x45, 0x1D, 0x36, 0x34, 0x0A, 0x2B, 0xD7, 0xE6, 0x9F, 0xAB,
-	0x32, 0xEB
-};
-
-uint8_t result2[] = {
-	0x3F, 0xE2, 0xAD, 0x85, 0x24, 0xCE, 0x60, 0xE7, 0xC2, 0x1C,
-	0x38, 0xA1, 0xDA, 0xB0, 0x2F, 0x3C, 0x20, 0x50, 0x11, 0x82,
-	0xF3, 0x89, 0xEE, 0x69, 0x9F, 0x03, 0xFD, 0x87, 0x79, 0xED,
-	0x17, 0xC6, 0x5B, 0x87, 0xAC, 0xEE, 0xEB, 0xF1, 0xD1, 0x46,
-	0xE7, 0xEE, 0x10, 0x6C, 0xEC, 0x89, 0x55, 0xEE, 0xAF, 0xC1,
-	0x8A, 0xBB, 0xC5, 0x62, 0xA5, 0x66, 0x8B, 0xB4, 0x9B, 0x0B,
-	0x9C, 0x2F, 0xC7, 0x01, 0x89, 0xB2, 0x4E, 0x02, 0x73, 0x59,
-	0x54, 0x58, 0xCD, 0x78, 0x0F, 0xBF, 0xA5, 0xF2, 0x16, 0x12,
-	0x24, 0x21, 0xB8, 0x0B, 0xF7, 0x73, 0xD7, 0x36, 0xE6, 0xE1,
-	0x1D, 0xEB, 0xB4, 0x24, 0x77, 0xD6, 0x96, 0x68, 0xD2, 0xF9,
-	0x40, 0xC6, 0x60, 0xF6, 0xA2, 0xC1, 0xC9, 0xB4, 0x17, 0x95,
-	0x92, 0xE0
-};
-
-#elif MD_MAP == SH256
-
-uint8_t seed1[63];
-
-#define FUNCTION "sha-256"
-
-uint8_t result1[] = {
-	0x77, 0xE0, 0x5A, 0x0E, 0x7D, 0xC7, 0x8A, 0xB5, 0xD8, 0x93,
-	0x4D, 0x5E, 0x93, 0xE8, 0x2C, 0x06, 0xA0, 0x7C, 0x04, 0xCE,
-	0xE6, 0xC9, 0xC5, 0x30, 0x45, 0xEE, 0xB4, 0x85, 0x87, 0x27,
-	0x77, 0xCF, 0x3B, 0x3E, 0x35, 0xC4, 0x74, 0xF9, 0x76, 0xB8,
-	0x94, 0xBF, 0x30, 0x1A, 0x86, 0xFA, 0x65, 0x1F, 0x46, 0x39,
-	0x70, 0xE8, 0x9D, 0x4A, 0x05, 0x34, 0xB2, 0xEC, 0xAD, 0x29,
-	0xEC, 0x04, 0x4E, 0x7E, 0x5F, 0xF4, 0xBA, 0x49, 0x3C, 0x40,
-	0xCF, 0xFF, 0x3B, 0x01, 0xE4, 0x72, 0xC5, 0x75, 0x66, 0x8C,
-	0xCE, 0x38, 0x80, 0xB9, 0x29, 0x0B, 0x05, 0xBF, 0xED, 0xE5,
-	0xEC, 0x96, 0xED, 0x5E, 0x9B, 0x28, 0x98, 0x50, 0x8B, 0x09,
-	0xBC, 0x80, 0x0E, 0xEE, 0x09, 0x9A, 0x3C, 0x90, 0x60, 0x2A,
-	0xBD, 0x4B, 0x1D, 0x4F, 0x34, 0x3D, 0x49, 0x7C, 0x60, 0x55,
-	0xC8, 0x7B, 0xB9, 0x56, 0xD5, 0x3B, 0xF3, 0x51
-};
-
-uint8_t result2[] = {
-	0x92, 0x27, 0x55, 0x23, 0xC7, 0x0E, 0x56, 0x7B, 0xCF, 0x9B,
-	0x35, 0xEC, 0x50, 0xB9, 0x33, 0xF8, 0x12, 0x61, 0x6D, 0xF5,
-	0x86, 0xB7, 0xF7, 0x2E, 0xE1, 0xBC, 0x77, 0x35, 0xA5, 0xC2,
-	0x65, 0x43, 0x73, 0xCB, 0xBC, 0x72, 0x31, 0x6D, 0xFF, 0x84,
-	0x20, 0xA3, 0x3B, 0xF0, 0x2B, 0x97, 0xAC, 0x8D, 0x19, 0x52,
-	0x58, 0x3F, 0x27, 0x0A, 0xCD, 0x70, 0x05, 0xCC, 0x02, 0x7F,
-	0x4C, 0xF1, 0x18, 0x7E, 0x68, 0x1A, 0x46, 0xB2, 0xAA, 0x86,
-	0x94, 0xA0, 0xFE, 0x4D, 0xEE, 0xA7, 0x20, 0x92, 0x7A, 0x84,
-	0xEA, 0xAA, 0x98, 0x5E, 0x59, 0xC1, 0x9F, 0x8B, 0xE0, 0x98,
-	0x4D, 0x8C, 0xBE, 0xF8, 0xC6, 0x9B, 0x75, 0x41, 0x67, 0x64,
-	0x19, 0x46, 0xE0, 0x40, 0xEE, 0x20, 0x43, 0xE1, 0xCC, 0xB2,
-	0x9D, 0xCF, 0x06, 0x3C, 0x0A, 0x50, 0x83, 0x0E, 0x42, 0x8E,
-	0x6D, 0xCA, 0x26, 0x2E, 0xCD, 0x77, 0xC5, 0x42
-};
-
-#elif MD_MAP == SH384
-
-#define FUNCTION "sha-384"
-
-uint8_t seed1[123];
-
-uint8_t result1[] = {
-	0x04, 0xFF, 0x23, 0xAD, 0x15, 0xE7, 0x87, 0x90, 0xAD, 0xD3,
-	0x6B, 0x43, 0x8B, 0xBC, 0x09, 0x7C, 0x7A, 0x11, 0x74, 0x7C,
-	0xC2, 0xCC, 0xEE, 0xDE, 0x2C, 0x97, 0x8B, 0x23, 0xB3, 0xDC,
-	0x63, 0xB7, 0x32, 0xC9, 0x53, 0x06, 0x1D, 0x77, 0x64, 0x99,
-	0x0A, 0xBF, 0xEF, 0xC4, 0x7A, 0x58, 0x1B, 0x92, 0x1B, 0xC0,
-	0x42, 0x8C, 0x4F, 0x12, 0x21, 0x24, 0x60, 0xE4, 0x06, 0xA0,
-	0xF0, 0x65, 0x1E, 0x7F, 0x0C, 0xB9, 0xA9, 0x0A, 0xBF, 0xDB,
-	0x07, 0xB5, 0x25, 0x56, 0x5C, 0x74, 0xF0, 0xAA, 0x08, 0x50,
-	0x82, 0xF6, 0xCF, 0x21, 0x3A, 0xAF, 0xAD, 0x0C, 0x06, 0x46,
-	0x89, 0x50, 0x78, 0xF1, 0xE1, 0xFE, 0x4F, 0x35, 0xB8, 0x5F,
-	0x95, 0xDE, 0xE3, 0xE8, 0x73, 0x05, 0x49, 0x05, 0xCF, 0xD0,
-	0x23, 0x41, 0x65, 0x3E, 0x18, 0xF5, 0x29, 0x93, 0x0C, 0xBE,
-	0x14, 0xD9, 0x09, 0xF3, 0x7F, 0xEA, 0xF2, 0xC7, 0x90, 0xD2,
-	0x2F, 0xAE, 0x75, 0x16, 0xB4, 0x59, 0x0B, 0xE3, 0x5D, 0x53,
-	0xE2, 0xFE, 0x1A, 0x35, 0xAF, 0xE4, 0xB6, 0x60, 0x7C, 0xB3,
-	0x58, 0x58, 0x9C, 0x3B, 0x4D, 0x09, 0x4A, 0x1D, 0x81, 0xFE,
-	0x07, 0x17, 0xF1, 0xDF, 0x5B, 0xDD, 0xEB, 0x3E, 0x11, 0x4F,
-	0x13, 0x0B, 0xB7, 0x81, 0xE6, 0x6C, 0x22, 0xB5, 0xB7, 0x70,
-	0xE8, 0xAE, 0x11, 0x5F, 0xF3, 0x9F, 0x8A, 0xDA, 0xF6, 0x6D,
-	0xEE, 0xDF
-};
-
-uint8_t result2[] = {
-	0x97, 0x99, 0x3B, 0x78, 0xF7, 0xC3, 0x1C, 0x0E, 0x87, 0x6D,
-	0xC9, 0x2E, 0xB7, 0xD6, 0xC4, 0x08, 0xE0, 0x9D, 0x60, 0x8A,
-	0xD6, 0xB9, 0x9D, 0x0E, 0xA2, 0x22, 0x9B, 0x05, 0xA5, 0x78,
-	0xC4, 0x26, 0x33, 0x4F, 0xCC, 0x8A, 0x1C, 0x7E, 0x67, 0x6E,
-	0xD2, 0xD8, 0x9A, 0x5B, 0x4C, 0xDF, 0x5B, 0x3F, 0x4A, 0xDF,
-	0x11, 0x93, 0x6B, 0xF1, 0x4F, 0x4E, 0x10, 0x90, 0x9D, 0xBA,
-	0x9C, 0x24, 0xF4, 0xFD, 0xFF, 0xDE, 0x72, 0x35, 0x1D, 0xA8,
-	0xE2, 0xCC, 0x3B, 0x13, 0x5A, 0x39, 0x53, 0x73, 0x89, 0x9E,
-	0x5F, 0x1A, 0x59, 0x55, 0xB8, 0x80, 0xCA, 0x9B, 0x9E, 0x9D,
-	0xD4, 0xC9, 0xCA, 0x7F, 0xA4, 0xD4, 0xF5, 0x98, 0x39, 0x46,
-	0x32, 0x0E, 0x36, 0xC6, 0x4E, 0xF2, 0x83, 0xCA, 0x1F, 0x65,
-	0xD1, 0x97, 0xCF, 0x81, 0x62, 0x4E, 0xC6, 0x77, 0x8E, 0x77,
-	0x0E, 0x78, 0x94, 0x9D, 0x84, 0xEF, 0x21, 0xA4, 0x5C, 0xDD,
-	0x62, 0xD1, 0xDB, 0x76, 0x92, 0x0D, 0x4C, 0x28, 0x36, 0xFC,
-	0x6A, 0xE5, 0x29, 0x9F, 0xAF, 0x13, 0x57, 0xD9, 0x70, 0x1F,
-	0xAD, 0x10, 0xFB, 0xD8, 0x8D, 0x1E, 0x28, 0x32, 0x23, 0x94,
-	0x36, 0xD7, 0x6E, 0xB2, 0x71, 0xBD, 0xC3, 0xCA, 0x04, 0x42,
-	0x5E, 0xC8, 0x8B, 0xC0, 0xE8, 0x9A, 0x4D, 0x5C, 0x37, 0xFF,
-	0xCE, 0x7C, 0x6C, 0x3A, 0xBD, 0xE9, 0xC4, 0x13, 0xAE, 0x6D,
-	0x3F, 0xEA
-};
-
-#elif MD_MAP == SH512
-
-#define FUNCTION "sha-512"
-
-uint8_t seed1[127];
-
-uint8_t result1[] = {
-	0x17, 0x0C, 0xC7, 0x07, 0xC7, 0x1C, 0x69, 0xCE, 0x45, 0xC4,
-	0x3C, 0xBA, 0xFF, 0x52, 0x10, 0x14, 0x05, 0x72, 0xD4, 0x78,
-	0x59, 0x52, 0x1B, 0xA1, 0x31, 0x41, 0xBA, 0xDD, 0x2E, 0x5B,
-	0x9A, 0x7B, 0x3E, 0x80, 0x20, 0x62, 0x5C, 0xD8, 0x89, 0x3F,
-	0xD6, 0xA4, 0x73, 0x9C, 0x58, 0x1E, 0xD5, 0xBE, 0x7F, 0xA3,
-	0x14, 0x8A, 0x05, 0xD7, 0xF5, 0x4A, 0xE9, 0xEA, 0xDA, 0xE8,
-	0xF1, 0xA7, 0x19, 0x4D, 0xF9, 0x4B, 0x6B, 0x75, 0x5B, 0x94,
-	0x8E, 0x0C, 0x27, 0xE1, 0x74, 0x7F, 0x02, 0xF6, 0x63, 0xD6,
-	0xB5, 0x14, 0xA0, 0xF5, 0x86, 0xF9, 0x4E, 0x53, 0xD3, 0x21,
-	0x69, 0xE1, 0xCC, 0xC6, 0x21, 0x1A, 0xD0, 0x34, 0x81, 0x24,
-	0x19, 0xB6, 0xBA, 0x8F, 0x3C, 0x82, 0x93, 0x04, 0x89, 0x83,
-	0x93, 0xBF, 0x39, 0xE5, 0x7E, 0x2F, 0xED, 0xF7, 0x75, 0xFC,
-	0x6E, 0x5E, 0xB0, 0xE3, 0x07, 0xED, 0xCA, 0x0B, 0xD5, 0x15,
-	0xB9, 0x2B, 0x18, 0x11, 0xF5, 0xAA, 0xD0, 0x2A, 0xAC, 0x9B,
-	0x39, 0xDF, 0xA5, 0xB8, 0xB1, 0xA9, 0x50, 0x48, 0x7D, 0x34,
-	0x29, 0xB1, 0x08, 0x1D, 0x0F, 0xEC, 0x28, 0xD5, 0x76, 0x86,
-	0xD8, 0x5B, 0xC6, 0xB4, 0x5A, 0xB8, 0xB8, 0x4C, 0x54, 0xDD,
-	0x80, 0xB2, 0x82, 0x59, 0x1F, 0x55, 0x07, 0xED, 0x9B, 0x3F,
-	0xB1, 0xCD, 0xEE, 0xFD, 0x58, 0xAD, 0x5A, 0x98, 0x12, 0xED,
-	0x92, 0x9C, 0x77, 0x9B, 0x0F, 0x54, 0xBA, 0xDF, 0x2C, 0xAF,
-	0xBA, 0xCF, 0xAC, 0xB3, 0xEC, 0xAC, 0xC1, 0x27, 0xC7, 0x64,
-	0x0C, 0xBB, 0x67, 0x15, 0x4F, 0x54, 0x5A, 0x62, 0x2B, 0xE0,
-	0xA9, 0xB5, 0x52, 0xA2, 0x42, 0x08, 0x31, 0x3B, 0xFA, 0x49,
-	0x1F, 0x53, 0xAA, 0xA3, 0x07, 0x4B, 0xDC, 0x48, 0xBC, 0x5B,
-	0xDB, 0x3F, 0xF0, 0xE2, 0xD0, 0x5B, 0xB4, 0x77, 0xB5, 0x9F,
-	0x87, 0xE3, 0xA1, 0xEA, 0xB3, 0xE6
-};
-
-uint8_t result2[] = {
-	0xF9, 0x3C, 0xA6, 0x85, 0x55, 0x90, 0xA7, 0x7F, 0x07, 0x35,
-	0x40, 0x97, 0xE9, 0x0E, 0x02, 0x66, 0x48, 0xB6, 0x11, 0x5D,
-	0xF0, 0x08, 0xFF, 0xED, 0xBD, 0x9D, 0x98, 0x11, 0xF5, 0x4E,
-	0x82, 0x86, 0xEF, 0x00, 0xFD, 0xD6, 0xBA, 0x1E, 0x58, 0xDF,
-	0x25, 0x35, 0xE3, 0xFB, 0xDD, 0x9A, 0x9B, 0xA3, 0x75, 0x4A,
-	0x97, 0xF3, 0x6E, 0xE8, 0x33, 0x22, 0x15, 0x82, 0x06, 0x0A,
-	0x1F, 0x37, 0xFC, 0xE4, 0xEE, 0x88, 0x26, 0x63, 0x6B, 0x28,
-	0xEA, 0xD5, 0x89, 0x59, 0x3F, 0x4C, 0xA8, 0xB6, 0x47, 0x38,
-	0x8F, 0x24, 0xEB, 0x3F, 0x0A, 0x34, 0x79, 0x69, 0x68, 0xD2,
-	0x1B, 0xDE, 0xE6, 0xF8, 0x1F, 0xD5, 0xDF, 0x93, 0x53, 0x6F,
-	0x93, 0x59, 0x37, 0xB8, 0x02, 0x5E, 0xC8, 0xCB, 0xF5, 0x7D,
-	0xDB, 0x0C, 0x61, 0xF2, 0xE4, 0x14, 0x63, 0xCC, 0x15, 0x16,
-	0xD6, 0x57, 0xDA, 0x28, 0x29, 0xC6, 0xBF, 0x90, 0x48, 0x17,
-	0x61, 0x8F, 0x48, 0xC6, 0x0F, 0xB1, 0xCE, 0x5B, 0xFB, 0xDA,
-	0x0C, 0xAF, 0x45, 0x91, 0x88, 0x2A, 0x31, 0xF6, 0xEE, 0x3F,
-	0xE0, 0xF7, 0x87, 0x79, 0x99, 0x2A, 0x06, 0xEC, 0x60, 0xF3,
-	0x7F, 0xB9, 0xA8, 0xD6, 0x10, 0x8C, 0x23, 0x1F, 0x0A, 0x92,
-	0x77, 0x54, 0xB0, 0x59, 0x9F, 0xA4, 0xFA, 0x27, 0xA4, 0xE2,
-	0x5E, 0x06, 0x5E, 0xF0, 0x30, 0x85, 0xB8, 0x92, 0x97, 0x9D,
-	0xC0, 0xE7, 0xA1, 0x08, 0x08, 0x83, 0xCA, 0xEB, 0xFD, 0xFD,
-	0x36, 0x65, 0xA8, 0xF2, 0xD0, 0x61, 0xC5, 0x21, 0xF7, 0xD6,
-	0xE3, 0xDA, 0x2A, 0xF8, 0xB9, 0x7B, 0x6B, 0x43, 0xB6, 0xEC,
-	0x83, 0x1A, 0xF5, 0x15, 0x07, 0x0A, 0x83, 0xBB, 0xB9, 0xAC,
-	0x95, 0xED, 0x4E, 0xF4, 0x9B, 0x75, 0x6A, 0x23, 0x77, 0xA5,
-	0xF0, 0x83, 0x3D, 0x84, 0x7E, 0x27, 0xA8, 0x8D, 0xDB, 0x0C,
-	0x2C, 0xE4, 0xAD, 0x78, 0x2E, 0x7B
-};
-
-#elif MD_MAP == B2S160
-
-#define FUNCTION "blake2s-160"
-
-uint8_t seed1[60];
-
-uint8_t result1[] = {
-	0x3B, 0xFB, 0x98, 0xB1, 0x75, 0x4A, 0x85, 0x1D, 0x82, 0x51,
-	0x09, 0xE7, 0xA9, 0x7B, 0x45, 0x25, 0x3F, 0x82, 0xEC, 0xBB,
-	0x8A, 0xF6, 0x7A, 0x15, 0x6B, 0x8D, 0x8A, 0xE7, 0x1E, 0xD9,
-	0x17, 0xED, 0x24, 0x35, 0x00, 0x87, 0x7B, 0xE6, 0xBD, 0xEF,
-	0xF5, 0xD7, 0xD0, 0x6C, 0x57, 0x08, 0xF6, 0x62, 0x43, 0x51,
-	0xD6, 0x9C, 0x6A, 0x7A, 0xF1, 0xC9, 0xB3, 0xF6, 0xD9, 0x5B,
-	0x94, 0x3C, 0xBB, 0x1A, 0xF4, 0x3C, 0xD8, 0xB4, 0x2A, 0xA3,
-	0xE8, 0x7C, 0x62, 0x40, 0xD1, 0xBD, 0x5D, 0x6B, 0x8C, 0xF0
-};
-
-uint8_t result2[] = {
-	0xAD, 0xF3, 0x6B, 0x2A, 0x4A, 0xAA, 0x78, 0xEC, 0x4B, 0xE7,
-	0x50, 0xEA, 0x91, 0x08, 0xD7, 0xBC, 0x9A, 0x7B, 0x52, 0x0A,
-	0x46, 0x0D, 0xA5, 0xD9, 0x12, 0xCC, 0xF8, 0x3C, 0x51, 0x48,
-	0xFD, 0xD3, 0x45, 0x9E, 0xC5, 0x84, 0xF1, 0x29, 0xFD, 0x0C,
-	0x03, 0x28, 0xD1, 0xEF, 0x0B, 0xBE, 0x73, 0x8B, 0xD4, 0x77,
-	0xA2, 0x48, 0x05, 0xDE, 0xA3, 0xFD, 0xB2, 0x75, 0xF2, 0x9F,
-	0xE8, 0xCA, 0xEF, 0xDB, 0x5D, 0x4F, 0xBF, 0xB6, 0x27, 0x93,
-	0x98, 0x7B, 0x11, 0x8D, 0x9F, 0x97, 0xA1, 0x4E, 0x67, 0x82
-};
-
-#elif MD_MAP == B2S256
-
-uint8_t seed1[63];
-
-#define FUNCTION "blake2s-256"
-
-uint8_t result1[] = {
-	0xD5, 0x26, 0xBD, 0x3B, 0x1A, 0x08, 0x91, 0x25, 0xB1, 0x2D,
-	0xFF, 0x63, 0x57, 0x33, 0x85, 0x11, 0x7A, 0x1E, 0xF3, 0x7E,
-	0xE0, 0xAE, 0xCE, 0x77, 0xAC, 0x19, 0x8B, 0x92, 0x7A, 0xDE,
-	0x79, 0x23, 0x0E, 0xA9, 0x25, 0xF3, 0x33, 0xB4, 0x17, 0xC7,
-	0xF7, 0x0A, 0xEB, 0x25, 0x0C, 0x9B, 0xAF, 0x38, 0xD0, 0x5C,
-	0xCE, 0xC6, 0xB5, 0x63, 0x70, 0x15, 0xD7, 0x36, 0x4A, 0x99,
-	0x25, 0xE9, 0xE1, 0x76, 0x75, 0xE0, 0x1C, 0x8E, 0x1E, 0x0B,
-	0xC1, 0xE2, 0x8F, 0xB7, 0xCA, 0x56, 0x69, 0xB7, 0xAB, 0x5B,
-	0x45, 0x6F, 0x5B, 0xA4, 0xF3, 0xAA, 0x54, 0x30, 0x3B, 0x44,
-	0xFF, 0x35, 0xBF, 0xBB, 0xD8, 0xA3, 0xEA, 0xFA, 0x32, 0x8F,
-	0xD0, 0x68, 0x76, 0x5B, 0x47, 0x9E, 0x61, 0x73, 0xEB, 0xF8,
-	0x84, 0x1D, 0xF5, 0xA7, 0xEF, 0x91, 0x47, 0x19, 0x30, 0x12,
-	0xF6, 0x7C, 0x04, 0x7A, 0x4F, 0x4F, 0x07, 0xA0
-};
-
-uint8_t result2[] = {
-	0xAB, 0x61, 0x58, 0xF2, 0x82, 0x88, 0xAA, 0x0A, 0xD1, 0xA3,
-	0x98, 0xAD, 0x73, 0xD5, 0xD5, 0x1D, 0x6E, 0xDE, 0xA4, 0x24,
-	0xA7, 0x76, 0x3D, 0x77, 0xD5, 0x33, 0xB8, 0x1B, 0xE7, 0x43,
-	0x32, 0x0A, 0xB6, 0x44, 0x4D, 0x47, 0x54, 0x68, 0x69, 0x1B,
-	0xA7, 0x5E, 0xA4, 0x90, 0x1D, 0x21, 0xBA, 0x3B, 0xC3, 0x7B,
-	0x60, 0x3A, 0xDB, 0xD5, 0xDC, 0xCB, 0x8B, 0x6E, 0xB6, 0x6A,
-	0xA0, 0xA7, 0x5B, 0xBB, 0x40, 0xC4, 0x7E, 0xB9, 0xD0, 0xC9,
-	0xDB, 0xFF, 0xAC, 0x19, 0xFA, 0xB2, 0x71, 0x41, 0xAB, 0x0A,
-	0x41, 0xEB, 0x9C, 0xD1, 0x42, 0x08, 0x97, 0xAF, 0x17, 0x87,
-	0x45, 0x7A, 0x2C, 0x7D, 0x8F, 0x43, 0xB3, 0x85, 0x49, 0xFF,
-	0x28, 0x81, 0xE9, 0x5C, 0x85, 0x58, 0x06, 0x74, 0x11, 0x3A,
-	0xDC, 0x00, 0x29, 0xA0, 0x78, 0xC8, 0xA7, 0xE4, 0xEB, 0x2D,
-	0x9D, 0x07, 0xE1, 0x64, 0xCC, 0x0B, 0x94, 0x37
-};
-
-#endif
-
-static int test(void) {
-	int i, len = 2 * RLC_MD_LEN, code = RLC_ERR;
-	uint8_t out[2 * RLC_MD_LEN], seed2[(RLC_RAND_SIZE - 1) / 2], seed3[(RLC_RAND_SIZE - 1) / 2];
-
-	for (i = 0; i < (RLC_RAND_SIZE - 1) / 2; i++) {
-		seed1[i] = i;
-		seed2[i] = 0x80 + i;
-		seed3[i] = 0xC0 + i;
-	}
-	for (; i < sizeof(seed1); i++) {
-		seed1[i] = 0x20 + (i - (RLC_RAND_SIZE - 1) / 2);
-	}
-
-	TEST_ONCE("hash-dbrg (" FUNCTION ") random generator is correct") {
-		rand_clean();
-		rand_seed(seed1, sizeof(seed1));
-		rand_bytes(out, len);
-		TEST_ASSERT(memcmp(out, result1, len) == 0, end);
-		rand_bytes(out, len);
-		TEST_ASSERT(memcmp(out, result1 + len, len) == 0, end);
-	}
-	TEST_END;
-
-	TEST_ONCE("hash-dbrg (" FUNCTION ") reseeding is correct") {
-		rand_clean();
-		rand_seed(seed1, sizeof(seed1));
-		rand_seed(seed2, sizeof(seed2));
-		rand_bytes(out, len);
-		TEST_ASSERT(memcmp(out, result2, len) == 0, end);
-		rand_seed(seed3, sizeof(seed3));
-		rand_bytes(out, len);
-		TEST_ASSERT(memcmp(out, result2 + len, len) == 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#elif RAND == UDEV
-
-static int test(void) {
-	uint8_t out[20], digit;
-
-	TEST_ONCE("reading from /dev/urandom is correct") {
-		digit = 0;
-		memset(out, 0, sizeof(out));
-		rand_bytes(out, sizeof(out));
-		for (int j = 0; j < sizeof(20); j++) {
-			digit ^= out[j];
-		}
-		TEST_ASSERT(digit != 0, end);
-	}
-	TEST_END;
-  end:
-	return RLC_OK;
-}
-
-#elif RAND == RDRND
-
-static int test(void) {
-	uint8_t out[64];
-	int len = sizeof(out) / 2, code = RLC_ERR;
-
-	TEST_ONCE("rdrand hardware generator is non-trivial") {
-		memset(out, 0, 2 * len);
-		rand_bytes(out, len);
-		/* This fails with negligible probability. */
-		TEST_ASSERT(memcmp(out, out + len, len) != 0, end);
-	}
-	TEST_END;
-
-	code = RLC_OK;
-
-  end:
-	return code;
-}
-
-#elif RAND == CALL
-
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static void test_bytes(uint8_t *buf, int size, void *args) {
-	int c, l, fd = *(int *)args;
-
-	if (fd == -1) {
-		RLC_THROW(ERR_NO_FILE);
-	}
-
-	l = 0;
-	do {
-		c = read(fd, buf + l, size - l);
-		l += c;
-		if (c == -1) {
-			RLC_THROW(ERR_NO_READ);
-		}
-	} while (l < size);
-}
-
-static int test(void) {
-	uint8_t out[20], digit;
-	int fd = open("/dev/urandom", O_RDONLY);
-
-	TEST_ONCE("callback to reading /dev/urandom is correct") {
-		digit = 0;
-		memset(out, 0, sizeof(out));
-		rand_bytes(out, sizeof(out));
-		for (int j = 0; j < sizeof(20); j++) {
-			digit ^= out[j];
-		}
-		TEST_ASSERT(digit != 0, end);
-		rand_seed(&test_bytes, (void *)&fd);
-		rand_bytes(out, sizeof(out));
-		for (int j = 0; j < sizeof(20); j++) {
-			digit ^= out[j];
-		}
-		TEST_ASSERT(digit != 0, end);
-	}
-	TEST_END;
-  end:
-  	close(fd);
-	return RLC_OK;
-}
-
-#endif
-
-int main(void) {
-	if (core_init() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("Tests for the RAND module:\n", 0);
-
-	if (test() != RLC_OK) {
-		core_clean();
-		return 1;
-	}
-
-	util_banner("All tests have passed.\n", 0);
-
-	core_clean();
-	return 0;
-}
diff --git a/src/dashbls/depends/relic/tools/git-creation-date.sh b/src/dashbls/depends/relic/tools/git-creation-date.sh
deleted file mode 100755
index ce70f7036e36..000000000000
--- a/src/dashbls/depends/relic/tools/git-creation-date.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-for file in $(git ls-files *.c *.h *.in *.s *.S *.tmpl)
-do
-    HASH=$(git rev-list HEAD "$file" | tail -n 1)
-    DATE=$(git show -s --format="%ad" --date=format:'%Y' $HASH --)
-    printf "%-35s %s\n  %s\n" "$file" "$DATE"
-    sed -i "s/Copyright (c) 20[0-9][0-9]/Copyright (c) $DATE/g" "$file"
-done
-
-
diff --git a/src/dashbls/depends/relic/tools/relic_gen_label.sh b/src/dashbls/depends/relic/tools/relic_gen_label.sh
deleted file mode 100755
index 46920725e3a7..000000000000
--- a/src/dashbls/depends/relic/tools/relic_gen_label.sh
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/bash
-
-cat << PREAMBLE
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2021 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Symbol renaming to a#undef clashes when simultaneous linking multiple builds.
- *
- * @ingroup core
- */
-
-#ifndef RLC_LABEL_H
-#define RLC_LABEL_H
-
-#include "relic_conf.h"
-
-#define RLC_PREFIX(F)			_RLC_PREFIX(LABEL, F)
-#define _RLC_PREFIX(A, B)		__RLC_PREFIX(A, B)
-#define __RLC_PREFIX(A, B)		A ## _ ## B
-
-/*============================================================================*/
-/* Macro definitions                                                          */
-/*============================================================================*/
-
-#ifdef LABEL
-
-PREAMBLE
-
-REDEF() {
-	cat "relic_$1.h" | grep "$1_" | grep -v define | grep -v typedef | grep -v '\\' | grep '(' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_0-9]+ ([a-z,_,0-9]+)\(.*/\#undef \1/'
-	echo
-	cat "relic_$1.h" | grep "$1_" | grep -v define | grep -v typedef | grep -v '\\' | grep '(' | sed 's/\*//' | sed 's/const //' | sed -r 's/[a-z,_,0-9]+ ([a-z,_,0-9]+)\(.*/\#define \1 \tRLC_PREFIX\(\1\)/'
-	echo
-}
-
-REDEF2() {
-	cat "relic_$1.h" | grep "$2_" | grep -v define | grep -v typedef | grep -v '\\' | grep '(' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_0-9]+ ([a-z,_,0-9]+)\(.*/\#undef \1/'
-	echo
-	cat "relic_$1.h" | grep "$2_" | grep -v define | grep -v typedef | grep -v '\\' | grep '(' | sed 's/\*//' | sed 's/const //' | sed -r 's/[a-z,_,0-9]+ ([a-z,_,0-9]+)\(.*/\#define \1 \tRLC_PREFIX\(\1\)/'
-	echo
-}
-
-REDEF_LOW() {
-	cat "low/relic_$1_low.h" | grep "$1_" | grep -v define | grep -v typedef | grep -v '\\' | grep -v '\}' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_]+ ([a-z,_,0-9]+)\(.*/\#undef \1/'
-	echo
-	cat "low/relic_$1_low.h" | grep "$1_" | grep -v define | grep -v @version | grep -v typedef | grep -v '\\' | grep -v '\}' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_]+ ([a-z,_,0-9]+)\(.*/\#define \1 \tRLC_PREFIX\(\1\)/'
-	echo
-}
-
-REDEF2_LOW() {
-	cat "low/relic_$1_low.h" | grep "$2_" | grep -v define | grep -v typedef | grep -v '\\' | grep -v '\}' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_]+ ([a-z,_,0-9]+)\(.*/\#undef \1/'
-	echo
-	cat "low/relic_$1_low.h" | grep "$2_" | grep -v define | grep -v @version | grep -v typedef | grep -v '\\' | grep -v '\}' | grep -v '^ \*' | sed 's/const //' | sed 's/\*//' | sed -r 's/[a-z,_]+ ([a-z,_,0-9]+)\(.*/\#define \1 \tRLC_PREFIX\(\1\)/'
-	echo
-}
-
-echo "#undef first_ctx"
-echo "#define first_ctx     RLC_PREFIX(first_ctx)"
-echo "#undef core_ctx"
-echo "#define core_ctx      RLC_PREFIX(core_ctx)"
-echo
-REDEF core
-REDEF arch
-REDEF bench
-REDEF err
-REDEF rand
-REDEF test
-REDEF util
-
-echo "#undef conf_print"
-echo "#define conf_print    RLC_PREFIX(conf_print)"
-echo
-
-echo "#undef dv_t"
-echo "#define dv_t          RLC_PREFIX(dv_t)"
-echo
-REDEF dv
-REDEF_LOW dv
-
-echo "#undef bn_st"
-echo "#undef bn_t"
-echo "#define bn_st     	RLC_PREFIX(bn_st)"
-echo "#define bn_t      	RLC_PREFIX(bn_t)"
-echo
-REDEF bn
-REDEF_LOW bn
-
-echo "#undef fp_st"
-echo "#undef fp_t"
-echo "#define fp_st	        RLC_PREFIX(fp_st)"
-echo "#define fp_t          RLC_PREFIX(fp_t)"
-echo
-REDEF fp
-REDEF_LOW fp
-
-echo "#undef fp_st"
-echo "#undef fp_t"
-echo "#define fp_st	        RLC_PREFIX(fp_st)"
-echo "#define fp_t          RLC_PREFIX(fp_t)"
-echo
-REDEF fb
-REDEF_LOW fb
-
-echo "#undef ep_st"
-echo "#undef ep_t"
-echo "#define ep_st         RLC_PREFIX(ep_st)"
-echo "#define ep_t          RLC_PREFIX(ep_t)"
-echo
-REDEF ep
-
-echo "#undef ed_st"
-echo "#undef ed_t"
-echo "#define ed_st         RLC_PREFIX(ed_st)"
-echo "#define ed_t          RLC_PREFIX(ed_t)"
-echo
-REDEF ed
-
-echo "#undef eb_st"
-echo "#undef eb_t"
-echo "#define eb_st         RLC_PREFIX(eb_st)"
-echo "#define eb_t          RLC_PREFIX(eb_t)"
-echo
-REDEF eb
-
-echo "#undef ep2_st"
-echo "#undef ep2_t"
-echo "#define ep2_st        RLC_PREFIX(ep2_st)"
-echo "#define ep2_t         RLC_PREFIX(ep2_t)"
-echo
-REDEF2 epx ep2
-
-echo "#undef fp2_st"
-echo "#undef fp2_t"
-echo "#undef dv2_t"
-echo "#define fp2_st        RLC_PREFIX(fp2_st)"
-echo "#define fp2_t         RLC_PREFIX(fp2_t)"
-echo "#define dv2_t         RLC_PREFIX(dv2_t)"
-echo "#undef fp3_st"
-echo "#undef fp3_t"
-echo "#undef dv3_t"
-echo "#define fp3_st        RLC_PREFIX(fp3_st)"
-echo "#define fp3_t         RLC_PREFIX(fp3_t)"
-echo "#define dv3_t         RLC_PREFIX(dv3_t)"
-echo "#undef fp6_st"
-echo "#undef fp6_t"
-echo "#undef dv6_t"
-echo "#define fp6_st        RLC_PREFIX(fp6_st)"
-echo "#define fp6_t         RLC_PREFIX(fp6_t)"
-echo "#define dv6_t         RLC_PREFIX(dv6_t)"
-echo "#undef fp9_st"
-echo "#undef fp8_t"
-echo "#undef dv8_t"
-echo "#define fp8_st        RLC_PREFIX(fp8_st)"
-echo "#define fp8_t         RLC_PREFIX(fp8_t)"
-echo "#define dv8_t         RLC_PREFIX(dv8_t)"
-echo "#undef fp9_st"
-echo "#undef fp9_t"
-echo "#undef dv9_t"
-echo "#define fp9_st        RLC_PREFIX(fp9_st)"
-echo "#define fp9_t         RLC_PREFIX(fp9_t)"
-echo "#define dv9_t         RLC_PREFIX(dv9_t)"
-echo "#undef fp12_st"
-echo "#undef fp12_t"
-echo "#undef dv12_t"
-echo "#define fp12_st        RLC_PREFIX(fp12_st)"
-echo "#define fp12_t         RLC_PREFIX(fp12_t)"
-echo "#define dv12_t         RLC_PREFIX(dv12_t)"
-echo "#undef fp18_st"
-echo "#undef fp18_t"
-echo "#undef dv18_t"
-echo "#define fp18_st        RLC_PREFIX(fp18_st)"
-echo "#define fp18_t         RLC_PREFIX(fp18_t)"
-echo "#define dv18_t         RLC_PREFIX(dv18_t)"
-echo "#undef fp24_st"
-echo "#undef fp24_t"
-echo "#undef dv24_t"
-echo "#define fp24_st        RLC_PREFIX(fp24_st)"
-echo "#define fp24_t         RLC_PREFIX(fp24_t)"
-echo "#define dv24_t         RLC_PREFIX(dv24_t)"
-echo "#undef fp48_st"
-echo "#undef fp48_t"
-echo "#undef dv48_t"
-echo "#define fp48_st        RLC_PREFIX(fp48_st)"
-echo "#define fp48_t         RLC_PREFIX(fp48_t)"
-echo "#define dv48_t         RLC_PREFIX(dv48_t)"
-echo "#undef fp54_st"
-echo "#undef fp54_t"
-echo "#undef dv54_t"
-echo "#define fp54_st        RLC_PREFIX(fp54_st)"
-echo "#define fp54_t         RLC_PREFIX(fp54_t)"
-echo "#define dv54_t         RLC_PREFIX(dv54_t)"
-echo
-REDEF2 fpx fp2
-REDEF2_LOW fpx fp2
-REDEF2 fpx fp3
-REDEF2_LOW fpx fp3
-REDEF2 fpx fp4
-REDEF2 fpx fp6
-REDEF2 fpx fp8
-REDEF2 fpx fp9
-REDEF2 fpx fp12
-REDEF2 fpx fp18
-REDEF2 fpx fp24
-REDEF2 fpx fp48
-REDEF2 fpx fp54
-
-REDEF2 fbx fb2
-REDEF2 fbx fb4
-
-REDEF pp
-
-echo "#undef crt_t"
-echo "#undef rsa_t"
-echo "#undef rabin_t"
-echo "#undef phpe_t"
-echo "#undef bdpe_t"
-echo "#undef sokaka_t"
-echo "#define crt_t		RLC_PREFIX(crt_t)"
-echo "#define rsa_t		RLC_PREFIX(rsa_t)"
-echo "#define rabin_t	RLC_PREFIX(rabin_t)"
-echo "#define phpe_t	RLC_PREFIX(phpe_t)"
-echo "#define bdpe_t	RLC_PREFIX(bdpe_t)"
-echo "#define sokaka_t	RLC_PREFIX(sokaka_t)"
-echo
-REDEF cp
-
-REDEF md
-
-echo "#endif /* LABEL */"
-echo
-echo "#endif /* !RLC_LABEL_H */"
diff --git a/src/dashbls/emsdk_build.sh b/src/dashbls/emsdk_build.sh
deleted file mode 100755
index 704f43cfbcc8..000000000000
--- a/src/dashbls/emsdk_build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --init --recursive
-
-rm -rf js_build
-mkdir -p js_build
-cd js_build
-
-emcmake cmake -G "Unix Makefiles" ..
-emmake make
diff --git a/src/dashbls/go-bindings/.gitignore b/src/dashbls/go-bindings/.gitignore
deleted file mode 100644
index 24600083db41..000000000000
--- a/src/dashbls/go-bindings/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!Makefile
diff --git a/src/dashbls/go-bindings/Makefile b/src/dashbls/go-bindings/Makefile
deleted file mode 100644
index dcea3f24f2d3..000000000000
--- a/src/dashbls/go-bindings/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-export CGO_ENABLED := 1
-GO=go
-
-OS := $(shell uname -s)
-ARCH := $(shell uname -m)
-
-COVERAGE_OUTPUT ?= coverage.out
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-
-BUILD_DIR=$(CURDIR)/../build
-CURR_DIR := $(dir $(MAKEFILE_PATH))
-SRC_DIR=$(CURDIR)/../src
-
-GMP_PREFIX := /usr/local
-
-ifeq ("$(OS)", "Darwin")
-  ifneq ($(wildcard /opt/local/bin/port),)
-    GMP_PREFIX := /opt/local
-  endif
-  ifeq ("$(ARCH)", "arm64")
-    ifneq ($(wildcard /opt/homebrew/bin/brew),)
-      GMP_PREFIX := /opt/homebrew
-    endif
-  endif
-else ifeq ("$(OS)", "Linux")
-  ifneq ($(wildcard /home/linuxbrew/.linuxbrew/bin/brew),)
-    GMP_PREFIX := /home/linuxbrew/.linuxbrew
-  endif
-endif
-
-MIMALLOC_LIB := mimalloc-secure
-MIMALLOC_LIB_PATH := $(CURR_DIR)../build/depends/mimalloc
-
-ifneq ($(wildcard $(MIMALLOC_LIB_PATH)/libmimalloc-secure-debug.a),)
-  MIMALLOC_LIB := mimalloc-secure-debug
-endif
-
-CGO_CXXFLAGS ?= "\
--I$(CURR_DIR)../build/depends/relic/include \
--I$(CURR_DIR)../depends/mimalloc/include \
--I$(CURR_DIR)../depends/relic/include \
--I$(CURR_DIR)../include \
--I$(GMP_PREFIX)/include"
-
-CGO_LDFLAGS ?= "\
--L$(CURR_DIR)../build/src -ldashbls \
--L$(MIMALLOC_LIB_PATH) -l$(MIMALLOC_LIB) \
--L$(CURR_DIR)../build/depends/relic/lib -lrelic_s \
--L$(GMP_PREFIX)/lib -lgmp"
-
-.PHONY: default prepare fmt test cover vet help clean config
-
-all: default
-
-default: prepare vet test clean
-
-prepare:
-	@mkdir -p ../build/src/dashbls
-	cp -rv ../src/* ../build/src/dashbls
-
-fmt:  ## Run go fmt to format Go files
-	$(GO) fmt
-
-test: ## Run a basic test suite
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) test
-
-cover:  ## Run tests and generate test coverage file, output coverage results and HTML coverage file.
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) test -coverprofile $(COVERAGE_OUTPUT)
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) tool cover -func=$(COVERAGE_OUTPUT)
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) tool cover -html=$(COVERAGE_OUTPUT)
-	rm -f $(COVERAGE_OUTPUT)
-
-vet:  ## Go vet all project code
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) vet ./...
-
-help: ## Show This Help
-	@for line in $$(cat Makefile | grep "##" | grep -v "grep" | sed  "s/:.*##/:/g" | sed "s/\ /!/g"); do verb=$$(echo $$line | cut -d ":" -f 1); desc=$$(echo $$line | cut -d ":" -f 2 | sed "s/!/\ /g"); printf "%-30s--%s\n" "$$verb" "$$desc"; done
-
-clean: ## Clean up transient (generated) files
-	$(GO) clean
-	rm -f $(COVERAGE_OUTPUT)
-
-config: ## Display build configuration
-	@echo ""
-	@echo "OS:           $(OS)"
-	@echo "ARCH:         $(ARCH)"
-	@echo ""
-	@echo "CC:           $${CC:-<not set>}"
-	@echo "CXX:          $${CXX:-<not set>}"
-	@echo "GO:           $(GO)"
-	@echo ""
-	@echo "GOROOT:       $${GOROOT:-<not set>}"
-	@echo ""
-	@echo "CGO_CXXFLAGS: $(CGO_CXXFLAGS)"
-	@echo "CGO_LDFLAGS:  $(CGO_LDFLAGS)"
-	@echo ""
diff --git a/src/dashbls/go-bindings/README.md b/src/dashbls/go-bindings/README.md
deleted file mode 100644
index 60640abca868..000000000000
--- a/src/dashbls/go-bindings/README.md
+++ /dev/null
@@ -1,195 +0,0 @@
-## bls-signatures
-
-Go library that implements BLS signatures with aggregation as
-in [Boneh, Drijvers, Neven 2018](https://crypto.stanford.edu/~dabo/pubs/papers/BLSmultisig.html), using the relic
-toolkit for cryptographic primitives (pairings, EC, hashing).
-
-This library is a Go port of the [Chia Network's BLS lib](https://github.com/Chia-Network/bls-signatures).
-
-### Usage
-
-```bash
-go get github.com/dashpay/bls-signatures/go-bindings
-```
-
-### Creating keys and signatures
-
-```go
-// seed data must not be less 32 bytes length
-seed := []byte{
-    0, 50, 6, 244, 24, 199, 1, 25,
-    52, 88, 192, 19, 18, 12, 89, 6,
-    220, 18, 102, 58, 209, 82, 12, 62,
-    89, 110, 182, 9, 44, 20, 254, 22,
-}
-
-// create a scheme, available three schemes: BasicSchemeMPL, AugSchemeMPL and PopSchemeMPL 
-scheme := NewAugSchemeMPL()
-
-// generate a private key using a seed data
-sk, err := scheme.KeyGen(seed)
-if err != nil {
-    panic(err.Error())
-}
-// get a public key
-pk, err := sk.G1Element()
-if err != nil {
-    panic(err.Error())
-}
-
-msg := []byte{1, 2, 3, 4, 5}
-
-// make a signature for a message
-sig := scheme.Sign(sk, msg)
-
-// verify the message signature 
-if !scheme.Verify(pk, msg, sig) {
-    panic("failed the signature verification")
-}
-```
-
-### Serializing keys and signatures to bytes
-
-```go  
-skBytes := sk.Serialize()
-pkBytes := pk.Serialize()
-sigBytes := sig.Serialize()  
-```
-
-### Loading keys and signatures from bytes
-
-```go
-sk1, _ := PrivateKeyFromBytes(skBytes, false)
-pk1, _ := G1ElementFromBytes(pkBytes)
-sig1, _ := G2ElementFromBytes(sigBytes)
-```
-
-### Create aggregate signatures
-
-```go
-// Generate some more private keys
-seed[0] = 1
-sk1, _ := scheme.KeyGen(seed)
-seed[0] = 2
-sk2, _ := scheme.KeyGen(seed)
-msg2 := []byte{1, 2, 3, 4, 5,6, 7}
-
-// Generate first sig
-pk1, _ := sk1.G1Element()
-sig1 := scheme.Sign(sk1, msg)
-
-// Generate second sig
-pk2, _ := sk2.G1Element()
-sig2 := scheme.Sign(sk2, msg2)
-
-// Signatures can be non-interactively combined by anyone
-var aggSig = scheme.AggregateSigs(sig1, sig2)
-
-ok := scheme.AggregateVerify([]*G1Element{pk1, pk2}, [][]byte{msg, msg2}, aggSig)
-if !ok {
-    panic("failed a verification of the aggregated signature ")
-}
-```
-
-### Arbitrary trees of aggregates
-
-```go
-seed[0] = 3
-sk3, _ := scheme.KeyGen(seed)
-pk3, _ := sk3.G1Element()
-msg3 := []byte{100, 2, 254, 88, 90, 45, 23}
-sig3 := scheme.Sign(sk3, msg3)
-
-aggSigFinal := scheme.AggregateSigs(aggSig, sig3)
-ok = scheme.AggregateVerify([]*G1Element{pk1, pk2, pk3}, [][]byte{msg, msg2, msg3}, aggSigFinal)
-if !ok {
-    panic("failed a verification of the aggregated signature ")
-}
-```
-
-### Very fast verification with Proof of Possession scheme
-
-```go
-// create a proof possession scheme
-popScheme := NewPopSchemeMPL()
-
-// If the same msg is signed, you can use Proof of Possession (PopScheme) for efficiency
-// A proof of possession MUST be passed around with the PK to ensure security.
-popSig1 := popScheme.Sign(sk1, msg)
-popSig2 := popScheme.Sign(sk2, msg)
-popSig3 := popScheme.Sign(sk3, msg)
-pop1 := popScheme.PopProve(sk1)
-pop2 := popScheme.PopProve(sk2)
-pop3 := popScheme.PopProve(sk3)
-
-ok = popScheme.PopVerify(pk1, pop1)
-if !ok {
-    panic("failed a verification")
-}
-ok = popScheme.PopVerify(pk2, pop2)
-if !ok {
-    panic("failed a verification")
-}
-ok = popScheme.PopVerify(pk3, pop3)
-if !ok {
-    panic("failed a verification")
-}
-
-popSigAgg := popScheme.AggregateSigs(popSig1, popSig2, popSig3)
-ok = popScheme.FastAggregateVerify([]*G1Element{pk1, pk2, pk3}, msg, popSigAgg)
-if !ok {
-    panic("failed a verification")
-}
-
-// Aggregate public key, indistinguishable from a single public key
-var popAggPk = pk1.Add(pk2).Add(pk3)
-ok = popScheme.Verify(popAggPk, msg, popSigAgg)
-if !ok {
-    panic("failed a verification")
-}
-
-// Aggregate private keys
-var aggSk = PrivateKeyAggregate(sk1, sk2, sk3)
-ok = popScheme.Sign(aggSk, msg).EqualTo(popSigAgg)
-if !ok {
-    panic("failed a verification")
-}
-```
-
-### HD keys using [EIP-2333](https://github.com/ethereum/EIPs/pull/2333)
-
-```go
-// You can derive 'child' keys from any key, to create arbitrary trees. 4 byte indeces are used.
-// Hardened (more secure, but no parent pk -> child pk)
-masterSk, _ := augScheme.KeyGen(seed)
-
-// Unhardened (less secure, but can go from parent pk -> child pk), BIP32 style
-masterPk, _ := masterSk.G1Element()
-childU := augScheme.DeriveChildSkUnhardened(masterSk, 22)
-grandchildU := augScheme.DeriveChildSkUnhardened(childU, 0)
-
-childUPk := augScheme.DeriveChildPkUnhardened(masterPk, 22)
-grandchildUPk := augScheme.DeriveChildPkUnhardened(childUPk, 0)
-
-pkChildU, _ := grandchildU.G1Element()
-ok = grandchildUPk.EqualTo(pkChildU)
-if !ok {
-    panic("keys are not equal")
-}
-```
-
-Do not forget to handle the errors properly, this part of the code was omitted deliberately
-
-Use cases can be found in the [original lib's readme](../README.md).
-
-__Important note:__ Since this library is a port of the c++ library, so every piece of memory allocated by the library
-MUST be released on our own in GO. To release the memory is used `runtime.SetFinalizer` function, that will invoke
-automatically before GC release a memory allocated by GO.
-
-### Run tests
-
-To run tests, build the library, then go to the `go-bindings` folder in the build directory and run
-
-```bash
-make test
-```
diff --git a/src/dashbls/go-bindings/blschia.cpp b/src/dashbls/go-bindings/blschia.cpp
deleted file mode 100644
index 04f0f5494ac4..000000000000
--- a/src/dashbls/go-bindings/blschia.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <string>
-#include <stdlib.h>
-#include "dashbls/bls.hpp"
-#include "error.h"
-#include "blschia.h"
-
-std::string gErrMsg;
-
-void SecFree(void *p) {
-    bls::Util::SecFree(p);
-}
-
-void** AllocPtrArray(size_t len) {
-    // caller to free
-    return (void**)bls::Util::SecAlloc<uint8_t>(sizeof(void*) * len);
-}
-
-void SetPtrArray(void** arrPtr, void* elemPtr, int index) {
-    arrPtr[index] = elemPtr;
-}
-
-void FreePtrArray(void** inPtr) {
-    bls::Util::SecFree(inPtr);
-}
-
-void* GetPtrAtIndex(void** arrPtr, int index) {
-    return arrPtr[index];
-}
-
-uint8_t* SecAllocBytes(size_t len) {
-    return (uint8_t*)bls::Util::SecAlloc<uint8_t>(sizeof(uint8_t) * len);
-}
-
-void* GetAddressAtIndex(uint8_t* ptr, int index) {
-    return (void*)&ptr[index];
-}
-
-const char* GetLastErrorMsg() {
-    return gErrMsg.c_str();
-}
diff --git a/src/dashbls/go-bindings/blschia.h b/src/dashbls/go-bindings/blschia.h
deleted file mode 100644
index 450cda277bc5..000000000000
--- a/src/dashbls/go-bindings/blschia.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_BLSCHIA_H_
-#define GO_BINDINGS_BLSCHIA_H_
-#include <stdbool.h>
-#include <stdint.h>
-#include "privatekey.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Export the BLS SecFree method
-void SecFree(void *p);
-
-typedef void** carr;
-
-// Additional C++ helper funcs for allocations
-void** AllocPtrArray(size_t len);
-void SetPtrArray(void **arrPtr, void *elemPtr, int index);
-void FreePtrArray(void **inPtr);
-void* GetPtrAtIndex(void **arrPtr, int index);
-
-// Allocates an array of bytes with size of passed in len argument
-uint8_t* SecAllocBytes(size_t len);
-
-void* GetAddressAtIndex(uint8_t *ptr, int index);
-
-const char* GetLastErrorMsg();
-
-#ifdef __cplusplus
-}
-#endif
-#endif // GO_BINDINGS_BLSCHIA_H_
diff --git a/src/dashbls/go-bindings/elements.cpp b/src/dashbls/go-bindings/elements.cpp
deleted file mode 100644
index eb30fcec88ec..000000000000
--- a/src/dashbls/go-bindings/elements.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "dashbls/bls.hpp"
-#include "blschia.h"
-#include "error.h"
-#include "elements.h"
-
-// G1Element
-int CG1ElementSize() {
-    return bls::G1Element::SIZE;
-}
-
-CG1Element CG1ElementFromBytes(const void* data, size_t len, bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)data, len))
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-CG1Element CG1ElementGenerator() {
-    return new bls::G1Element(bls::G1Element::Generator());
-}
-
-bool CG1ElementIsValid(const CG1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return elPtr->IsValid();
-}
-
-uint32_t CG1ElementGetFingerprint(const CG1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return elPtr->GetFingerprint();
-}
-
-void* CG1ElementSerialize(const CG1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    const std::vector<uint8_t> serialized = elPtr->Serialize();
-    uint8_t* buffer = (uint8_t*)malloc(bls::G1Element::SIZE);
-    memcpy(buffer, serialized.data(), bls::G1Element::SIZE);
-    return (void*)buffer;
-}
-
-bool CG1ElementIsEqual(const CG1Element el1, const CG1Element el2) {
-    const bls::G1Element* el1Ptr = (bls::G1Element*)el1;
-    const bls::G1Element* el2Ptr = (bls::G1Element*)el2;
-    return *el1Ptr == *el2Ptr;
-}
-
-CG1Element CG1ElementAdd(const CG1Element el1, const CG1Element el2) {
-    const bls::G1Element* el1Ptr = (bls::G1Element*)el1;
-    const bls::G1Element* el2Ptr = (bls::G1Element*)el2;
-    return new bls::G1Element((*el1Ptr) + (*el2Ptr));
-}
-
-CG1Element CG1ElementMul(const CG1Element el, const CPrivateKey sk) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G1Element(*elPtr * *skPtr);
-}
-
-CG1Element CG1ElementNegate(const CG1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return new bls::G1Element(elPtr->Negate());
-}
-
-void CG1ElementFree(const CG1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    delete elPtr;
-}
-
-// G2Element
-int CG2ElementSize() {
-    return bls::G2Element::SIZE;
-}
-
-CG2Element CG2ElementFromBytes(const void* data, size_t len, bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, len))
-        );
-        *didErr = false;
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-CG2Element CG2ElementGenerator() {
-    return new bls::G2Element(bls::G2Element::Generator());
-}
-
-bool CG2ElementIsValid(const CG2Element el) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return elPtr->IsValid();
-}
-
-void* CG2ElementSerialize(const CG2Element el) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    const std::vector<uint8_t> serialized = elPtr->Serialize();
-    uint8_t* buffer = (uint8_t*)malloc(bls::G2Element::SIZE);
-    memcpy(buffer, serialized.data(), bls::G2Element::SIZE);
-    return (void*)buffer;
-}
-
-bool CG2ElementIsEqual(const CG2Element el1, const CG2Element el2) {
-    const bls::G2Element* el1Ptr = (bls::G2Element*)el1;
-    const bls::G2Element* el2Ptr = (bls::G2Element*)el2;
-    return *el1Ptr == *el2Ptr;
-}
-
-CG2Element CG2ElementAdd(const CG2Element el1, const CG2Element el2) {
-    bls::G2Element* el1Ptr = (bls::G2Element*)el1;
-    bls::G2Element* el2Ptr = (bls::G2Element*)el2;
-    return new bls::G2Element(*el1Ptr + *el2Ptr);
-}
-
-CG2Element CG2ElementMul(const CG2Element el, const CPrivateKey sk) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(*elPtr * *skPtr);
-}
-
-CG2Element CG2ElementNegate(const CG2Element el) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return new bls::G2Element(elPtr->Negate());
-}
-
-void CG2ElementFree(const CG2Element el) {
-    bls::G2Element* elPtr = (bls::G2Element*)el;
-    delete elPtr;
-}
diff --git a/src/dashbls/go-bindings/elements.go b/src/dashbls/go-bindings/elements.go
deleted file mode 100644
index 84548c17e1dd..000000000000
--- a/src/dashbls/go-bindings/elements.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include <stdbool.h>
-// #include <stdlib.h>
-// #include "elements.h"
-// #include "blschia.h"
-import "C"
-import (
-	"encoding/hex"
-	"runtime"
-	"unsafe"
-)
-
-// G1Element represents a bls::G1Element (48 bytes)
-// in fact G1Element is corresponding to a public-key
-type G1Element struct {
-	val C.CG1Element
-}
-
-// G1ElementFromBytes returns a new G1Element (public-key) from bytes
-// this method allocates the new bls::G2Element object and keeps its pointer
-func G1ElementFromBytes(data []byte) (*G1Element, error) {
-	cBytesPtr := C.CBytes(data)
-	defer C.free(cBytesPtr)
-	var cDidErr C.bool
-	el := G1Element{
-		val: C.CG1ElementFromBytes(cBytesPtr, C.size_t(len(data)), &cDidErr),
-	}
-	if bool(cDidErr) {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&el, func(el *G1Element) { el.free() })
-	return &el, nil
-}
-
-// Mul performs multiplication operation with PrivateKey and returns a new G1Element (public-key)
-// this method is the binding of the multiplication operation
-func (g *G1Element) Mul(sk *PrivateKey) *G1Element {
-	el := G1Element{
-		val: C.CG1ElementMul(g.val, sk.val),
-	}
-	runtime.SetFinalizer(&el, func(el *G1Element) { el.free() })
-	runtime.KeepAlive(g)
-	runtime.KeepAlive(sk)
-	return &el
-}
-
-// EqualTo returns true if the elements are equal otherwise returns false
-// this method is the binding of the equality operation
-func (g *G1Element) EqualTo(el *G1Element) bool {
-	val := bool(C.CG1ElementIsEqual(g.val, el.val))
-	runtime.KeepAlive(g)
-	runtime.KeepAlive(el)
-	return val
-}
-
-// IsValid returns true if a state of G1Element (public key) is valid
-// this method is the binding of the bls::G1Element::IsValid
-func (g *G1Element) IsValid() bool {
-	isValid := bool(C.CG1ElementIsValid(g.val))
-	runtime.KeepAlive(g)
-	return isValid
-}
-
-// Add performs addition operation on the passed G1Element (public key) and returns a new G1Element (public key)
-// this method is a binding of the bls::G1Element::GetFingerprint
-func (g *G1Element) Add(el *G1Element) *G1Element {
-	res := G1Element{
-		val: C.CG1ElementAdd(g.val, el.val),
-	}
-	runtime.SetFinalizer(&res, func(res *G1Element) { res.free() })
-	runtime.KeepAlive(g)
-	runtime.KeepAlive(el)
-	return &res
-}
-
-// Fingerprint returns a fingerprint of G1Element (public key)
-// this method is a binding of the bls::G1Element::GetFingerprint
-func (g *G1Element) Fingerprint() int {
-	fp := int(C.CG1ElementGetFingerprint(g.val))
-	runtime.KeepAlive(g)
-	return fp
-}
-
-// Serialize serializes G1Element (public key) into a slice of bytes and returns it
-// this method is a binding of the bls::G1Element::Serialize
-func (g *G1Element) Serialize() []byte {
-	ptr := C.CG1ElementSerialize(g.val)
-	defer C.free(unsafe.Pointer(ptr))
-	bytes := C.GoBytes(ptr, C.CG1ElementSize())
-	runtime.KeepAlive(g)
-	return bytes
-}
-
-// HexString returns a hex string representation of serialized data
-func (g *G1Element) HexString() string {
-	return hex.EncodeToString(g.Serialize())
-}
-
-// free calls CG1ElementFree "C" function to release a memory allocated for bls::G1Element
-func (g *G1Element) free() {
-	C.CG1ElementFree(g.val)
-}
-
-// G2Element represents a bls::G2Element (96 bytes)
-// in fact G2Element is corresponding to a signature
-type G2Element struct {
-	val C.CG2Element
-}
-
-// G2ElementFromBytes returns a new G2Element (signature) from passed byte slice
-// this method allocates the new bls::G2Element object and keeps its pointer
-func G2ElementFromBytes(data []byte) (*G2Element, error) {
-	cBytesPtr := C.CBytes(data)
-	defer C.free(cBytesPtr)
-	var cDidErr C.bool
-	el := G2Element{
-		val: C.CG2ElementFromBytes(cBytesPtr, C.size_t(len(data)), &cDidErr),
-	}
-	if bool(cDidErr) {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&el, func(el *G2Element) { el.free() })
-	return &el, nil
-}
-
-// EqualTo returns true if the elements are equal, otherwise returns false
-// this method is the binding of the equality operation
-func (g *G2Element) EqualTo(el *G2Element) bool {
-	isEqual := bool(C.CG2ElementIsEqual(g.val, el.val))
-	runtime.KeepAlive(g)
-	return isEqual
-}
-
-// Add performs an addition operation on the passed G2Element (signature) and returns a new G2Element (signature)
-// this method is the binding of the addition operation
-func (g *G2Element) Add(el *G2Element) *G2Element {
-	res := G2Element{
-		val: C.CG2ElementAdd(g.val, el.val),
-	}
-	runtime.SetFinalizer(&res, func(res *G2Element) { res.free() })
-	runtime.KeepAlive(g)
-	runtime.KeepAlive(el)
-	return &res
-}
-
-// Mul performs multiplication operation with PrivateKey and returns a new G2Element (signature)
-// this method is the binding of the multiplication operation
-func (g *G2Element) Mul(sk *PrivateKey) *G2Element {
-	el := G2Element{
-		val: C.CG2ElementMul(g.val, sk.val),
-	}
-	runtime.SetFinalizer(&el, func(el *G2Element) { el.free() })
-	runtime.KeepAlive(g)
-	runtime.KeepAlive(sk)
-	return &el
-}
-
-// Serialize serializes G2Element (signature) into a slice of bytes and returns it
-// this method is a binding of the bls::G2Element::Serialize
-func (g *G2Element) Serialize() []byte {
-	ptr := C.CG2ElementSerialize(g.val)
-	defer C.free(unsafe.Pointer(ptr))
-	bytes := C.GoBytes(ptr, C.CG2ElementSize())
-	runtime.KeepAlive(g)
-	return bytes
-}
-
-// HexString returns a hex string representation of serialized data
-func (g *G2Element) HexString() string {
-	return hex.EncodeToString(g.Serialize())
-}
-
-// free calls CG2ElementFree "C" function to release a memory allocated for bls::G2Element
-func (g *G2Element) free() {
-	C.CG2ElementFree(g.val)
-}
diff --git a/src/dashbls/go-bindings/elements.h b/src/dashbls/go-bindings/elements.h
deleted file mode 100644
index a391534dc55d..000000000000
--- a/src/dashbls/go-bindings/elements.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_ELEMENTS_H_
-#define GO_BINDINGS_ELEMENTS_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* CG1Element;
-typedef void* CG2Element;
-typedef void* CPrivateKey;
-
-// G1Element
-int CG1ElementSize();
-CG1Element CG1ElementFromBytes(const void* data, size_t len, bool* didErr);
-CG1Element CG1ElementGenerator();
-bool CG1ElementIsValid(const CG1Element el);
-uint32_t CG1ElementGetFingerprint(const CG1Element el);
-bool CG1ElementIsEqual(const CG1Element el1, const CG1Element el2);
-CG1Element CG1ElementAdd(const CG1Element el1, const CG1Element el2);
-CG1Element CG1ElementMul(const CG1Element el, const CPrivateKey sk);
-CG1Element CG1ElementNegate(const CG1Element el);
-void* CG1ElementSerialize(const CG1Element el);
-void CG1ElementFree(const CG1Element el);
-
-// G2Element
-int CG2ElementSize();
-CG2Element CG2ElementFromBytes(const void* data, size_t len, bool* didErr);
-CG2Element CG2ElementGenerator();
-bool CG2ElementIsValid(const CG2Element el);
-bool CG2ElementIsEqual(const CG2Element el1, const CG2Element el2);
-CG2Element CG2ElementAdd(const CG2Element el1, const CG2Element el2);
-CG2Element CG2ElementMul(const CG2Element el, const CPrivateKey sk);
-CG2Element CG2ElementNegate(const CG2Element el);
-void* CG2ElementSerialize(const CG2Element el);
-void CG2ElementFree(const CG2Element el);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // GO_BINDINGS_ELEMENTS_H_
diff --git a/src/dashbls/go-bindings/error.go b/src/dashbls/go-bindings/error.go
deleted file mode 100644
index 073f53cff05f..000000000000
--- a/src/dashbls/go-bindings/error.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include "blschia.h"
-import "C"
-import "errors"
-
-func errFromC() error {
-	return errors.New(C.GoString(C.GetLastErrorMsg()))
-}
diff --git a/src/dashbls/go-bindings/error.h b/src/dashbls/go-bindings/error.h
deleted file mode 100644
index fddb772fceb8..000000000000
--- a/src/dashbls/go-bindings/error.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2020 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_ERROR_H_
-#define GO_BINDINGS_ERROR_H_
-#include <string>
-
-extern std::string gErrMsg;
-
-#endif  // GO_BINDINGS_ERROR_H_
diff --git a/src/dashbls/go-bindings/go.mod b/src/dashbls/go-bindings/go.mod
deleted file mode 100644
index b52f1e0e6dfd..000000000000
--- a/src/dashbls/go-bindings/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/dashpay/bls-signatures/go-bindings
-
-go 1.15
-
-require github.com/stretchr/testify v1.7.0
diff --git a/src/dashbls/go-bindings/go.sum b/src/dashbls/go-bindings/go.sum
deleted file mode 100644
index acb88a48f684..000000000000
--- a/src/dashbls/go-bindings/go.sum
+++ /dev/null
@@ -1,11 +0,0 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/dashbls/go-bindings/privatekey.cpp b/src/dashbls/go-bindings/privatekey.cpp
deleted file mode 100644
index 90b7f0aab696..000000000000
--- a/src/dashbls/go-bindings/privatekey.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "dashbls/bls.hpp"
-#include "privatekey.h"
-#include "blschia.h"
-#include "error.h"
-#include "utils.hpp"
-
-// private key bindings implementation
-CPrivateKey CPrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr) {
-    bls::PrivateKey* skPtr = nullptr;
-    try {
-        skPtr = new bls::PrivateKey(
-            bls::PrivateKey::FromBytes(
-                bls::Bytes((uint8_t*)data, len),
-                modOrder
-            )
-        );
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return skPtr;
-}
-
-CPrivateKey CPrivateKeyAggregate(void** sks, const size_t len) {
-    return new bls::PrivateKey(
-        bls::PrivateKey::Aggregate(toBLSVector<bls::PrivateKey>(sks, len))
-    );
-}
-
-void* CPrivateKeySerialize(const CPrivateKey sk) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    uint8_t* buffer = bls::Util::SecAlloc<uint8_t>(bls::PrivateKey::PRIVATE_KEY_SIZE);
-    skPtr->Serialize(buffer);
-    return (void*)buffer;
-}
-
-size_t CPrivateKeySizeBytes() {
-    return bls::PrivateKey::PRIVATE_KEY_SIZE;
-}
-
-bool CPrivateKeyIsEqual(const CPrivateKey sk1, const CPrivateKey sk2) {
-    const bls::PrivateKey* sk1Ptr = (bls::PrivateKey*)sk1;
-    const bls::PrivateKey* sk2Ptr = (bls::PrivateKey*)sk2;
-    return *sk1Ptr == *sk2Ptr;
-}
-
-CG1Element CPrivateKeyGetG1Element(const CPrivateKey sk, bool* didErr) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(skPtr->GetG1Element());
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-CG2Element CPrivateKeyGetG2Element(const CPrivateKey sk, bool* didErr) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(skPtr->GetG2Element());
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-CG2Element CPrivateKeyGetG2Power(const CPrivateKey sk, const CG2Element el) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return new bls::G2Element(skPtr->GetG2Power(*elPtr));
-}
-
-CG2Element CPrivateKeySignG2(const CPrivateKey sk,
-                             uint8_t* msg,
-                             const size_t len,
-                             const uint8_t* dst,
-                             const size_t dstLen) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(skPtr->SignG2(msg, len, dst, dstLen));
-}
-
-void CPrivateKeyFree(CPrivateKey sk) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    delete skPtr;
-}
diff --git a/src/dashbls/go-bindings/privatekey.go b/src/dashbls/go-bindings/privatekey.go
deleted file mode 100644
index 155338e834cb..000000000000
--- a/src/dashbls/go-bindings/privatekey.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include <stdbool.h>
-// #include <stdlib.h>
-// #include "privatekey.h"
-// #include "blschia.h"
-import "C"
-import (
-	"encoding/hex"
-	"runtime"
-)
-
-// PrivateKey represents a bls::PrivateKey (32 byte integer)
-type PrivateKey struct {
-	val C.CPrivateKey
-}
-
-// PrivateKeyFromBytes returns a new PrivateKey from bytes
-// this method allocates the new bls::PrivateKey object and keeps its pointer
-func PrivateKeyFromBytes(data []byte, modOrder bool) (*PrivateKey, error) {
-	cBytesPtr := cAllocBytes(data)
-	defer C.SecFree(cBytesPtr)
-	var cDidErr C.bool
-	sk := PrivateKey{
-		val: C.CPrivateKeyFromBytes(cBytesPtr, C.size_t(len(data)), C.bool(modOrder), &cDidErr),
-	}
-	if bool(cDidErr) {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sk, func(p *PrivateKey) { p.free() })
-	return &sk, nil
-}
-
-// G1Element returns a G1Element (public key) using a state of the current private key
-// this method is a binding of the bls::PrivateKey::G1Element
-func (sk *PrivateKey) G1Element() (*G1Element, error) {
-	var cDidErr C.bool
-	el := G1Element{
-		val: C.CPrivateKeyGetG1Element(sk.val, &cDidErr),
-	}
-	if bool(cDidErr) {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&el, func(el *G1Element) { el.free() })
-	runtime.KeepAlive(sk)
-	return &el, nil
-}
-
-// G2Element returns a G2Element (signature) using a state of the current private key
-// this method is a binding of the bls::PrivateKey::G2Element
-func (sk *PrivateKey) G2Element() (*G2Element, error) {
-	var cDidErr C.bool
-	el := G2Element{
-		val: C.CPrivateKeyGetG2Element(sk.val, &cDidErr),
-	}
-	runtime.SetFinalizer(&el, func(el *G2Element) { el.free() })
-	if bool(cDidErr) {
-		return nil, errFromC()
-	}
-	runtime.KeepAlive(sk)
-	return &el, nil
-}
-
-// G2Power returns a power of G2Element (signature)
-// this method is a binding of the bls::PrivateKey::G2Power
-func (sk *PrivateKey) G2Power(el *G2Element) *G2Element {
-	sig := G2Element{
-		val: C.CPrivateKeyGetG2Power(sk.val, el.val),
-	}
-	runtime.SetFinalizer(&sig, func() { sig.free() })
-	runtime.KeepAlive(sk)
-	runtime.KeepAlive(el)
-	return &sig
-}
-
-// Serialize returns the byte representation of the private key
-// this method is a binding of the bls::PrivateKey::Serialize
-func (sk *PrivateKey) Serialize() []byte {
-	ptr := C.CPrivateKeySerialize(sk.val)
-	defer C.SecFree(ptr)
-	bytes := C.GoBytes(ptr, C.int(C.CPrivateKeySizeBytes()))
-	runtime.KeepAlive(sk)
-	return bytes
-}
-
-// PrivateKeyAggregate securely aggregates multiple private keys into one
-// this method is a binding of the bls::PrivateKey::Aggregate
-func PrivateKeyAggregate(sks ...*PrivateKey) *PrivateKey {
-	cPrivKeyArrPtr := cAllocPrivKeys(sks...)
-	defer C.FreePtrArray(cPrivKeyArrPtr)
-	sk := PrivateKey{
-		val: C.CPrivateKeyAggregate(cPrivKeyArrPtr, C.size_t(len(sks))),
-	}
-	runtime.SetFinalizer(&sk, func(p *PrivateKey) { p.free() })
-	runtime.KeepAlive(sks)
-	return &sk
-}
-
-// EqualTo tests if one PrivateKey is equal to another
-// this method is the binding of the equality operation
-func (sk *PrivateKey) EqualTo(other *PrivateKey) bool {
-	isEqual := bool(C.CPrivateKeyIsEqual(sk.val, other.val))
-	runtime.KeepAlive(sk)
-	runtime.KeepAlive(other)
-	return isEqual
-}
-
-// HexString returns a hex string representation of serialized data
-func (sk *PrivateKey) HexString() string {
-	return hex.EncodeToString(sk.Serialize())
-}
-
-// free calls CPrivateKeyFree "C" function to release a memory allocated for bls::PrivateKey
-func (sk *PrivateKey) free() {
-	C.CPrivateKeyFree(sk.val)
-}
diff --git a/src/dashbls/go-bindings/privatekey.h b/src/dashbls/go-bindings/privatekey.h
deleted file mode 100644
index 13f3c5d3dd14..000000000000
--- a/src/dashbls/go-bindings/privatekey.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_PRIVATEKEY_H_
-#define GO_BINDINGS_PRIVATEKEY_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include "elements.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* CPrivateKey;
-
-CPrivateKey CPrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr);
-CPrivateKey CPrivateKeyAggregate(void** sks, const size_t len);
-CG1Element CPrivateKeyGetG1Element(const CPrivateKey sk, bool* didErr);
-CG2Element CPrivateKeyGetG2Element(const CPrivateKey sk, bool* didErr);
-CG2Element CPrivateKeyGetG2Power(const CPrivateKey sk, const CG2Element el);
-bool CPrivateKeyIsEqual(const CPrivateKey sk1, const CPrivateKey sk2);
-void* CPrivateKeySerialize(const CPrivateKey sk);
-void CPrivateKeyFree(const CPrivateKey sk);
-size_t CPrivateKeySizeBytes();
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // GO_BINDINGS_PRIVATEKEY_H_
diff --git a/src/dashbls/go-bindings/schemes.cpp b/src/dashbls/go-bindings/schemes.cpp
deleted file mode 100644
index d9e5d637c8e8..000000000000
--- a/src/dashbls/go-bindings/schemes.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "dashbls/bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-#include "schemes.h"
-#include "blschia.h"
-#include "error.h"
-#include "utils.hpp"
-
-// Implementation of bindings for CoreMPL class
-
-CPrivateKey CCoreMPLKeyGen(const CCoreMPL scheme, const void* seed, const size_t seedLen, bool* didErr) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::PrivateKey* sk = nullptr;
-    try {
-        sk = new bls::PrivateKey(schemePtr->KeyGen(bls::Bytes((uint8_t*)seed, seedLen)));
-    } catch (const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-CG1Element CCoreMPSkToG1(const CCoreMPL scheme, const CPrivateKey sk) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G1Element(
-        schemePtr->SkToG1(*skPtr)
-    );
-}
-
-CG2Element CCoreMPLSign(CCoreMPL scheme, const CPrivateKey sk, const void* msg, const size_t msgLen) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen))
-    );
-}
-
-bool CCoreMPLVerify(const CCoreMPL scheme,
-                    const CG1Element pk,
-                    const void* msg,
-                    const size_t msgLen,
-                    const CG2Element sig) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->Verify(*pkPtr, bls::Bytes((uint8_t*)msg, msgLen), *sigPtr);
-}
-
-CG1Element CCoreMPLAggregatePubKeys(const CCoreMPL scheme, void** pks, const size_t pksLen) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    return new bls::G1Element(schemePtr->Aggregate(toBLSVector<bls::G1Element>(pks, pksLen)));
-}
-
-CG2Element CCoreMPLAggregateSigs(const CCoreMPL scheme, void** sigs, const size_t sigsLen) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    return new bls::G2Element(
-        schemePtr->Aggregate(toBLSVector<bls::G2Element>(sigs, sigsLen))
-    );
-}
-
-CPrivateKey CCoreMPLDeriveChildSk(const CCoreMPL scheme, const CPrivateKey sk, const uint32_t index) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::PrivateKey(schemePtr->DeriveChildSk(*skPtr, index));
-}
-
-CPrivateKey CCoreMPLDeriveChildSkUnhardened(CCoreMPL scheme, CPrivateKey sk, uint32_t index) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::PrivateKey(schemePtr->DeriveChildSkUnhardened(*skPtr, index));
-}
-
-CG1Element CCoreMPLDeriveChildPkUnhardened(CCoreMPL scheme, CG1Element el, uint32_t index) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::G1Element* elPtr = (bls::G1Element*)el;
-    return new bls::G1Element(schemePtr->DeriveChildPkUnhardened(*elPtr, index));
-}
-
-bool CCoreMPLAggregateVerify(const CCoreMPL scheme,
-                             void** pks,
-                             const size_t pksLen,
-                             void** msgs,
-                             const void* msgsLens,
-                             const size_t msgsLen,
-                             const CG2Element sig) {
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys = toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens = std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs = toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-// BasicSchemeMPL
-CBasicSchemeMPL NewCBasicSchemeMPL() {
-    return new bls::BasicSchemeMPL();
-}
-
-bool CBasicSchemeMPLAggregateVerify(CBasicSchemeMPL scheme,
-                                    void** pks,
-                                    const size_t pksLen,
-                                    void** msgs,
-                                    const void* msgsLens,
-                                    const size_t msgsLen,
-                                    const CG2Element sig) {
-    bls::BasicSchemeMPL* schemePtr = (bls::BasicSchemeMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys = toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens = std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs = toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-void CBasicSchemeMPLFree(CBasicSchemeMPL scheme) {
-    bls::BasicSchemeMPL* schemePtr = (bls::BasicSchemeMPL*)scheme;
-    delete schemePtr;
-}
-
-// AugSchemeMPL
-CAugSchemeMPL NewCAugSchemeMPL() {
-    return new bls::AugSchemeMPL();
-}
-
-CG2Element CAugSchemeMPLSign(const CAugSchemeMPL scheme, const CPrivateKey sk, const void* msg, const size_t msgLen) {
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen))
-    );
-}
-
-CG2Element CAugSchemeMPLSignPrepend(const CAugSchemeMPL scheme,
-                                    const CPrivateKey sk,
-                                    const void* msg,
-                                    const size_t msgLen,
-                                    const CG1Element prepPk) {
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    const bls::G1Element* prepPkPtr = (bls::G1Element*)prepPk;
-    return new bls::G2Element(schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen), *prepPkPtr));
-}
-
-bool CAugSchemeMPLVerify(const CAugSchemeMPL scheme,
-                         const CG1Element pk,
-                         const void* msg,
-                         const size_t msgLen,
-                         const CG2Element sig) {
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const uint8_t* msgPtr = (uint8_t*)msg;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->Verify(*pkPtr, bls::Bytes(msgPtr, msgLen), *sigPtr);
-}
-
-bool CAugSchemeMPLAggregateVerify(const CAugSchemeMPL scheme,
-                                  void** pks,
-                                  const size_t pksLen,
-                                  void** msgs,
-                                  const void* msgsLens,
-                                  const size_t msgsLen,
-                                  const CG2Element sig) {
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys = toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens = std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs = toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-void CAugSchemeMPLFree(CAugSchemeMPL scheme) {
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    delete schemePtr;
-}
-
-// PopSchemeMPL
-CPopSchemeMPL NewCPopSchemeMPL() {
-    return new bls::PopSchemeMPL();
-}
-
-CG2Element CPopSchemeMPLPopProve(const CPopSchemeMPL scheme, const CPrivateKey sk) {
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(schemePtr->PopProve(*skPtr));
-}
-
-bool CPopSchemeMPLPopVerify(const CPopSchemeMPL scheme, const CG1Element pk, const CG2Element sig) {
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->PopVerify(*pkPtr, *sigPtr);
-}
-
-bool CPopSchemeMPLFastAggregateVerify(const CPopSchemeMPL scheme,
-                                      void** pks,
-                                      const size_t pksLen,
-                                      const void* msg,
-                                      const size_t msgLen,
-                                      const CG2Element sig) {
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys = toBLSVector<bls::G1Element>(pks, pksLen);
-    return schemePtr->FastAggregateVerify(vecPubKeys, bls::Bytes((uint8_t*)msg, msgLen), *sigPtr);
-}
-
-void CPopSchemeMPLFree(CPopSchemeMPL scheme) {
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    delete schemePtr;
-}
diff --git a/src/dashbls/go-bindings/schemes.go b/src/dashbls/go-bindings/schemes.go
deleted file mode 100644
index 2289b212bd7d..000000000000
--- a/src/dashbls/go-bindings/schemes.go
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include <stdbool.h>
-// #include <stdlib.h>
-// #include "schemes.h"
-// #include "privatekey.h"
-// #include "elements.h"
-// #include "blschia.h"
-import "C"
-import (
-	"runtime"
-	"unsafe"
-)
-
-// Signer is a signer interface
-type Signer interface {
-	Sign(sk *PrivateKey, msg []byte) *G2Element
-}
-
-// Generator is the interface that wraps the method needed to generate a private key
-type Generator interface {
-	KeyGen(seed []byte) (*PrivateKey, error)
-}
-
-// Verifier is the interface that wraps the methods needed to verifications
-// the interface contains the method for direct verification
-// and aggregation with verification
-type Verifier interface {
-	Verify(pk *G1Element, msg []byte, sig *G2Element) bool
-	AggregateVerify(pks []*G1Element, msgs [][]byte, sig *G2Element) bool
-}
-
-// Aggregator is the interface that's described methods for aggregation public (G1) and private (g2) keys
-type Aggregator interface {
-	AggregatePubKeys(pks ...*G1Element) *G1Element
-	AggregateSigs(sigs ...*G2Element) *G2Element
-}
-
-// Deriver is an interface for describing some methods for the derivation of children
-type Deriver interface {
-	DeriveChildSk(sk *PrivateKey, index int) *PrivateKey
-	DeriveChildSkUnhardened(sk *PrivateKey, index int) *PrivateKey
-	DeriveChildPkUnhardened(el *G1Element, index int) *G1Element
-}
-
-// Scheme is a schema interface
-type Scheme interface {
-	Signer
-	Generator
-	Verifier
-	Aggregator
-	Deriver
-}
-
-type coreMPL struct {
-	val C.CCoreMPL
-}
-
-// KeyGen returns a new generated PrivateKey using passed a genSeed data
-// this method is a binding of bls::CoreMPL::KeyGen
-func (s *coreMPL) KeyGen(seed []byte) (*PrivateKey, error) {
-	cSeedPtr := C.CBytes(seed)
-	defer C.free(cSeedPtr)
-	var cDidErr C.bool
-	sk := PrivateKey{
-		val: C.CCoreMPLKeyGen(s.val, cSeedPtr, C.size_t(len(seed)), &cDidErr),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sk, func(sk *PrivateKey) { sk.free() })
-	runtime.KeepAlive(s)
-	return &sk, nil
-}
-
-// SkToG1 converts PrivateKey into G1Element (public key)
-// this method is a binding of bls::CoreMPL::SkToG1
-func (s *coreMPL) SkToG1(sk *PrivateKey) *G1Element {
-	el := &G1Element{
-		val: C.CCoreMPSkToG1(s.val, sk.val),
-	}
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return el
-}
-
-// Sign signs a message using a PrivateKey and returns the G2Element as a signature
-// this method is a binding of bls::CoreMPL::Sign
-func (s *coreMPL) Sign(sk *PrivateKey, msg []byte) *G2Element {
-	cMsgPtr := C.CBytes(msg)
-	defer C.free(cMsgPtr)
-	sig := G2Element{
-		val: C.CCoreMPLSign(s.val, sk.val, cMsgPtr, C.size_t(len(msg))),
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return &sig
-}
-
-// Verify verifies a signature for a message with a G1Element as a public key
-// this method is a binding of bls::CoreMPL::Verify
-func (s *coreMPL) Verify(pk *G1Element, msg []byte, sig *G2Element) bool {
-	cMsgPtr := C.CBytes(msg)
-	defer C.free(cMsgPtr)
-	isVerified := bool(C.CCoreMPLVerify(s.val, pk.val, cMsgPtr, C.size_t(len(msg)), sig.val))
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pk)
-	runtime.KeepAlive(sig)
-	return isVerified
-}
-
-// AggregatePubKeys returns a new G1Element (public key) as an aggregated public keys
-// this method is a binding of bls::CoreMPL::AggregatePubKeys
-func (s *coreMPL) AggregatePubKeys(pks ...*G1Element) *G1Element {
-	cPkArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cPkArrPtr)
-	aggSig := G1Element{
-		val: C.CCoreMPLAggregatePubKeys(s.val, cPkArrPtr, C.size_t(len(pks))),
-	}
-	runtime.SetFinalizer(&aggSig, func(aggSig *G1Element) { aggSig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pks)
-	return &aggSig
-}
-
-// AggregateSigs returns a new G1Element (aggregated public keys)
-// as a result of the aggregation of the passed public keys
-// this method is a binding of bls::CoreMPL::AggregateSigs
-func (s *coreMPL) AggregateSigs(sigs ...*G2Element) *G2Element {
-	cSigArrPtr := cAllocSigs(sigs...)
-	defer C.FreePtrArray(cSigArrPtr)
-	aggSig := G2Element{
-		val: C.CCoreMPLAggregateSigs(s.val, cSigArrPtr, C.size_t(len(sigs))),
-	}
-	runtime.SetFinalizer(&aggSig, func(aggSig *G2Element) { aggSig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sigs)
-	return &aggSig
-}
-
-// DeriveChildSk returns a child PrivateKey using the passed as a master key
-// this method is a binding of bls::CoreMPL::DeriveChildSk
-func (s *coreMPL) DeriveChildSk(sk *PrivateKey, index int) *PrivateKey {
-	res := PrivateKey{
-		val: C.CCoreMPLDeriveChildSk(s.val, sk.val, C.uint32_t(index)),
-	}
-	runtime.SetFinalizer(&res, func(res *PrivateKey) { res.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return &res
-}
-
-// DeriveChildSkUnhardened returns a child PrivateKey of the passed master PrivateKey
-// this method is a binding of bls::CoreMPL::DeriveChildSkUnhardened
-func (s *coreMPL) DeriveChildSkUnhardened(sk *PrivateKey, index int) *PrivateKey {
-	res := PrivateKey{
-		val: C.CCoreMPLDeriveChildSkUnhardened(s.val, sk.val, C.uint32_t(index)),
-	}
-	runtime.SetFinalizer(&res, func(res *PrivateKey) { res.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return &res
-}
-
-// DeriveChildPkUnhardened returns a child G1Element of the passed master G1Element
-// this method is a binding of bls::CoreMPL::DeriveChildPkUnhardened
-func (s *coreMPL) DeriveChildPkUnhardened(el *G1Element, index int) *G1Element {
-	res := G1Element{
-		val: C.CCoreMPLDeriveChildPkUnhardened(s.val, el.val, C.uint32_t(index)),
-	}
-	runtime.SetFinalizer(&res, func(res *G1Element) { res.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(el)
-	return &res
-}
-
-// AggregateVerify verifies the aggregated signature for a list of messages with public keys
-// returns true if the signature is a valid otherwise returns false
-// this method is a binding of bls::CoreMPL::AggregateVerify
-func (s *coreMPL) AggregateVerify(pks []*G1Element, msgs [][]byte, sig *G2Element) bool {
-	cPkArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cPkArrPtr)
-	cMsgArrPtr, msgLens := cAllocMsgs(msgs)
-	defer C.FreePtrArray(cMsgArrPtr)
-	val := C.CCoreMPLAggregateVerify(
-		s.val,
-		cPkArrPtr,
-		C.size_t(len(pks)),
-		cMsgArrPtr,
-		unsafe.Pointer(&msgLens[0]),
-		C.size_t(len(msgs)),
-		sig.val,
-	)
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pks)
-	runtime.KeepAlive(sig)
-	return bool(val)
-}
-
-// BasicSchemeMPL represents bls::BasicSchemeMPL (basic scheme using minimum public key sizes)
-type BasicSchemeMPL struct {
-	coreMPL
-}
-
-// NewBasicSchemeMPL returns a new BasicSchemeMPL
-// this method allocates the bls::BasicSchemeMPL object and keeps its pointer
-func NewBasicSchemeMPL() *BasicSchemeMPL {
-	scheme := BasicSchemeMPL{
-		coreMPL{
-			val: C.NewCBasicSchemeMPL(),
-		},
-	}
-	runtime.SetFinalizer(&scheme, func(scheme *BasicSchemeMPL) { scheme.free() })
-	return &scheme
-}
-
-// AggregateVerify verifies the aggregated signature for a list of messages with public keys
-// this method is a binding of bls::BasicSchemeMPL::AggregateVerify
-func (s *BasicSchemeMPL) AggregateVerify(pks []*G1Element, msgs [][]byte, sig *G2Element) bool {
-	cPkArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cPkArrPtr)
-	cMsgArrPtr, msgLens := cAllocMsgs(msgs)
-	defer C.FreePtrArray(cMsgArrPtr)
-	val := C.CBasicSchemeMPLAggregateVerify(
-		s.val,
-		cPkArrPtr,
-		C.size_t(len(pks)),
-		cMsgArrPtr,
-		unsafe.Pointer(&msgLens[0]),
-		C.size_t(len(msgs)),
-		sig.val,
-	)
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pks)
-	runtime.KeepAlive(sig)
-	return bool(val)
-}
-
-// free calls CPopSchemeMPLFree "C" function to release a memory allocated for bls::BasicSchemeMPL
-func (s *BasicSchemeMPL) free() {
-	C.CBasicSchemeMPLFree(s.val)
-}
-
-// AugSchemeMPL represents bls::AugSchemeMPL
-// augmented should be enough for most use cases
-type AugSchemeMPL struct {
-	coreMPL
-}
-
-// NewAugSchemeMPL returns a new AugSchemeMPL
-// this method allocates the bls::AugSchemeMPL object and keeps its pointer
-func NewAugSchemeMPL() *AugSchemeMPL {
-	scheme := AugSchemeMPL{
-		coreMPL: coreMPL{
-			val: C.NewCAugSchemeMPL(),
-		},
-	}
-	runtime.SetFinalizer(&scheme, func(scheme *AugSchemeMPL) { scheme.free() })
-	return &scheme
-}
-
-// Sign signs a message with a PrivateKey
-// this method is a binding of bls::AugSchemeMPL::Sign
-func (s *AugSchemeMPL) Sign(sk *PrivateKey, msg []byte) *G2Element {
-	cMsgPtr := C.CBytes(msg)
-	defer C.free(cMsgPtr)
-	sig := G2Element{
-		val: C.CAugSchemeMPLSign(s.val, sk.val, cMsgPtr, C.size_t(len(msg))),
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return &sig
-}
-
-// SignPrepend is used for prepending different message
-// this method is a binding of bls::AugSchemeMPL::Sign
-func (s *AugSchemeMPL) SignPrepend(sk *PrivateKey, msg []byte, prepPk *G1Element) *G2Element {
-	sig := G2Element{
-		val: C.CAugSchemeMPLSignPrepend(s.val, sk.val, C.CBytes(msg), C.size_t(len(msg)), prepPk.val),
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	runtime.KeepAlive(prepPk)
-	return &sig
-}
-
-// Verify verifies a G2Element (signature) for a message with a G1Element (public key)
-// this method is a binding of bls::AugSchemeMPL::Verify
-func (s *AugSchemeMPL) Verify(pk *G1Element, msg []byte, sig *G2Element) bool {
-	cMsgPtr := C.CBytes(msg)
-	defer C.free(cMsgPtr)
-	val := C.CAugSchemeMPLVerify(s.val, pk.val, cMsgPtr, C.size_t(len(msg)), sig.val)
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pk)
-	runtime.KeepAlive(sig)
-	return bool(val)
-}
-
-// AggregateVerify verifies the aggregated signature for a list of messages with public keys
-// this method is a binding of bls::AugSchemeMPL::AggregateVerify
-func (s *AugSchemeMPL) AggregateVerify(pks []*G1Element, msgs [][]byte, sig *G2Element) bool {
-	cPkArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cPkArrPtr)
-	cMsgArrPtr, msgLens := cAllocMsgs(msgs)
-	defer C.FreePtrArray(cMsgArrPtr)
-	val := C.CAugSchemeMPLAggregateVerify(
-		s.val,
-		cPkArrPtr,
-		C.size_t(len(pks)),
-		cMsgArrPtr,
-		unsafe.Pointer(&msgLens[0]),
-		C.size_t(len(msgs)),
-		sig.val,
-	)
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pks)
-	runtime.KeepAlive(sig)
-	return bool(val)
-}
-
-// free calls CAugSchemeMPLFree "C" function to release a memory allocated for bls::AugSchemeMPL
-func (s *AugSchemeMPL) free() {
-	C.CAugSchemeMPLFree(s.val)
-}
-
-// PopSchemeMPL represents bls::PopSchemeMPL (proof of possession scheme)
-// proof of possession can be used where verification must be fast
-type PopSchemeMPL struct {
-	coreMPL
-}
-
-// NewPopSchemeMPL returns a new bls::PopSchemeMPL
-// this method allocates the new bls::PopSchemeMPL object and keeps its pointer
-func NewPopSchemeMPL() *PopSchemeMPL {
-	scheme := PopSchemeMPL{
-		coreMPL: coreMPL{
-			val: C.NewCPopSchemeMPL(),
-		},
-	}
-	runtime.SetFinalizer(&scheme, func(scheme *PopSchemeMPL) { scheme.free() })
-	return &scheme
-}
-
-// PopProve proves using the PrivateKey
-// this method is a binding of bls::PopSchemeMPL::PopProve
-func (s *PopSchemeMPL) PopProve(sk *PrivateKey) *G2Element {
-	sig := G2Element{
-		val: C.CPopSchemeMPLPopProve(s.val, sk.val),
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(sk)
-	return &sig
-}
-
-// PopVerify verifies of a signature using proof of possession
-// this method is a binding of bls::PopSchemeMPL::PopVerify
-func (s *PopSchemeMPL) PopVerify(pk *G1Element, sig *G2Element) bool {
-	isVerified := bool(C.CPopSchemeMPLPopVerify(s.val, pk.val, sig.val))
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pk)
-	runtime.KeepAlive(sig)
-	return isVerified
-}
-
-// FastAggregateVerify uses for a fast verification
-// this method is a binding of bls::PopSchemeMPL::FastAggregateVerify
-func (s *PopSchemeMPL) FastAggregateVerify(pks []*G1Element, msg []byte, sig *G2Element) bool {
-	msgPtr := C.CBytes(msg)
-	cPkArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cPkArrPtr)
-	isVerified := C.CPopSchemeMPLFastAggregateVerify(
-		s.val,
-		cPkArrPtr,
-		C.size_t(len(pks)),
-		msgPtr,
-		C.size_t(len(msg)),
-		sig.val,
-	)
-	runtime.KeepAlive(s)
-	runtime.KeepAlive(pks)
-	runtime.KeepAlive(sig)
-	return bool(isVerified)
-}
-
-// free calls CPopSchemeMPLFree "C" function to release a memory allocated for bls::PopSchemeMPL
-func (s *PopSchemeMPL) free() {
-	C.CPopSchemeMPLFree(s.val)
-}
-
-func cAllocPubKeys(pks ...*G1Element) *unsafe.Pointer {
-	arr := C.AllocPtrArray(C.size_t(len(pks)))
-	for i, pk := range pks {
-		C.SetPtrArray(arr, unsafe.Pointer(pk.val), C.int(i))
-	}
-	return arr
-}
diff --git a/src/dashbls/go-bindings/schemes.h b/src/dashbls/go-bindings/schemes.h
deleted file mode 100644
index 1e5a1a737923..000000000000
--- a/src/dashbls/go-bindings/schemes.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_SCHEMES_H_
-#define GO_BINDINGS_SCHEMES_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include "privatekey.h"
-#include "elements.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* CCoreMPL;
-typedef CCoreMPL CBasicSchemeMPL;
-typedef CCoreMPL CAugSchemeMPL;
-typedef CCoreMPL CPopSchemeMPL;
-
-// CoreMPL
-CPrivateKey CCoreMPLKeyGen(const CCoreMPL scheme, const void* seed, const size_t seedLen, bool* didErr);
-CG1Element CCoreMPSkToG1(const CCoreMPL scheme, const CPrivateKey sk);
-CG2Element CCoreMPLSign(const CCoreMPL scheme, const CPrivateKey sk, const void* msg, const size_t msgLen);
-bool CCoreMPLVerify(const CBasicSchemeMPL scheme,
-                    const CG1Element pk,
-                    const void* msg,
-                    const size_t msgLen,
-                    const CG2Element sig);
-CG1Element CCoreMPLAggregatePubKeys(const CCoreMPL scheme, void** pubKeys, const size_t pkLen);
-CG2Element CCoreMPLAggregateSigs(const CCoreMPL scheme, void** sigs, const size_t sigLen);
-CPrivateKey CCoreMPLDeriveChildSk(const CCoreMPL scheme, const CPrivateKey sk, const uint32_t index);
-CPrivateKey CCoreMPLDeriveChildSkUnhardened(const CCoreMPL scheme, const CPrivateKey sk, const uint32_t index);
-CG1Element CCoreMPLDeriveChildPkUnhardened(const CCoreMPL scheme, const CG1Element sk, const uint32_t index);
-bool CCoreMPLAggregateVerify(const CCoreMPL scheme,
-                             void** pks,
-                             const size_t pkLen,
-                             void** msgs,
-                             const void* msgLens,
-                             const size_t msgLen,
-                             const CG2Element sig);
-
-// BasicSchemeMPL
-CBasicSchemeMPL NewCBasicSchemeMPL();
-bool CBasicSchemeMPLAggregateVerify(CBasicSchemeMPL scheme,
-                                    void** pks,
-                                    const size_t pksLen,
-                                    void** msgs,
-                                    const void* msgsLens,
-                                    const size_t msgsLen,
-                                    const CG2Element sig);
-void CBasicSchemeMPLFree(CBasicSchemeMPL scheme);
-
-// AugSchemeMPL
-CAugSchemeMPL NewCAugSchemeMPL();
-CG2Element CAugSchemeMPLSign(const CAugSchemeMPL scheme, const CPrivateKey sk, const void* msg, const size_t msgLen);
-CG2Element CAugSchemeMPLSignPrepend(const CAugSchemeMPL scheme,
-                                    const CPrivateKey sk,
-                                    const void* msg,
-                                    const size_t msgLen,
-                                    const CG1Element prepPk);
-bool CAugSchemeMPLVerify(const CAugSchemeMPL scheme,
-                         const CG1Element pk,
-                         const void* msg,
-                         const size_t msgLen,
-                         const CG2Element sig);
-bool CAugSchemeMPLAggregateVerify(const CAugSchemeMPL scheme,
-                                  void** pks,
-                                  const size_t pksLen,
-                                  void** msgs,
-                                  const void* msgsLens,
-                                  const size_t msgsLen,
-                                  const CG2Element sig);
-void CAugSchemeMPLFree(CAugSchemeMPL scheme);
-
-// PopSchemeMPL
-CPopSchemeMPL NewCPopSchemeMPL();
-CG2Element CPopSchemeMPLPopProve(const CPopSchemeMPL scheme, const CPrivateKey sk);
-bool CPopSchemeMPLPopVerify(const CPopSchemeMPL scheme, const CG1Element pk, const CG2Element sig);
-bool CPopSchemeMPLFastAggregateVerify(const CPopSchemeMPL scheme,
-                                      void** pks,
-                                      const size_t pksLen,
-                                      const void* msgs,
-                                      const size_t msgsLen,
-                                      const CG2Element sig);
-void CPopSchemeMPLFree(CPopSchemeMPL scheme);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // GO_BINDINGS_SCHEMES_H_
diff --git a/src/dashbls/go-bindings/schemes_test.go b/src/dashbls/go-bindings/schemes_test.go
deleted file mode 100644
index 90a484aa1042..000000000000
--- a/src/dashbls/go-bindings/schemes_test.go
+++ /dev/null
@@ -1,661 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-import (
-	"encoding/hex"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSchemesSignAndVerify(t *testing.T) {
-	msg := []byte{100, 2, 254, 88, 90, 45, 23}
-	testCases := []struct {
-		name   string
-		scheme Scheme
-	}{
-		{
-			name:   "test a verification of basic scheme",
-			scheme: NewBasicSchemeMPL(),
-		},
-		{
-			name:   "test a verification of augmented scheme",
-			scheme: NewAugSchemeMPL(),
-		},
-		{
-			name:   "test a verification of proof of possession scheme",
-			scheme: NewPopSchemeMPL(),
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			sk, err := tc.scheme.KeyGen(genSeed(1))
-			assert.NoError(t, err)
-			pk, err := sk.G1Element()
-			assert.NoError(t, err)
-			sig := tc.scheme.Sign(sk, msg)
-			assert.True(t, tc.scheme.Verify(pk, msg, sig))
-		})
-	}
-}
-
-func TestSchemeAggregate(t *testing.T) {
-	seed := []byte{
-		0, 50, 6, 244, 24, 199, 1, 25,
-		52, 88, 192, 19, 18, 12, 89, 6,
-		220, 18, 102, 58, 209, 82, 12, 62,
-		89, 110, 182, 9, 44, 20, 254, 22,
-	}
-	msg1 := []byte{100, 2, 254, 88, 90, 45, 23}
-	msg2 := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
-	testCases := []struct {
-		name   string
-		scheme Scheme
-	}{
-		{
-			name:   "testing of the basic scheme aggregation",
-			scheme: NewBasicSchemeMPL(),
-		},
-		{
-			name:   "testing of the augmented scheme aggregation",
-			scheme: NewAugSchemeMPL(),
-		},
-		{
-			name:   "testing of the proof of possession scheme aggregation",
-			scheme: NewPopSchemeMPL(),
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			seed1 := replLeft(seed, []byte{1})
-			seed2 := replLeft(seed, []byte{2})
-
-			sk1, _ := tc.scheme.KeyGen(seed1)
-			pk1, _ := sk1.G1Element()
-
-			sk2, _ := tc.scheme.KeyGen(seed2)
-			pk2, _ := sk2.G1Element()
-
-			aggPk := pk1.Add(pk2)
-
-			var sig1, sig2 *G2Element
-			switch scheme := tc.scheme.(type) {
-			case *AugSchemeMPL:
-				sig1 = scheme.SignPrepend(sk1, msg1, aggPk)
-				sig2 = scheme.SignPrepend(sk2, msg1, aggPk)
-			default:
-				sig1 = scheme.Sign(sk1, msg1)
-				sig2 = scheme.Sign(sk2, msg1)
-			}
-
-			aggSig := tc.scheme.AggregateSigs(sig1, sig2)
-			assert.True(t, tc.scheme.Verify(aggPk, msg1, aggSig))
-
-			// Aggregate different msg
-			sig1 = tc.scheme.Sign(sk1, msg1)
-			sig2 = tc.scheme.Sign(sk2, msg2)
-			aggSig = tc.scheme.AggregateSigs(sig1, sig2)
-			assert.True(t, tc.scheme.AggregateVerify([]*G1Element{pk1, pk2}, [][]byte{msg1, msg2}, aggSig))
-
-			// HD keys
-			child := tc.scheme.DeriveChildSk(sk1, 123)
-			childU := tc.scheme.DeriveChildSkUnhardened(sk1, 123)
-			childUPk := tc.scheme.DeriveChildPkUnhardened(pk1, 123)
-
-			sigChild := tc.scheme.Sign(child, msg1)
-			sigChildPk, _ := child.G1Element()
-			assert.True(t, tc.scheme.Verify(sigChildPk, msg1, sigChild))
-
-			sigUChild := tc.scheme.Sign(childU, msg1)
-			assert.True(t, tc.scheme.Verify(childUPk, msg1, sigUChild))
-		})
-	}
-}
-
-func TestVectorInvalid(t *testing.T) {
-	type testCase struct {
-		name string
-		data []string
-	}
-	// Invalid inputs from https://github.com/algorand/bls_sigs_ref/blob/master/python-impl/serdesZ.py
-	g1TestCases := []testCase{
-		{
-			name: "infinity points: too short",
-			data: []string{
-				// temporary disabled
-				//"c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "infinity points: not all zeros",
-			data: []string{
-				"c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000",
-				"400000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "bad tags",
-			data: []string{
-				"3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-				"7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-				"fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-			},
-		},
-		{
-			name: "wrong length for compressed point",
-			data: []string{
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa",
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaaaa",
-			},
-		},
-		{
-			name: "wrong length for uncompressed point",
-			data: []string{
-				"1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "invalid x-coord",
-			data: []string{
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-			},
-		},
-		{
-			name: "invalid elm of Fp --- equal to p (must be strictly less)",
-			data: []string{
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-			},
-		},
-		{
-			name: "point not on curve",
-			data: []string{
-				"1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-			},
-		},
-	}
-	g2TestCases := []testCase{
-		{
-			name: "infinity points: too short",
-			data: []string{
-				"c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "infinity points: not all zeros",
-			data: []string{
-				"c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "bad tags 1",
-			data: []string{
-				"3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			},
-		},
-		{
-			name: "invalid x-coord",
-			data: []string{
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaa7",
-			},
-		},
-		{
-			name: "invalid elm of Fp --- equal to p (must be strictly less)",
-			data: []string{
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-				"9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-			},
-		},
-		{
-			name: "point not on curve",
-			data: []string{
-				"1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-			},
-		},
-	}
-	testCases := []struct {
-		name  string
-		cases []testCase
-		fn    func(data []byte) error
-	}{
-		{
-			name:  "G1Element: ",
-			cases: g1TestCases,
-			fn: func(data []byte) error {
-				_, err := G1ElementFromBytes(data)
-				return err
-			},
-		},
-		{
-			name:  "G2Element: ",
-			cases: g2TestCases,
-			fn: func(data []byte) error {
-				_, err := G2ElementFromBytes(data)
-				return err
-			},
-		},
-	}
-	for _, tc := range testCases {
-		for _, c := range tc.cases {
-			t.Run(tc.name+c.name, func(t *testing.T) {
-				for _, in := range c.data {
-					data, _ := hex.DecodeString(in)
-					err := tc.fn(data)
-					assert.Error(t, err)
-				}
-			})
-		}
-	}
-}
-
-func TestVectorValid(t *testing.T) {
-	secret1 := make([]byte, 32)
-	secret2 := make([]byte, 32)
-	for i := 0; i < 32; i++ {
-		secret1[i] = 1
-		secret2[i] = byte(i * 314159 % 256)
-	}
-	sk1, err := PrivateKeyFromBytes(secret1, false)
-	assert.NoError(t, err)
-	sk2, err := PrivateKeyFromBytes(secret2, false)
-	assert.NoError(t, err)
-	msg := []byte{3, 1, 4, 1, 5, 9}
-	testCases := []struct {
-		name    string
-		scheme  Scheme
-		refSig1 string
-		refSig2 string
-		refSigA string
-	}{
-		{
-			name:   "testing of signature serialization of the basic scheme",
-			scheme: NewBasicSchemeMPL(),
-			refSig1: "96ba34fac33c7f129d602a0bc8a3d43f9abc014eceaab7359146b4b150e57b80" +
-				"8645738f35671e9e10e0d862a30cab70074eb5831d13e6a5b162d01eebe687d0" +
-				"164adbd0a864370a7c222a2768d7704da254f1bf1823665bc2361f9dd8c00e99",
-			refSig2: "a402790932130f766af11ba716536683d8c4cfa51947e4f9081fedd692d6dc0c" +
-				"ac5b904bee5ea6e25569e36d7be4ca59069a96e34b7f700758b716f9494aaa59" +
-				"a96e74d14a3b552a9a6bc129e717195b9d6006fd6d5cef4768c022e0f7316abf",
-			refSigA: "987cfd3bcd62280287027483f29c55245ed831f51dd6bd999a6ff1a1f1f1f0b6" +
-				"47778b0167359c71505558a76e158e66181ee5125905a642246b01e7fa5ee53d" +
-				"68a4fe9bfb29a8e26601f0b9ad577ddd18876a73317c216ea61f430414ec51c5",
-		},
-		{
-			name:   "testing of signature serialization of the augmented scheme",
-			scheme: NewAugSchemeMPL(),
-			refSig1: "8180f02ccb72e922b152fcedbe0e1d195210354f70703658e8e08cbebf11d497" +
-				"0eab6ac3ccf715f3fb876df9a9797abd0c1af61aaeadc92c2cfe5c0a56c146cc" +
-				"8c3f7151a073cf5f16df38246724c4aed73ff30ef5daa6aacaed1a26ecaa336b",
-			refSig2: "99111eeafb412da61e4c37d3e806c6fd6ac9f3870e54da9222ba4e494822c5b7" +
-				"656731fa7a645934d04b559e9261b86201bbee57055250a459a2da10e51f9c1a" +
-				"6941297ffc5d970a557236d0bdeb7cf8ff18800b08633871a0f0a7ea42f47480",
-			refSigA: "8c5d03f9dae77e19a5945a06a214836edb8e03b851525d84b9de6440e68fc0ca" +
-				"7303eeed390d863c9b55a8cf6d59140a01b58847881eb5af67734d44b2555646" +
-				"c6616c39ab88d253299acc1eb1b19ddb9bfcbe76e28addf671d116c052bb1847",
-		},
-		{
-			name:   "testing of signature serialization of the proof of possession scheme",
-			scheme: NewPopSchemeMPL(),
-			refSig1: "9550fb4e7f7e8cc4a90be8560ab5a798b0b23000b6a54a2117520210f986f3f2" +
-				"81b376f259c0b78062d1eb3192b3d9bb049f59ecc1b03a7049eb665e0df36494" +
-				"ae4cb5f1136ccaeefc9958cb30c3333d3d43f07148c386299a7b1bfc0dc5cf7c",
-			refSig2: "a69036bc11ae5efcbf6180afe39addde7e27731ec40257bfdc3c37f17b8df683" +
-				"06a34ebd10e9e32a35253750df5c87c2142f8207e8d5654712b4e554f585fb68" +
-				"46ff3804e429a9f8a1b4c56b75d0869ed67580d789870babe2c7c8a9d51e7b2a",
-			refSigA: "a4ea742bcdc1553e9ca4e560be7e5e6c6efa6a64dddf9ca3bb2854233d85a6aa" +
-				"c1b76ec7d103db4e33148b82af9923db05934a6ece9a7101cd8a9d47ce279780" +
-				"56b0f5900021818c45698afdd6cf8a6b6f7fee1f0b43716f55e413d4b87a6039",
-		},
-	}
-	for i, tc := range testCases {
-		t.Run(fmt.Sprintf("test case #%d", i), func(t *testing.T) {
-			sig1 := tc.scheme.Sign(sk1, msg)
-			sig2 := tc.scheme.Sign(sk2, msg)
-			sigA := tc.scheme.AggregateSigs(sig1, sig2)
-			assert.Equal(t, sig1.HexString(), tc.refSig1)
-			assert.Equal(t, sig2.HexString(), tc.refSig2)
-			assert.Equal(t, sigA.HexString(), tc.refSigA)
-		})
-	}
-}
-
-func TestBasicSchemeMPL(t *testing.T) {
-	testCases := []struct {
-		scheme         Scheme
-		msgs           [][]byte
-		refSig1        string
-		refSk1         string
-		refPk1         string
-		refSig2        string
-		refAggSig1     string
-		refAggSig2     string
-		pk1FingerPrint int
-		pk2FingerPrint int
-	}{
-		{
-			msgs: [][]byte{
-				{7, 8, 9},
-				{10, 11, 12},
-				{1, 2, 3},
-				{1, 2, 3, 4},
-				{1, 2},
-			},
-			scheme: NewBasicSchemeMPL(),
-			refSig1: "b8faa6d6a3881c9fdbad803b170d70ca5cbf1e6ba5a586262df368c75acd1d1f" +
-				"fa3ab6ee21c71f844494659878f5eb230c958dd576b08b8564aad2ee0992e85a" +
-				"1e565f299cd53a285de729937f70dc176a1f01432129bb2b94d3d5031f8065a1",
-			refSk1:     "4a353be3dac091a0a7e640620372f5e1e2e4401717c1e79cac6ffba8f6905604",
-			refPk1:     "85695fcbc06cc4c4c9451f4dce21cbf8de3e5a13bf48f44cdbb18e2038ba7b8bb1632d7911ef1e2e08749bddbf165352",
-			refSig2:    "a9c4d3e689b82c7ec7e838dac2380cb014f9a08f6cd6ba044c263746e39a8f7a60ffee4afb78f146c2e421360784d58f0029491e3bd8ab84f0011d258471ba4e87059de295d9aba845c044ee83f6cf2411efd379ef38bf4cf41d5f3c0ae1205d",
-			refAggSig1: "aee003c8cdaf3531b6b0ca354031b0819f7586b5846796615aee8108fec75ef838d181f9d244a94d195d7b0231d4afcf06f27f0cc4d3c72162545c240de7d5034a7ef3a2a03c0159de982fbc2e7790aeb455e27beae91d64e077c70b5506dea3",
-			refAggSig2: "a0b1378d518bea4d1100adbc7bdbc4ff64f2c219ed6395cd36fe5d2aa44a4b8e710b607afd965e505a5ac3283291b75413d09478ab4b5cfbafbeea366de2d0c0bcf61deddaa521f6020460fd547ab37659ae207968b545727beba0a3c5572b9c",
-
-			pk1FingerPrint: 0xb40dd58a,
-			pk2FingerPrint: 0xb839add1,
-		},
-	}
-	for i, tc := range testCases {
-		t.Run(fmt.Sprintf("test case #%d", i), func(t *testing.T) {
-			scheme := tc.scheme
-			sk1, err := scheme.KeyGen(genSeed(0))
-			assert.NoError(t, err)
-			pk1, err := sk1.G1Element()
-			assert.NoError(t, err)
-			sig1 := scheme.Sign(sk1, tc.msgs[0])
-			assert.NoError(t, err)
-
-			sk2, err := scheme.KeyGen(genSeed(1))
-			assert.NoError(t, err)
-			pk2, err := sk2.G1Element()
-			assert.NoError(t, err)
-			sig2 := scheme.Sign(sk2, tc.msgs[1])
-			assert.NoError(t, err)
-
-			assert.Equal(t, pk1.Fingerprint(), 0xb40dd58a)
-			assert.Equal(t, pk2.Fingerprint(), 0xb839add1)
-
-			assert.Equal(t, sig1.HexString(), tc.refSig1)
-			assert.Equal(t, sig2.HexString(), tc.refSig2)
-			assert.Equal(t, sk1.HexString(), tc.refSk1)
-			assert.Equal(t, pk1.HexString(), tc.refPk1)
-
-			aggSig1 := scheme.AggregateSigs(sig1, sig2)
-			assert.NoError(t, err)
-			assert.Equal(t, aggSig1.HexString(), tc.refAggSig1)
-
-			pks := []*G1Element{pk1, pk2}
-			assert.True(t, scheme.AggregateVerify(pks, [][]byte{tc.msgs[0], tc.msgs[1]}, aggSig1))
-			assert.False(t, scheme.AggregateVerify(pks, [][]byte{tc.msgs[0], tc.msgs[1]}, sig1))
-			assert.False(t, scheme.Verify(pk1, tc.msgs[0], sig2))
-			assert.False(t, scheme.Verify(pk1, tc.msgs[1], sig1))
-
-			sig3 := scheme.Sign(sk1, tc.msgs[2])
-			assert.NoError(t, err)
-			sig4 := scheme.Sign(sk1, tc.msgs[3])
-			assert.NoError(t, err)
-			sig5 := scheme.Sign(sk2, tc.msgs[4])
-			assert.NoError(t, err)
-
-			aggSig2 := scheme.AggregateSigs(sig3, sig4, sig5)
-			assert.NoError(t, err)
-
-			assert.Equal(t, tc.refAggSig2, aggSig2.HexString())
-
-			assert.True(t, scheme.AggregateVerify([]*G1Element{pk1, pk1, pk2}, tc.msgs[2:], aggSig2))
-			assert.False(t, scheme.AggregateVerify([]*G1Element{pk1, pk1, pk2}, tc.msgs[2:], aggSig1))
-		})
-	}
-}
-
-func TestNewBasicSchemeMPL_KeyGen(t *testing.T) {
-	scheme := NewBasicSchemeMPL()
-	seed1 := genByteSlice(8, 31)
-	seed2 := genByteSlice(8, 32)
-	_, err := scheme.KeyGen(seed1)
-	assert.True(t, checkError(err, "Seed size must be at least 32 bytes"))
-	sk, err := scheme.KeyGen(seed2)
-	assert.NoError(t, err)
-	pk, _ := sk.G1Element()
-	assert.Equal(t, pk.Fingerprint(), 0x8ee7ba56)
-}
-
-func TestAugSchemeMPL(t *testing.T) {
-	msg1 := []byte{1, 2, 3, 40}
-	msg2 := []byte{5, 6, 70, 201}
-	msg3 := []byte{9, 10, 11, 12, 13}
-	msg4 := []byte{15, 63, 244, 92, 0, 1}
-
-	scheme := NewAugSchemeMPL()
-	sk1, _ := scheme.KeyGen(genSeed(2))
-	sk2, _ := scheme.KeyGen(genSeed(3))
-
-	pk1, _ := sk1.G1Element()
-	pk2, _ := sk2.G1Element()
-
-	sig1 := scheme.Sign(sk1, msg1)
-	sig2 := scheme.Sign(sk2, msg2)
-	sig3 := scheme.Sign(sk2, msg1)
-	sig4 := scheme.Sign(sk1, msg3)
-	sig5 := scheme.Sign(sk1, msg1)
-	sig6 := scheme.Sign(sk1, msg4)
-
-	aggSigL := scheme.AggregateSigs(sig1, sig2)
-	aggSigR := scheme.AggregateSigs(sig3, sig4, sig5)
-	aggSig := scheme.AggregateSigs(aggSigL, aggSigR, sig6)
-
-	pks := []*G1Element{pk1, pk2, pk2, pk1, pk1, pk1}
-	msgs := [][]byte{msg1, msg2, msg1, msg3, msg1, msg4}
-	assert.True(t, scheme.AggregateVerify(pks, msgs, aggSig))
-
-	aggSigHex := aggSig.HexString()
-	assert.Equal(t,
-		aggSigHex,
-		"a1d5360dcb418d33b29b90b912b4accde535cf0e52caf467a005dc632d9f7af44b6c4e9acd4"+
-			"6eac218b28cdb07a3e3bc087df1cd1e3213aa4e11322a3ff3847bbba0b2fd19ddc25ca964871"+
-			"997b9bceeab37a4c2565876da19382ea32a962200",
-	)
-}
-
-func TestPopSchemeMPL(t *testing.T) {
-	scheme := NewPopSchemeMPL()
-	sk1, _ := scheme.KeyGen(genSeed(4))
-	pop := scheme.PopProve(sk1)
-	pk1, _ := sk1.G1Element()
-	assert.True(t, scheme.PopVerify(pk1, pop))
-	hexStrActual := pop.HexString()
-	assert.Equal(t,
-		hexStrActual,
-		"84f709159435f0dc73b3e8bf6c78d85282d19231555a8ee3b6e2573aaf66872d9203fefa1ef"+
-			"700e34e7c3f3fb28210100558c6871c53f1ef6055b9f06b0d1abe22ad584ad3b957f3018a8f5"+
-			"8227c6c716b1e15791459850f2289168fa0cf9115",
-	)
-}
-
-func TestAggSks(t *testing.T) {
-	msg := []byte{100, 2, 254, 88, 90, 45, 23}
-	scheme := NewBasicSchemeMPL()
-	sk1, _ := scheme.KeyGen(genSeed(7))
-	pk1, _ := sk1.G1Element()
-	sk2, _ := scheme.KeyGen(genSeed(8))
-	pk2, _ := sk2.G1Element()
-	aggSk := PrivateKeyAggregate(sk1, sk2)
-	aggSkAlt := PrivateKeyAggregate(sk2, sk1)
-
-	assert.True(t, aggSk.EqualTo(aggSkAlt))
-
-	aggPubKey := pk1.Add(pk2)
-	aggPk, _ := aggSk.G1Element()
-	assert.True(t, aggPubKey.EqualTo(aggPk))
-
-	sig1 := scheme.Sign(sk1, msg)
-	sig2 := scheme.Sign(sk2, msg)
-	aggSig2 := scheme.Sign(aggSk, msg)
-	aggSig := scheme.AggregateSigs(sig1, sig2)
-	assert.True(t, aggSig.EqualTo(aggSig2))
-
-	// Verify as a single G2Element
-	assert.True(t, scheme.Verify(aggPubKey, msg, aggSig))
-	assert.True(t, scheme.Verify(aggPubKey, msg, aggSig2))
-
-	// Verify aggregate with both keys (Fails since not distinct)
-	assert.False(t, scheme.AggregateVerify([]*G1Element{pk1, pk2}, [][]byte{msg, msg}, aggSig))
-	assert.False(t, scheme.AggregateVerify([]*G1Element{pk1, pk2}, [][]byte{msg, msg}, aggSig2))
-
-	msg2 := []byte{200, 29, 54, 8, 9, 29, 155, 55}
-	sig3 := scheme.Sign(sk2, msg2)
-	aggSigFinal := scheme.AggregateSigs(aggSig, sig3)
-	aggSigAlt := scheme.AggregateSigs(sig1, sig2, sig3)
-	aggSigAlt2 := scheme.AggregateSigs(sig1, sig3, sig2)
-	assert.True(t, aggSigFinal.EqualTo(aggSigAlt))
-	assert.True(t, aggSigFinal.EqualTo(aggSigAlt2))
-
-	skFinal := PrivateKeyAggregate(aggSk, sk2)
-	skFinalAlt := PrivateKeyAggregate(sk2, sk1, sk2)
-	assert.True(t, skFinal.EqualTo(skFinalAlt))
-	assert.True(t, !skFinal.EqualTo(aggSk))
-
-	pkFinal := aggPubKey.Add(pk2)
-	pkFinalAlt := pk2.Add(pk1).Add(pk2)
-	assert.True(t, pkFinal.EqualTo(pkFinalAlt))
-	assert.True(t, !pkFinal.EqualTo(aggPubKey))
-
-	// Cannot verify with aggPubKey (since we have multiple messages)
-	assert.True(t, scheme.AggregateVerify([]*G1Element{aggPubKey, pk2}, [][]byte{msg, msg2}, aggSigFinal))
-}
-
-func TestReadme(t *testing.T) {
-	seed := []byte{
-		0, 50, 6, 244, 24, 199, 1, 25, 52, 88, 192, 19, 18, 12, 89, 6,
-		220, 18, 102, 58, 209, 82, 12, 62, 89, 110, 182, 9, 44, 20, 254, 22,
-	}
-
-	var scheme Scheme = NewAugSchemeMPL()
-	sk, _ := scheme.KeyGen(seed)
-	pk, _ := sk.G1Element()
-
-	msg := []byte{1, 2, 3, 4, 5}
-	sig := scheme.Sign(sk, msg)
-
-	assert.True(t, scheme.Verify(pk, msg, sig))
-
-	skRaw := sk.Serialize()   // 32 bytes
-	pkRaw := pk.Serialize()   // 48 bytes
-	sigRaw := sig.Serialize() // 96 bytes
-
-	sk, _ = PrivateKeyFromBytes(skRaw, false)
-	pk, _ = G1ElementFromBytes(pkRaw)
-	sig, _ = G2ElementFromBytes(sigRaw)
-
-	sk1, _ := scheme.KeyGen(replLeft(seed, []byte{1}))
-	sk2, _ := scheme.KeyGen(replLeft(seed, []byte{2}))
-
-	msg2 := []byte{1, 2, 3, 4, 5, 6, 7}
-
-	pk1, _ := sk1.G1Element()
-	sig1 := scheme.Sign(sk1, msg)
-
-	pk2, _ := sk2.G1Element()
-	sig2 := scheme.Sign(sk2, msg2)
-
-	aggSig := scheme.AggregateSigs(sig1, sig2)
-
-	assert.True(t, scheme.AggregateVerify([]*G1Element{pk1, pk2}, [][]byte{msg, msg2}, aggSig))
-
-	sk3, _ := scheme.KeyGen(replLeft(seed, []byte{2}))
-	pk3, _ := sk3.G1Element()
-	msg3 := []byte{100, 2, 254, 88, 90, 45, 23}
-	sig3 := scheme.Sign(sk3, msg3)
-
-	aggSigFinal := scheme.AggregateSigs(aggSig, sig3)
-	assert.True(t,
-		scheme.AggregateVerify(
-			[]*G1Element{pk1, pk2, pk3},
-			[][]byte{msg, msg2, msg3},
-			aggSigFinal,
-		),
-	)
-
-	popScheme := NewPopSchemeMPL()
-	popSig1 := popScheme.Sign(sk1, msg)
-	popSig2 := popScheme.Sign(sk2, msg)
-	popSig3 := popScheme.Sign(sk3, msg)
-	pop1 := popScheme.PopProve(sk1)
-	pop2 := popScheme.PopProve(sk2)
-	pop3 := popScheme.PopProve(sk3)
-
-	assert.True(t, popScheme.PopVerify(pk1, pop1))
-	assert.True(t, popScheme.PopVerify(pk2, pop2))
-	assert.True(t, popScheme.PopVerify(pk3, pop3))
-
-	popSigAgg := popScheme.AggregateSigs(popSig1, popSig2, popSig3)
-
-	assert.True(t, popScheme.FastAggregateVerify([]*G1Element{pk1, pk2, pk3}, msg, popSigAgg))
-
-	popAggPk := pk1.Add(pk2).Add(pk3)
-
-	tPopAggPk1 := pk1.Add(pk2.Add(pk3))
-	assert.Equal(t, popAggPk.Serialize(), tPopAggPk1.Serialize())
-
-	assert.True(t, popScheme.Verify(popAggPk, msg, popSigAgg))
-
-	popAggSk := PrivateKeyAggregate(sk1, sk2, sk3)
-	assert.True(t, popScheme.Sign(popAggSk, msg).EqualTo(popSigAgg))
-	assert.Equal(t, popScheme.Sign(popAggSk, msg).Serialize(), popSigAgg.Serialize())
-
-	masterSk, _ := scheme.KeyGen(seed)
-
-	masterPk, _ := masterSk.G1Element()
-	childU := scheme.DeriveChildSkUnhardened(masterSk, 22)
-	grandChildU := scheme.DeriveChildSkUnhardened(childU, 0)
-
-	childUPk := scheme.DeriveChildPkUnhardened(masterPk, 22)
-	grandChildUPk := scheme.DeriveChildPkUnhardened(childUPk, 0)
-
-	grandChildUPkAlt, _ := grandChildU.G1Element()
-	assert.Equal(t, grandChildUPk.Serialize(), grandChildUPkAlt.Serialize())
-}
-
-func genSeed(v byte) []byte {
-	return genByteSlice(v, 32)
-}
-
-func genByteSlice(v byte, l int) []byte {
-	data := make([]byte, l)
-	for i := 0; i < l; i++ {
-		data[i] = v
-	}
-	return data
-}
-
-func replLeft(arr []byte, r []byte) []byte {
-	return append(r, arr[len(r):]...)
-}
-
-func checkError(err error, wantErr string) bool {
-	if err == nil && wantErr == "" {
-		return true
-	}
-	if (err == nil && wantErr != "") || wantErr == "" {
-		return false
-	}
-	return strings.Contains(err.Error(), wantErr)
-}
diff --git a/src/dashbls/go-bindings/threshold.cpp b/src/dashbls/go-bindings/threshold.cpp
deleted file mode 100644
index 6451000db9af..000000000000
--- a/src/dashbls/go-bindings/threshold.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include <stdint.h>
-#include "dashbls/bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-#include "blschia.h"
-#include "threshold.h"
-#include "utils.hpp"
-#include "error.h"
-
-std::vector<bls::Bytes> toVectorHashes(void** elems, const size_t len) {
-    std::vector<bls::Bytes> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        vec.push_back(
-            bls::Bytes((uint8_t*)elems[i], HashSize)
-        );
-    }
-    return vec;
-}
-
-CPrivateKey CThresholdPrivateKeyShare(void** sks, const size_t sksLen, const void* hash, bool* didErr) {
-    bls::PrivateKey* sk = nullptr;
-    try {
-        sk = new bls::PrivateKey(
-            bls::Threshold::PrivateKeyShare(
-                toBLSVector<bls::PrivateKey>(sks, sksLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-CPrivateKey CThresholdPrivateKeyRecover(void** sks,
-                                        const size_t sksLen,
-                                        void** hashes,
-                                        const size_t hashesLen,
-                                        bool* didErr) {
-    bls::PrivateKey* sk = nullptr;
-    std::vector<bls::Bytes> pop = toVectorHashes(hashes, hashesLen);
-    try {
-        sk = new bls::PrivateKey(
-            bls::Threshold::PrivateKeyRecover(
-                toBLSVector<bls::PrivateKey>(sks, sksLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-CG1Element CThresholdPublicKeyShare(void** pks, const size_t pksLen, const void* hash, bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::Threshold::PublicKeyShare(
-                toBLSVector<bls::G1Element>(pks, pksLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-CG1Element CThresholdPublicKeyRecover(void** pks,
-                                      const size_t pksLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::Threshold::PublicKeyRecover(
-                toBLSVector<bls::G1Element>(pks, pksLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-CG2Element CThresholdSignatureShare(void** sigs, const size_t sigsLen, const void* hash, bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::Threshold::SignatureShare(
-                toBLSVector<bls::G2Element>(sigs, sigsLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-CG2Element CThresholdSignatureRecover(void** sigs,
-                                      const size_t sigsLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::Threshold::SignatureRecover(
-                toBLSVector<bls::G2Element>(sigs, sigsLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-CG2Element CThresholdSign(const CPrivateKey sk, const void* hash) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        bls::Threshold::Sign(*skPtr, bls::Bytes((uint8_t*)hash, HashSize))
-    );
-}
-
-bool CThresholdVerify(const CG1Element pk, const void* hash, const CG2Element sig) {
-    bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return bls::Threshold::Verify(*pkPtr, bls::Bytes((uint8_t*)hash, HashSize), *sigPtr);
-}
diff --git a/src/dashbls/go-bindings/threshold.go b/src/dashbls/go-bindings/threshold.go
deleted file mode 100644
index 5f484cee8dc3..000000000000
--- a/src/dashbls/go-bindings/threshold.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include <stdlib.h>
-// #include "threshold.h"
-// #include "blschia.h"
-import "C"
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"runtime"
-	"unsafe"
-)
-
-// HashSize is the allowed size of a hash
-const HashSize = sha256.Size
-
-// Hash represents 32 byte of hash data
-type Hash [HashSize]byte
-
-var errWrongHexStringValue = errors.New("a hex string must contain 32 bytes")
-
-// HashFromString convert a hex string into a Hash
-func HashFromString(hexString string) (Hash, error) {
-	var hash Hash
-	data, err := hex.DecodeString(hexString)
-	if err != nil {
-		return hash, err
-	}
-	if len(data) < HashSize {
-		return hash, errWrongHexStringValue
-	}
-	for i, d := range data[len(data)-HashSize:] {
-		hash[HashSize-(i+1)] = d
-	}
-	return hash, nil
-}
-
-// BuildSignHash creates the required signHash for LLMQ threshold signing process
-func BuildSignHash(llmqType uint8, quorumHash Hash, signID Hash, msgHash Hash) Hash {
-	hasher := sha256.New()
-	hasher.Write([]byte{llmqType})
-	hasher.Write(quorumHash[:])
-	hasher.Write(signID[:])
-	hasher.Write(msgHash[:])
-	return sha256.Sum256(hasher.Sum(nil))
-}
-
-// ThresholdPrivateKeyShare retrieves a shared PrivateKey
-// from a set of PrivateKey(s) and a hash
-// this function is a binding of bls::Threshold::PrivateKeyShare
-func ThresholdPrivateKeyShare(sks []*PrivateKey, hash Hash) (*PrivateKey, error) {
-	cHashPtr := C.CBytes(hash[:])
-	defer C.free(cHashPtr)
-	cArrPtr := cAllocPrivKeys(sks...)
-	defer C.FreePtrArray(cArrPtr)
-	var cDidErr C.bool
-	sk := PrivateKey{
-		val: C.CThresholdPrivateKeyShare(cArrPtr, C.size_t(len(sks)), cHashPtr, &cDidErr),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sk, func(pk *PrivateKey) { sk.free() })
-	runtime.KeepAlive(sks)
-	return &sk, nil
-}
-
-// ThresholdPublicKeyShare retrieves a shared G1Element (public key)
-// from a set of G1Element(s) and a hash
-// this function is a binding of bls::Threshold::PublicKeyShare
-func ThresholdPublicKeyShare(pks []*G1Element, hash Hash) (*G1Element, error) {
-	cHashPtr := C.CBytes(hash[:])
-	defer C.free(cHashPtr)
-	cArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cArrPtr)
-	var cDidErr C.bool
-	pk := G1Element{
-		val: C.CThresholdPublicKeyShare(cArrPtr, C.size_t(len(pks)), cHashPtr, &cDidErr),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&pk, func(pk *G1Element) { pk.free() })
-	runtime.KeepAlive(pks)
-	return &pk, nil
-}
-
-// ThresholdSignatureShare retrieves a shared G2Element (signature)
-// from a set of G2Element(s) and a hash
-// this function is a binding of bls::Threshold::SignatureShare
-func ThresholdSignatureShare(sigs []*G2Element, hash Hash) (*G2Element, error) {
-	cHashPtr := C.CBytes(hash[:])
-	defer C.free(cHashPtr)
-	cArrPtr := cAllocSigs(sigs...)
-	defer C.FreePtrArray(cArrPtr)
-	var cDidErr C.bool
-	sig := G2Element{
-		val: C.CThresholdSignatureShare(cArrPtr, C.size_t(len(sigs)), cHashPtr, &cDidErr),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sig, func(pk *G2Element) { sig.free() })
-	runtime.KeepAlive(sigs)
-	return &sig, nil
-}
-
-// ThresholdPrivateKeyRecover recovers PrivateKey
-// from the set of shared PrivateKey(s) with a list of the hashes
-// this function is a binding of bls::Threshold::PrivateKeyRecover
-func ThresholdPrivateKeyRecover(sks []*PrivateKey, hashes []Hash) (*PrivateKey, error) {
-	cArrPtr := cAllocPrivKeys(sks...)
-	defer C.FreePtrArray(cArrPtr)
-	cHashArrPtr := cAllocHashes(hashes)
-	defer C.FreePtrArray(cHashArrPtr)
-	var cDidErr C.bool
-	sk := PrivateKey{
-		val: C.CThresholdPrivateKeyRecover(
-			cArrPtr,
-			C.size_t(len(sks)),
-			cHashArrPtr,
-			C.size_t(len(hashes)),
-			&cDidErr,
-		),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sk, func(sk *PrivateKey) { sk.free() })
-	runtime.KeepAlive(sks)
-	return &sk, nil
-}
-
-// ThresholdPublicKeyRecover recovers G1Element (public key)
-// from the set of shared G1Element(s) with a list of the hashes
-// this function is a binding of bls::Threshold::PublicKeyRecover
-func ThresholdPublicKeyRecover(pks []*G1Element, hashes []Hash) (*G1Element, error) {
-	cArrPtr := cAllocPubKeys(pks...)
-	defer C.FreePtrArray(cArrPtr)
-	cHashArrPtr := cAllocHashes(hashes)
-	defer C.FreePtrArray(cHashArrPtr)
-	var cDidErr C.bool
-	pk := G1Element{
-		val: C.CThresholdPublicKeyRecover(
-			cArrPtr,
-			C.size_t(len(pks)),
-			cHashArrPtr,
-			C.size_t(len(hashes)),
-			&cDidErr,
-		),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&pk, func(pk *G1Element) { pk.free() })
-	runtime.KeepAlive(pks)
-	return &pk, nil
-}
-
-// ThresholdSignatureRecover recovers G2Element (signature)
-// from the set of shared G2Element(s) with a list of the hashes
-// this function is a binding of bls::Threshold::SignatureRecover
-func ThresholdSignatureRecover(sigs []*G2Element, hashes []Hash) (*G2Element, error) {
-	cArrPtr := cAllocSigs(sigs...)
-	defer C.FreePtrArray(cArrPtr)
-	cHashArrPtr := cAllocHashes(hashes)
-	defer C.FreePtrArray(cHashArrPtr)
-	var cDidErr C.bool
-	sig := G2Element{
-		val: C.CThresholdSignatureRecover(
-			cArrPtr,
-			C.size_t(len(sigs)),
-			cHashArrPtr,
-			C.size_t(len(hashes)),
-			&cDidErr,
-		),
-	}
-	if cDidErr {
-		return nil, errFromC()
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(sigs)
-	return &sig, nil
-}
-
-// ThresholdSign signs of the hash with PrivateKey
-// this function is a binding of bls::Threshold::Sign
-func ThresholdSign(sk *PrivateKey, hash Hash) *G2Element {
-	cHashPtr := C.CBytes(hash[:])
-	defer C.free(cHashPtr)
-	sig := G2Element{
-		val: C.CThresholdSign(sk.val, cHashPtr),
-	}
-	runtime.SetFinalizer(&sig, func(sig *G2Element) { sig.free() })
-	runtime.KeepAlive(sk)
-	return &sig
-}
-
-// ThresholdVerify verifies of the hash with G1Element (public key)
-// this function is a binding of bls::Threshold::Verify
-func ThresholdVerify(pk *G1Element, hash Hash, sig *G2Element) bool {
-	cHashPtr := C.CBytes(hash[:])
-	defer C.free(cHashPtr)
-	val := C.CThresholdVerify(pk.val, cHashPtr, sig.val)
-	runtime.KeepAlive(pk)
-	runtime.KeepAlive(sig)
-	return bool(val)
-}
-
-func cAllocHashes(hashes []Hash) *unsafe.Pointer {
-	cArrPtr := C.AllocPtrArray(C.size_t(len(hashes)))
-	for i, hash := range hashes {
-		C.SetPtrArray(cArrPtr, unsafe.Pointer(C.CBytes(hash[:])), C.int(i))
-	}
-	return cArrPtr
-}
diff --git a/src/dashbls/go-bindings/threshold.h b/src/dashbls/go-bindings/threshold.h
deleted file mode 100644
index 90d63abd2147..000000000000
--- a/src/dashbls/go-bindings/threshold.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GO_BINDINGS_THRESHOLD_H_
-#define GO_BINDINGS_THRESHOLD_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "privatekey.h"
-#include "elements.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const int HashSize = 32;
-
-CPrivateKey CThresholdPrivateKeyShare(void** sks, const size_t sksLen, const void* hash, bool* didErr);
-CPrivateKey CThresholdPrivateKeyRecover(void** sks,
-                                        const size_t sksLen,
-                                        void** hashes,
-                                        const size_t hashesLen,
-                                        bool* didErr);
-
-CG1Element CThresholdPublicKeyShare(void** pks, const size_t pksLen, const void* hash, bool* didErr);
-CG1Element CThresholdPublicKeyRecover(void** pks,
-                                      const size_t pksLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr);
-
-CG2Element CThresholdSignatureShare(void** sigs, const size_t sigsLen, const void* hash, bool* didErr);
-CG2Element CThresholdSignatureRecover(void** sigs,
-                                      const size_t sigsLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr);
-
-CG2Element CThresholdSign(const CPrivateKey sk, const void* hash);
-bool CThresholdVerify(const CG1Element pk, const void* hash, const CG2Element sig);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // GO_BINDINGS_THRESHOLD_H_
diff --git a/src/dashbls/go-bindings/threshold_test.go b/src/dashbls/go-bindings/threshold_test.go
deleted file mode 100644
index 2ddfe536e215..000000000000
--- a/src/dashbls/go-bindings/threshold_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package blschia
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestThreshold(t *testing.T) {
-	testCases := []struct {
-		n, m int
-		hash [32]byte
-	}{
-		{
-			n:    5,
-			m:    3,
-			hash: genHash(100),
-		},
-	}
-	for j, tc := range testCases {
-		t.Run(fmt.Sprintf("threshold test case #%d", j), func(t *testing.T) {
-			n, m := tc.n, tc.m
-			var hashes []Hash
-			for i := 0; i < n; i++ {
-				hashes = append(hashes, genHash(byte(i+1)))
-			}
-			pks := make([]*G1Element, m)
-			sigs := make([]*G2Element, m)
-			sks := make([]*PrivateKey, m)
-			for i := 0; i < m; i++ {
-				sks[i] = mustPrivateKeyFromBytes(genSeed(byte(i+11)), true)
-				pks[i] = mustGetG1(sks[i])
-				sigs[i] = ThresholdSign(sks[i], tc.hash)
-				assert.True(t, ThresholdVerify(pks[i], tc.hash, sigs[i]))
-			}
-			sig := ThresholdSign(sks[0], tc.hash)
-			assert.True(t, ThresholdVerify(pks[0], tc.hash, sig))
-			skShares := make([]*PrivateKey, n)
-			pkShares := make([]*G1Element, n)
-			sigShares := make([]*G2Element, n)
-			for i := 0; i < n; i++ {
-				skShares[i] = mustThresholdPrivateKeyShare(sks, hashes[i])
-				pkShares[i] = mustThresholdPublicKeyShare(pks, hashes[i])
-				sigShares[i] = mustThresholdSignatureShare(sigs, hashes[i])
-				assert.True(t, mustGetG1(skShares[i]).EqualTo(pkShares[i]))
-				sigShare2 := ThresholdSign(skShares[i], tc.hash)
-				assert.True(t, sigShares[i].EqualTo(sigShare2))
-				assert.True(t, ThresholdVerify(pkShares[i], tc.hash, sigShares[i]))
-			}
-			recSk := mustThresholdPrivateKeyRecover(skShares[:m-1], hashes[:m-1])
-			recPk := mustThresholdPublicKeyRecover(pkShares[:m-1], hashes[:m-1])
-			recSig := mustThresholdSignatureRecover(sigShares[:m-1], hashes[:m-1])
-			assert.False(t, recSk.EqualTo(sks[0]))
-			assert.False(t, recPk.EqualTo(pks[0]))
-			assert.False(t, recSig.EqualTo(sig))
-			recSk = mustThresholdPrivateKeyRecover(skShares[:m], hashes[:m])
-			recPk = mustThresholdPublicKeyRecover(pkShares[:m], hashes[:m])
-			recSig = mustThresholdSignatureRecover(sigShares[:m], hashes[:m])
-			assert.True(t, recSk.EqualTo(sks[0]))
-			assert.True(t, recPk.EqualTo(pks[0]))
-			assert.True(t, recSig.EqualTo(sig))
-		})
-	}
-}
-
-func mustGetG1(sk *PrivateKey) *G1Element {
-	pk, err := sk.G1Element()
-	if err != nil {
-		panic(err)
-	}
-	return pk
-}
-
-func mustPrivateKeyFromBytes(data []byte, modOrder bool) *PrivateKey {
-	sk, err := PrivateKeyFromBytes(data, modOrder)
-	if err != nil {
-		panic(err)
-	}
-	return sk
-}
-
-func genHash(v byte) [HashSize]byte {
-	var hash Hash
-	copy(hash[:], genSeed(v))
-	return hash
-}
-
-func mustThresholdPrivateKeyShare(sks []*PrivateKey, hash Hash) *PrivateKey {
-	share, err := ThresholdPrivateKeyShare(sks, hash)
-	if err != nil {
-		panic(err)
-	}
-	return share
-}
-
-func mustThresholdPublicKeyShare(pks []*G1Element, hash Hash) *G1Element {
-	share, err := ThresholdPublicKeyShare(pks, hash)
-	if err != nil {
-		panic(err)
-	}
-	return share
-}
-
-func mustThresholdSignatureShare(sigs []*G2Element, hash Hash) *G2Element {
-	share, err := ThresholdSignatureShare(sigs, hash)
-	if err != nil {
-		panic(err)
-	}
-	return share
-}
-
-func mustThresholdPrivateKeyRecover(sks []*PrivateKey, hashes []Hash) *PrivateKey {
-	recSk, err := ThresholdPrivateKeyRecover(sks, hashes)
-	if err != nil {
-		panic(err)
-	}
-	return recSk
-}
-
-func mustThresholdPublicKeyRecover(pks []*G1Element, hashes []Hash) *G1Element {
-	recPk, err := ThresholdPublicKeyRecover(pks, hashes)
-	if err != nil {
-		panic(err)
-	}
-	return recPk
-}
-
-func mustThresholdSignatureRecover(sigs []*G2Element, hashes []Hash) *G2Element {
-	recSig, err := ThresholdSignatureRecover(sigs, hashes)
-	if err != nil {
-		panic(err)
-	}
-	return recSig
-}
diff --git a/src/dashbls/go-bindings/util.go b/src/dashbls/go-bindings/util.go
deleted file mode 100644
index fbea18895a76..000000000000
--- a/src/dashbls/go-bindings/util.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package blschia
-
-// #include "blschia.h"
-// #include <string.h>
-import "C"
-import (
-	"unsafe"
-)
-
-func cAllocBytes(data []byte) unsafe.Pointer {
-	l := C.size_t(len(data))
-	ptr := unsafe.Pointer(C.SecAllocBytes(l))
-	C.memcpy(ptr, unsafe.Pointer(&data[0]), l)
-	return ptr
-}
-
-func cAllocSigs(sigs ...*G2Element) *unsafe.Pointer {
-	arr := C.AllocPtrArray(C.size_t(len(sigs)))
-	for i, pk := range sigs {
-		C.SetPtrArray(arr, unsafe.Pointer(pk.val), C.int(i))
-	}
-	return arr
-}
-
-func cAllocPrivKeys(sks ...*PrivateKey) *unsafe.Pointer {
-	arr := C.AllocPtrArray(C.size_t(len(sks)))
-	for i, sk := range sks {
-		C.SetPtrArray(arr, unsafe.Pointer(sk.val), C.int(i))
-	}
-	return arr
-}
-
-func cAllocMsgs(msgs [][]byte) (*unsafe.Pointer, []int) {
-	msgLens := make([]int, len(msgs))
-	cMsgArrPtr := C.AllocPtrArray(C.size_t(len(msgs)))
-	for i, msg := range msgs {
-		cMsgPtr := C.CBytes(msg)
-		C.SetPtrArray(cMsgArrPtr, unsafe.Pointer(cMsgPtr), C.int(i))
-		msgLens[i] = len(msg)
-	}
-	return cMsgArrPtr, msgLens
-}
diff --git a/src/dashbls/go-bindings/util_test.go b/src/dashbls/go-bindings/util_test.go
deleted file mode 100644
index 132d2220680e..000000000000
--- a/src/dashbls/go-bindings/util_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package blschia
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestHashFromString(t *testing.T) {
-	testCases := []struct {
-		s       string
-		want    Hash
-		wantErr string
-	}{
-		{
-			s: "0000000000000000000000000000000000000000000000000000000000000001",
-			want: Hash{
-				1, 0, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0,
-			},
-		},
-		{
-			s:       "",
-			wantErr: errWrongHexStringValue.Error(),
-		},
-		{
-			s:       "_+",
-			wantErr: "invalid byte",
-		},
-	}
-	for _, tc := range testCases {
-		h, err := HashFromString(tc.s)
-		assert.Equal(t, tc.want, h)
-		assert.True(t, errContain(err, tc.wantErr), "got err=%v, want=%s", err, tc.wantErr)
-	}
-}
-
-func errContain(err error, want string) bool {
-	if err == nil && want == "" {
-		return true
-	}
-	if err == nil && want != "" {
-		return false
-	}
-	return strings.Contains(err.Error(), want)
-}
diff --git a/src/dashbls/go-bindings/utils.cpp b/src/dashbls/go-bindings/utils.cpp
deleted file mode 100644
index b411ff751c7c..000000000000
--- a/src/dashbls/go-bindings/utils.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "dashbls/bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-
-// helper functions
-template <class T>
-std::vector<T> toBLSVector(void** elems, const size_t len) {
-    std::vector<T> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        T* el = (T*)elems[i];
-        vec.push_back(*el);
-    }
-    return vec;
-}
-
-std::vector<bls::Bytes> toVectorBytes(void** elems, const size_t len, const std::vector<size_t> vecElemsLens) {
-    std::vector<bls::Bytes> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        uint8_t* elPtr = (uint8_t*)elems[i];
-        vec.push_back(bls::Bytes(elPtr, vecElemsLens[i]));
-    }
-    return vec;
-}
diff --git a/src/dashbls/go-bindings/utils.hpp b/src/dashbls/go-bindings/utils.hpp
deleted file mode 100644
index b4cecd564f53..000000000000
--- a/src/dashbls/go-bindings/utils.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#include <vector>
-#include "dashbls/bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-
-// helper functions
-template <class T>
-std::vector<T> toBLSVector(void** elems, const size_t len) {
-    std::vector<T> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        const T* el = (T*)elems[i];
-        vec.push_back(*el);
-    }
-    return vec;
-}
-
-std::vector<bls::Bytes> toVectorBytes(void** elems, const size_t len, const std::vector<size_t> vecElemsLens);
diff --git a/src/dashbls/include/dashbls/bls.hpp b/src/dashbls/include/dashbls/bls.hpp
deleted file mode 100644
index cd6922a58cd6..000000000000
--- a/src/dashbls/include/dashbls/bls.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLS_HPP_
-#define SRC_BLS_HPP_
-
-#include "privatekey.hpp"
-#include "util.hpp"
-#include "schemes.hpp"
-#include "chaincode.hpp"
-#include "elements.hpp"
-#include "extendedprivatekey.hpp"
-#include "extendedpublickey.hpp"
-#include "hkdf.hpp"
-#include "hdkeys.hpp"
-#include "threshold.hpp"
-
-namespace bls {
-
-/*
- * Principal class for verification and signature aggregation.
- * Include this file to use the library.
- */
-class BLS {
- public:
-    static const size_t MESSAGE_HASH_LEN = 32;
-
-    // Initializes the BLS library (called automatically)
-    static bool Init();
-
-    static void SetSecureAllocator(Util::SecureAllocCallback allocCb, Util::SecureFreeCallback freeCb);
-
-    static void CheckRelicErrors(bool should_throw = true);
-};
-} // end namespace bls
-
-#endif  // SRC_BLS_HPP_
diff --git a/src/dashbls/include/dashbls/chaincode.hpp b/src/dashbls/include/dashbls/chaincode.hpp
deleted file mode 100644
index bd3e57b4d779..000000000000
--- a/src/dashbls/include/dashbls/chaincode.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_CHAINCODE_HPP_
-#define SRC_CHAINCODE_HPP_
-
-#include <iostream>
-#include <vector>
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-
-#include "relic.h"
-#include "relic_test.h"
-
-#include "util.hpp"
-
-namespace bls {
-class ChainCode {
- public:
-    static const size_t SIZE = 32;
-
-    static ChainCode FromBytes(const Bytes& bytes);
-
-    ChainCode(const ChainCode &cc);
-
-    // Comparator implementation.
-    friend bool operator==(ChainCode const &a,  ChainCode const &b);
-    friend bool operator!=(ChainCode const &a,  ChainCode const &b);
-    friend std::ostream &operator<<(std::ostream &os, ChainCode const &s);
-
-    void Serialize(uint8_t *buffer) const;
-    std::vector<uint8_t> Serialize() const;
-
-    // Prevent direct construction, use static constructor
-    ChainCode() {}
-private:
-
-    bn_t chainCode;
-};
-} // end namespace bls
-
-#endif  // SRC_CHAINCODE_HPP_
-
diff --git a/src/dashbls/include/dashbls/elements.hpp b/src/dashbls/include/dashbls/elements.hpp
deleted file mode 100644
index 95937f62dbc6..000000000000
--- a/src/dashbls/include/dashbls/elements.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSELEMENTS_HPP_
-#define SRC_BLSELEMENTS_HPP_
-
-extern "C" {
-#include "relic.h"
-}
-#include "relic_conf.h"
-#include "util.hpp"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include <utility>
-
-namespace bls {
-class G1Element;
-class G2Element;
-class GTElement;
-
-class G1Element {
-public:
-    static const size_t SIZE = 48;
-
-    G1Element() {
-        g1_set_infty(p);
-    }
-
-    static G1Element FromBytes(Bytes bytes, bool fLegacy = false);
-    static G1Element FromBytesUnchecked(Bytes bytes, bool fLegacy = false);
-    static G1Element FromByteVector(const std::vector<uint8_t> &bytevec, bool fLegacy = false);
-    static G1Element FromNative(const g1_t element);
-    static G1Element FromMessage(const std::vector<uint8_t> &message,
-                                 const uint8_t *dst,
-                                 int dst_len);
-    static G1Element FromMessage(Bytes message,
-                                 const uint8_t* dst,
-                                 int dst_len);
-    static G1Element Generator();
-
-    bool IsValid() const;
-    void CheckValid() const;
-    void ToNative(g1_t output) const;
-    G1Element Negate() const;
-    GTElement Pair(const G2Element &b) const;
-    uint32_t GetFingerprint(bool fLegacy = false) const;
-    std::vector<uint8_t> Serialize(bool fLegacy = false) const;
-    std::array<uint8_t, SIZE> SerializeToArray(bool fLegacy = false) const;
-    G1Element Copy();
-
-    friend bool operator==(const G1Element &a, const G1Element &b);
-    friend bool operator!=(const G1Element &a, const G1Element &b);
-    friend std::ostream &operator<<(std::ostream &os, const G1Element &s);
-    friend G1Element& operator+=(G1Element& a, const G1Element& b);
-    friend G1Element operator+(const G1Element &a, const G1Element &b);
-    friend G1Element operator*(const G1Element &a, const bn_t &k);
-    friend G1Element operator*(const bn_t &k, const G1Element &a);
-    friend GTElement operator&(const G1Element &a, const G2Element &b);
-
-private:
-    g1_t p;
-};
-
-class G2Element {
-public:
-    static const size_t SIZE = 96;
-
-    G2Element() {
-        g2_set_infty(q);
-    }
-
-    static G2Element FromBytes(Bytes bytes, bool fLegacy = false);
-    static G2Element FromBytesUnchecked(Bytes bytes, bool fLegacy = false);
-    static G2Element FromByteVector(const std::vector<uint8_t> &bytevec, bool fLegacy = false);
-    static G2Element FromNative(const g2_t element);
-    static G2Element FromMessage(const std::vector<uint8_t>& message,
-                                 const uint8_t* dst,
-                                 int dst_len,
-                                 bool fLegacy = false);
-    static G2Element FromMessage(Bytes message,
-                                 const uint8_t* dst,
-                                 int dst_len,
-                                 bool fLegacy = false);
-    static G2Element Generator();
-
-    bool IsValid() const;
-    void CheckValid() const;
-    void ToNative(g2_t output) const;
-    G2Element Negate() const;
-    GTElement Pair(const G1Element &a) const;
-    std::vector<uint8_t> Serialize(bool fLegacy = false) const;
-    std::array<uint8_t, G2Element::SIZE> SerializeToArray(bool fLegacy = false) const;
-    G2Element Copy();
-
-    friend bool operator==(G2Element const &a, G2Element const &b);
-    friend bool operator!=(G2Element const &a, G2Element const &b);
-    friend std::ostream &operator<<(std::ostream &os, const G2Element &s);
-    friend G2Element& operator+=(G2Element& a, const G2Element& b);
-    friend G2Element operator+(const G2Element &a, const G2Element &b);
-    friend G2Element operator*(const G2Element &a, const bn_t &k);
-    friend G2Element operator*(const bn_t &k, const G2Element &a);
-
-private:
-    g2_t q;
-};
-
-class GTElement {
-public:
-    static const size_t SIZE = 384;
-    static GTElement FromBytes(Bytes bytes);
-    static GTElement FromBytesUnchecked(Bytes bytes);
-    static GTElement FromByteVector(const std::vector<uint8_t> &bytevec);
-    static GTElement FromNative(const gt_t *element);
-    static GTElement Unity();  // unity
-
-    void Serialize(uint8_t *buffer) const;
-    std::vector<uint8_t> Serialize() const;
-    std::array<uint8_t, SIZE> SerializeToArray() const;
-
-    friend bool operator==(GTElement const &a, GTElement const &b);
-    friend bool operator!=(GTElement const &a, GTElement const &b);
-    friend std::ostream &operator<<(std::ostream &os, const GTElement &s);
-    friend GTElement operator*(GTElement &a, GTElement &b);
-    GTElement &operator=(const GTElement &rhs);
-
-private:
-    gt_t r;
-    GTElement() {}
-};
-
-}  // end namespace bls
-
-#endif  // SRC_BLSELEMENTS_HPP_
diff --git a/src/dashbls/include/dashbls/extendedprivatekey.hpp b/src/dashbls/include/dashbls/extendedprivatekey.hpp
deleted file mode 100644
index aefdbf057257..000000000000
--- a/src/dashbls/include/dashbls/extendedprivatekey.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_EXTENDEDPRIVATEKEY_HPP_
-#define SRC_EXTENDEDPRIVATEKEY_HPP_
-
-#include "relic_conf.h"
-
-#include <vector>
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include "chaincode.hpp"
-#include "elements.hpp"
-#include "extendedpublickey.hpp"
-#include "privatekey.hpp"
-
-#include "relic.h"
-#include "relic_test.h"
-
-namespace bls {
-/*
-Defines a BIP-32 style node, which is composed of a private key and a
-chain code. This follows the spec from BIP-0032, with a few changes:
-  * The master secret key is generated mod n from the master seed,
-    since not all 32 byte sequences are valid BLS private keys
-  * Instead of SHA512(input), do SHA256(input || 00000000) ||
-    SHA256(input || 00000001)
-  * Mod n for the output of key derivation.
-  * ID of a key is SHA256(pk) instead of HASH160(pk)
-  * Serialization of extended public key is 93 bytes
-*/
-class ExtendedPrivateKey {
- public:
-    // version(4) depth(1) parent fingerprint(4) child#(4) cc(32) sk(32)
-    static const uint32_t SIZE = 77;
-
-    // Generates a master private key and chain code from a seed
-    static ExtendedPrivateKey FromSeed(const Bytes& bytes);
-
-    // Parse private key and chain code from bytes
-    static ExtendedPrivateKey FromBytes(const Bytes& bytes);
-
-    // Derive a child extEnded private key, hardened if i >= 2^31
-    ExtendedPrivateKey PrivateChild(uint32_t i, bool fLegacy = true) const;
-
-    // Derive a child extended public key, hardened if i >= 2^31
-    ExtendedPublicKey PublicChild(uint32_t i) const;
-
-    uint32_t GetVersion() const;
-    uint8_t GetDepth() const;
-    uint32_t GetParentFingerprint() const;
-    uint32_t GetChildNumber() const;
-
-    ChainCode GetChainCode() const;
-    PrivateKey GetPrivateKey() const;
-
-    G1Element GetPublicKey() const;
-    ExtendedPublicKey GetExtendedPublicKey(bool fLegacy = true) const;
-
-    // Compare to different private key
-    friend bool operator==(const ExtendedPrivateKey& a,
-                           const ExtendedPrivateKey& b);
-    friend bool operator!=(const ExtendedPrivateKey& a,
-                           const ExtendedPrivateKey& b);
-
-    void Serialize(uint8_t* buffer) const;
-    std::vector<uint8_t> Serialize() const;
-
-    ~ExtendedPrivateKey();
-
-    // Blank public constructor
-    ExtendedPrivateKey()
-            : version(0),
-              depth(0),
-              parentFingerprint(0),
-              childNumber(0),
-              chainCode(ChainCode()),
-              sk(PrivateKey()) {}
-
-private:
-    // Private constructor, force use of static methods
-    explicit ExtendedPrivateKey(const uint32_t v, const uint8_t d,
-                                const uint32_t pfp, const uint32_t cn,
-                                const ChainCode code, const PrivateKey key)
-         : version(v),
-          depth(d),
-          parentFingerprint(pfp),
-          childNumber(cn),
-          chainCode(code),
-          sk(key) {}
-
-    uint32_t version;
-    uint8_t depth;
-    uint32_t parentFingerprint;
-    uint32_t childNumber;
-
-    ChainCode chainCode;
-    PrivateKey sk;
-};
-} // end namespace bls
-
-#endif  // SRC_EXTENDEDPRIVATEKEY_HPP_
diff --git a/src/dashbls/include/dashbls/extendedpublickey.hpp b/src/dashbls/include/dashbls/extendedpublickey.hpp
deleted file mode 100644
index b44d5c636a3c..000000000000
--- a/src/dashbls/include/dashbls/extendedpublickey.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_EXTENDEDPUBLICKEY_HPP_
-#define SRC_EXTENDEDPUBLICKEY_HPP_
-
-#include "relic_conf.h"
-
-#include <vector>
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include "chaincode.hpp"
-#include "elements.hpp"
-
-
-#include "relic.h"
-#include "relic_test.h"
-
-namespace bls {
-
-/*
-Defines a BIP-32 style node, which is composed of a private key and a
-chain code. This follows the spec from BIP-0032, with a few changes:
-  * The master secret key is generated mod n from the master seed,
-    since not all 32 byte sequences are valid BLS private keys
-  * Instead of SHA512(input), do SHA256(input || 00000000) ||
-    SHA256(input || 00000001)
-  * Mod n for the output of key derivation.
-  * ID of a key is SHA256(pk) instead of HASH160(pk)
-  * Serialization of extended public key is 93 bytes
-*/
-class ExtendedPublicKey {
- public:
-    static const uint32_t REVISION = 1;
-
-    // version(4) depth(1) parent fingerprint(4) child#(4) cc(32) pk(48)
-    static const uint32_t SIZE = 93;
-
-    // Parse public key and chain code from bytes
-    static ExtendedPublicKey FromBytes(const Bytes& bytes, bool fLegacy = true);
-
-    // Derive a child extended public key, cannot be hardened
-    ExtendedPublicKey PublicChild(uint32_t i, bool fLegacy = true) const;
-
-    uint32_t GetVersion() const;
-    uint8_t GetDepth() const;
-    uint32_t GetParentFingerprint() const;
-    uint32_t GetChildNumber() const;
-
-    ChainCode GetChainCode() const;
-    G1Element GetPublicKey() const;
-
-    // Comparator implementation.
-    friend bool operator==(ExtendedPublicKey const &a,
-                           ExtendedPublicKey const &b);
-    friend bool operator!=(ExtendedPublicKey const &a,
-                           ExtendedPublicKey const &b);
-    friend std::ostream &operator<<(std::ostream &os,
-                                    ExtendedPublicKey const &s);
-
-    void Serialize(uint8_t *buffer, bool fLegacy = true) const;
-    std::vector<uint8_t> Serialize(bool fLegacy = true) const;
-
-    // Blank public constructor
-    ExtendedPublicKey()
-            : version(0),
-              depth(0),
-              parentFingerprint(0),
-              childNumber(0),
-              chainCode(ChainCode()),
-              pk(G1Element()) {}
-
-private:
-    // private constructor, force use of static methods
-    explicit ExtendedPublicKey(const uint32_t v, const uint8_t d,
-                               const uint32_t pfp, const uint32_t cn,
-                               const ChainCode code, const G1Element key)
-         : version(v),
-          depth(d),
-          parentFingerprint(pfp),
-          childNumber(cn),
-          chainCode(code),
-          pk(key) {}
-
-    uint32_t version;
-    uint8_t depth;
-    uint32_t parentFingerprint;
-    uint32_t childNumber;
-
-    ChainCode chainCode;
-    G1Element pk;
-};
-} // end namespace bls
-
-#endif  // SRC_EXTENDEDPUBLICKEY_HPP_
diff --git a/src/dashbls/include/dashbls/hdkeys.hpp b/src/dashbls/include/dashbls/hdkeys.hpp
deleted file mode 100644
index 629ec5e3d142..000000000000
--- a/src/dashbls/include/dashbls/hdkeys.hpp
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSHDKEYS_HPP_
-#define SRC_BLSHDKEYS_HPP_
-
-#include "relic_conf.h"
-#include <math.h>
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include "util.hpp"
-#include "privatekey.hpp"
-#include "hkdf.hpp"
-
-namespace bls {
-
-class HDKeys {
-    /**
-     * Implements HD keys as specified in EIP2333.
-     **/
- public:
-    static const uint8_t HASH_LEN = 32;
-
-    static PrivateKey KeyGen(const std::vector<uint8_t>& seed)
-    {
-        return KeyGen(Bytes(seed));
-    }
-    
-    static PrivateKey KeyGen(const Bytes& seed)
-    {
-        // KeyGen
-        // 1. PRK = HKDF-Extract("BLS-SIG-KEYGEN-SALT-", IKM || I2OSP(0, 1))
-        // 2. OKM = HKDF-Expand(PRK, keyInfo || I2OSP(L, 2), L)
-        // 3. SK = OS2IP(OKM) mod r
-        // 4. return SK
-
-        const uint8_t info[1] = {0};
-        const size_t infoLen = 0;
-
-        // Required by the ietf spec to be at least 32 bytes
-        if (seed.size() < 32) {
-            throw std::invalid_argument("Seed size must be at least 32 bytes");
-        }
-
-        // "BLS-SIG-KEYGEN-SALT-" in ascii
-        const uint8_t saltHkdf[20] = {66, 76, 83, 45, 83, 73, 71, 45, 75, 69,
-                                    89, 71, 69, 78, 45, 83, 65, 76, 84, 45};
-
-        uint8_t *prk = Util::SecAlloc<uint8_t>(32);
-        uint8_t *ikmHkdf = Util::SecAlloc<uint8_t>(seed.size() + 1);
-        memcpy(ikmHkdf, seed.begin(), seed.size());
-        ikmHkdf[seed.size()] = 0;
-
-        const uint8_t L = 48;  // `ceil((3 * ceil(log2(r))) / 16)`, where `r` is the
-                            // order of the BLS 12-381 curve
-
-        uint8_t *okmHkdf = Util::SecAlloc<uint8_t>(L);
-
-        uint8_t keyInfoHkdf[infoLen + 2];
-        memcpy(keyInfoHkdf, info, infoLen);
-        keyInfoHkdf[infoLen] = 0;  // Two bytes for L, 0 and 48
-        keyInfoHkdf[infoLen + 1] = L;
-
-        HKDF256::ExtractExpand(
-            okmHkdf,
-            L,
-            ikmHkdf,
-            seed.size() + 1,
-            saltHkdf,
-            20,
-            keyInfoHkdf,
-            infoLen + 2);
-
-        bn_t order;
-        bn_new(order);
-        g1_get_ord(order);
-
-        // Make sure private key is less than the curve order
-        bn_t *skBn = Util::SecAlloc<bn_t>(1);
-        bn_new(*skBn);
-        bn_read_bin(*skBn, okmHkdf, L);
-        bn_mod_basic(*skBn, *skBn, order);
-
-        uint8_t *skBytes = Util::SecAlloc<uint8_t>(32);
-        bn_write_bin(skBytes, 32, *skBn);
-        PrivateKey k = PrivateKey::FromBytes(Bytes(skBytes, 32));
-
-        Util::SecFree(prk);
-        Util::SecFree(ikmHkdf);
-        Util::SecFree(skBn);
-        Util::SecFree(okmHkdf);
-        Util::SecFree(skBytes);
-
-        return k;
-    }
-
-    static void IKMToLamportSk(uint8_t* outputLamportSk, const uint8_t* ikm, size_t ikmLen, const uint8_t* salt, size_t saltLen)  {
-        // Expands the ikm to 255*HASH_LEN bytes for the lamport sk
-        const uint8_t info[1] = {0};
-        HKDF256::ExtractExpand(outputLamportSk, HASH_LEN * 255, ikm, ikmLen, salt, saltLen, info, 0);
-    }
-
-    static void ParentSkToLamportPK(uint8_t* outputLamportPk, const PrivateKey& parentSk, uint32_t index) {
-        uint8_t* salt = Util::SecAlloc<uint8_t>(4);
-        uint8_t* ikm = Util::SecAlloc<uint8_t>(HASH_LEN);
-        uint8_t* notIkm = Util::SecAlloc<uint8_t>(HASH_LEN);
-        uint8_t* lamport0 = Util::SecAlloc<uint8_t>(HASH_LEN * 255);
-        uint8_t* lamport1 = Util::SecAlloc<uint8_t>(HASH_LEN * 255);
-
-        Util::IntToFourBytes(salt, index);
-        parentSk.Serialize(ikm);
-
-        for (size_t i = 0; i < HASH_LEN; i++) {  // Flips the bits
-            notIkm[i] = ikm[i] ^ 0xff;
-        }
-
-        HDKeys::IKMToLamportSk(lamport0, ikm, HASH_LEN, salt, 4);
-        HDKeys::IKMToLamportSk(lamport1, notIkm, HASH_LEN, salt, 4);
-
-        uint8_t* lamportPk = Util::SecAlloc<uint8_t>(HASH_LEN * 255 * 2);
-
-        for (size_t i = 0; i < 255; i++) {
-            Util::Hash256(lamportPk + i * HASH_LEN, lamport0 + i * HASH_LEN, HASH_LEN);
-        }
-
-        for (size_t i=0; i < 255; i++) {
-            Util::Hash256(lamportPk + 255 * HASH_LEN + i * HASH_LEN, lamport1 + i * HASH_LEN, HASH_LEN);
-        }
-        Util::Hash256(outputLamportPk, lamportPk, HASH_LEN * 255 * 2);
-
-        Util::SecFree(salt);
-        Util::SecFree(ikm);
-        Util::SecFree(notIkm);
-        Util::SecFree(lamport0);
-        Util::SecFree(lamport1);
-        Util::SecFree(lamportPk);
-    }
-
-    static PrivateKey DeriveChildSk(const PrivateKey& parentSk, uint32_t index) {
-        uint8_t* lamportPk = Util::SecAlloc<uint8_t>(HASH_LEN);
-        HDKeys::ParentSkToLamportPK(lamportPk, parentSk, index);
-        std::vector<uint8_t> lamportPkVector(lamportPk, lamportPk + HASH_LEN);
-        PrivateKey child = HDKeys::KeyGen(lamportPkVector);
-        Util::SecFree(lamportPk);
-        return child;
-    }
-
-    static PrivateKey DeriveChildSkUnhardened(const PrivateKey& parentSk, uint32_t index) {
-        uint8_t* buf = Util::SecAlloc<uint8_t>(G1Element::SIZE + 4);
-        uint8_t* digest = Util::SecAlloc<uint8_t>(HASH_LEN);
-        memcpy(buf, parentSk.GetG1Element().Serialize().data(), G1Element::SIZE);
-        Util::IntToFourBytes(buf + G1Element::SIZE, index);
-        Util::Hash256(digest, buf, G1Element::SIZE + 4);
-
-        PrivateKey ret = PrivateKey::Aggregate({parentSk, PrivateKey::FromBytes(Bytes(digest, HASH_LEN), true)});
-
-        Util::SecFree(buf);
-        Util::SecFree(digest);
-        return ret;
-    }
-
-    static G1Element DeriveChildG1Unhardened(const G1Element& pk, uint32_t index) {
-        uint8_t* buf = Util::SecAlloc<uint8_t>(G1Element::SIZE + 4);
-        uint8_t* digest = Util::SecAlloc<uint8_t>(HASH_LEN);
-        memcpy(buf, pk.Serialize().data(), G1Element::SIZE);
-
-        Util::IntToFourBytes(buf + G1Element::SIZE, index);
-        Util::Hash256(digest, buf, G1Element::SIZE + 4);
-
-        bn_t nonce, ord;
-        bn_new(nonce);
-        bn_zero(nonce);
-        bn_read_bin(nonce, digest, HASH_LEN);
-        bn_new(ord);
-        g1_get_ord(ord);
-        bn_mod_basic(nonce, nonce, ord);
-
-        Util::SecFree(buf);
-        Util::SecFree(digest);
-
-        G1Element gen = G1Element::Generator();
-        return pk + gen * nonce;
-    }
-
-    static G2Element DeriveChildG2Unhardened(const G2Element& pk, uint32_t index) {
-        uint8_t* buf = Util::SecAlloc<uint8_t>(G2Element::SIZE + 4);
-        uint8_t* digest = Util::SecAlloc<uint8_t>(HASH_LEN);
-        memcpy(buf, pk.Serialize().data(), G2Element::SIZE);
-        Util::IntToFourBytes(buf + G2Element::SIZE, index);
-        Util::Hash256(digest, buf, G2Element::SIZE + 4);
-
-        bn_t nonce, ord;
-        bn_new(nonce);
-        bn_zero(nonce);
-        bn_read_bin(nonce, digest, HASH_LEN);
-        bn_new(ord);
-        g1_get_ord(ord);
-        bn_mod_basic(nonce, nonce, ord);
-
-        Util::SecFree(buf);
-        Util::SecFree(digest);
-
-        G2Element gen = G2Element::Generator();
-        return pk + gen * nonce;
-    }
-};
-} // end namespace bls
-#endif  // SRC_BLSHDKEYS_HPP_
diff --git a/src/dashbls/include/dashbls/hkdf.hpp b/src/dashbls/include/dashbls/hkdf.hpp
deleted file mode 100644
index a7ddc863ebab..000000000000
--- a/src/dashbls/include/dashbls/hkdf.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSHKDF_HPP_
-#define SRC_BLSHKDF_HPP_
-
-#include "relic_conf.h"
-#include <math.h>
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include <cassert>
-#include "util.hpp"
-
-namespace bls {
-
-class HKDF256 {
-    /**
-     * Implements HKDF as specified in RFC5869: https://tools.ietf.org/html/rfc5869,
-     * with sha256 as the hash function.
-     **/
- public:
-    static const uint8_t HASH_LEN = 32;
-
-    static void Extract(uint8_t* prk_output, const uint8_t* salt, const size_t saltLen, const uint8_t* ikm, const size_t ikm_len) {
-        // assert(saltLen == 4);  // Used for EIP2333 key derivation
-        // assert(ikm_len == 32);  // Used for EIP2333 key derivation
-        // Hash256 used as the hash function (sha256)
-        // PRK Output is 32 bytes (HashLen)
-        md_hmac(prk_output, ikm, ikm_len, salt, saltLen);
-    }
-
-    static void Expand(uint8_t* okm, size_t L, const uint8_t* prk, const uint8_t* info, const size_t infoLen) {
-        assert(L <= 255 * HASH_LEN); // L <= 255 * HashLen
-        assert(infoLen >= 0);
-        size_t N = (L + HASH_LEN - 1) / HASH_LEN; // Round up
-        size_t bytesWritten = 0;
-
-        uint8_t* T = Util::SecAlloc<uint8_t>(HASH_LEN);
-        uint8_t* hmacInput1 = Util::SecAlloc<uint8_t>(infoLen + 1);
-        uint8_t* hmacInput = Util::SecAlloc<uint8_t>(HASH_LEN + infoLen + 1);
-
-        assert(N >= 1 && N <= 255);
-
-        for (size_t i = 1; i <= N; i++) {
-            if (i == 1) {
-                memcpy(hmacInput1, info, infoLen);
-                hmacInput1[infoLen] = i;
-                md_hmac(T, hmacInput1, infoLen + 1, prk, HASH_LEN);
-            } else {
-                memcpy(hmacInput, T, HASH_LEN);
-                memcpy(hmacInput + HASH_LEN, info, infoLen);
-                hmacInput[HASH_LEN + infoLen] = i;
-                md_hmac(T, hmacInput, HASH_LEN + infoLen + 1, prk, HASH_LEN);
-            }
-            size_t to_write = L - bytesWritten;
-            if (to_write > HASH_LEN) {
-                to_write = HASH_LEN;
-            }
-            assert (to_write > 0 && to_write <= HASH_LEN);
-            memcpy(okm + bytesWritten, T, to_write);
-            bytesWritten += to_write;
-        }
-        Util::SecFree(T);
-        Util::SecFree(hmacInput1);
-        Util::SecFree(hmacInput);
-        assert(bytesWritten == L);
-    }
-
-    static void ExtractExpand(uint8_t* output, size_t outputLen,
-                              const uint8_t* key, size_t keyLen,
-                              const uint8_t* salt, size_t saltLen,
-                              const uint8_t* info, size_t infoLen) {
-        uint8_t* prk = Util::SecAlloc<uint8_t>(HASH_LEN);
-        HKDF256::Extract(prk, salt, saltLen, key, keyLen);
-        HKDF256::Expand(output, outputLen, prk, info, infoLen);
-        Util::SecFree(prk);
-    }
-};
-} // end namespace bls
-#endif  // SRC_BLSHKDF_HPP_
diff --git a/src/dashbls/include/dashbls/legacy.hpp b/src/dashbls/include/dashbls/legacy.hpp
deleted file mode 100644
index b3e1ee1345f1..000000000000
--- a/src/dashbls/include/dashbls/legacy.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef SRC_LEGACY_HPP_
-#define SRC_LEGACY_HPP_
-
-#include <ios>
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-extern "C" {
-#include "relic.h"
-}
-
-/**
- * Maps a byte array to a point in an elliptic curve over a quadratic extension.
- *
- * Called ep2_map() in old relic version, _legacy prefix is to avoid duplicated symbols
- *
- * @param[out] p			- the result.
- * @param[in] msg			- the byte array to map.
- * @param[in] len			- the array length in bytes.
- */
-void ep2_map_legacy(ep2_t p, const uint8_t *msg, int len);
-
-#endif  // #define SRC_LEGACY_HPP_
diff --git a/src/dashbls/include/dashbls/privatekey.hpp b/src/dashbls/include/dashbls/privatekey.hpp
deleted file mode 100644
index d02a7d292c12..000000000000
--- a/src/dashbls/include/dashbls/privatekey.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSPRIVATEKEY_HPP_
-#define SRC_BLSPRIVATEKEY_HPP_
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include "elements.hpp"
-
-namespace bls {
-class PrivateKey {
- public:
-    // Private keys are represented as 32 byte field elements. Note that
-    // not all 32 byte integers are valid keys, the private key must be
-    // less than the group order (which is in bls.hpp).
-    static const size_t PRIVATE_KEY_SIZE = 32;
-
-    // Construct a private key from a BIP32 based seed.
-    static PrivateKey FromSeedBIP32(const Bytes& seed);
-
-    // Construct a random private key.
-    static PrivateKey RandomPrivateKey();
-
-    // Construct a private key from a bytearray.
-    static PrivateKey FromBytes(const Bytes& bytes, bool modOrder = false);
-
-    // Construct a private key from a bytearray.
-    static PrivateKey FromByteVector(const std::vector<uint8_t> bytes, bool modOrder = false);
-
-    // Aggregate many private keys into one (sum of keys mod order)
-    static PrivateKey Aggregate(std::vector<PrivateKey> const &privateKeys);
-
-    PrivateKey();
-
-    // Construct a private key from another private key. Allocates memory in
-    // secure heap, and copies keydata.
-    PrivateKey(const PrivateKey &k);
-    PrivateKey(PrivateKey &&k);
-
-    PrivateKey& operator=(const PrivateKey& other);
-    PrivateKey& operator=(PrivateKey&& other);
-
-    ~PrivateKey();
-
-    const G1Element& GetG1Element() const;
-    const G2Element& GetG2Element() const;
-
-    G2Element GetG2Power(const G2Element& element) const;
-
-    bool IsZero() const;
-
-    // Compare to different private key
-    friend bool operator==(const PrivateKey &a, const PrivateKey &b);
-    friend bool operator!=(const PrivateKey &a, const PrivateKey &b);
-
-    // Multiply private key by G1 or G2 elements
-    friend G1Element operator*(const G1Element &a, const PrivateKey &k);
-    friend G1Element operator*(const PrivateKey &k, const G1Element &a);
-
-    friend G2Element operator*(const G2Element &a, const PrivateKey &k);
-    friend G2Element operator*(const PrivateKey &k, const G2Element &a);
-
-    friend PrivateKey operator*(const PrivateKey& a, const bn_t& k);
-    friend PrivateKey operator*(const bn_t& k, const PrivateKey& a);
-
-    // Serialize the key into bytes
-    void Serialize(uint8_t *buffer) const;
-    std::vector<uint8_t> Serialize(bool fLegacy = false) const;
-    std::array<uint8_t, PrivateKey::PRIVATE_KEY_SIZE> SerializeToArray(bool fLegacy = false) const;
-
-    G2Element SignG2(
-        const uint8_t *msg,
-        size_t len,
-        const uint8_t *dst,
-        size_t dst_len,
-        bool fLegacy = false) const;
-
-    bool HasKeyData() const;
-
- private:
-
-    // Allocate memory for private key
-    void AllocateKeyData();
-    /// Throw an error if keydata isn't initialized
-    void CheckKeyData() const;
-    /// Deallocate *keydata and keydata if requried
-    void DeallocateKeyData();
-
-    void InvalidateCaches();
-
-    // The actual byte data
-    bn_st* keydata{nullptr};
-
-    mutable bool fG1CacheValid{false};
-    mutable G1Element g1Cache;
-
-    mutable bool fG2CacheValid{false};
-    mutable G2Element g2Cache;
-};
-}  // end namespace bls
-
-#endif  // SRC_BLSPRIVATEKEY_HPP_
diff --git a/src/dashbls/include/dashbls/schemes.hpp b/src/dashbls/include/dashbls/schemes.hpp
deleted file mode 100644
index 1aee61dd346d..000000000000
--- a/src/dashbls/include/dashbls/schemes.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in coiance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or iied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSSCHEMES_HPP_
-#define SRC_BLSSCHEMES_HPP_
-
-#include <array>
-#include <iostream>
-#include <vector>
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-#include "elements.hpp"
-#include "privatekey.hpp"
-
-using std::vector;
-
-// These are all MPL schemes
-namespace bls {
-
-class Bytes;
-
-class CoreMPL {
-
-public:
-    CoreMPL() = delete;
-    CoreMPL(const std::string& strId) : strCiphersuiteId(strId) {}
-    virtual ~CoreMPL() {}
-    // Generates a private key from a seed, similar to HD key generation
-    // (hashes the seed), and reduces it mod the group order
-    virtual PrivateKey KeyGen(const vector<uint8_t>& seed);
-    virtual PrivateKey KeyGen(const Bytes& seed);
-
-    // Generates a public key from a secret key
-    virtual vector<uint8_t> SkToPk(const PrivateKey &seckey);
-
-    virtual G1Element SkToG1(const PrivateKey &seckey);
-
-    virtual G2Element Sign(const PrivateKey &seckey, const vector<uint8_t> &message);
-    virtual G2Element Sign(const PrivateKey& seckey, const Bytes& message);
-
-    virtual bool Verify(const vector<uint8_t> &pubkey,
-                        const vector<uint8_t> &message,
-                        const vector<uint8_t> &signature);
-
-    virtual bool Verify(const Bytes& pubkey, const Bytes& message, const Bytes& signature);
-
-    virtual bool Verify(const G1Element &pubkey,
-                        const vector<uint8_t> &message,
-                        const G2Element &signature);
-
-    virtual bool Verify(const G1Element& pubkey, const Bytes& message, const G2Element& signature);
-
-    virtual std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<vector<uint8_t>> &signatures);
-    virtual std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<Bytes>& signatures);
-
-    virtual G2Element Aggregate(const vector<G2Element> &signatures);
-
-    virtual G1Element Aggregate(const vector<G1Element> &publicKeys);
-
-    virtual G2Element AggregateSecure(const std::vector<G1Element>& vecPublicKeys,
-                                      const std::vector<G2Element>& vecSignatures,
-                                      const Bytes& message);
-
-    virtual bool VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                              const G2Element& signature,
-                              const Bytes& message);
-
-    virtual bool AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                                 const vector<vector<uint8_t>> &messages,
-                                 const vector<uint8_t> &signature);
-
-    virtual bool AggregateVerify(const vector<Bytes>& pubkeys,
-                                 const vector<Bytes>& messages,
-                                 const Bytes& signature);
-
-    virtual bool AggregateVerify(const vector<G1Element> &pubkeys,
-                                 const vector<vector<uint8_t>> &messages,
-                                 const G2Element &signature);
-
-     virtual bool AggregateVerify(const vector<G1Element>& pubkeys,
-                                  const vector<Bytes>& messages,
-                                  const G2Element& signature);
-
-    PrivateKey DeriveChildSk(const PrivateKey& sk, uint32_t index);
-    PrivateKey DeriveChildSkUnhardened(const PrivateKey& sk, uint32_t index);
-    G1Element DeriveChildPkUnhardened(const G1Element& sk, uint32_t index);
-
-protected:
-    const std::string& strCiphersuiteId;
-    bool NativeVerify(g1_t *pubKeys, g2_t *mappedHashes, size_t length);
-    G2Element AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
-                              std::vector<G2Element> const &vecSignatures,
-                              const Bytes& message,
-                              bool fLegacy);
-    bool VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                      const G2Element& signature,
-                      const Bytes& message,
-                      bool fLegacy);
-};
-
-class BasicSchemeMPL final : public CoreMPL {
-public:
-    static const std::string CIPHERSUITE_ID;
-    BasicSchemeMPL() : CoreMPL(BasicSchemeMPL::CIPHERSUITE_ID) {}
-    bool AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const vector<uint8_t> &signature) override;
-
-    bool AggregateVerify(const vector<Bytes>& pubkeys,
-                         const vector<Bytes>& messages,
-                         const Bytes& signature) override;
-
-    bool AggregateVerify(const vector<G1Element> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const G2Element &signature) override;
-
-    bool AggregateVerify(const vector<G1Element>& pubkeys,
-                         const vector<Bytes>& messages,
-                         const G2Element& signature) override;
-};
-
-class AugSchemeMPL final : public CoreMPL {
-
-public:
-    static const std::string CIPHERSUITE_ID;
-    AugSchemeMPL() : CoreMPL(AugSchemeMPL::CIPHERSUITE_ID) {}
-
-    G2Element Sign(const PrivateKey &seckey, const vector<uint8_t> &message) override;
-
-    G2Element Sign(const PrivateKey& seckey, const Bytes& message) override;
-
-    // Used for prepending different augMessage
-    G2Element Sign(const PrivateKey &seckey,
-                   const vector<uint8_t> &message,
-                   const G1Element &prepend_pk);
-
-    // Used for prepending different augMessage
-    G2Element Sign(const PrivateKey& seckey,
-                   const Bytes& message,
-                   const G1Element& prepend_pk);
-
-    bool Verify(const vector<uint8_t> &pubkey,
-                const vector<uint8_t> &message,
-                const vector<uint8_t> &signature) override;
-
-    bool Verify(const Bytes& pubkey,
-                const Bytes& message,
-                const Bytes& signature) override;
-
-    bool Verify(const G1Element &pubkey,
-                const vector<uint8_t> &message,
-                const G2Element &signature) override;
-
-    bool Verify(const G1Element& pubkey,
-                const Bytes& message,
-                const G2Element& signature) override;
-
-    bool AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const vector<uint8_t> &signature) override;
-
-    bool AggregateVerify(const vector<Bytes>& pubkeys,
-                         const vector<Bytes>& messages,
-                         const Bytes& signature) override;
-
-    bool AggregateVerify(const vector<G1Element> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const G2Element &signature) override;
-
-    bool AggregateVerify(const vector<G1Element>& pubkeys,
-                         const vector<Bytes>& messages,
-                         const G2Element& signature) override;
-};
-
-class PopSchemeMPL final : public CoreMPL {
-
-public:
-    static const std::string CIPHERSUITE_ID;
-    static const std::string POP_CIPHERSUITE_ID;
-    PopSchemeMPL() : CoreMPL(PopSchemeMPL::CIPHERSUITE_ID) {}
-
-    G2Element PopProve(const PrivateKey &seckey);
-
-    bool PopVerify(const G1Element &pubkey, const G2Element &signature_proof);
-
-    bool PopVerify(const vector<uint8_t> &pubkey, const vector<uint8_t> &proof);
-
-    bool PopVerify(const Bytes& pubkey, const Bytes& proof);
-
-    bool FastAggregateVerify(const vector<G1Element> &pubkeys,
-                             const vector<uint8_t> &message,
-                             const G2Element &signature);
-
-    bool FastAggregateVerify(const vector<G1Element>& pubkeys,
-                             const Bytes& message,
-                             const G2Element& signature);
-
-    bool FastAggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                             const vector<uint8_t> &message,
-                             const vector<uint8_t> &signature);
-
-    bool FastAggregateVerify(const vector<Bytes>& pubkeys,
-                             const Bytes& message,
-                             const Bytes& signature);
-};
-
-/**
- * This scheme reflects the Sign/Verify behaviour of older bls-signatures library versions (<0.1.29).
- */
-class LegacySchemeMPL final : public CoreMPL {
-
-public:
-    LegacySchemeMPL() : CoreMPL(std::string{}) {}
-
-    virtual vector<uint8_t> SkToPk(const PrivateKey &seckey) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    G2Element Sign(const PrivateKey &seckey, const vector<uint8_t> &message) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-    G2Element Sign(const PrivateKey &seckey, const Bytes& message) final;
-
-    bool Verify(const vector<uint8_t>& pubkey,
-                const vector<uint8_t>& message,
-                const vector<uint8_t>& signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    bool Verify(const G1Element& pubkey,
-                const vector<uint8_t>& message,
-                const G2Element& signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    bool Verify(const Bytes& pubkey, const Bytes& message, const Bytes& signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-    bool Verify(const G1Element &pubkey, const Bytes& message, const G2Element &signature) final;
-
-    std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<vector<uint8_t>> &signatures) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    G2Element AggregateSecure(const std::vector<G1Element>& vecPublicKeys,
-                              const std::vector<G2Element>& vecSignatures,
-                              const Bytes& message) final;
-
-    bool VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                      const G2Element& signature,
-                      const Bytes& message) final;
-
-    bool AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const vector<uint8_t> &signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    bool AggregateVerify(const vector<Bytes> &pubkeys,
-                         const vector<Bytes> &messages,
-                         const Bytes &signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    bool AggregateVerify(const vector<G1Element> &pubkeys,
-                         const vector<vector<uint8_t>> &messages,
-                         const G2Element &signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
-
-    bool AggregateVerify(const vector<G1Element> &pubkeys,
-                         const vector<Bytes> &messages,
-                         const G2Element &signature) final;
-};
-}  // end namespace bls
-
-#endif  // SRC_BLSSCHEMES_HPP_
diff --git a/src/dashbls/include/dashbls/test-utils.hpp b/src/dashbls/include/dashbls/test-utils.hpp
deleted file mode 100644
index 154079ff4a99..000000000000
--- a/src/dashbls/include/dashbls/test-utils.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <chrono>
-#include <string>
-#include "bls.hpp"
-
-using std::string;
-using std::vector;
-using std::cout;
-using std::endl;
-
-#ifdef _MSC_VER
-#define __PRETTY_FUNCTION__ __FUNCSIG__
-#endif
-#define STR(x) #x
-#define ASSERT(x) if (!(x)) { printf("BLS assertion failed: (%s), function %s, file %s, line %d.\n", STR(x), __PRETTY_FUNCTION__, __FILE__, __LINE__); abort(); }
-
-std::chrono::time_point<std::chrono::steady_clock> startStopwatch() {
-    return std::chrono::steady_clock::now();
-}
-
-void endStopwatch(string testName,
-                  std::chrono::time_point<std::chrono::steady_clock> start,
-                  int numIters) {
-    auto end = std::chrono::steady_clock::now();
-    auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-            end - start);
-
-    cout << endl << testName << endl;
-    cout << "Total: " << numIters << " runs in " << now_ms.count()
-         << " ms" << endl;
-    cout << "Avg: " << now_ms.count() / static_cast<double>(numIters)
-         << " ms" << endl;
-}
-
-std::vector<uint8_t> getRandomSeed() {
-    uint8_t buf[32];
-    bn_t r;
-    bn_new(r);
-    bn_rand(r, RLC_POS, 256);
-    bn_write_bin(buf, 32, r);
-    std::vector<uint8_t> ret(buf, buf + 32);
-    return ret;
-}
diff --git a/src/dashbls/include/dashbls/threshold.hpp b/src/dashbls/include/dashbls/threshold.hpp
deleted file mode 100644
index d76f2cd4f669..000000000000
--- a/src/dashbls/include/dashbls/threshold.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef SRC_THRESHOLD_HPP_
-#define SRC_THRESHOLD_HPP_
-
-#include "privatekey.hpp"
-#include "elements.hpp"
-
-namespace bls {
-
-    namespace Threshold {
-
-        PrivateKey PrivateKeyShare(const std::vector<PrivateKey>& sks, const Bytes& id);
-        PrivateKey PrivateKeyRecover(const std::vector<PrivateKey>& sks, const std::vector<Bytes>& ids);
-
-        G1Element PublicKeyShare(const std::vector<G1Element>& pks, const Bytes& id);
-        G1Element PublicKeyRecover(const std::vector<G1Element>& sks, const std::vector<Bytes>& ids);
-
-        G2Element SignatureShare(const std::vector<G2Element>& sks, const Bytes& id);
-        G2Element SignatureRecover(const std::vector<G2Element>& sigs, const std::vector<Bytes>& ids);
-
-        G2Element Sign(const PrivateKey& privateKey, const Bytes& vecMessage);
-        bool Verify(const G1Element& pubKey, const Bytes& vecMessage, const G2Element& signature);
-    } // end namespace Threshold
-} // end namespace bls
-
-#endif  // SRC_THRESHOLD_HPP_
diff --git a/src/dashbls/include/dashbls/util.hpp b/src/dashbls/include/dashbls/util.hpp
deleted file mode 100644
index 37fd8547a983..000000000000
--- a/src/dashbls/include/dashbls/util.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SRC_BLSUTIL_HPP_
-#define SRC_BLSUTIL_HPP_
-
-#include <algorithm>
-#include <iomanip>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <array>
-
-namespace bls {
-
-class BLS;
-
-class Bytes {
-    const uint8_t* pData;
-    const size_t nSize;
-
-public:
-    Bytes(const uint8_t* pDataIn, const size_t nSizeIn)
-        : pData(pDataIn), nSize(nSizeIn)
-    {
-    }
-    Bytes(const std::vector<uint8_t>& vecBytes)
-        : pData(vecBytes.data()), nSize(vecBytes.size())
-    {
-    }
-    template <size_t N>
-    Bytes(const std::array<uint8_t, N>& a)
-        : pData(a.data()), nSize(N)
-    {
-    }
-
-    inline const uint8_t* begin() const { return pData; }
-    inline const uint8_t* end() const { return pData + nSize; }
-
-    inline size_t size() const { return nSize; }
-
-    const uint8_t& operator[](const int nIndex) const { return pData[nIndex]; }
-};
-
-class Util {
- public:
-    typedef void *(*SecureAllocCallback)(size_t);
-    typedef void (*SecureFreeCallback)(void*);
- public:
-    static void Hash256(uint8_t* output, const uint8_t* message,
-                        size_t messageLen) {
-        md_map_sh256(output, message, messageLen);
-    }
-
-    static std::string HexStr(const uint8_t* data, size_t len) {
-        std::stringstream s;
-        s << std::hex;
-        for (size_t i=0; i < len; ++i)
-            s << std::setw(2) << std::setfill('0') << static_cast<int>(data[i]);
-        return s.str();
-    }
-
-    static std::string HexStr(const std::vector<uint8_t> &data) {
-        std::stringstream s;
-        s << std::hex;
-        for (size_t i=0; i < data.size(); ++i)
-            s << std::setw(2) << std::setfill('0') << static_cast<int>(data[i]);
-        return s.str();
-    }
-
-    /*
-     * Securely allocates a portion of memory, using libsodium. This prevents
-     * paging to disk, and zeroes out the memory when it's freed.
-     */
-    template<class T>
-    static T* SecAlloc(size_t numTs) {
-        return static_cast<T*>(secureAllocCallback(sizeof(T) * numTs));
-    }
-
-    /*
-     * Frees memory allocated using SecAlloc.
-     */
-    static void SecFree(void* ptr) {
-        secureFreeCallback(ptr);
-    }
-
-    /*
-     * Converts one hex character to an int.
-     */
-    static uint8_t char2int(const char input) {
-        if(input >= '0' && input <= '9')
-            return input - '0';
-        if(input >= 'A' && input <= 'F')
-            return input - 'A' + 10;
-        if(input >= 'a' && input <= 'f')
-            return input - 'a' + 10;
-        throw std::invalid_argument("Invalid input string");
-    }
-
-    /*
-     * Converts a hex string into a vector of bytes.
-     */
-    static std::vector<uint8_t> HexToBytes(const std::string hex) {
-        if (hex.size() % 2 != 0) {
-            throw std::invalid_argument("Invalid input string, length must be multple of 2");
-        }
-        std::vector<uint8_t> ret = std::vector<uint8_t>();
-        size_t start_at = 0;
-        if (hex.rfind("0x", 0) == 0 || hex.rfind("0x", 0) == 0) {
-            start_at = 2;
-        }
-
-        for (size_t i = start_at; i < hex.size(); i += 2) {
-            ret.push_back(char2int(hex[i]) * 16 + char2int(hex[i+1]));
-        }
-        return ret;
-    }
-
-    /*
-     * Converts a 32 bit int to bytes.
-     */
-    static void IntToFourBytes(uint8_t* result,
-                               const uint32_t input) {
-        for (size_t i = 0; i < 4; i++) {
-            result[3 - i] = (input >> (i * 8));
-        }
-    }
-
-    /*
-     * Converts a byte array to a 32 bit int.
-     */
-    static uint32_t FourBytesToInt(const uint8_t* bytes) {
-        uint32_t sum = 0;
-        for (size_t i = 0; i < 4; i++) {
-            uint32_t addend = bytes[i] << (8 * (3 - i));
-            sum += addend;
-        }
-        return sum;
-    }
-
-    static bool HasOnlyZeros(const Bytes& bytes) {
-        return std::all_of(bytes.begin(), bytes.end(), [](uint8_t byte){ return byte == 0x00; });
-    }
-
- private:
-    friend class BLS;
-    static SecureAllocCallback secureAllocCallback;
-    static SecureFreeCallback secureFreeCallback;
-};
-} // end namespace bls
-#endif  // SRC_BLSUTIL_HPP_
diff --git a/src/dashbls/js-bindings/CMakeLists.txt b/src/dashbls/js-bindings/CMakeLists.txt
deleted file mode 100644
index f053eb2ea05e..000000000000
--- a/src/dashbls/js-bindings/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.14.0 FATAL_ERROR)
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories(
-        ${INCLUDE_DIRECTORIES}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include
-        ${CMAKE_CURRENT_SOURCE_DIR}/../depends/relic/include
-        ${CMAKE_CURRENT_BINARY_DIR}/../depends/relic/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/../depends/catch2/include
-)
-
-file(GLOB_RECURSE WRAP_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/wrappers/*.h)
-file(GLOB_RECURSE WRAP_SRC ${CMAKE_CURRENT_SOURCE_DIR}/wrappers/*.cpp)
-
-add_executable(blsjstmp ${CMAKE_CURRENT_SOURCE_DIR}/jsbindings.cpp
-        ${WRAP_HEADERS} ${WRAP_SRC}  ${CMAKE_CURRENT_SOURCE_DIR}/helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/helpers.cpp
-        )
-add_custom_target(install_npm_dependencies npm ci)
-add_dependencies(blsjstmp install_npm_dependencies)
-target_link_libraries(blsjstmp PRIVATE dashbls)
-
-target_link_options(blsjstmp PRIVATE
-    "SHELL:--bind"
-    "SHELL:-Oz"
-    "SHELL:--closure 1"
-    "SHELL:-s MODULARIZE=1"
-    "SHELL:-s MALLOC=emmalloc"
-    "SHELL:-s ALLOW_MEMORY_GROWTH=1"
-    "SHELL:-s INITIAL_MEMORY=134217728"
-)
-
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    target_link_options(blsjstmp PRIVATE "SHELL:-s ASSERTIONS=2")
-endif()
-
-# Copy necessary files for the npm package
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.json package.json COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json package-lock.json COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blsjs.d.ts blsjs.d.ts COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/README.md README.md COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bundle_wasm_for_web.js bundle_wasm_for_web.js COPYONLY)
-
-# Copy test files
-file(GLOB JS_BINDINGS_TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/tests/ ${CMAKE_CURRENT_SOURCE_DIR}/tests/*)
-foreach(file ${JS_BINDINGS_TESTS})
-    message(FILE ${file})
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/${file} tests/${file} COPYONLY)
-endforeach()
-
-add_custom_command(TARGET blsjstmp POST_BUILD COMMAND npm run build:web)
diff --git a/src/dashbls/js-bindings/README.md b/src/dashbls/js-bindings/README.md
deleted file mode 100644
index 09b125607a3d..000000000000
--- a/src/dashbls/js-bindings/README.md
+++ /dev/null
@@ -1,178 +0,0 @@
-## bls-signatures
-
-JavaScript library that implements BLS signatures with aggregation as in [Boneh, Drijvers, Neven 2018](https://crypto.stanford.edu/~dabo/pubs/papers/BLSmultisig.html), using the relic toolkit for cryptographic primitives (pairings, EC, hashing).
-
-This library is a JavaScript port of the [Chia Network's BLS lib](https://github.com/Chia-Network/bls-signatures). We also have typings, so you can use it with TypeScript too!
-
-### Usage
-
-```bash
-npm i bls-signatures --save # or yarn add bls-signatures
-```
-
-### Creating keys and signatures
-```javascript
-  var loadBls = require("bls-signatures");
-  var BLS = await loadBls();
-  
-  var seed = Uint8Array.from([
-    0,  50, 6,  244, 24,  199, 1,  25,  52,  88,  192,
-    19, 18, 12, 89,  6,   220, 18, 102, 58,  209, 82,
-    12, 62, 89, 110, 182, 9,   44, 20,  254, 22
-  ]);
-  
-  var sk = BLS.AugSchemeMPL.key_gen(seed);
-  var pk = sk.get_g1();
-  
-  var message = Uint8Array.from([1,2,3,4,5]);
-  var signature = BLS.AugSchemeMPL.sign(sk, message);
-  
-  let ok = BLS.AugSchemeMPL.verify(pk, message, signature);
-  console.log(ok); // true
-```
-
-### Serializing keys and signatures to bytes
-```javascript  
-  var skBytes = sk.serialize();
-  var pkBytes = pk.serialize();
-  var signatureBytes = signature.serialize();
-  
-  console.log(BLS.Util.hex_str(skBytes));
-  console.log(BLS.Util.hex_str(pkBytes));
-  console.log(BLS.Util.hex_str(signatureBytes));
-  
-```
-
-### Loading keys and signatures from bytes
-```javascript
-  var skc = BLS.PrivateKey.from_bytes(skBytes, false);
-  var pk = BLS.G1Element.from_bytes(pkBytes);
-
-  var signature = BLS.G2Element.from_bytes(signatureBytes);
-```
-
-### Create aggregate signatures
-```javascript
-  // Generate some more private keys
-  seed[0] = 1;
-  var sk1 = BLS.AugSchemeMPL.key_gen(seed);
-  seed[0] = 2;
-  var sk2 = BLS.AugSchemeMPL.key_gen(seed);
-  var message2 = Uint8Array.from([1,2,3,4,5,6,7]);
-  
-  // Generate first sig
-  var pk1 = sk1.get_g1();
-  var sig1 = BLS.AugSchemeMPL.sign(sk1, message);
-  
-  // Generate second sig
-  var pk2 = sk2.get_g1();
-  var sig2 = BLS.AugSchemeMPL.sign(sk2, message2);
-  
-  // Signatures can be non-interactively combined by anyone
-  var aggSig = BLS.AugSchemeMPL.aggregate([sig1, sig2]);
-  
-  ok = BLS.AugSchemeMPL.aggregate_verify([pk1, pk2], [message, message2], aggSig);
-  console.log(ok); // true
-  
-```
-
-### Arbitrary trees of aggregates
-```javascript
-  seed[0] = 3;
-  var sk3 = BLS.AugSchemeMPL.key_gen(seed);
-  var pk3 = sk3.get_g1();
-  var message3 = Uint8Array.from([100, 2, 254, 88, 90, 45, 23]);
-  var sig3 = BLS.AugSchemeMPL.sign(sk3, message3);
-  
-  var aggSigFinal = BLS.AugSchemeMPL.aggregate([aggSig, sig3]);
-  ok = BLS.AugSchemeMPL.aggregate_verify([pk1, pk2, pk3], [message, message2, message3], aggSigFinal);
-  console.log(ok); // true
-```
-
-### Very fast verification with Proof of Possession scheme
-```javascript
-
-  // If the same message is signed, you can use Proof of Posession (PopScheme) for efficiency
-  // A proof of possession MUST be passed around with the PK to ensure security.
-  var popSig1 = BLS.PopSchemeMPL.sign(sk1, message);
-  var popSig2 = BLS.PopSchemeMPL.sign(sk2, message);
-  var popSig3 = BLS.PopSchemeMPL.sign(sk3, message);
-  var pop1 = BLS.PopSchemeMPL.pop_prove(sk1);
-  var pop2 = BLS.PopSchemeMPL.pop_prove(sk2);
-  var pop3 = BLS.PopSchemeMPL.pop_prove(sk3);
-  
-  ok = BLS.PopSchemeMPL.pop_verify(pk1, pop1);
-  console.log(ok); // true
-  ok = BLS.PopSchemeMPL.pop_verify(pk2, pop2);
-  console.log(ok); // true
-  ok = BLS.PopSchemeMPL.pop_verify(pk3, pop3);
-  console.log(ok); // true
-  
-  var popSigAgg = BLS.PopSchemeMPL.aggregate([popSig1, popSig2, popSig3]);
-  ok = BLS.PopSchemeMPL.fast_aggregate_verify([pk1, pk2, pk3], message, popSigAgg);
-  console.log(ok); // true
-  
-  // Aggregate public key, indistinguishable from a single public key
-  var popAggPk = pk1.add(pk2).add(pk3);
-  ok = BLS.PopSchemeMPL.verify(popAggPk, message, popSigAgg);
-  console.log(ok); // true
-  
-  // Aggregate private keys
-  var aggSk = BLS.PrivateKey.aggregate([sk1, sk2, sk3]);
-  ok = (BLS.PopSchemeMPL.sign(aggSk, message).equal_to(popSigAgg));
-  console.log(ok); // true
-```
-
-### HD keys using [EIP-2333](https://github.com/ethereum/EIPs/pull/2333)
-```javascript
-  // You can derive 'child' keys from any key, to create arbitrary trees. 4 byte indeces are used.
-  // Hardened (more secure, but no parent pk -> child pk)
-  var masterSk = BLS.AugSchemeMPL.key_gen(seed);
-  var child = BLS.AugSchemeMPL.derive_child_sk(masterSk, 152);
-  var grandChild = BLS.AugSchemeMPL.derive_child_sk(child, 952);
-  
-  // Unhardened (less secure, but can go from parent pk -> child pk), BIP32 style
-  var masterPk = masterSk.get_g1();
-  var childU = BLS.AugSchemeMPL.derive_child_sk_unhardened(masterSk, 22);
-  var grandchildU = BLS.AugSchemeMPL.derive_child_sk_unhardened(childU, 0);
-  
-  var childUPk = BLS.AugSchemeMPL.derive_child_pk_unhardened(masterPk, 22);
-  var grandchildUPk = BLS.AugSchemeMPL.derive_child_pk_unhardened(childUPk, 0);
-  
-  ok = (grandchildUPk.equal_to(grandchildU.get_g1()));
-  console.log(ok); // true
-```
-
-Please refer to the library's [typings](./blsjs.d.ts) for detailed API information. Use cases can be found in the [original lib's readme](../README.md).
-
-__Important note on usage:__ Since this library is a WebAssembly port of the c++ library, JavaScript's automatic memory management isn't available. Please, delete all objects manually if they are not needed anymore by calling the delete method on them, as shown in the example below.
-
-```javascript
-  sk.delete();
-  // ...
-  pk.delete();
-  // ...
-  sig1.delete();
-  // ...
-```
-
-### Build
-
-Building requires Node.js (with npm) and [Emscripten](https://emscripten.org/docs/getting_started/downloads.html) to be installed.
-The build process is the same as for the c++ lib, with one additional step: pass the Emscripten toolchain file as an option to CMake.
-From the project root directory, run:
-```
-#git submodule update --init --recursive
-mkdir js_build
-cd js_build
-cmake ../ -DCMAKE_TOOLCHAIN_FILE={path_to_your_emscripten_installation}/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
-cmake --build . --
-```
-
-Run the build after any changes to the library, including readme and tests, as the library will be deployed from the build directory, and the build system copies all the files from the source dir.
-### Run tests
-Tests are run in node.js and Firefox, therefore you need to install node.js and Firefox.
-To run tests, build the library, then go to the `js_bindings` folder in the build directory and run
-```bash
-npm test
-```
diff --git a/src/dashbls/js-bindings/blsjs.d.ts b/src/dashbls/js-bindings/blsjs.d.ts
deleted file mode 100644
index 95cb05962ad1..000000000000
--- a/src/dashbls/js-bindings/blsjs.d.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-export declare class AugSchemeMPL {
-  static skToG1(sk: PrivateKey): G1Element;
-  static keyGen(msg: Uint8Array): PrivateKey;
-  static sign(sk: PrivateKey, msg: Uint8Array): G2Element;
-  static signPrepend(sk: PrivateKey, msg: Uint8Array, prependPk: G1Element): G2Element;
-  static verify(pk: G1Element, msg: Uint8Array, sig: G2Element): boolean;
-  static aggregate(g2Elements: G2Element[]): G2Element;
-  static aggregateVerify(pks: G1Element[], msgs: Uint8Array[], sig: G2Element): boolean;
-  static deriveChildSk(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildSkUnhardened(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildPkUnhardened(pk: G1Element, index: number): G1Element;
-}
-
-export declare class BasicSchemeMPL {
-  static skToG1(sk: PrivateKey): G1Element;
-  static keyGen(msg: Uint8Array): PrivateKey;
-  static sign(sk: PrivateKey, msg: Uint8Array): G2Element;
-  static verify(pk: G1Element, msg: Uint8Array, sig: G2Element): boolean;
-  static aggregate(g2Elements: G2Element[]): G2Element;
-  static aggregateVerify(pks: G1Element[], msgs: Uint8Array[], sig: G2Element): boolean;
-  static deriveChildSk(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildSkUnhardened(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildPkUnhardened(pk: G1Element, index: number): G1Element;
-  static verifySecure(pk: G1Element, sig: G2Element, msg: Uint8Array): boolean;
-}
-
-export declare class PopSchemeMPL {
-  static skToG1(sk: PrivateKey): G1Element;
-  static keyGen(msg: Uint8Array): PrivateKey;
-  static sign(sk: PrivateKey, msg: Uint8Array): G2Element;
-  static verify(pk: G1Element, msg: Uint8Array, sig: G2Element): boolean;
-  static aggregate(g2Elements: G2Element[]): G2Element;
-  static aggregateVerify(pks: G1Element[], msgs: Uint8Array[], sig: G2Element): boolean;
-  static deriveChildSk(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildSkUnhardened(sk: PrivateKey, index: number): PrivateKey;
-  static deriveChildPkUnhardened(pk: G1Element, index: number): G1Element;
-  static popProve(sk: PrivateKey): G2Element;
-  static popVerify(pk: G1Element, signatureProof: G2Element): boolean;
-  static fastAggregateVerify(pks: G1Element[], msg: Uint8Array, sig: G2Element): boolean;
-}
-
-export declare class G1Element {
-  static SIZE: number;
-  static fromBytes(bytes: Uint8Array): G1Element;
-  static generator(): G2Element;
-  serialize(): Uint8Array;
-  negate(): G1Element;
-  deepcopy(): G1Element;
-  getFingerprint(): number;
-  add(el: G1Element): G1Element;
-  mul(bn: Bignum): G1Element;
-  equalTo(el: G1Element): boolean;
-  delete(): void;
-}
-
-export declare class G2Element {
-  static SIZE: number;
-  static fromBytes(bytes: Uint8Array): G2Element;
-  static fromG2(sk: G2Element): G2Element;
-  static aggregateSigs(sigs: G2Element[]): G2Element;
-  static generator(): G2Element;
-  serialize(): Uint8Array;
-  negate(): G2Element;
-  deepcopy(): G2Element;
-  add(el: G2Element): G2Element;
-  mul(bn: Bignum): G2Element;
-  equalTo(el: G2Element): boolean;
-  delete(): void;
-}
-
-export declare class PrivateKey {
-  static PRIVATE_KEY_SIZE: number;
-  static fromBytes(bytes: Uint8Array, modOrder: boolean): PrivateKey;
-  static aggregate(pks: PrivateKey[]): PrivateKey;
-  deepcopy(): PrivateKey;
-  serialize(): Uint8Array;
-  getG1(): G1Element;
-  getG2(): G2Element;
-  mulG1(el: G1Element): G1Element;
-  mulG2(el: G2Element): G2Element;
-  equalTo(key: PrivateKey): boolean;
-  delete(): void;
-}
-
-export declare class Bignum {
-  static fromString(s: string, radix: number): Bignum;
-  toString(radix: number): string;
-  delete(): void;
-}
-
-export declare class Util {
-  static hash256(msg: Uint8Array): Uint8Array;
-  static hexStr(msg: Uint8Array): string;
-}
-
-export interface ModuleInstance {
-  AugSchemeMPL: typeof AugSchemeMPL;
-  BasicSchemeMPL: typeof BasicSchemeMPL;
-  PopSchemeMPL: typeof PopSchemeMPL;
-  G1Element: typeof G1Element;
-  G2Element: typeof G2Element;
-  PrivateKey: typeof PrivateKey;
-  Bignum: typeof Bignum;
-  Util: typeof Util;
-}
-
-export default function createModule(options?: {}): Promise<ModuleInstance>;
diff --git a/src/dashbls/js-bindings/bundle_wasm_for_web.js b/src/dashbls/js-bindings/bundle_wasm_for_web.js
deleted file mode 100644
index cfd67d56d457..000000000000
--- a/src/dashbls/js-bindings/bundle_wasm_for_web.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// The code manipulation from this file needs to be done for Chrome, as
-// it requires wasm to be loaded asynchronously, and it doesn't
-// work when bundling complex projects. With this solution, wasm is
-// included right into the bundle itself in a form of base64 string
-// and compiled asynchronously, just as Chrome requires
-
-const fs = require('fs');
-
-const outputPath = './blsjs.js';
-
-const wasm = fs.readFileSync('./blsjstmp.wasm');
-const wasmBase = wasm.toString('base64');
-
-const codeToPrepend = `
-if (typeof window === "object") {
-    var buf = Buffer.from("${wasmBase}", "base64");
-    var blob = new Blob([buf], { type: "application/wasm" });
-    var wasmUrl = URL.createObjectURL(blob);
-}
-`;
-
-const originalSourceCode = fs.readFileSync('./blsjstmp.js', 'utf-8');
-const modifiedSourceCode = originalSourceCode
-    .replace(/fetch\(.,/g, "fetch(wasmUrl,");
-
-const modifiedSourceBuffer = Buffer.from(modifiedSourceCode, 'utf-8');
-
-const bundleFileDescriptor = fs.openSync(outputPath, 'w+');
-
-const bufferToPrepend = Buffer.from(codeToPrepend);
-
-fs.writeSync(bundleFileDescriptor, bufferToPrepend, 0, bufferToPrepend.length, 0);
-fs.writeSync(bundleFileDescriptor, modifiedSourceBuffer, 0, modifiedSourceBuffer.length, bufferToPrepend.length);
-
-fs.close(bundleFileDescriptor, (err) => {
-    if (err) throw err;
-});
diff --git a/src/dashbls/js-bindings/helpers.cpp b/src/dashbls/js-bindings/helpers.cpp
deleted file mode 100644
index e58f5e4909f2..000000000000
--- a/src/dashbls/js-bindings/helpers.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "./helpers.h"
-
-namespace helpers {
-    val toUint8Array(std::vector<uint8_t> vec) {
-        val arr = helpers::toJSArray<uint8_t>(vec);
-        return val::global("Uint8Array").call<val>("from", arr);
-    }
-
-    val toUint8Array(uint8_t *pointer, size_t data_size) {
-        std::vector<uint8_t> vec = toVector(pointer, data_size);
-        val buffer = toUint8Array(vec);
-        return buffer;
-    }
-
-    val toUint8Array(bn_t bn) {
-        std::vector<uint8_t> vec = toVector(bn);
-        val buffer = toUint8Array(vec);
-        return buffer;
-    }
-
-    std::vector<uint8_t> toVector(uint8_t *pointer, size_t data_size) {
-        std::vector<uint8_t> data;
-        data.reserve(data_size);
-        std::copy(pointer, pointer + data_size, std::back_inserter(data));
-        return data;
-    }
-
-    std::vector<uint8_t> toVector(val jsUint8Array) {
-        auto l = jsUint8Array["length"].as<unsigned>();
-        std::vector<uint8_t> vec;
-        for (unsigned i = 0; i < l; ++i) {
-            vec.push_back(jsUint8Array[i].as<uint8_t>());
-        }
-        return vec;
-    }
-
-    std::vector<uint8_t> toVector(bn_t bn) {
-        uint8_t buf[bn_size_bin(bn)];
-        bn_write_bin(buf, bn_size_bin(bn), bn);
-        std::vector<uint8_t> vec = helpers::toVector(buf, bn_size_bin(bn));
-        return vec;
-    }
-
-    std::vector<std::vector<uint8_t>> jsBuffersArrayToVector(val buffersArray) {
-        auto l = buffersArray["length"].as<unsigned>();
-        std::vector<std::vector<uint8_t>> vec;
-        for (unsigned i = 0; i < l; ++i) {
-            vec.push_back(toVector(buffersArray[i].as<val>()));
-        }
-        return vec;
-    }
-
-    std::vector<bn_t *> jsBuffersArrayToBnVector(val buffersArray) {
-        auto l = buffersArray["length"].as<unsigned>();
-        std::vector<bn_t *> vec;
-        for (unsigned i = 0; i < l; ++i) {
-            bn_t data;
-            bn_new(data);
-            std::vector<uint8_t> bnVec = toVector(buffersArray[i]);
-            bn_read_bin(data, bnVec.data(), static_cast<int>(bnVec.size()));
-            bn_t *point = &data;
-            vec.push_back(point);
-        }
-        return vec;
-    }
-
-    val byteArraysVectorToJsBuffersArray(std::vector<uint8_t *> arraysVector, size_t element_size) {
-        auto vecSize = arraysVector.size();
-        std::vector<val> valVector;
-        for (unsigned i = 0; i < vecSize; ++i) {
-            valVector.push_back(toUint8Array(arraysVector[i], element_size));
-        }
-        val arr = helpers::toJSArray<val>(valVector);
-        return arr;
-    }
-}  // namespace helpers
diff --git a/src/dashbls/js-bindings/helpers.h b/src/dashbls/js-bindings/helpers.h
deleted file mode 100644
index 031df07043dc..000000000000
--- a/src/dashbls/js-bindings/helpers.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_HELPERS_H_
-#define JS_BINDINGS_HELPERS_H_
-
-#include <algorithm>
-#include <vector>
-#include <emscripten/val.h>
-extern "C" {
-#include <relic.h>
-}
-#include <dashbls/bls.hpp>
-
-using namespace emscripten;
-using namespace bls;
-
-namespace helpers {
-    val toUint8Array(uint8_t *pointer, size_t data_size);
-
-    val toUint8Array(std::vector<uint8_t> vec);
-
-    val toUint8Array(bn_t bn);
-
-    std::vector<uint8_t> toVector(uint8_t *pointer, size_t data_size);
-
-    std::vector<uint8_t> toVector(val jsBuffer);
-
-    std::vector<uint8_t> toVector(bn_t bn);
-
-    template<typename T>
-    inline std::vector<T> toVectorFromJSArray(val jsArray) {
-        auto l = jsArray["length"].as<unsigned>();
-        std::vector<T> vec;
-        for (unsigned i = 0; i < l; ++i) {
-            vec.push_back(jsArray[i].as<T>());
-        }
-        return vec;
-    }
-
-    template<typename T>
-    inline val toJSArray(std::vector<T> vec) {
-        val Array = val::global("Array");
-        val arr = Array.new_();
-        auto l = vec.size();
-        for (unsigned i = 0; i < l; ++i) {
-            arr.call<void>("push", vec[i]);
-        }
-        return arr;
-    }
-
-    std::vector<std::vector<uint8_t>> jsBuffersArrayToVector(val buffersArray);
-
-    std::vector<bn_t *> jsBuffersArrayToBnVector(val buffersArray);
-
-    val byteArraysVectorToJsBuffersArray(std::vector<uint8_t *> arraysVector, size_t element_size);
-}  // namespace helpers
-
-#endif  // JS_BINDINGS_HELPERS_H_
diff --git a/src/dashbls/js-bindings/jsbindings.cpp b/src/dashbls/js-bindings/jsbindings.cpp
deleted file mode 100644
index 81daa4abc74e..000000000000
--- a/src/dashbls/js-bindings/jsbindings.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <emscripten/bind.h>
-#include "wrappers/PrivateKeyWrapper.h"
-#include "wrappers/SchemeMPLWrapper.h"
-#include "wrappers/UtilWrapper.h"
-
-using namespace emscripten;
-
-namespace js_wrappers {
-EMSCRIPTEN_BINDINGS(blsjs) {
-    class_<AugSchemeMPLWrapper>("AugSchemeMPL")
-        .class_function("skToG1", &AugSchemeMPLWrapper::SkToG1)
-        .class_function("keyGen", &AugSchemeMPLWrapper::KeyGen)
-        .class_function("sign", &AugSchemeMPLWrapper::Sign)
-        .class_function("signPrepend", &AugSchemeMPLWrapper::SignPrepend)
-        .class_function("verify", &AugSchemeMPLWrapper::Verify)
-        .class_function("aggregate", &AugSchemeMPLWrapper::Aggregate)
-        .class_function("aggregateVerify", &AugSchemeMPLWrapper::AggregateVerify)
-        .class_function("deriveChildSk", &AugSchemeMPLWrapper::DeriveChildSk)
-        .class_function("deriveChildSkUnhardened", &AugSchemeMPLWrapper::DeriveChildSkUnhardened)
-        .class_function("deriveChildPkUnhardened", &AugSchemeMPLWrapper::DeriveChildPkUnhardened);
-
-    class_<SchemeMPLWrapper<BasicSchemeMPL>>("BasicSchemeMPL")
-        .class_function("skToG1", &SchemeMPLWrapper<BasicSchemeMPL>::SkToG1)
-        .class_function("keyGen", &SchemeMPLWrapper<BasicSchemeMPL>::KeyGen)
-        .class_function("sign", &SchemeMPLWrapper<BasicSchemeMPL>::Sign)
-        .class_function("verify", &SchemeMPLWrapper<BasicSchemeMPL>::Verify)
-        .class_function("aggregate", &SchemeMPLWrapper<BasicSchemeMPL>::Aggregate)
-        .class_function("aggregateVerify", &SchemeMPLWrapper<BasicSchemeMPL>::AggregateVerify)
-        .class_function("deriveChildSk", &SchemeMPLWrapper<BasicSchemeMPL>::DeriveChildSk)
-        .class_function("deriveChildSkUnhardened", &SchemeMPLWrapper<BasicSchemeMPL>::DeriveChildSkUnhardened)
-        .class_function("deriveChildPkUnhardened", &SchemeMPLWrapper<BasicSchemeMPL>::DeriveChildPkUnhardened)
-        .class_function("verifySecure", &SchemeMPLWrapper<BasicSchemeMPL>::VerifySecure);
-
-    class_<PopSchemeMPLWrapper>("PopSchemeMPL")
-        .class_function("skToG1", &PopSchemeMPLWrapper::SkToG1)
-        .class_function("keyGen", &PopSchemeMPLWrapper::KeyGen)
-        .class_function("sign", &PopSchemeMPLWrapper::Sign)
-        .class_function("verify", &PopSchemeMPLWrapper::Verify)
-        .class_function("aggregate", &PopSchemeMPLWrapper::Aggregate)
-        .class_function("aggregateVerify", &PopSchemeMPLWrapper::AggregateVerify)
-        .class_function("deriveChildSk", &PopSchemeMPLWrapper::DeriveChildSk)
-        .class_function("deriveChildSkUnhardened", &PopSchemeMPLWrapper::DeriveChildSkUnhardened)
-        .class_function("deriveChildPkUnhardened", &PopSchemeMPLWrapper::DeriveChildPkUnhardened)
-        .class_function("popProve", &PopSchemeMPLWrapper::PopProve)
-        .class_function("popVerify", &PopSchemeMPLWrapper::PopVerify)
-        .class_function("fastAggregateVerify", &PopSchemeMPLWrapper::FastAggregateVerify);
-
-
-    class_<G1ElementWrapper>("G1Element")
-        .class_property("SIZE", &G1ElementWrapper::SIZE)
-        .constructor<>()
-        .class_function("fromBytes", &G1ElementWrapper::FromBytes)
-        .class_function("generator", &G2ElementWrapper::Generator)
-        .function("serialize", &G1ElementWrapper::Serialize)
-        .function("negate", &G1ElementWrapper::Negate)
-        .function("deepcopy", &G1ElementWrapper::Deepcopy)
-        .function("getFingerprint", &G1ElementWrapper::GetFingerprint)
-        .function("add", &G1ElementWrapper::Add)
-        .function("mul", &G1ElementWrapper::Mul)
-        .function("equalTo", &G1ElementWrapper::EqualTo);
-
-    class_<G2ElementWrapper>("G2Element")
-        .class_property("SIZE", &G2ElementWrapper::SIZE)
-        .constructor<>()
-        .class_function("fromBytes", &G2ElementWrapper::FromBytes)
-        .class_function("fromG2", &G2ElementWrapper::FromG2Element)
-        .class_function("aggregateSigs", &G2ElementWrapper::AggregateSigs)
-        .class_function("generator", &G2ElementWrapper::Generator)
-        .function("serialize", &G2ElementWrapper::Serialize)
-        .function("negate", &G2ElementWrapper::Negate)
-        .function("deepcopy", &G2ElementWrapper::Deepcopy)
-        .function("add", &G2ElementWrapper::Add)
-        .function("mul", &G2ElementWrapper::Mul)
-        .function("equalTo", &G2ElementWrapper::EqualTo);
-
-    class_<PrivateKeyWrapper>("PrivateKey")
-        .class_property("PRIVATE_KEY_SIZE", &PrivateKeyWrapper::PRIVATE_KEY_SIZE)
-        .class_function("fromBytes", &PrivateKeyWrapper::FromBytes)
-        .class_function("aggregate", &PrivateKeyWrapper::Aggregate)
-        .function("deepcopy", &PrivateKeyWrapper::Deepcopy)
-        .function("serialize", &PrivateKeyWrapper::Serialize)
-        .function("getG1", &PrivateKeyWrapper::GetG1)
-        .function("getG2", &PrivateKeyWrapper::GetG2)
-        .function("mulG1", &PrivateKeyWrapper::MulG1)
-        .function("mulG2", &PrivateKeyWrapper::MulG2)
-        .function("equalTo", &PrivateKeyWrapper::EqualTo);
-
-    class_<BignumWrapper>("Bignum")
-        .class_function("fromString", &BignumWrapper::FromString)
-        .function("toString", &BignumWrapper::ToString);
-
-    class_<UtilWrapper>("Util")
-        .class_function("hash256", &UtilWrapper::Hash256)
-        .class_function("hexStr", &UtilWrapper::HexStr);
-};
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/package-lock.json b/src/dashbls/js-bindings/package-lock.json
deleted file mode 100644
index 33a83eb635d7..000000000000
--- a/src/dashbls/js-bindings/package-lock.json
+++ /dev/null
@@ -1,7366 +0,0 @@
-{
-  "name": "@dashevo/bls",
-  "version": "1.0.0-beta.3",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@dashevo/bls",
-      "version": "1.0.0-beta.3",
-      "dependencies": {
-        "binascii": "0.0.2"
-      },
-      "devDependencies": {
-        "@types/mocha": "^5.2.7",
-        "@types/node": "^11.15.18",
-        "assert": "^2.0.0",
-        "babel-polyfill": "^6.26.0",
-        "buffer": "^6.0.3",
-        "crypto-browserify": "^3.12.0",
-        "karma": "^6.3.4",
-        "karma-firefox-launcher": "^1.3.0",
-        "karma-mocha": "^2.0.1",
-        "karma-mocha-reporter": "^2.2.5",
-        "karma-webpack": "^5.0.0",
-        "mime": "1.4.1",
-        "mocha": "^8.4.0",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "stream-browserify": "^3.0.0",
-        "typescript": "^3.6.5",
-        "webpack": "^5.39.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.47",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
-      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
-      "dev": true
-    },
-    "node_modules/@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "11.15.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.18.tgz",
-      "integrity": "sha512-3p2M6moxwdDFyPia2ROI8CCkRa9ZzYjvCys2TOE1xgwYDQmY49Cj0cvkdBkzh/rY9gkvzgzYOeECYtB4f0/fDA==",
-      "dev": true
-    },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
-      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
-      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
-      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
-      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
-      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
-      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
-      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
-      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
-      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
-      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
-      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/helper-wasm-section": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-opt": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "@webassemblyjs/wast-printer": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
-      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
-      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
-      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
-      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-      "dev": true,
-      "dependencies": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
-      }
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz",
-      "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
-      }
-    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true,
-      "engines": {
-        "node": "^4.5.0 || >= 5.9"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/binascii": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz",
-      "integrity": "sha1-p/iogB28z4sXVrdD2qD+6eLZ4O4="
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001237",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz",
-      "integrity": "sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "node_modules/date-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
-      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "dependencies": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.752",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz",
-      "integrity": "sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==",
-      "dev": true
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/elliptic/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/engine.io": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.0.tgz",
-      "integrity": "sha512-OgxY1c/RuCSeO/rTr8DIFXx76IzUUft86R7/P7MMbbkuzeqJoTNw2lmeD91IyGz41QYleIIjWeMJGgug043sfQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/engine.io/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/engine.io/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "node_modules/es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-abstract/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-abstract/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-abstract/node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
-      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
-      "dev": true
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
-      "dev": true
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-intrinsic/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
-    },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-generator-function": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz",
-      "integrity": "sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-nan": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-regex/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz",
-      "integrity": "sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.0-next.2",
-        "foreach": "^2.0.5",
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/jest-worker": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-      "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/js-yaml": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/karma": {
-      "version": "6.3.16",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz",
-      "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==",
-      "dev": true,
-      "dependencies": {
-        "body-parser": "^1.19.0",
-        "braces": "^3.0.2",
-        "chokidar": "^3.5.1",
-        "colors": "1.4.0",
-        "connect": "^3.7.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.1",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.8",
-        "lodash": "^4.17.21",
-        "log4js": "^6.4.1",
-        "mime": "^2.5.2",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.5",
-        "qjobs": "^1.2.0",
-        "range-parser": "^1.2.1",
-        "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
-        "source-map": "^0.6.1",
-        "tmp": "^0.2.1",
-        "ua-parser-js": "^0.7.30",
-        "yargs": "^16.1.1"
-      },
-      "bin": {
-        "karma": "bin/karma"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/karma-firefox-launcher": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz",
-      "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==",
-      "dev": true,
-      "dependencies": {
-        "is-wsl": "^2.1.0"
-      }
-    },
-    "node_modules/karma-mocha": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz",
-      "integrity": "sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.3"
-      }
-    },
-    "node_modules/karma-mocha-reporter": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "peerDependencies": {
-        "karma": ">=0.13"
-      }
-    },
-    "node_modules/karma-webpack": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
-      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "webpack-merge": "^4.1.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/karma/node_modules/graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/log4js": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
-      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.3",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.4",
-        "rfdc": "^1.3.0",
-        "streamroller": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/log4js/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/log4js/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/mocha": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
-      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
-      "dev": true,
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.1",
-        "debug": "4.3.1",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.6",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.0.0",
-        "log-symbols": "4.0.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.20",
-        "serialize-javascript": "5.0.1",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "wide-align": "1.1.3",
-        "workerpool": "6.1.0",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 10.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "node_modules/mocha/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/mocha/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/mocha/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mocha/node_modules/chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.1"
-      }
-    },
-    "node_modules/mocha/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/mocha/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mocha/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/log-symbols": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mocha/node_modules/readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
-      "dev": true
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-      "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.9"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/socket.io": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.0.tgz",
-      "integrity": "sha512-b65bp6INPk/BMMrIgVvX12x3Q+NqlGqSlTuvKQWt0BUJ3Hyy3JangBl7fEoWZTXbOKlCqNPbQ6MbWgok/km28w==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.4.0",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "dependencies": {
-        "ws": "~8.11.0"
-      }
-    },
-    "node_modules/socket.io-parser": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/socket.io-parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/socket.io-parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/socket.io/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/socket.io/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
-      }
-    },
-    "node_modules/stream-browserify/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/streamroller": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
-      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.3",
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/streamroller/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/streamroller/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/supports-color/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.16.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz",
-      "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz",
-      "integrity": "sha512-cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbox-primitive/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/util": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "safe-buffer": "^5.1.2",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.39.0.tgz",
-      "integrity": "sha512-25CHmuDj+oOTyteI13sUqNlCnjCnySuhiKWE/cRYPQYeoQ3ijHgyWX27CiyUKLNGq27v8S0mrksyTreT/xo7pg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.47",
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/wasm-edit": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "acorn": "^8.2.1",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.4.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.1",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^2.3.0"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz",
-      "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
-      "integrity": "sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.0",
-        "es-abstract": "^1.18.0-next.1",
-        "foreach": "^2.0.5",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.1",
-        "is-typed-array": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array/node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/workerpool": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
-      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-unparser/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs-unparser/node_modules/decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
-  "dependencies": {
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
-    },
-    "@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
-    "@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "@types/estree": {
-      "version": "0.0.47",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
-      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
-      "dev": true
-    },
-    "@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
-      "dev": true
-    },
-    "@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "11.15.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.18.tgz",
-      "integrity": "sha512-3p2M6moxwdDFyPia2ROI8CCkRa9ZzYjvCys2TOE1xgwYDQmY49Cj0cvkdBkzh/rY9gkvzgzYOeECYtB4f0/fDA==",
-      "dev": true
-    },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
-      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
-      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
-      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
-      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
-      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
-      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
-      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
-      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
-      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
-      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
-      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/helper-wasm-section": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-opt": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "@webassemblyjs/wast-printer": "1.11.0"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
-      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
-      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
-      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
-      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-      "dev": true,
-      "requires": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
-      }
-    },
-    "available-typed-arrays": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz",
-      "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==",
-      "dev": true
-    },
-    "babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-          "dev": true
-        }
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true
-    },
-    "binascii": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz",
-      "integrity": "sha1-p/iogB28z4sXVrdD2qD+6eLZ4O4="
-    },
-    "bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      }
-    },
-    "buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001237",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz",
-      "integrity": "sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        }
-      }
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true
-    },
-    "core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "dev": true
-    },
-    "cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "date-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
-      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
-      "dev": true
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.3.752",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz",
-      "integrity": "sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==",
-      "dev": true
-    },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        }
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "engine.io": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.0.tgz",
-      "integrity": "sha512-OgxY1c/RuCSeO/rTr8DIFXx76IzUUft86R7/P7MMbbkuzeqJoTNw2lmeD91IyGz41QYleIIjWeMJGgug043sfQ==",
-      "dev": true,
-      "requires": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
-      "dev": true
-    },
-    "enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
-    "ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3",
-            "has-symbols": "^1.0.1",
-            "object-keys": "^1.1.1"
-          }
-        }
-      }
-    },
-    "es-module-lexer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
-      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
-      "dev": true
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
-      "dev": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      }
-    },
-    "flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true
-    },
-    "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
-      "dev": true
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        }
-      }
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
-      "dev": true
-    },
-    "is-docker": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-generator-function": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz",
-      "integrity": "sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-nan": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz",
-      "integrity": "sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.0-next.2",
-        "foreach": "^2.0.5",
-        "has-symbols": "^1.0.1"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-      "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      }
-    },
-    "js-yaml": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "karma": {
-      "version": "6.3.16",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz",
-      "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==",
-      "dev": true,
-      "requires": {
-        "body-parser": "^1.19.0",
-        "braces": "^3.0.2",
-        "chokidar": "^3.5.1",
-        "colors": "1.4.0",
-        "connect": "^3.7.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.1",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.8",
-        "lodash": "^4.17.21",
-        "log4js": "^6.4.1",
-        "mime": "^2.5.2",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.5",
-        "qjobs": "^1.2.0",
-        "range-parser": "^1.2.1",
-        "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
-        "source-map": "^0.6.1",
-        "tmp": "^0.2.1",
-        "ua-parser-js": "^0.7.30",
-        "yargs": "^16.1.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.9",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-          "dev": true
-        },
-        "mime": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-          "dev": true
-        }
-      }
-    },
-    "karma-firefox-launcher": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz",
-      "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^2.1.0"
-      }
-    },
-    "karma-mocha": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz",
-      "integrity": "sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.3"
-      }
-    },
-    "karma-mocha-reporter": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "karma-webpack": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
-      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "webpack-merge": "^4.1.5"
-      }
-    },
-    "loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      }
-    },
-    "log4js": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
-      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
-      "dev": true,
-      "requires": {
-        "date-format": "^4.0.3",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.4",
-        "rfdc": "^1.3.0",
-        "streamroller": "^3.0.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "mocha": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
-      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
-      "dev": true,
-      "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.1",
-        "debug": "4.3.1",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.6",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.0.0",
-        "log-symbols": "4.0.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.20",
-        "serialize-javascript": "5.0.1",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "wide-align": "1.1.3",
-        "workerpool": "6.1.0",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.1",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.5.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-              "dev": true
-            }
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "log-symbols": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-          "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.2.1"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
-      "dev": true
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-      "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      }
-    },
-    "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "socket.io": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.0.tgz",
-      "integrity": "sha512-b65bp6INPk/BMMrIgVvX12x3Q+NqlGqSlTuvKQWt0BUJ3Hyy3JangBl7fEoWZTXbOKlCqNPbQ6MbWgok/km28w==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.4.0",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "requires": {
-        "ws": "~8.11.0"
-      }
-    },
-    "socket.io-parser": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "stream-browserify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        }
-      }
-    },
-    "streamroller": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
-      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
-      "dev": true,
-      "requires": {
-        "date-format": "^4.0.3",
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        }
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        }
-      }
-    },
-    "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
-      "dev": true
-    },
-    "terser": {
-      "version": "5.16.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz",
-      "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz",
-      "integrity": "sha512-cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A==",
-      "dev": true,
-      "requires": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.0"
-      }
-    },
-    "tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "requires": {
-        "rimraf": "^3.0.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typescript": {
-      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
-      "dev": true
-    },
-    "ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "util": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "safe-buffer": "^5.1.2",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
-      "dev": true,
-      "requires": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "webpack": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.39.0.tgz",
-      "integrity": "sha512-25CHmuDj+oOTyteI13sUqNlCnjCnySuhiKWE/cRYPQYeoQ3ijHgyWX27CiyUKLNGq27v8S0mrksyTreT/xo7pg==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.47",
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/wasm-edit": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "acorn": "^8.2.1",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.4.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.1",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^2.3.0"
-      }
-    },
-    "webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "webpack-sources": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz",
-      "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
-      "integrity": "sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.2",
-        "call-bind": "^1.0.0",
-        "es-abstract": "^1.18.0-next.1",
-        "foreach": "^2.0.5",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.1",
-        "is-typed-array": "^1.1.3"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-          "dev": true
-        }
-      }
-    },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "workerpool": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
-      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "requires": {}
-    },
-    "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-      "dev": true
-    },
-    "yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-          "dev": true
-        },
-        "decamelize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-          "dev": true
-        }
-      }
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
-  }
-}
diff --git a/src/dashbls/js-bindings/package.json b/src/dashbls/js-bindings/package.json
deleted file mode 100644
index 2a4faebb7b4e..000000000000
--- a/src/dashbls/js-bindings/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "name": "@dashevo/bls",
-  "version": "1.0.0-beta.3",
-  "description": "The most advanced BLS library for JavaScript",
-  "main": "blsjs.js",
-  "types": "blsjs.d.ts",
-  "files": [
-    "blsjs.js",
-    "blsjstmp.wasm",
-    "blsjs.d.ts"
-  ],
-  "directories": {
-    "test": "tests"
-  },
-  "scripts": {
-    "build:web": "node bundle_wasm_for_web.js",
-    "test": "npm run test:node && npm run test:browser",
-    "test:typings": "tsc ./tests/typings.spec.ts",
-    "test:node": "mocha ./tests/*.spec.js",
-    "test:browser": "npm run test:typings && karma start ./tests/karma.conf.js --single-run",
-    "webpack": "webpack --config=./webpack.config.js",
-    "rollup": "rollup -c"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:dashpay/bls-signatures.git"
-  },
-  "homepage": "https://github.com/dashpay/bls-signatures/tree/main/js-bindings",
-  "author": {
-    "name": "Anton Suprunchuk",
-    "email": "antouhou@gmail.com",
-    "url": "https://github.com/antouhou"
-  },
-  "keywords": [
-    "bls",
-    "BLS",
-    "threshold",
-    "signature",
-    "crypto",
-    "cryptography"
-  ],
-  "devDependencies": {
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^11.15.18",
-    "assert": "^2.0.0",
-    "babel-polyfill": "^6.26.0",
-    "buffer": "^6.0.3",
-    "crypto-browserify": "^3.12.0",
-    "karma": "^6.3.4",
-    "karma-firefox-launcher": "^1.3.0",
-    "karma-mocha": "^2.0.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "karma-webpack": "^5.0.0",
-    "mime": "1.4.1",
-    "mocha": "^8.4.0",
-    "path-browserify": "^1.0.1",
-    "process": "^0.11.10",
-    "stream-browserify": "^3.0.0",
-    "typescript": "^3.6.5",
-    "webpack": "^5.39.0"
-  },
-  "dependencies": {
-    "binascii": "0.0.2"
-  }
-}
diff --git a/src/dashbls/js-bindings/tests/PrivateKey.spec.js b/src/dashbls/js-bindings/tests/PrivateKey.spec.js
deleted file mode 100644
index b25bf40e64cd..000000000000
--- a/src/dashbls/js-bindings/tests/PrivateKey.spec.js
+++ /dev/null
@@ -1,128 +0,0 @@
-const blsSignaturesModule = require('..')();
-const assert = require('assert');
-const crypto = require('crypto');
-const {Buffer} = require('buffer');
-
-// Values lifted from test.js, which is ported from test.py and is a more
-// primary source.
-function getPkSeed() {
-    return Uint8Array.from([
-        0, 50, 6, 244, 24, 199, 1, 25, 52, 88, 192, 19, 18, 12, 89, 6, 220,
-        18, 102, 58, 209, 82, 12, 62, 89, 110, 182, 9, 44, 20, 254, 22
-    ]);
-}
-
-function getSeedAndFinferprint() {
-    var seedArray = getPkSeed();
-    var seed = Buffer.from(seedArray);
-    return {
-        seed: seed,
-        fingerprint: 3146750013
-    };
-}
-
-function getPkBuffer() {
-    return Uint8Array.from([
-        55, 112, 145, 240, 231, 40,  70,  59,
-        194, 218, 125,  84, 108, 83, 185, 246,
-        184,  29, 244, 161, 204, 26, 181, 191,
-        41, 197, 144, 139, 113, 81, 163,  45
-    ]);
-}
-
-function getPkUint8Array() {
-    return new Uint8Array(getPkBuffer());
-}
-
-let blsSignatures = null;
-before((done) => {
-    blsSignaturesModule.then((mod) => {
-        blsSignatures = mod;
-        done();
-    });
-});
-
-function makehash(msg) {
-    return crypto
-        .createHash('sha256')
-        .update(msg)
-        .digest();
-}
-
-describe('PrivateKey', () => {
-    it('Should sign and verify', () => {
-        const {AugSchemeMPL, PrivateKey} = blsSignatures;
-
-        const message1 = Uint8Array.from([1, 65, 254, 88, 90, 45, 22]);
-
-        const seed = Uint8Array.from([28, 20, 102, 229, 1, 157]);
-        const sk1 = AugSchemeMPL.keyGen(getPkSeed());
-        const pk1 = AugSchemeMPL.skToG1(sk1);
-        const sig1 = AugSchemeMPL.sign(sk1, message1);
-
-        assert(AugSchemeMPL.verify(pk1, message1, sig1));
-    });
-
-    describe('.fromSeed', () => {
-        it('Should create a private key from a seed', () => {
-            const {AugSchemeMPL, PrivateKey} = blsSignatures;
-
-            const pk = AugSchemeMPL.keyGen(getPkSeed());
-            assert(pk instanceof PrivateKey);
-            assert.deepStrictEqual(pk.serialize(), getPkBuffer());
-        });
-    });
-
-    describe('.fromBytes', () => {
-        it('Should create a private key from a Buffer', () => {
-            const {PrivateKey, Util} = blsSignatures;
-
-            const pk = PrivateKey.fromBytes(getPkBuffer(), false);
-            assert(pk instanceof PrivateKey);
-            assert.deepStrictEqual(pk.serialize(), getPkBuffer());
-        });
-        it('Should create a private key from a Uint8Array', () => {
-            const {PrivateKey, Util} = blsSignatures;
-
-            const pk = PrivateKey.fromBytes(getPkUint8Array(), false);
-            assert(pk instanceof PrivateKey);
-            assert.deepStrictEqual(pk.serialize(), getPkBuffer());
-        });
-    });
-
-    describe('#serialize', () => {
-        it('Should serialize key to a Buffer', () => {
-            const {AugSchemeMPL, PrivateKey} = blsSignatures;
-
-            const pk = AugSchemeMPL.keyGen(getPkSeed());
-            const serialized = pk.serialize();
-            assert(serialized instanceof Uint8Array);
-            assert.deepStrictEqual(serialized, getPkBuffer());
-        });
-    });
-
-    describe('#sign', () => {
-        it('Should return a verifiable signature', () => {
-            const {AugSchemeMPL, PrivateKey, G2Element} = blsSignatures;
-
-            const pk = PrivateKey.fromBytes(getPkBuffer(), false);
-            const pubkey = AugSchemeMPL.skToG1(pk);
-            const message = 'Hello world';
-            const messageBuffer = Uint8Array.from(Buffer.from(message, 'utf8'));
-            const signature = AugSchemeMPL.sign(pk, messageBuffer);
-            assert(signature instanceof G2Element);
-            assert(AugSchemeMPL.verify(pubkey, messageBuffer, signature));
-        });
-    });
-
-    describe('#getPublicKey', () => {
-        it('Should return a public key with a verifiable fingerprint', () => {
-            const {AugSchemeMPL, PrivateKey, G1Element} = blsSignatures;
-
-            const pk = AugSchemeMPL.keyGen(getPkSeed());
-            const publicKey = AugSchemeMPL.skToG1(pk);
-            assert(publicKey instanceof G1Element);
-            assert.strictEqual(publicKey.getFingerprint(), getSeedAndFinferprint().fingerprint);
-        });
-    });
-});
diff --git a/src/dashbls/js-bindings/tests/PublicKey.spec.js b/src/dashbls/js-bindings/tests/PublicKey.spec.js
deleted file mode 100644
index 835fe5192754..000000000000
--- a/src/dashbls/js-bindings/tests/PublicKey.spec.js
+++ /dev/null
@@ -1,85 +0,0 @@
-const blsSignaturesModule = require('..')();
-const assert = require('assert');
-const {Buffer} = require('buffer');
-
-// Value from test.js, ported from test.py
-// Form of serialized public key requires first two bits 10 unless infinite,
-// in which case 11 is required.
-// (elements.cpp:49)
-function getPublicKeyFixtureHex() {
-    return '9790635de8740e9a6a6b15fb6b72f3a16afa0973d971979b6ba54761d6e2502c50db76f4d26143f05459a42cfd520d44';
-}
-
-function getPublicKeyFixture() {
-    return {
-        buffer: Uint8Array.from(Buffer.from(getPublicKeyFixtureHex(), 'hex')),
-        fingerprint: 0xa14c4f99
-    };
-}
-
-// These values were adapted to fit the constraints in elements.cpp, namely to set
-// the high bit of the first byte.
-function getPublicKeysHexes() {
-    return [
-        '82a8d2aaa6a5e2e08d4b8d406aaf0121a2fc2088ed12431e6b0663028da9ac5922c9ea91cde7dd74b7d795580acc7a61',
-        '856e742478d4e95e708b8ae0d487f94099b769cb7df4c674dc0c10fbbe7d175603d090ac6064aeeb249a00ba6b3d85eb'
-    ];
-}
-
-function getPublicKeysArray() {
-    return getPublicKeysHexes().map(hex => {
-        return Uint8Array.from(Buffer.from(hex, 'hex'));
-    });
-}
-
-let blsSignatures = null;
-before((done) => {
-    blsSignaturesModule.then((mod) => {
-        blsSignatures = mod;
-        done();
-    });
-});
-
-describe('G1Element', () => {
-    describe('.fromBytes', () => {
-        it('Should create a public key from bytes', () => {
-            const {G1Element, Util} = blsSignatures;
-
-            const pk = G1Element.fromBytes(getPublicKeyFixture().buffer);
-            assert(pk instanceof G1Element);
-        });
-    });
-
-    describe('.aggregate', () => {
-        it('Should aggregate keys if keys array contains more than one key', () => {
-            const {G1Element} = blsSignatures;
-
-            const pks = getPublicKeysArray().map(buf => G1Element.fromBytes(buf));
-            let firstPk = pks[0];
-            for (var i = 1; i < pks.length; i++) {
-                firstPk = firstPk.add(pks[i]);
-            }
-            assert(firstPk instanceof G1Element);
-        });
-    });
-
-    describe('#serialize', () => {
-        it('Should serialize key to the same buffer', () => {
-            const {G1Element} = blsSignatures;
-
-            const pk = G1Element.fromBytes(getPublicKeyFixture().buffer);
-            const serialized = pk.serialize();
-            assert.deepStrictEqual(Buffer.from(serialized).toString('hex'), getPublicKeyFixtureHex());
-        });
-    });
-
-    describe('getFingerprint', () => {
-        it('Should get correct fingerprint', () => {
-            const {G1Element} = blsSignatures;
-
-            const pk = G1Element.fromBytes(getPublicKeyFixture().buffer);
-            const fingerprint = pk.getFingerprint();
-            assert.strictEqual(fingerprint, getPublicKeyFixture().fingerprint);
-        });
-    });
-});
diff --git a/src/dashbls/js-bindings/tests/Signature.spec.js b/src/dashbls/js-bindings/tests/Signature.spec.js
deleted file mode 100644
index dbec9e5f3e93..000000000000
--- a/src/dashbls/js-bindings/tests/Signature.spec.js
+++ /dev/null
@@ -1,162 +0,0 @@
-const blsSignaturesModule = require('..')();
-const assert = require('assert');
-const crypto = require('crypto');
-const {Buffer} = require('buffer');
-
-// Current format of signature taken from test.js, ported from test.py
-function getSignatureHex() {
-    return '900d5223412ee471b42dbb8a6706de5f5eba4ca7e1a0fb6b3fa431f510b3e6d73c440748693d787e1a25c8bc4596f66b1130634f4b32e8e09f52f2c6a843b700cbb5aeadb8ab3456d002c143be68998573166e5979e6a48fcbb67ac8fd981f73';
-}
-
-function getSignatureBytes() {
-    return Uint8Array.from(Buffer.from(getSignatureHex(), 'hex'));
-}
-
-function makehash(msg) {
-    return crypto
-        .createHash('sha256')
-        .update(msg)
-        .digest();
-}
-
-var blsSignatures;
-before((done) => {
-    blsSignaturesModule.then((mod) => {
-        blsSignatures = mod;
-        done();
-    });
-});
-
-describe('Signature', () => {
-    describe('Integration', () => {
-        it('Should verify signatures', function () {
-            const {BasicSchemeMPL, G2Element, G1Element, PrivateKey} = blsSignatures;
-
-            this.timeout(10000);
-            const message = Uint8Array.from([100, 2, 254, 88, 90, 45, 23]);
-            const seed1 = makehash(Uint8Array.from([1, 2, 3, 4, 5]));
-            const seed2 = makehash(Uint8Array.from([3, 4, 5, 6, 7]));
-            const seed3 = makehash(Uint8Array.from([4, 5, 6, 7, 8]));
-
-            const privateKey1 = BasicSchemeMPL.keyGen(seed1);
-            const privateKey2 = BasicSchemeMPL.keyGen(seed2);
-            const privateKey3 = BasicSchemeMPL.keyGen(seed3);
-
-            const publicKey1 = BasicSchemeMPL.skToG1(privateKey1);
-            const publicKey2 = BasicSchemeMPL.skToG1(privateKey2);
-            const publicKey3 = BasicSchemeMPL.skToG1(privateKey3);
-
-            const sig1 = BasicSchemeMPL.sign(privateKey1, message);
-            const sig2 = BasicSchemeMPL.sign(privateKey2, message);
-            const sig3 = BasicSchemeMPL.sign(privateKey3, message);
-
-            assert(BasicSchemeMPL.verify(publicKey1, message, sig1), 'Signature 1 is not verifiable');
-            assert(BasicSchemeMPL.verify(publicKey2, message, sig2), 'Signature 2 is not verifiable');
-            assert(BasicSchemeMPL.verify(publicKey3, message, sig3), 'Signature 3 is not verifiable');
-
-            const aggregatedSignature = BasicSchemeMPL.aggregate([sig1, sig2, sig3]);
-            // PublicKey aggregate was replaced with G1Element add.
-            const aggregatedPubKey = publicKey1.add(publicKey2).add(publicKey3);
-
-            assert(BasicSchemeMPL.verify(aggregatedPubKey, message, aggregatedSignature));
-
-            privateKey1.delete();
-            privateKey2.delete();
-            privateKey3.delete();
-            sig1.delete();
-            sig2.delete();
-            sig3.delete();
-            aggregatedSignature.delete();
-            aggregatedPubKey.delete();
-        });
-    });
-    describe('.fromBytes', () => {
-        it('Should create verifiable signature from bytes', () => {
-            const {AugSchemeMPL, G2Element, Util} = blsSignatures;
-
-            const sig = G2Element.fromBytes(getSignatureBytes());
-
-            assert.strictEqual(Buffer.from(sig.serialize()).toString('hex'), getSignatureHex());
-            // Since there is no aggregation info, it's impossible to verify sig
-            // This iteration of the library differs in that Signature objects
-            // aren't stateful and therefore can't be self-verified without a
-            // message and public key.
-
-            sig.delete();
-        });
-    });
-    describe('.aggregateSigs', () => {
-        it('Should aggregate signature', () => {
-            const {AugSchemeMPL, G2Element, PrivateKey} = blsSignatures;
-
-            const sk = AugSchemeMPL.keyGen(makehash(Uint8Array.from([1, 2, 3])));
-            const pk = AugSchemeMPL.skToG1(sk);
-            const msg1 = Uint8Array.from([3, 4, 5]);
-            const msg2 = Uint8Array.from([6, 7, 8]);
-            const sig1 = AugSchemeMPL.sign(sk, msg1);
-            const sig2 = AugSchemeMPL.sign(sk, msg2);
-            const aggregatedSig = G2Element.aggregateSigs([sig1, sig2]);
-            assert.strictEqual(AugSchemeMPL.aggregateVerify([pk, pk], [msg1, msg2], aggregatedSig), true);
-
-            sk.delete();
-            pk.delete();
-            sig1.delete();
-            sig2.delete();
-            aggregatedSig.delete();
-        });
-    });
-    describe('#serialize', () => {
-        it('Should serialize signature to Buffer', () => {
-            const {AugSchemeMPL, G2Element, PrivateKey} = blsSignatures;
-
-            const sk = AugSchemeMPL.keyGen(makehash(Uint8Array.from([1, 2, 3, 4, 5])));
-            const sig = AugSchemeMPL.sign(sk, Uint8Array.from([100, 2, 254, 88, 90, 45, 23]));
-            assert(sig instanceof G2Element);
-            assert.deepStrictEqual(Buffer.from(sig.serialize()).toString('hex'), getSignatureHex());
-
-            sk.delete();
-            sig.delete();
-        });
-    });
-    describe('#verify', () => {
-        it('Should return true if signature can be verified', () => {
-            const {AugSchemeMPL, G2Element, G1Element} = blsSignatures;
-
-            const message = Uint8Array.from(Buffer.from('Message'));
-            const seed1 = makehash(Buffer.from([1, 2, 3, 4, 5]));
-            const seed2 = makehash(Buffer.from([1, 2, 3, 4, 6]));
-            const sk1 = AugSchemeMPL.keyGen(seed1);
-            const sk2 = AugSchemeMPL.keyGen(seed2);
-            const pk1 = AugSchemeMPL.skToG1(sk1);
-            const pk2 = AugSchemeMPL.skToG1(sk2);
-            const sig1 = AugSchemeMPL.sign(sk1, message);
-            const sig2 = AugSchemeMPL.sign(sk2, message);
-            const sig = AugSchemeMPL.aggregate([sig1, sig2]);
-
-            assert(AugSchemeMPL.aggregateVerify([pk1, pk2], [message, message], sig));
-
-            sk1.delete();
-            sk2.delete();
-            pk1.delete();
-            pk2.delete();
-            sig1.delete();
-            sig2.delete();
-            sig.delete();
-        });
-        it("Should return false if signature can't be verified", () => {
-            const {AugSchemeMPL, G1Element, PrivateKey} = blsSignatures;
-
-            const message1 = Uint8Array.from(Buffer.from('Message'));
-            const message2 = Uint8Array.from(Buffer.from('Nessage'));
-            const seed = makehash(Buffer.from([1, 2, 3, 4, 5]));
-            const sk = AugSchemeMPL.keyGen(seed);
-            const pk = AugSchemeMPL.skToG1(sk);
-            const sig = AugSchemeMPL.sign(sk, message1);
-            assert.strictEqual(AugSchemeMPL.verify(pk, message2, sig), false);
-
-            sk.delete();
-            pk.delete();
-            sig.delete();
-        });
-    });
-});
diff --git a/src/dashbls/js-bindings/tests/karma.conf.js b/src/dashbls/js-bindings/tests/karma.conf.js
deleted file mode 100644
index cd5a2cb152dd..000000000000
--- a/src/dashbls/js-bindings/tests/karma.conf.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const testSource = './karma.test.js';
-const mime = require('mime');
-const fs = require('fs');
-
-function webpackConfig() {
-    const config = require('./webpack.config.js');
-    delete config.context;
-    delete config.entry;
-    delete config.output;
-    // delete config.devServer;
-
-    return config;
-}
-
-function MimeTypeMiddleware(config) {
-    return function (request, response, next) {
-        if (request.url.endsWith('.wasm')) {
-            const content = fs.readFileSync('blsjs.wasm');
-            response.setHeader('Content-Type', 'application/wasm');
-            response.writeHead(200);
-            response.write(content);
-            response.end();
-            return next('route');
-        } else {
-            return next(request,response);
-        }
-    };
-}
-
-const karmaConfig = {
-    frameworks: ['mocha', 'webpack'],
-    files: [
-        'node_modules/babel-polyfill/dist/polyfill.js',
-        testSource
-    ],
-    preprocessors: {
-        [testSource]: ['webpack']
-    },
-    webpack: webpackConfig(),
-    reporters: ['mocha'],
-    port: 9876,
-    colors: true,
-    autoWatch: false,
-    browsers: ['FirefoxHeadless'],
-    singleRun: false,
-    concurrency: Infinity,
-    plugins: [
-        'karma-mocha',
-        'karma-mocha-reporter',
-        'karma-firefox-launcher',
-        'karma-webpack',
-        {'middleware:mimetyper': ['factory', MimeTypeMiddleware]}
-    ],
-    middleware: [ 'mimetyper' ],
-    customLaunchers: {
-        FirefoxHeadless: {
-            base: 'Firefox',
-            flags: ['-headless'],
-        },
-    },
-};
-
-module.exports = function (config) {
-    config.set(karmaConfig);
-};
diff --git a/src/dashbls/js-bindings/tests/karma.test.js b/src/dashbls/js-bindings/tests/karma.test.js
deleted file mode 100644
index b1d9b0ee3018..000000000000
--- a/src/dashbls/js-bindings/tests/karma.test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is needed to compile tests with webpack into one file for the browser tests
-
-const testsContext = require.context('./', true, /spec\.js$/);
-
-testsContext.keys().forEach(testsContext);
\ No newline at end of file
diff --git a/src/dashbls/js-bindings/tests/test.js b/src/dashbls/js-bindings/tests/test.js
deleted file mode 100644
index 34671d6546b7..000000000000
--- a/src/dashbls/js-bindings/tests/test.js
+++ /dev/null
@@ -1,409 +0,0 @@
-const assert = require('assert');
-const binascii = require('binascii');
-const blsjs = require('../blsjs');
-
-function bytes(x) {
-    return Buffer.from(binascii.unhexlify(x), 'binary');
-}
-
-function range(n) {
-    const arr = [];
-    for (var i = 0; i < n; i++) {
-        arr.push(i);
-    }
-    return arr;
-}
-
-function repeat(n,v) {
-    return range(32).map(() => v);
-}
-
-blsjs().then((blsjs) => {
-    const modules = [
-        'AugSchemeMPL',
-        'BasicSchemeMPL',
-        "Bignum",
-        'G1Element',
-        'G2Element',
-        'PopSchemeMPL',
-        'PrivateKey',
-        'Util'
-    ];
-
-    // ensure all present
-    for (var i = 0; i < modules.length; i++) {
-        const m = modules[i];
-        if (blsjs[m] === undefined) {
-            console.log(`undefined required module ${m}`);
-            process.exit(1);
-        }
-    }
-
-    const {
-        AugSchemeMPL,
-        BasicSchemeMPL,
-        Bignum,
-        G1Element,
-        G2Element,
-        PopSchemeMPL,
-        PrivateKey,
-        Util
-    } = blsjs;
-
-    function testSchemes() {
-        var seedArray = [
-            0, 50, 6, 244, 24, 199, 1, 25, 52, 88, 192, 19, 18, 12, 89, 6,
-            220, 18, 102, 58, 209, 82, 12, 62, 89, 110, 182, 9, 44, 20, 254, 22
-        ];
-        var seed = Buffer.from(seedArray);
-
-        const msg = Buffer.from([100, 2, 254, 88, 90, 45, 23]);
-        const msg2 = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-        const sk = BasicSchemeMPL.keyGen(seed);
-        const pk = sk.getG1();
-
-        //assert(sk == PrivateKey.fromBytes(sk.serialize(), false));
-        //assert(pk == G1Element.fromBytes(pk.serialize()));
-
-        [BasicSchemeMPL, AugSchemeMPL, PopSchemeMPL].map((Scheme) => {
-            const sig = Scheme.sign(sk, msg);
-            //assert(sig == G2Element.fromBytes(Buffer.from(sig)));
-            assert(Scheme.verify(pk, msg, sig));
-        });
-
-        var seed = Buffer.concat([Buffer.from([1]), seed.slice(1)]);
-        const sk1 = BasicSchemeMPL.keyGen(seed);
-        const pk1 = sk1.getG1();
-        var seed = Buffer.concat([Buffer.from([2]), seed.slice(1)]);
-        const sk2 = BasicSchemeMPL.keyGen(seed);
-        const pk2 = sk2.getG1();
-
-        [BasicSchemeMPL, AugSchemeMPL, PopSchemeMPL].map((Scheme) => {
-            // Aggregate same message
-            const aggPk = pk1.add(pk2);
-            var sig1, sig2;
-            if (Scheme === AugSchemeMPL) {
-                sig1 = Scheme.signPrepend(sk1, msg, aggPk);
-                sig2 = Scheme.signPrepend(sk2, msg, aggPk);
-            } else {
-                sig1 = Scheme.sign(sk1, msg);
-                sig2 = Scheme.sign(sk2, msg);
-            }
-
-            var aggSig = Scheme.aggregate([sig1, sig2]);
-            assert(Scheme.verify(aggPk, msg, aggSig));
-
-            // Aggregate different message
-            sig1 = Scheme.sign(sk1, msg)
-            sig2 = Scheme.sign(sk2, msg2)
-            aggSig = Scheme.aggregate([sig1, sig2])
-            assert(Scheme.aggregateVerify([pk1, pk2], [msg, msg2], aggSig));
-
-            // HD keys
-            const child = Scheme.deriveChildSk(sk1, 123);
-            const childU = Scheme.deriveChildSkUnhardened(sk1, 123);
-            const childUPk = Scheme.deriveChildPkUnhardened(pk1, 123);
-
-            const sigChild = Scheme.sign(child, msg);
-            assert(Scheme.verify(child.getG1(), msg, sigChild));
-
-            const sigUChild = Scheme.sign(childU, msg);
-            assert(Scheme.verify(childUPk, msg, sigUChild));
-        });
-    }
-
-    function testVectorsInvalid() {
-        // Invalid inputs from https://github.com/algorand/bls_sigs_ref/blob/master/python-impl/serdesZ.py
-        const invalidInputs1 = [
-            // infinity points: too short
-            "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            // infinity points: not all zeros
-            "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000",
-            // bad tags
-            "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-            "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-            "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-            // wrong length for compresed point
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa",
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaaaa",
-            // invalid x-coord
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-            // invalid elm of Fp --- equal to p (must be strictly less)
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-        ]
-        const invalidInputs2 = [
-            // infinity points: too short
-            "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            // infinity points: not all zeros
-            "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000",
-            // bad tags
-            "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            // wrong length for compressed point
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            // invalid x-coord
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaa7",
-            // invalid elm of Fp --- equal to p (must be strictly less)
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-        ];
-
-        let g1ExnCount = 0;
-        let g2ExnCount = 0;
-
-        invalidInputs1.map((s) => {
-            const bytes_ = binascii.unhexlify(s);
-            try {
-                const g1 = G1Element(bytes_);
-                console.log(`Failed to disallow creation of G1 element for string ${s}`);
-                assert(false);
-            } catch(e) {
-                g1ExnCount++;
-            }
-        });
-
-        invalidInputs2.map((s) => {
-            const bytes_ = binascii.unhexlify(s);
-            try {
-                const g2 = G2Element(bytes_);
-                console.log(`Failed to disallow creation of G2 element for string ${s}`);
-                assert(false);
-            } catch(e) {
-                g2ExnCount++;
-            }
-        });
-
-        assert(g1ExnCount == invalidInputs1.length);
-        assert(g2ExnCount == invalidInputs2.length);
-    }
-
-    function testVectorsValid() {
-        // The following code was used to generate these vectors
-        //
-        //   from py_ecc.bls import (
-        //        G2Basic,
-        //        G2MessageAugmentation as G2MA,
-        //        G2ProofOfPossession as G2Pop,
-        //    )
-        //
-        //    secret1 = bytes([1] * 32)
-        //    secret2 = bytes([x * 314159 % 256 for x in range(32)])
-        //    sk1 = int.fromBytes(secret1, 'big')
-        //    sk2 = int.fromBytes(secret2, 'big')
-        //    msg = bytes([3, 1, 4, 1, 5, 9])
-        //    pk1 = G2Basic.SkToPk(sk1)
-        //    pk2 = G2Basic.SkToPk(sk2)
-        //
-        //    for Scheme in (G2Basic, G2MA, G2Pop):
-        //        sig1 = Scheme.Sign(sk1, msg)
-        //        sig2 = Scheme.Sign(sk2, msg)
-        //        sig_agg = Scheme.Aggregate([sig1, sig2])
-        //        print(sig1)
-        //        print(sig2)
-        //        print(sig_agg)
-        //
-        // Javascript version converts these strings to binascii
-
-        const refSig1Basic = bytes('96ba34fac33c7f129d602a0bc8a3d43f9abc014eceaab7359146b4b150e57b808645738f35671e9e10e0d862a30cab70074eb5831d13e6a5b162d01eebe687d0164adbd0a864370a7c222a2768d7704da254f1bf1823665bc2361f9dd8c00e99');
-        const refSig2Basic = bytes('a402790932130f766af11ba716536683d8c4cfa51947e4f9081fedd692d6dc0cac5b904bee5ea6e25569e36d7be4ca59069a96e34b7f700758b716f9494aaa59a96e74d14a3b552a9a6bc129e717195b9d6006fd6d5cef4768c022e0f7316abf');
-        const refSigABasic = bytes('987cfd3bcd62280287027483f29c55245ed831f51dd6bd999a6ff1a1f1f1f0b647778b0167359c71505558a76e158e66181ee5125905a642246b01e7fa5ee53d68a4fe9bfb29a8e26601f0b9ad577ddd18876a73317c216ea61f430414ec51c5');
-        const refSig1Aug = bytes('8180f02ccb72e922b152fcedbe0e1d195210354f70703658e8e08cbebf11d4970eab6ac3ccf715f3fb876df9a9797abd0c1af61aaeadc92c2cfe5c0a56c146cc8c3f7151a073cf5f16df38246724c4aed73ff30ef5daa6aacaed1a26ecaa336b');
-        const refSig2Aug = bytes('99111eeafb412da61e4c37d3e806c6fd6ac9f3870e54da9222ba4e494822c5b7656731fa7a645934d04b559e9261b86201bbee57055250a459a2da10e51f9c1a6941297ffc5d970a557236d0bdeb7cf8ff18800b08633871a0f0a7ea42f47480');
-        const refSigAAug = bytes('8c5d03f9dae77e19a5945a06a214836edb8e03b851525d84b9de6440e68fc0ca7303eeed390d863c9b55a8cf6d59140a01b58847881eb5af67734d44b2555646c6616c39ab88d253299acc1eb1b19ddb9bfcbe76e28addf671d116c052bb1847');
-        const refSig1Pop = bytes('9550fb4e7f7e8cc4a90be8560ab5a798b0b23000b6a54a2117520210f986f3f281b376f259c0b78062d1eb3192b3d9bb049f59ecc1b03a7049eb665e0df36494ae4cb5f1136ccaeefc9958cb30c3333d3d43f07148c386299a7b1bfc0dc5cf7c');
-        const refSig2Pop = bytes('a69036bc11ae5efcbf6180afe39addde7e27731ec40257bfdc3c37f17b8df68306a34ebd10e9e32a35253750df5c87c2142f8207e8d5654712b4e554f585fb6846ff3804e429a9f8a1b4c56b75d0869ed67580d789870babe2c7c8a9d51e7b2a');
-        const refSigAPop = bytes('a4ea742bcdc1553e9ca4e560be7e5e6c6efa6a64dddf9ca3bb2854233d85a6aac1b76ec7d103db4e33148b82af9923db05934a6ece9a7101cd8a9d47ce27978056b0f5900021818c45698afdd6cf8a6b6f7fee1f0b43716f55e413d4b87a6039');
-
-        const secret1 = Buffer.from(repeat(32,1));
-        const secret2 = Buffer.from(range(32).map((x) => x * 314159 % 256));
-        const sk1 = PrivateKey.fromBytes(secret1, false);
-        const sk2 = PrivateKey.fromBytes(secret2, false);
-
-        const msg = Buffer.from([3, 1, 4, 1, 5, 9]);
-        const sig1Basic = BasicSchemeMPL.sign(sk1, msg)
-        const sig2Basic = BasicSchemeMPL.sign(sk2, msg)
-        const sigABasic = BasicSchemeMPL.aggregate([sig1Basic, sig2Basic])
-        const sig1Aug = AugSchemeMPL.sign(sk1, msg)
-        const sig2Aug = AugSchemeMPL.sign(sk2, msg)
-        const sigAAug = AugSchemeMPL.aggregate([sig1Aug, sig2Aug])
-        const sig1Pop = PopSchemeMPL.sign(sk1, msg)
-        const sig2Pop = PopSchemeMPL.sign(sk2, msg)
-        const sigAPop = PopSchemeMPL.aggregate([sig1Pop, sig2Pop])
-
-        assert(Buffer.from(sig1Basic.serialize()).equals(refSig1Basic));
-        assert(Buffer.from(sig2Basic.serialize()).equals(refSig2Basic));
-        assert(Buffer.from(sigABasic.serialize()).equals(refSigABasic));
-        assert(Buffer.from(sig1Aug.serialize()).equals(refSig1Aug));
-        assert(Buffer.from(sig2Aug.serialize()).equals(refSig2Aug));
-        assert(Buffer.from(sigAAug.serialize()).equals(refSigAAug));
-        assert(Buffer.from(sig1Pop.serialize()).equals(refSig1Pop));
-        assert(Buffer.from(sig2Pop.serialize()).equals(refSig2Pop));
-        assert(Buffer.from(sigAPop.serialize()).equals(refSigAPop));
-    }
-
-    function testReadme() {
-        let seed = Buffer.from(
-            [
-                0,
-                50,
-                6,
-                244,
-                24,
-                199,
-                1,
-                25,
-                52,
-                88,
-                192,
-                19,
-                18,
-                12,
-                89,
-                6,
-                220,
-                18,
-                102,
-                58,
-                209,
-                82,
-                12,
-                62,
-                89,
-                110,
-                182,
-                9,
-                44,
-                20,
-                254,
-                22,
-            ]
-        );
-        let sk = AugSchemeMPL.keyGen(seed);
-        let pk = sk.getG1();
-
-        const message = Buffer.from([1, 2, 3, 4, 5]);
-        let signature = AugSchemeMPL.sign(sk, message);
-
-        let ok = AugSchemeMPL.verify(pk, message, signature);
-        assert(ok);
-
-        const skBytes = sk.serialize();  // 32 bytes
-        const pkBytes = pk.serialize();  // 48 bytes
-        const signatureBytes = signature.serialize();  // 96 bytes
-
-        console.log(Buffer.from(skBytes).toString('hex'), Buffer.from(pkBytes).toString('hex'), Buffer.from(signatureBytes).toString('hex'));
-
-        sk = PrivateKey.fromBytes(skBytes, false);
-        pk = G1Element.fromBytes(pkBytes);
-        signature = G2Element.fromBytes(signatureBytes);
-
-        seed = Buffer.concat([Buffer.from([1]), seed.slice(1)]);
-        const sk1 = AugSchemeMPL.keyGen(seed);
-        seed = Buffer.concat([Buffer.from([2]), seed.slice(1)]);
-        const sk2 = AugSchemeMPL.keyGen(seed);
-        const message2 = Buffer.from([1, 2, 3, 4, 5, 6, 7]);
-
-        const pk1 = sk1.getG1();
-        const sig1 = AugSchemeMPL.sign(sk1, message);
-
-        const pk2 = sk2.getG1();
-        const sig2 = AugSchemeMPL.sign(sk2, message2);
-
-        const aggSig = AugSchemeMPL.aggregate([sig1, sig2]);
-
-        ok = AugSchemeMPL.aggregateVerify([pk1, pk2], [message, message2], aggSig);
-        assert(ok);
-
-        seed = Buffer.concat([Buffer.from([3]), seed.slice(1)]);
-        const sk3 = AugSchemeMPL.keyGen(seed);
-        const pk3 = sk3.getG1();
-        const message3 = Buffer.from([100, 2, 254, 88, 90, 45, 23]);
-        const sig3 = AugSchemeMPL.sign(sk3, message3);
-
-        const aggSigFinal = AugSchemeMPL.aggregate([aggSig, sig3]);
-        ok = AugSchemeMPL.aggregateVerify(
-            [pk1, pk2, pk3], [message, message2, message3], aggSigFinal
-        );
-        assert(ok);
-
-        const popSig1 = PopSchemeMPL.sign(sk1, message);
-        const popSig2 = PopSchemeMPL.sign(sk2, message);
-        const popSig3 = PopSchemeMPL.sign(sk3, message);
-        const pop1 = PopSchemeMPL.popProve(sk1);
-        const pop2 = PopSchemeMPL.popProve(sk2);
-        const pop3 = PopSchemeMPL.popProve(sk3);
-
-        ok = PopSchemeMPL.popVerify(pk1, pop1);
-        assert(ok);
-        ok = PopSchemeMPL.popVerify(pk2, pop2);
-        assert(ok);
-        ok = PopSchemeMPL.popVerify(pk3, pop3);
-        assert(ok);
-
-        const popSigAgg = PopSchemeMPL.aggregate([popSig1, popSig2, popSig3]);
-
-        ok = PopSchemeMPL.fastAggregateVerify([pk1, pk2, pk3], message, popSigAgg);
-        assert(ok);
-
-        const popAggPk = pk1.add(pk2).add(pk3);
-        assert(Buffer.from(popAggPk.serialize()).toString('hex') == '8ffb2a3c4a6ce516febdf1f2a5140c6974cce2530ebc1b56629f078c25d538aa3d8f0cf694516b4bfc8d344bbea829d3');
-        const tPopAggPk1 = pk1.add(pk2.add(pk3));
-        assert(Buffer.from(popAggPk.serialize()).equals(Buffer.from(tPopAggPk1.serialize())));
-
-        assert(Buffer.from(popSigAgg.serialize()).toString('hex') == 'b3115327c21286b043cf972db56cefe0a745a8091482c9eec47fe5c0dbdb2ffc4d05ae54e7ee45e209135e6c81e8af2212465abffe8ab3166d3f4d5ed1f4d98cb65323d8d1fc210311c7e46a5f637ef7d90b7f3206708dc4bb32a2e1549a3060');
-        ok = PopSchemeMPL.verify(popAggPk, message, popSigAgg);
-        assert(ok);
-
-        const popAggSk = PrivateKey.aggregate([sk1, sk2, sk3]);
-        ok = Buffer.from(PopSchemeMPL.sign(popAggSk, message).serialize()).equals(Buffer.from(popSigAgg.serialize()));
-        assert(ok);
-
-        const masterSk = AugSchemeMPL.keyGen(seed);
-        const child = AugSchemeMPL.deriveChildSk(masterSk, 152);
-        const grandchild = AugSchemeMPL.deriveChildSk(child, 952);
-
-        const masterPk = masterSk.getG1();
-        const childU = AugSchemeMPL.deriveChildSkUnhardened(masterSk, 22);
-        const grandchildU = AugSchemeMPL.deriveChildSkUnhardened(childU, 0);
-
-        const childUPk = AugSchemeMPL.deriveChildPkUnhardened(masterPk, 22);
-        const grandchildUPk = AugSchemeMPL.deriveChildPkUnhardened(childUPk, 0);
-
-        ok = Buffer.from(grandchildUPk.serialize()).equals(Buffer.from(grandchildU.getG1().serialize()));
-        assert(ok);
-    }
-
-    function testAggregateVerifyZeroItems() {
-        assert(AugSchemeMPL.aggregateVerify([], [], new G2Element()));
-    }
-
-    function testBignum() {
-        const mersenne = Bignum.fromString('162259276829213363391578010288127', 10);
-        assert(mersenne.toString(16).toLowerCase() == '7ffffffffffffffffffffffffff');
-    }
-
-    testSchemes();
-    testVectorsInvalid();
-    testVectorsValid();
-    testReadme();
-    testAggregateVerifyZeroItems();
-    testBignum();
-}).then(function() {
-    console.log("\nAll tests passed.");
-});
-
-const copyright = [
-    'Copyright 2020 Chia Network Inc',
-    'Licensed under the Apache License, Version 2.0 (the "License");',
-    'you may not use this file except in compliance with the License.',
-    'You may obtain a copy of the License at',
-    'http://www.apache.org/licenses/LICENSE-2.0',
-    'Unless required by applicable law or agreed to in writing, software',
-    'distributed under the License is distributed on an "AS IS" BASIS,',
-    'WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.',
-    'See the License for the specific language governing permissions and',
-    'limitations under the License.'
-];
diff --git a/src/dashbls/js-bindings/tests/typings.spec.ts b/src/dashbls/js-bindings/tests/typings.spec.ts
deleted file mode 100644
index f84a93b92bab..000000000000
--- a/src/dashbls/js-bindings/tests/typings.spec.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// This file is used to check if the typescript typings are working
-import createBlsSignaturesModule from '..';
-import {deepStrictEqual, ok, strictEqual} from 'assert';
-import {createHash} from 'crypto';
-
-createBlsSignaturesModule().then((blsSignatures) => {
-    const {
-        AugSchemeMPL,
-        PrivateKey,
-        G1Element,
-        G2Element
-    } = blsSignatures;
-
-    function makehash(msg : Uint8Array) : Uint8Array {
-        return createHash('sha256').update(msg).digest();
-    }
-
-    function getSkSeed(): Uint8Array {
-        return Uint8Array.from([
-            0, 50, 6, 244, 24, 199, 1, 25, 52, 88, 192, 19, 18, 12, 89, 6, 220,
-            18, 102, 58, 209, 82, 12, 62, 89, 110, 182, 9, 44, 20, 254, 22
-         ]);
-    }
-
-    function getSkBytes(): Uint8Array {
-        return Uint8Array.from([
-            55, 112, 145, 240, 231, 40,  70,  59,
-            194, 218, 125,  84, 108, 83, 185, 246,
-            184,  29, 244, 161, 204, 26, 181, 191,
-            41, 197, 144, 139, 113, 81, 163,  45
-        ]);
-    }
-
-    function getPkBytes(): Uint8Array {
-        return Uint8Array.from([
-            134,  36,  50, 144, 187, 203, 253, 154, 231,
-            91, 222, 206, 121, 129, 150,  83,  80,  32,
-            142, 181, 233, 155,   4, 213, 205,  36, 233,
-            85, 173, 169,  97, 248, 192, 161,  98, 222,
-            231,  64, 190, 123, 220, 108,  60,   6,  19,
-            186,  46, 177
-        ]);
-    }
-
-    function getMessageBytes(): Uint8Array {
-        return Uint8Array.from([1, 2, 3]);
-    }
-
-    function getMessageHash(): Uint8Array {
-        return Uint8Array.from(createHash('sha256').update(getMessageBytes()).digest());
-    }
-
-    function getSignatureBytes(): Uint8Array {
-        return Uint8Array.from([
-            150,  18, 129, 243, 101, 246,  44,  55,  26, 188,  24,  50,
-            34, 223, 147,  98, 184, 115, 124,  54, 133,  86, 100, 135,
-            205, 155, 191, 212,  36,  49,   2, 244, 241, 202, 143, 223,
-            89,  34,   7, 115,  96, 209,  22,  24, 100,  22,  55, 175,
-            2, 199, 236, 131, 152, 217,  76, 146,  32,  13, 235,  31,
-            129,  47,  84, 187, 229, 161,  27,  89, 214,  21,   7, 240,
-            1, 130, 214,  13, 134, 189, 139, 112,  40,  94, 221,  76,
-            249, 168, 114, 254,  55,  45,  42,  30,  14,  22, 107,  10
-        ]);
-    }
-
-    function getChainCodeBytes(): Uint8Array {
-        return Uint8Array.from([137, 75, 79, 148, 193, 235, 158, 172, 163, 41, 102, 134, 72, 161, 187, 104, 97, 202, 38, 27, 206, 125, 64, 60, 149, 248, 29, 53, 180, 23, 253, 255]);
-    }
-
-    describe('typings', () => {
-        it('PrivateKey', () => {
-            strictEqual(PrivateKey.PRIVATE_KEY_SIZE, 32);
-            const sk = AugSchemeMPL.keyGen(getSkSeed());
-            const aggSk = PrivateKey.aggregate([sk]);
-            const pk = sk.getG1();
-            const bytes: Uint8Array = sk.serialize();
-            const sig = AugSchemeMPL.sign(sk, getMessageBytes());
-            ok(AugSchemeMPL.verify(pk, getMessageBytes(), sig));
-            aggSk.delete();
-            pk.delete();
-            sig.delete();
-        });
-
-        it('G1Element', () => {
-            strictEqual(G1Element.SIZE, 48);
-            const pk = G1Element.fromBytes(getPkBytes());
-            const aggPk = pk.add(pk);
-            const fingerprint: number = pk.getFingerprint();
-            const bytes: Uint8Array = pk.serialize();
-            pk.delete();
-            aggPk.delete();
-        });
-
-        it('G2Element', () => {
-            strictEqual(G2Element.SIZE, 96);
-            const pk = G1Element.fromBytes(getPkBytes());
-            const sig = G2Element.fromBytes(getSignatureBytes());
-            const aggSig = AugSchemeMPL.aggregate([sig]);
-            const sig2 = G2Element.fromBytes(getSignatureBytes());
-            const isValid: boolean =
-              AugSchemeMPL.verify(pk, getMessageBytes(), sig);
-            const serialized: Uint8Array = sig.serialize();
-            ok(isValid);
-            sig.delete();
-            aggSig.delete();
-            sig2.delete();
-        });
-    });
-});
diff --git a/src/dashbls/js-bindings/tests/webpack.config.js b/src/dashbls/js-bindings/tests/webpack.config.js
deleted file mode 100644
index 183b88bd4dde..000000000000
--- a/src/dashbls/js-bindings/tests/webpack.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const webpack = require('webpack');
-
-module.exports = {
-    mode: 'development',
-    plugins: [
-        new webpack.ProvidePlugin({
-            process: 'process',
-
-        })
-    ],
-    resolve: {
-        fallback: {
-            "path": require.resolve("path-browserify"),
-            "crypto": require.resolve("crypto-browserify"),
-            "stream": require.resolve("stream-browserify"),
-            "fs": false,
-        }
-    }
-};
diff --git a/src/dashbls/js-bindings/tests/yarn.lock b/src/dashbls/js-bindings/tests/yarn.lock
deleted file mode 100644
index 7695a5a37c34..000000000000
--- a/src/dashbls/js-bindings/tests/yarn.lock
+++ /dev/null
@@ -1,300 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
-assert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
-  dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
-
-available-typed-arrays@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
-  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
-  dependencies:
-    array-filter "^1.0.0"
-
-binascii@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/binascii/-/binascii-0.0.2.tgz#a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee"
-  integrity sha1-p/iogB28z4sXVrdD2qD+6eLZ4O4=
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
-  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    is-callable "^1.2.3"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.2"
-    is-string "^1.0.5"
-    object-inspect "^1.9.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-inherits@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-arguments@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-bigint@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
-
-is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-callable@^1.1.4, is-callable@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
-  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
-
-is-date-object@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.3.tgz#4c0802ae9c8097939ea8001eaae3c502f3dbe72f"
-  integrity sha512-tDpEUInNcy2Yw3lNSepK3Wdw1RnXLcIVienz6Ou631Acl15cJyRWK4dgA1vCmOEgIbtOV0W7MHg+AR2Gdg1NXQ==
-
-is-generator-function@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
-  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
-
-is-nan@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
-  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
-
-is-regex@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
-  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-symbols "^1.0.1"
-
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-typed-array@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
-  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.2"
-    es-abstract "^1.18.0-next.2"
-    foreach "^2.0.5"
-    has-symbols "^1.0.1"
-
-object-inspect@^1.9.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
-  integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
-
-object-is@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-safe-buffer@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-unbox-primitive@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
-util@^0.12.0:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
-  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    safe-buffer "^5.1.2"
-    which-typed-array "^1.1.2"
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-typed-array@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
-  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.0"
-    es-abstract "^1.18.0-next.1"
-    foreach "^2.0.5"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.1"
-    is-typed-array "^1.1.3"
diff --git a/src/dashbls/js-bindings/wrappers/BignumWrapper.cpp b/src/dashbls/js-bindings/wrappers/BignumWrapper.cpp
deleted file mode 100644
index 26fea069a0ff..000000000000
--- a/src/dashbls/js-bindings/wrappers/BignumWrapper.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <helpers.h>
-#include "BignumWrapper.h"
-
-namespace js_wrappers {
-Bignum::Bignum() {
-    bn_make(&content, 1);
-}
-
-Bignum::~Bignum() {
-    bn_clean(&content);
-}
-
-Bignum::Bignum(const Bignum &other) {
-    bn_copy(&content, &other.content);
-}
-
-bn_st *Bignum::operator &() { return &content; }
-
-BignumWrapper::BignumWrapper(const Bignum &bn) : JSWrapper(bn) {}
-
-BignumWrapper BignumWrapper::FromString(const std::string &s, int radix) {
-    Bignum result;
-    bn_read_str(&result, s.c_str(), s.size(), radix);
-    return BignumWrapper(result);
-}
-
-std::string BignumWrapper::ToString(int radix) {
-    auto wrapper = GetWrappedInstance();
-    int strsize = bn_size_str(&wrapper, radix);
-    std::vector<char> strholder(strsize);
-    bn_write_str(&strholder[0], strsize, &wrapper, radix);
-    return std::string(&strholder[0], strsize - 1);
-}
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/BignumWrapper.h b/src/dashbls/js-bindings/wrappers/BignumWrapper.h
deleted file mode 100644
index 337d52702506..000000000000
--- a/src/dashbls/js-bindings/wrappers/BignumWrapper.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_BIGNUMWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_BIGNUMWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-
-namespace js_wrappers {
-class Bignum {
-public:
-    Bignum();
-    ~Bignum();
-    Bignum(const Bignum &other);
-
-    bn_st *operator &();
-
-private:
-    bn_st content;
-};
-
-class BignumWrapper : public JSWrapper<Bignum> {
-public:
-    explicit BignumWrapper(const Bignum &bn);
-    static BignumWrapper FromString(const std::string &s, int radix);
-    std::string ToString(int radix);
-};
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_SIGNATUREWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/G1ElementWrapper.cpp b/src/dashbls/js-bindings/wrappers/G1ElementWrapper.cpp
deleted file mode 100644
index 0d630514886b..000000000000
--- a/src/dashbls/js-bindings/wrappers/G1ElementWrapper.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "G1ElementWrapper.h"
-
-namespace js_wrappers {
-G1ElementWrapper::G1ElementWrapper(const G1Element &publicKey) : JSWrapper(publicKey) {}
-
-G1ElementWrapper::G1ElementWrapper() : JSWrapper(G1Element()) { }
-
-const size_t G1ElementWrapper::SIZE = G1Element::SIZE;
-
-std::vector <G1Element> G1ElementWrapper::Unwrap(std::vector <G1ElementWrapper> wrappers) {
-    std::vector <G1Element> unwrapped;
-    for (auto &wrapper : wrappers) {
-        unwrapped.push_back(wrapper.GetWrappedInstance());
-    }
-    return unwrapped;
-}
-
-G1ElementWrapper G1ElementWrapper::FromBytes(val buffer) {
-    std::vector <uint8_t> bytes = helpers::toVector(buffer);
-    const bls::Bytes bytesView(bytes);
-    G1Element pk = G1Element::FromBytes(bytesView);
-    return G1ElementWrapper(pk);
-}
-
-val G1ElementWrapper::Serialize() const {
-    return helpers::toUint8Array(wrapped.Serialize());
-}
-
-G1ElementWrapper G1ElementWrapper::Add(const G1ElementWrapper &other) {
-    return G1ElementWrapper(GetWrappedInstance() + other.GetWrappedInstance());
-}
-
-G1ElementWrapper G1ElementWrapper::Mul(const BignumWrapper &other) {
-    bn_t factor;
-    // Since the type of bn_t is bn_st[0], we can do this dance to make a temporary
-    // copy of the struct itself to hand to G1ElementWrapper's multiply.  The
-    // type was clearly intended to by by-value in argument lists (degrade to ptr)
-    // but value semantics in C++ complicates matters.
-    factor[0] = *(&other.GetWrappedInstance());
-    return G1ElementWrapper(GetWrappedInstance() * factor);
-}
-
-bool G1ElementWrapper::EqualTo(const G1ElementWrapper &others) {
-    return GetWrappedInstance() == others.GetWrappedInstance();
-}
-
-G1ElementWrapper G1ElementWrapper::Negate() {
-    return G1ElementWrapper(GetWrappedInstance().Negate());
-}
-
-G1ElementWrapper G1ElementWrapper::Generator() {
-    return G1ElementWrapper(G1Element::Generator());
-}
-
-G1ElementWrapper G1ElementWrapper::Deepcopy() {
-    return G1ElementWrapper(GetWrappedInstance());
-}
-
-uint32_t G1ElementWrapper::GetFingerprint() const {
-    return wrapped.GetFingerprint();
-}
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/G1ElementWrapper.h b/src/dashbls/js-bindings/wrappers/G1ElementWrapper.h
deleted file mode 100644
index 1b5a0f8282a7..000000000000
--- a/src/dashbls/js-bindings/wrappers/G1ElementWrapper.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_G1ELEMENTWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_G1ELEMENTWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-#include "BignumWrapper.h"
-
-namespace js_wrappers {
-class G1ElementWrapper : public JSWrapper<G1Element> {
-public:
-    explicit G1ElementWrapper(const G1Element &publicKey);
-
-    G1ElementWrapper();
-
-    static const size_t SIZE;
-
-    static std::vector <G1Element> Unwrap(std::vector <G1ElementWrapper> wrappers);
-
-    static G1ElementWrapper FromBytes(val buffer);
-
-    static G1ElementWrapper Generator();
-
-    val Serialize() const;
-
-    G1ElementWrapper Add(const G1ElementWrapper &other);
-
-    G1ElementWrapper Mul(const BignumWrapper &other);
-
-    bool EqualTo(const G1ElementWrapper &others);
-
-    G1ElementWrapper Negate();
-
-    G1ElementWrapper Deepcopy();
-
-    uint32_t GetFingerprint() const;
-};
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_G1ELEMENTWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/G2ElementWrapper.cpp b/src/dashbls/js-bindings/wrappers/G2ElementWrapper.cpp
deleted file mode 100644
index 980a7dd8e706..000000000000
--- a/src/dashbls/js-bindings/wrappers/G2ElementWrapper.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "G2ElementWrapper.h"
-
-namespace js_wrappers {
-G2ElementWrapper::G2ElementWrapper(const G2Element &signature) : JSWrapper(signature) {}
-
-G2ElementWrapper::G2ElementWrapper() : JSWrapper(G2Element()) { }
-
-const size_t G2ElementWrapper::SIZE = G2Element::SIZE;
-
-
-std::vector <G2Element> G2ElementWrapper::Unwrap(std::vector <js_wrappers::G2ElementWrapper> sigWrappers) {
-    std::vector <G2Element> signatures;
-    for (auto &sigWrapper : sigWrappers) {
-        signatures.push_back(sigWrapper.GetWrappedInstance());
-    }
-    return signatures;
-}
-
-G2ElementWrapper G2ElementWrapper::FromG2Element(const G2Element &signature) {
-    return G2ElementWrapper(signature);
-}
-
-G2ElementWrapper G2ElementWrapper::FromBytes(val buffer) {
-    std::vector <uint8_t> bytes = helpers::toVector(buffer);
-    const bls::Bytes bytesView(bytes);
-    G2Element sig = G2Element::FromBytes(bytesView);
-    return G2ElementWrapper(sig);
-}
-
-G2ElementWrapper G2ElementWrapper::AggregateSigs(val signatureWrappers) {
-    std::vector <G2Element> signatures = G2ElementWrapper::Unwrap(
-            helpers::toVectorFromJSArray<G2ElementWrapper>(signatureWrappers));
-    return G2ElementWrapper::FromG2Element(BasicSchemeMPL().Aggregate(signatures));
-}
-
-G2ElementWrapper G2ElementWrapper::Generator() {
-    return G2ElementWrapper(G2Element::Generator());
-}
-
-G2ElementWrapper G2ElementWrapper::Deepcopy() {
-    return G2ElementWrapper(GetWrappedInstance());
-}
-
-G2ElementWrapper G2ElementWrapper::Negate() {
-    return G2ElementWrapper(GetWrappedInstance().Negate());
-}
-
-val G2ElementWrapper::Serialize() const {
-    return helpers::toUint8Array(wrapped.Serialize());
-}
-
-G2ElementWrapper G2ElementWrapper::Add(const G2ElementWrapper& other) {
-    return G2ElementWrapper(GetWrappedInstance() + other.GetWrappedInstance());
-}
-
-G2ElementWrapper G2ElementWrapper::Mul(const BignumWrapper& other) {
-    bn_t factor;
-    // Since the type of bn_t is bn_st[0], we can do this dance to make a
-    // temporary copy of the struct itself to hand to G2ElementWrapper's
-    // multiply.  The type was clearly intended to by by-value in argument lists
-    // (degrade to ptr) but value semantics in C++ complicates matters.
-    factor[0] = *(&other.GetWrappedInstance());
-    return G2ElementWrapper(GetWrappedInstance() * factor);
-}
-
-bool G2ElementWrapper::EqualTo(const G2ElementWrapper& others) {
-    return GetWrappedInstance() == others.GetWrappedInstance();
-}
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/G2ElementWrapper.h b/src/dashbls/js-bindings/wrappers/G2ElementWrapper.h
deleted file mode 100644
index 46f23f6ca826..000000000000
--- a/src/dashbls/js-bindings/wrappers/G2ElementWrapper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_G2ELEMENTWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_G2ELEMENTWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-#include "BignumWrapper.h"
-
-namespace js_wrappers {
-class G2ElementWrapper : public JSWrapper<G2Element> {
- public:
-    explicit G2ElementWrapper(const G2Element &signature);
-
-    G2ElementWrapper();
-
-    static const size_t SIZE;
-
-    static std::vector <G2Element> Unwrap(std::vector <G2ElementWrapper> sigWrappers);
-
-    static G2ElementWrapper FromG2Element(const G2Element &signature);
-
-    static G2ElementWrapper FromBytes(val buffer);
-
-    static G2ElementWrapper AggregateSigs(val signatureWrappers);
-
-    static G2ElementWrapper Generator();
-
-    G2ElementWrapper Deepcopy();
-
-    G2ElementWrapper Negate();
-
-    val Serialize() const;
-
-    G2ElementWrapper Add(const G2ElementWrapper &other);
-
-    G2ElementWrapper Mul(const BignumWrapper &other);
-
-    bool EqualTo(const G2ElementWrapper &others);
-};
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_G2ELEMENTWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/JSWrapper.h b/src/dashbls/js-bindings/wrappers/JSWrapper.h
deleted file mode 100644
index 3217d50b4e7f..000000000000
--- a/src/dashbls/js-bindings/wrappers/JSWrapper.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_JSWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_JSWRAPPER_H_
-
-namespace js_wrappers {
-template<class T>
-class JSWrapper {
- public:
-    inline explicit JSWrapper(const T &wrappedInstance) : wrapped(wrappedInstance) {}
-
-    inline T GetWrappedInstance() const {
-        return wrapped;
-    }
- protected:
-    T wrapped;
-};
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_JSWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.cpp b/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.cpp
deleted file mode 100644
index 70b812116ace..000000000000
--- a/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "PrivateKeyWrapper.h"
-
-namespace js_wrappers {
-PrivateKeyWrapper::PrivateKeyWrapper(const PrivateKey &privateKey) : JSWrapper(privateKey) {}
-
-const size_t PrivateKeyWrapper::PRIVATE_KEY_SIZE = PrivateKey::PRIVATE_KEY_SIZE;
-
-std::vector <PrivateKey> PrivateKeyWrapper::Unwrap(std::vector <PrivateKeyWrapper> wrappers) {
-    std::vector <PrivateKey> unwrapped;
-    for (auto &wrapper : wrappers) {
-        unwrapped.push_back(wrapper.GetWrappedInstance());
-    }
-    return unwrapped;
-}
-
-PrivateKeyWrapper PrivateKeyWrapper::Aggregate(val privateKeysArray) {
-    std::vector <PrivateKey> privateKeys = PrivateKeyWrapper::Unwrap(
-            helpers::toVectorFromJSArray<PrivateKeyWrapper>(privateKeysArray));
-
-    PrivateKey aggregatedSk = PrivateKey::Aggregate(privateKeys);
-    return PrivateKeyWrapper(aggregatedSk);
-}
-
-PrivateKeyWrapper PrivateKeyWrapper::FromBytes(val buffer, bool modOrder) {
-    std::vector <uint8_t> bytes = helpers::toVector(buffer);
-    const bls::Bytes bytesView(bytes);
-    PrivateKey pk = PrivateKey::FromBytes(bytesView, modOrder);
-    return PrivateKeyWrapper(pk);
-}
-
-val PrivateKeyWrapper::Serialize() const {
-    return helpers::toUint8Array(wrapped.Serialize());
-}
-
-PrivateKeyWrapper PrivateKeyWrapper::Deepcopy() {
-    return PrivateKeyWrapper(GetWrappedInstance());
-}
-
-G1ElementWrapper PrivateKeyWrapper::GetG1() const {
-    G1Element pk = wrapped.GetG1Element();
-    return G1ElementWrapper(pk);
-}
-
-G2ElementWrapper PrivateKeyWrapper::GetG2() const {
-    G2Element sk = wrapped.GetG2Element();
-    return G2ElementWrapper(sk);
-}
-
-G2ElementWrapper PrivateKeyWrapper::GetG2Power(const G2ElementWrapper& element) const {
-    return G2ElementWrapper(GetWrappedInstance().GetG2Power(element.GetWrappedInstance()));
-}
-
-G1ElementWrapper PrivateKeyWrapper::MulG1(const G1ElementWrapper& other) {
-    return G1ElementWrapper(GetWrappedInstance() * other.GetWrappedInstance());
-}
-
-G2ElementWrapper PrivateKeyWrapper::MulG2(const G2ElementWrapper& other) {
-    return G2ElementWrapper(GetWrappedInstance() * other.GetWrappedInstance());
-}
-
-bool PrivateKeyWrapper::EqualTo(const PrivateKeyWrapper& others) {
-    return GetWrappedInstance() == others.GetWrappedInstance();
-}
-
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.h b/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.h
deleted file mode 100644
index e633c5dd52a7..000000000000
--- a/src/dashbls/js-bindings/wrappers/PrivateKeyWrapper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_PRIVATEKEYWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_PRIVATEKEYWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-#include "G1ElementWrapper.h"
-#include "G2ElementWrapper.h"
-
-namespace js_wrappers {
-class PrivateKeyWrapper : public JSWrapper<PrivateKey> {
- public:
-    explicit PrivateKeyWrapper(const PrivateKey &privateKey);
-
-    static const size_t PRIVATE_KEY_SIZE;
-
-    static std::vector<PrivateKey> Unwrap(std::vector<PrivateKeyWrapper> wrappers);
-
-    static PrivateKeyWrapper FromBytes(val buffer, bool modOrder);
-
-    static PrivateKeyWrapper Aggregate(val privateKeysArray);
-
-    val Serialize() const;
-
-    PrivateKeyWrapper Deepcopy();
-
-    G1ElementWrapper GetG1() const;
-
-    G2ElementWrapper GetG2() const;
-
-    G2ElementWrapper GetG2Power(const G2ElementWrapper &element) const;
-
-    G1ElementWrapper MulG1(const G1ElementWrapper &other);
-
-    G2ElementWrapper MulG2(const G2ElementWrapper &other);
-
-    bool EqualTo(const PrivateKeyWrapper &others);
-};
-}  // namespace js_wrappers
-
-
-#endif  // JS_BINDINGS_WRAPPERS_PRIVATEKEYWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.cpp b/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.cpp
deleted file mode 100644
index d0e56c765bdb..000000000000
--- a/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "SchemeMPLWrapper.h"
-
-namespace js_wrappers {
-
-    // Non template code.
-
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.h b/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.h
deleted file mode 100644
index e5a4ae5ef860..000000000000
--- a/src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_SCHEMEMPLWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_SCHEMEMPLWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-#include "G1ElementWrapper.h"
-#include "PrivateKeyWrapper.h"
-
-namespace js_wrappers {
-
-// Basic scheme wrapper providing most of the methods.
-template <typename SchemeMPL> class SchemeMPLWrapper : public JSWrapper<SchemeMPL> {
- public:
-  static G1ElementWrapper SkToG1(const PrivateKeyWrapper &seckey) {
-    return G1ElementWrapper(mpl.SkToG1(seckey.GetWrappedInstance()));
-  }
-
-  static PrivateKeyWrapper KeyGen(val seedVal) {
-    std::vector <uint8_t> seed = helpers::toVector(seedVal);
-    return PrivateKeyWrapper(mpl.KeyGen(seed));
-  }
-
-  static G2ElementWrapper Sign(const PrivateKeyWrapper &seckey, val messageVal) {
-    std::vector <uint8_t> message = helpers::toVector(messageVal);
-    return G2ElementWrapper(mpl.Sign(seckey.GetWrappedInstance(), message));
-  }
-
-  static bool Verify(const G1ElementWrapper &pubkey, val messageVal, const G2ElementWrapper &signature) {
-    std::vector <uint8_t> message = helpers::toVector(messageVal);
-    return mpl.Verify(pubkey.GetWrappedInstance(), message, signature.GetWrappedInstance());
-  }
-
-  static std::vector<G2Element> Unwrap(const std::vector<G2ElementWrapper> &wrappers) {
-    std::vector<G2Element> unwrapped;
-    for (auto &wrapper : wrappers) {
-      unwrapped.push_back(wrapper.GetWrappedInstance());
-    }
-    return unwrapped;
-  }
-
-  static G2ElementWrapper Aggregate(val g2Elements) {
-    std::vector<G2Element> signatures = G2ElementWrapper::Unwrap
-      (helpers::toVectorFromJSArray<G2ElementWrapper>(g2Elements));
-    return G2ElementWrapper(mpl.Aggregate(signatures));
-  }
-
-  static bool AggregateVerify(val pubkeyArray, val messagesVal, const G2ElementWrapper &signature) {
-    std::vector<G1Element> pubkeys = G1ElementWrapper::Unwrap
-      (helpers::toVectorFromJSArray<G1ElementWrapper>(pubkeyArray));
-    std::vector<val> messagesVec = helpers::toVectorFromJSArray<val>(messagesVal);
-    std::vector<std::vector<uint8_t>> messages;
-    for (auto msgVal : messagesVec) {
-      messages.push_back(helpers::toVector(msgVal));
-    }
-    return mpl.AggregateVerify(pubkeys, messages, signature.GetWrappedInstance());
-  }
-
-  static PrivateKeyWrapper DeriveChildSk(const PrivateKeyWrapper &sk, uint32_t index) {
-    return PrivateKeyWrapper(mpl.DeriveChildSk(sk.GetWrappedInstance(), index));
-  }
-
-  static PrivateKeyWrapper DeriveChildSkUnhardened(const PrivateKeyWrapper &sk, uint32_t index) {
-    return PrivateKeyWrapper(mpl.DeriveChildSkUnhardened(sk.GetWrappedInstance(), index));
-  }
-
-  static G1ElementWrapper DeriveChildPkUnhardened(const G1ElementWrapper &pk, uint32_t index) {
-    return G1ElementWrapper(mpl.DeriveChildPkUnhardened(pk.GetWrappedInstance(), index));
-  }
-
-  static bool VerifySecure(val pubkeyArray, const G2ElementWrapper &signature, val messageVal) {
-    std::vector<G1Element> pubkeys = G1ElementWrapper::Unwrap
-        (helpers::toVectorFromJSArray<G1ElementWrapper>(pubkeyArray));
-
-    std::vector <uint8_t> message = helpers::toVector(messageVal);
-
-    return mpl.VerifySecure(pubkeys, signature.GetWrappedInstance(), message);
-  }
-
-protected:
-  static inline SchemeMPL mpl;
-};
-
-class AugSchemeMPLWrapper : public SchemeMPLWrapper<AugSchemeMPL> {
-public:
-  static G2ElementWrapper SignPrepend(const PrivateKeyWrapper &seckey, val messageVal, const G1ElementWrapper &prependPk) {
-    std::vector <uint8_t> message = helpers::toVector(messageVal);
-    return G2ElementWrapper(mpl.Sign(seckey.GetWrappedInstance(), message, prependPk.GetWrappedInstance()));
-  }
-};
-
-class PopSchemeMPLWrapper : public SchemeMPLWrapper<PopSchemeMPL> {
-public:
-  static G2ElementWrapper PopProve(const PrivateKeyWrapper &seckey) {
-    return G2ElementWrapper(mpl.PopProve(seckey.GetWrappedInstance()));
-  }
-
-  static bool PopVerify(const G1ElementWrapper &pubkey, const G2ElementWrapper &signatureProof) {
-    return mpl.PopVerify(pubkey.GetWrappedInstance(), signatureProof.GetWrappedInstance());
-  }
-
-  static bool FastAggregateVerify
-  (val pubkeyArray,
-   val messageVal,
-   const G2ElementWrapper &signature) {
-    std::vector<G1Element> pubkeys = G1ElementWrapper::Unwrap
-      (helpers::toVectorFromJSArray<G1ElementWrapper>(pubkeyArray));
-    std::vector<uint8_t> message = helpers::toVector(messageVal);
-    return mpl.FastAggregateVerify(pubkeys, message, signature.GetWrappedInstance());
-  }
-};
-
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_SIGNATUREWRAPPER_H_
diff --git a/src/dashbls/js-bindings/wrappers/UtilWrapper.cpp b/src/dashbls/js-bindings/wrappers/UtilWrapper.cpp
deleted file mode 100644
index aa61b0cc2bc1..000000000000
--- a/src/dashbls/js-bindings/wrappers/UtilWrapper.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "UtilWrapper.h"
-
-namespace js_wrappers {
-val UtilWrapper::Hash256(val msg) {
-    std::vector<uint8_t> bytes = helpers::toVector(msg);
-    std::vector<uint8_t> output(BLS::MESSAGE_HASH_LEN);
-    Util::Hash256(&output[0], (const uint8_t *)bytes.data(), bytes.size());
-    return helpers::toUint8Array(&output[0], output.size());
-}
-std::string UtilWrapper::HexStr(val msg) {
-    std::vector<uint8_t> bytes = helpers::toVector(msg);
-    return Util::HexStr(bytes);
-}
-}  // namespace js_wrappers
diff --git a/src/dashbls/js-bindings/wrappers/UtilWrapper.h b/src/dashbls/js-bindings/wrappers/UtilWrapper.h
deleted file mode 100644
index 55635d02ba54..000000000000
--- a/src/dashbls/js-bindings/wrappers/UtilWrapper.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef JS_BINDINGS_WRAPPERS_UTILWRAPPER_H_
-#define JS_BINDINGS_WRAPPERS_UTILWRAPPER_H_
-
-#include <helpers.h>
-#include "JSWrapper.h"
-
-namespace js_wrappers {
-class UtilWrapper : public JSWrapper<Util> {
-public:
-    static val Hash256(val message);
-    static std::string HexStr(val message);
-};
-}  // namespace js_wrappers
-
-#endif  // JS_BINDINGS_WRAPPERS_SIGNATUREWRAPPER_H_
diff --git a/src/dashbls/js_build.sh b/src/dashbls/js_build.sh
deleted file mode 100755
index 29928af4a831..000000000000
--- a/src/dashbls/js_build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --init --recursive
-
-mkdir js_build
-cd js_build
-
-cmake ../ -DCMAKE_TOOLCHAIN_FILE=$(dirname $(realpath $(which emcc)))/cmake/Modules/Platform/Emscripten.cmake
-cmake --build . --
diff --git a/src/dashbls/js_build_docker.sh b/src/dashbls/js_build_docker.sh
deleted file mode 100755
index 170254e7b6ff..000000000000
--- a/src/dashbls/js_build_docker.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-DOCKER_IMAGE=emscripten/emsdk
-
-git submodule update --init --recursive
-mkdir js_build
-
-docker run \
-  --rm \
-  -v $(pwd):/src \
-  -w="/src/js_build" \
-  $DOCKER_IMAGE \
-  emcmake cmake /src
-
-docker run \
-  --rm \
-  -v $(pwd):/src \
-  -w="/src/js_build" \
-  $DOCKER_IMAGE \
-  cmake --build . -- -j10
diff --git a/src/dashbls/js_test.sh b/src/dashbls/js_test.sh
deleted file mode 100755
index abd1546b3918..000000000000
--- a/src/dashbls/js_test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-YARN=yarn
-if which yarn >/dev/null ; then
-    YARN=yarn
-else
-    if which npm >/dev/null ; then
-        YARN=npm
-    else
-        echo "No yarn or npm installed."
-        exit 1
-    fi
-fi
-
-cd js_build/js-bindings/tests && ${YARN} install && exec node ./test.js
diff --git a/src/dashbls/lgtm.yml b/src/dashbls/lgtm.yml
deleted file mode 100644
index e8d3f8a2045f..000000000000
--- a/src/dashbls/lgtm.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-extraction:
-  cpp:
-    after_prepare:
-    - "mkdir custom_cmake"
-    - "wget --quiet -O - \"https://cmake.org/files/v3.16/cmake-3.16.3-Linux-x86_64.tar.gz\"\
-      \ | tar --strip-components=1 -xz -C custom_cmake"
-    - "export PATH=$(pwd)/custom_cmake/bin:${PATH}"
-    - "cd $LGTM_SRC/"
-    - "export CMAKE_INCLUDE_PATH=$LGTM_SRC/include:${CMAKE_INCLUDE_PATH}"
-    - "export CMAKE_LIBRARY_PATH=$LGTM_SRC/lib:${CMAKE_LIBRARY_PATH}"
-    - "mkdir $LGTM_SRC/_lgtm_build_dir"
-    - "cd $LGTM_SRC/_lgtm_build_dir"
diff --git a/src/dashbls/mypi.ini b/src/dashbls/mypi.ini
deleted file mode 100644
index 976ba0294638..000000000000
--- a/src/dashbls/mypi.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mypy]
-ignore_missing_imports = True
diff --git a/src/dashbls/pyproject.toml b/src/dashbls/pyproject.toml
deleted file mode 100644
index c320f0e05ccc..000000000000
--- a/src/dashbls/pyproject.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.5.0", "pybind11"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools_scm]
-local_scheme = "no-local-version"
diff --git a/src/dashbls/python-bindings/CMakeLists.txt b/src/dashbls/python-bindings/CMakeLists.txt
deleted file mode 100644
index 2726399ed8cb..000000000000
--- a/src/dashbls/python-bindings/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-include(FetchContent)
-
-FetchContent_Declare(
-  pybind11
-  GIT_REPOSITORY https://github.com/pybind/pybind11.git
-  GIT_TAG        v2.13.6
-)
-FetchContent_MakeAvailable(pybind11)
-
-include_directories(
-        ${INCLUDE_DIRECTORIES}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../include
-)
-
-pybind11_add_module(blspy ${CMAKE_CURRENT_SOURCE_DIR}/pythonbindings.cpp)
-target_link_libraries(blspy PRIVATE dashbls)
diff --git a/src/dashbls/python-bindings/README.md b/src/dashbls/python-bindings/README.md
deleted file mode 100644
index 0de31c9a8a03..000000000000
--- a/src/dashbls/python-bindings/README.md
+++ /dev/null
@@ -1,149 +0,0 @@
-# Python bindings
-
-Use the full power and efficiency of the C++ bls library, but in a few lines of python!
-
-## Install
-
-```bash
-pip3 install blspy
-
-```
-
-Alternatively, to install from source, run the following, in the project root directory:
-
-```bash
-pip3 install .
-```
-
-Cmake, a c++ compiler, and a recent version of pip3 (v18) are required for source install.
-GMP(speed) is an optional dependency.
-Public keys are G1Elements, and signatures are G2Elements.
-
-Then, to use:
-
-## Import the library
-
-```python
-from blspy import (PrivateKey, Util, AugSchemeMPL, PopSchemeMPL,
-                   G1Element, G2Element)
-```
-
-## Creating keys and signatures
-
-```python
-# Example seed, used to generate private key. Always use
-# a secure RNG with sufficient entropy to generate a seed (at least 32 bytes).
-seed: bytes = bytes([0,  50, 6,  244, 24,  199, 1,  25,  52,  88,  192,
-                        19, 18, 12, 89,  6,   220, 18, 102, 58,  209, 82,
-                        12, 62, 89, 110, 182, 9,   44, 20,  254, 22])
-sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-pk: G1Element = sk.get_g1()
-
-message: bytes = bytes([1, 2, 3, 4, 5])
-signature: G2Element = AugSchemeMPL.sign(sk, message)
-
-# Verify the signature
-ok: bool = AugSchemeMPL.verify(pk, message, signature)
-assert ok
-```
-
-## Serializing keys and signatures to bytes
-
-```python
-sk_bytes: bytes = bytes(sk)  # 32 bytes
-pk_bytes: bytes = bytes(pk)  # 48 bytes
-signature_bytes: bytes = bytes(signature)  # 96 bytes
-
-print(sk_bytes.hex(), pk_bytes.hex(), signature_bytes.hex())
-```
-
-## Loading keys and signatures from bytes
-
-```python
-sk = PrivateKey.from_bytes(sk_bytes)
-pk = G1Element.from_bytes(pk_bytes)
-signature = G2Element.from_bytes(signature_bytes)
-```
-
-## Create aggregate signatures
-
-```python
-# Generate some more private keys
-seed = bytes([1]) + seed[1:]
-sk1: PrivateKey = AugSchemeMPL.key_gen(seed)
-seed = bytes([2]) + seed[1:]
-sk2: PrivateKey = AugSchemeMPL.key_gen(seed)
-message2: bytes = bytes([1, 2, 3, 4, 5, 6, 7])
-
-# Generate first sig
-pk1: G1Element = sk1.get_g1()
-sig1: G2Element = AugSchemeMPL.sign(sk1, message)
-
-# Generate second sig
-pk2: G1Element = sk2.get_g1()
-sig2: G2Element = AugSchemeMPL.sign(sk2, message2)
-
-# Signatures can be non-interactively combined by anyone
-agg_sig: G2Element = AugSchemeMPL.aggregate([sig1, sig2])
-
-ok = AugSchemeMPL.aggregate_verify([pk1, pk2], [message, message2], agg_sig)
-```
-
-## Arbitrary trees of aggregates
-
-```python
-seed = bytes([3]) + seed[1:]
-sk3: PrivateKey = AugSchemeMPL.key_gen(seed)
-pk3: G1Element = sk3.get_g1()
-message3: bytes = bytes([100, 2, 254, 88, 90, 45, 23])
-sig3: G2Element = AugSchemeMPL.sign(sk3, message3)
-
-agg_sig_final: G2Element = AugSchemeMPL.aggregate([agg_sig, sig3])
-ok = AugSchemeMPL.aggregate_verify([pk1, pk2, pk3], [message, message2, message3], agg_sig_final)
-```
-
-## Very fast verification with Proof of Possession scheme
-
-```python
-# If the same message is signed, you can use Proof of Posession (PopScheme) for efficiency
-# A proof of possession MUST be passed around with the PK to ensure security.
-pop_sig1: G2Element = PopSchemeMPL.sign(sk1, message)
-pop_sig2: G2Element = PopSchemeMPL.sign(sk2, message)
-pop_sig3: G2Element = PopSchemeMPL.sign(sk3, message)
-pop1: G2Element = PopSchemeMPL.pop_prove(sk1)
-pop2: G2Element = PopSchemeMPL.pop_prove(sk2)
-pop3: G2Element = PopSchemeMPL.pop_prove(sk3)
-
-ok = PopSchemeMPL.pop_verify(pk1, pop1)
-ok = PopSchemeMPL.pop_verify(pk2, pop2)
-ok = PopSchemeMPL.pop_verify(pk3, pop3)
-
-pop_sig_agg: G2Element = PopSchemeMPL.aggregate([pop_sig1, pop_sig2, pop_sig3])
-
-ok = PopSchemeMPL.fast_aggregate_verify([pk1, pk2, pk3], message, pop_sig_agg)
-
-# Aggregate public key, indistinguishable from a single public key
-pop_agg_pk: G1Element = pk1 + pk2 + pk3
-ok = PopSchemeMPL.verify(pop_agg_pk, message, pop_sig_agg)
-
-# Aggregate private keys
-pop_agg_sk: PrivateKey = PrivateKey.aggregate([sk1, sk2, sk3])
-ok = PopSchemeMPL.sign(pop_agg_sk, message) == pop_sig_agg
-```
-
-## HD keys using [EIP-2333](https://github.com/ethereum/EIPs/pull/2333)
-
-```python
-master_sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-child: PrivateKey = AugSchemeMPL.derive_child_sk(master_sk, 152)
-grandchild: PrivateKey = AugSchemeMPL.derive_child_sk(child, 952)
-
-master_pk: G1Element = master_sk.get_g1()
-child_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(master_sk, 22)
-grandchild_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(child_u, 0)
-
-child_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(master_pk, 22)
-grandchild_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(child_u_pk, 0)
-
-ok = (grandchild_u_pk == grandchild_u.get_g1())
-```
diff --git a/src/dashbls/python-bindings/benchmark.py b/src/dashbls/python-bindings/benchmark.py
deleted file mode 100644
index 51feebd05e6e..000000000000
--- a/src/dashbls/python-bindings/benchmark.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# flake8: noqa: E501
-import time
-import secrets
-
-from blspy import (
-    AugSchemeMPL,
-    G1Element,
-    G2Element,
-    PrivateKey,
-)
-
-def startStopwatch():
-    return time.perf_counter()
-
-def endStopwatch(test_name, start, numIters):
-    end_time = time.perf_counter()
-
-    duration = end_time - start
-
-    print("\n%s\nTotal: %d runs in %0.1f ms\nAvg: %f"
-        % (test_name, numIters, duration * 1000, duration * 1000 / numIters))
-
-def batch_verification():
-
-    numIters = 100000
-    sig_bytes = []
-    pk_bytes = []
-    ms = []
-
-    for i in range(numIters):
-        message = b"%d" % i
-        sk: PrivateKey = AugSchemeMPL.key_gen(secrets.token_bytes(32))
-        pk: G1Element = sk.get_g1()
-        sig: G2Element = AugSchemeMPL.sign(sk, message)
-
-        sig_bytes.append(bytes(sig))
-        pk_bytes.append(bytes(pk))
-        ms.append(message)
-
-    pks = []
-
-    start = startStopwatch();
-    for pk in pk_bytes:
-        pks.append(G1Element.from_bytes(pk))
-
-    endStopwatch("Public key validation", start, numIters);
-
-    sigs = []
-
-    start = startStopwatch()
-    for sig in sig_bytes:
-        sigs.append(G2Element.from_bytes(sig))
-    endStopwatch("Signature validation", start, numIters);
-
-    start = startStopwatch()
-    aggSig = AugSchemeMPL.aggregate(sigs)
-    endStopwatch("Aggregation", start, numIters);
-
-    start = startStopwatch()
-    ok = AugSchemeMPL.aggregate_verify(pks, ms, aggSig);
-    endStopwatch("Batch verification", start, numIters);
-    if not ok:
-        print("aggregate_verification failed!")
-        sys.exit(1)
-
-batch_verification()
diff --git a/src/dashbls/python-bindings/pythonbindings.cpp b/src/dashbls/python-bindings/pythonbindings.cpp
deleted file mode 100644
index 4ba2acb83a67..000000000000
--- a/src/dashbls/python-bindings/pythonbindings.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <pybind11/operators.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-#include <dashbls/bls.hpp>
-#include <dashbls/elements.hpp>
-#include <dashbls/hdkeys.hpp>
-#include <dashbls/privatekey.hpp>
-#include <dashbls/schemes.hpp>
-
-namespace py = pybind11;
-using namespace bls;
-
-namespace {
-inline int PyLong_AsByteArray(PyLongObject* obj, uint8_t* buf, Py_ssize_t size, bool is_le, bool is_signed)
-{
-    return _PyLong_AsByteArray(obj, buf, size, is_le, is_signed
-#if PY_VERSION_HEX >= 0x030d0000
-                               , /*with_exceptions=*/true
-#endif // PY_VERSION_HEX >= 0x030d0000
-    );
-}
-} // anonymous namespace
-
-PYBIND11_MODULE(blspy, m)
-{
-    py::class_<PrivateKey>(m, "PrivateKey")
-        .def_property_readonly_static(
-            "PRIVATE_KEY_SIZE",
-            [](py::object self) { return PrivateKey::PRIVATE_KEY_SIZE; })
-        .def(
-            "from_bytes",
-            [](py::buffer const b) {
-                py::buffer_info info = b.request();
-                if (info.format != py::format_descriptor<uint8_t>::format() ||
-                    info.ndim != 1)
-                    throw std::runtime_error("Incompatible buffer format!");
-
-                if ((int)info.size != PrivateKey::PRIVATE_KEY_SIZE) {
-                    throw std::invalid_argument(
-                        "Length of bytes object not equal to PrivateKey::SIZE");
-                }
-                auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-                std::array<uint8_t, PrivateKey::PRIVATE_KEY_SIZE> data;
-                std::copy(data_ptr, data_ptr + data.size(), data.data());
-                py::gil_scoped_release release;
-                return PrivateKey::FromBytes(data);
-            })
-        .def(
-            "__bytes__",
-            [](const PrivateKey &k) {
-                uint8_t *output =
-                    Util::SecAlloc<uint8_t>(PrivateKey::PRIVATE_KEY_SIZE);
-                {
-                    py::gil_scoped_release release;
-                    k.Serialize(output);
-                }
-                py::bytes ret = py::bytes(
-                    reinterpret_cast<char *>(output),
-                    PrivateKey::PRIVATE_KEY_SIZE);
-                Util::SecFree(output);
-                return ret;
-            })
-        .def(
-            "__deepcopy__",
-            [](const PrivateKey &k, const py::object &memo) {
-                return PrivateKey(k);
-            })
-        .def("get_g1", [](const PrivateKey &k) {
-                py::gil_scoped_release release;
-                return k.GetG1Element();
-            })
-        .def("aggregate", &PrivateKey::Aggregate, py::call_guard<py::gil_scoped_release>())
-        .def(py::self == py::self)
-        .def(py::self != py::self)
-        .def("__repr__", [](const PrivateKey &k) {
-            py::gil_scoped_release release;
-            uint8_t *output = Util::SecAlloc<uint8_t>(PrivateKey::PRIVATE_KEY_SIZE);
-            k.Serialize(output);
-            std::string ret =
-                "<PrivateKey " +
-                Util::HexStr(output, PrivateKey::PRIVATE_KEY_SIZE) + ">";
-            Util::SecFree(output);
-            return ret;
-        });
-
-    py::class_<Util>(m, "Util").def("hash256", [](const py::bytes &message) {
-        std::string str(message);
-        const uint8_t *input = reinterpret_cast<const uint8_t *>(str.data());
-        uint8_t output[BLS::MESSAGE_HASH_LEN];
-        {
-            py::gil_scoped_release release;
-            Util::Hash256(output, (const uint8_t *)str.data(), str.size());
-        }
-        return py::bytes(
-            reinterpret_cast<char *>(output), BLS::MESSAGE_HASH_LEN);
-    });
-
-    py::class_<BasicSchemeMPL>(m, "BasicSchemeMPL")
-        .def("sk_to_g1", [](const PrivateKey &seckey){
-            py::gil_scoped_release release;
-            return BasicSchemeMPL().SkToG1(seckey);
-        })
-        .def(
-            "key_gen",
-            [](const py::bytes &b) {
-                std::string str(b);
-                py::gil_scoped_release release;
-                const vector<uint8_t> inputVec(str.begin(), str.end());
-                return BasicSchemeMPL().KeyGen(inputVec);
-            })
-        .def("derive_child_sk", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return BasicSchemeMPL().DeriveChildSk(sk, index);
-        })
-        .def("derive_child_sk_unhardened", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return BasicSchemeMPL().DeriveChildSkUnhardened(sk, index);
-        })
-        .def("derive_child_pk_unhardened", [](const G1Element& pk, uint32_t index){
-            py::gil_scoped_release release;
-            return BasicSchemeMPL().DeriveChildPkUnhardened(pk, index);
-        })
-        .def("aggregate", [](const vector<G2Element> &signatures) {
-            py::gil_scoped_release release;
-            return BasicSchemeMPL().Aggregate(signatures);
-        })
-        .def(
-            "sign",
-            [](const PrivateKey &pk, const py::bytes &msg) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return BasicSchemeMPL().Sign(pk, v);
-            })
-        .def(
-            "verify",
-            [](const G1Element &pk,
-               const py::bytes &msg,
-               const G2Element &sig) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return BasicSchemeMPL().Verify(pk, v, sig);
-            })
-        .def(
-            "aggregate_verify",
-            [](const vector<G1Element> &pks,
-               const vector<py::bytes> &msgs,
-               const G2Element &sig) {
-                vector<vector<uint8_t>> vecs(msgs.size());
-                for (int i = 0; i < (int)msgs.size(); ++i) {
-                    std::string s(msgs[i]);
-                    vecs[i] = vector<uint8_t>(s.begin(), s.end());
-                }
-                py::gil_scoped_release release;
-                return BasicSchemeMPL().AggregateVerify(pks, vecs, sig);
-            })
-        .def(
-            "g2_from_message",
-            [](const py::bytes &msg) {
-                const auto msg_str = std::string(msg);
-                py::gil_scoped_release release;
-                const auto msg_bytes = Bytes((const uint8_t *)msg_str.c_str(), msg_str.size());
-                return G2Element::FromMessage(
-                    msg_bytes,
-                    (const uint8_t *)BasicSchemeMPL::CIPHERSUITE_ID.c_str(),
-                    BasicSchemeMPL::CIPHERSUITE_ID.size()
-                );
-            });
-
-    py::class_<AugSchemeMPL>(m, "AugSchemeMPL")
-        .def("sk_to_g1", [](const PrivateKey &seckey){
-            py::gil_scoped_release release;
-            return AugSchemeMPL().SkToG1(seckey);
-        })
-        .def(
-            "key_gen",
-            [](const py::bytes &b) {
-                std::string str(b);
-                py::gil_scoped_release release;
-                const vector<uint8_t> inputVec(str.begin(), str.end());
-                return AugSchemeMPL().KeyGen(inputVec);
-            })
-        .def("derive_child_sk", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return AugSchemeMPL().DeriveChildSk(sk, index);
-        })
-        .def("derive_child_sk_unhardened", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return AugSchemeMPL().DeriveChildSkUnhardened(sk, index);
-        })
-        .def("derive_child_pk_unhardened", [](const G1Element& pk, uint32_t index){
-            py::gil_scoped_release release;
-            return AugSchemeMPL().DeriveChildPkUnhardened(pk, index);
-        })
-        .def("aggregate", [](const vector<G2Element>& signatures) {
-            py::gil_scoped_release release;
-            return AugSchemeMPL().Aggregate(signatures);
-        })
-        .def(
-            "sign",
-            [](const PrivateKey &pk, const py::bytes &msg) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return AugSchemeMPL().Sign(pk, v);
-            })
-        .def(
-            "sign",
-            [](const PrivateKey &pk,
-               const py::bytes &msg,
-               const G1Element &prepend_pk) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return AugSchemeMPL().Sign(pk, v, prepend_pk);
-            })
-        .def(
-            "verify",
-            [](const G1Element &pk,
-               const py::bytes &msg,
-               const G2Element &sig) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return AugSchemeMPL().Verify(pk, v, sig);
-            })
-        .def(
-            "aggregate_verify",
-            [](const vector<G1Element> &pks,
-               const vector<py::bytes> &msgs,
-               const G2Element &sig) {
-                vector<vector<uint8_t>> vecs(msgs.size());
-                for (int i = 0; i < (int)msgs.size(); ++i) {
-                    std::string s(msgs[i]);
-                    vecs[i] = vector<uint8_t>(s.begin(), s.end());
-                }
-                py::gil_scoped_release release;
-                return AugSchemeMPL().AggregateVerify(pks, vecs, sig);
-            })
-        .def(
-            "g2_from_message",
-            [](const py::bytes &msg) {
-                const auto msg_str = std::string(msg);
-                py::gil_scoped_release release;
-                const auto msg_bytes = Bytes((const uint8_t *)msg_str.c_str(), msg_str.size());
-                return G2Element::FromMessage(
-                    msg_bytes,
-                    (const uint8_t *)AugSchemeMPL::CIPHERSUITE_ID.c_str(),
-                    AugSchemeMPL::CIPHERSUITE_ID.size()
-                );
-            });
-
-    py::class_<PopSchemeMPL>(m, "PopSchemeMPL")
-        .def("sk_to_g1", [](const PrivateKey &seckey){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().SkToG1(seckey);
-        })
-        .def(
-            "key_gen",
-            [](const py::bytes &b) {
-                std::string str(b);
-                py::gil_scoped_release release;
-                const vector<uint8_t> inputVec(str.begin(), str.end());
-                return PopSchemeMPL().KeyGen(inputVec);
-            })
-        .def("derive_child_sk", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().DeriveChildSk(sk, index);
-        })
-        .def("derive_child_sk_unhardened", [](const PrivateKey& sk, uint32_t index){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().DeriveChildSkUnhardened(sk, index);
-        })
-        .def("derive_child_pk_unhardened", [](const G1Element& pk, uint32_t index){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().DeriveChildPkUnhardened(pk, index);
-        })
-        .def("aggregate", [](const vector<G2Element>& signatures) {
-            py::gil_scoped_release release;
-            return PopSchemeMPL().Aggregate(signatures);
-        })
-        .def(
-            "sign",
-            [](const PrivateKey &pk, const py::bytes &msg) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return PopSchemeMPL().Sign(pk, v);
-            })
-        .def(
-            "verify",
-            [](const G1Element &pk,
-               const py::bytes &msg,
-               const G2Element &sig) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return PopSchemeMPL().Verify(pk, v, sig);
-            })
-        .def(
-            "aggregate_verify",
-            [](const vector<G1Element> &pks,
-               const vector<py::bytes> &msgs,
-               const G2Element &sig) {
-                vector<vector<uint8_t>> vecs(msgs.size());
-                for (int i = 0; i < (int)msgs.size(); ++i) {
-                    std::string s(msgs[i]);
-                    vecs[i] = vector<uint8_t>(s.begin(), s.end());
-                }
-                py::gil_scoped_release release;
-                return PopSchemeMPL().AggregateVerify(pks, vecs, sig);
-            })
-        .def(
-            "g2_from_message",
-            [](const py::bytes &msg) {
-                const auto msg_str = std::string(msg);
-                py::gil_scoped_release release;
-                const auto msg_bytes = Bytes((const uint8_t *)msg_str.c_str(), msg_str.size());
-                return G2Element::FromMessage(
-                    msg_bytes,
-                    (const uint8_t *)PopSchemeMPL::CIPHERSUITE_ID.c_str(),
-                    PopSchemeMPL::CIPHERSUITE_ID.size()
-                );
-            })
-        .def("pop_prove", [](const PrivateKey& privateKey){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().PopProve(privateKey);
-        })
-        .def("pop_verify", [](const G1Element& pubkey, const G2Element& signature){
-            py::gil_scoped_release release;
-            return PopSchemeMPL().PopVerify(pubkey, signature);
-        })
-        .def(
-            "fast_aggregate_verify",
-            [](const vector<G1Element> &pks,
-               const py::bytes &msg,
-               const G2Element &sig) {
-                std::string s(msg);
-                py::gil_scoped_release release;
-                vector<uint8_t> v(s.begin(), s.end());
-                return PopSchemeMPL().FastAggregateVerify(pks, v, sig);
-            });
-
-    py::class_<G1Element>(m, "G1Element")
-        .def_property_readonly_static(
-            "SIZE", [](py::object self) { return G1Element::SIZE; })
-        .def(py::init([](){
-            py::gil_scoped_release release;
-            return G1Element();
-        }))
-        .def(py::init(&G1Element::FromByteVector), py::call_guard<py::gil_scoped_release>())
-        .def(py::init([](py::int_ pyint) {
-            std::array<uint8_t, G1Element::SIZE> buffer{};
-            if (PyLong_AsByteArray(
-                    (PyLongObject *)pyint.ptr(),
-                    buffer.data(),
-                    buffer.size(),
-                    0,
-                    0) < 0) {
-                throw std::invalid_argument("Failed to cast int to G1Element");
-            }
-            py::gil_scoped_release release;
-            return G1Element::FromBytes(buffer);
-        }))
-        .def(py::init([](py::buffer const b) {
-            py::buffer_info info = b.request();
-            if (info.format != py::format_descriptor<uint8_t>::format() ||
-                info.ndim != 1)
-                throw std::runtime_error("Incompatible buffer format!");
-
-            if ((int)info.size != G1Element::SIZE) {
-                throw std::invalid_argument(
-                    "Length of bytes object not equal to G1Element::SIZE");
-            }
-            auto data_ptr = static_cast<uint8_t *>(info.ptr);
-            std::array<uint8_t, G1Element::SIZE> data;
-            std::copy(data_ptr, data_ptr + data.size(), data.data());
-            py::gil_scoped_release release;
-            return G1Element::FromBytes(data);
-        }))
-        .def(
-            "from_bytes",
-            [](py::buffer const b) {
-                py::buffer_info info = b.request();
-                if (info.format != py::format_descriptor<uint8_t>::format() ||
-                    info.ndim != 1)
-                    throw std::runtime_error("Incompatible buffer format!");
-
-                if ((int)info.size != G1Element::SIZE) {
-                    throw std::invalid_argument(
-                        "Length of bytes object not equal to G1Element::SIZE");
-                }
-                auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-                std::array<uint8_t, G1Element::SIZE> data;
-                std::copy(data_ptr, data_ptr + data.size(), data.data());
-                py::gil_scoped_release release;
-                return G1Element::FromBytes(data);
-            })
-        .def(
-            "from_bytes_unchecked",
-            [](py::buffer const b) {
-              py::buffer_info info = b.request();
-              if (info.format != py::format_descriptor<uint8_t>::format() ||
-                  info.ndim != 1)
-                  throw std::runtime_error("Incompatible buffer format!");
-
-              if ((int)info.size != G1Element::SIZE) {
-                  throw std::invalid_argument(
-                      "Length of bytes object not equal to G1Element::SIZE");
-              }
-              auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-              return G1Element::FromBytesUnchecked({data_ptr, G1Element::SIZE});
-            })
-        .def("generator", &G1Element::Generator)
-        .def("from_message", py::overload_cast<const std::vector<uint8_t>&, const uint8_t*, int>(&G1Element::FromMessage), py::call_guard<py::gil_scoped_release>())
-        .def("pair", &G1Element::Pair, py::call_guard<py::gil_scoped_release>())
-        .def("negate", &G1Element::Negate, py::call_guard<py::gil_scoped_release>())
-        .def("get_fingerprint", &G1Element::GetFingerprint, py::call_guard<py::gil_scoped_release>())
-
-        .def(py::self == py::self)
-        .def(py::self != py::self)
-        .def(
-            "__deepcopy__",
-            [](const G1Element &g1, const py::object &memo) {
-                return G1Element(g1);
-            })
-        .def(
-            "__add__",
-            [](G1Element &self, G1Element &other) {
-                py::gil_scoped_release release;
-                return self + other;
-            },
-            py::is_operator())
-        .def(
-            "__mul__",
-            [](G1Element &self, bn_t other) {
-                py::gil_scoped_release release;
-                return self * (*(bn_t *)&other);
-            },
-            py::is_operator())
-        .def(
-            "__rmul__",
-            [](G1Element &self, bn_t other) {
-                py::gil_scoped_release release;
-                return self * (*(bn_t *)&other);
-            },
-            py::is_operator())
-        .def(
-            "__and__",
-            [](G1Element &self, G2Element &other) {
-                py::gil_scoped_release release;
-                return self & other;
-            },
-            py::is_operator())
-        .def(
-            "__repr__",
-            [](const G1Element &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return "<G1Element " + s.str() + ">";
-            })
-        .def(
-            "__str__",
-            [](const G1Element &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return s.str();
-            })
-        .def(
-            "__bytes__",
-            [](const G1Element &ele) {
-                vector<uint8_t> out;
-                {
-                    py::gil_scoped_release release;
-                    out = ele.Serialize();
-                }
-                py::bytes ans = py::bytes(
-                    reinterpret_cast<const char *>(out.data()), G1Element::SIZE);
-                return ans;
-            })
-        .def("__deepcopy__", [](const G1Element &ele, const py::object &memo) {
-            return G1Element(ele);
-        });
-
-    py::class_<G2Element>(m, "G2Element")
-        .def_property_readonly_static(
-            "SIZE", [](py::object self) { return G2Element::SIZE; })
-        .def(py::init([](){
-            return G2Element();
-        }))
-        .def(py::init(&G2Element::FromByteVector), py::call_guard<py::gil_scoped_release>())
-        .def(py::init([](py::buffer const b) {
-            py::buffer_info info = b.request();
-            if (info.format != py::format_descriptor<uint8_t>::format() ||
-                info.ndim != 1)
-                throw std::runtime_error("Incompatible buffer format!");
-
-            if ((int)info.size != G2Element::SIZE) {
-                throw std::invalid_argument(
-                    "Length of bytes object not equal to G2Element::SIZE");
-            }
-            auto data_ptr = static_cast<uint8_t *>(info.ptr);
-            std::array<uint8_t, G2Element::SIZE> data;
-            std::copy(data_ptr, data_ptr + data.size(), data.data());
-            py::gil_scoped_release release;
-            return G2Element::FromBytes(data);
-        }))
-        .def(py::init([](py::int_ pyint) {
-            std::array<uint8_t, G2Element::SIZE> buffer{};
-            if (PyLong_AsByteArray(
-                    (PyLongObject *)pyint.ptr(),
-                    buffer.data(),
-                    buffer.size(),
-                    0,
-                    0) < 0) {
-                throw std::invalid_argument("Failed to cast int to G2Element");
-            }
-            py::gil_scoped_release release;
-            return G2Element::FromBytes(buffer);
-        }))
-        .def(
-            "from_bytes",
-            [](py::buffer const b) {
-                py::buffer_info info = b.request();
-                if (info.format != py::format_descriptor<uint8_t>::format() ||
-                    info.ndim != 1)
-                    throw std::runtime_error("Incompatible buffer format!");
-
-                if ((int)info.size != G2Element::SIZE) {
-                    throw std::invalid_argument(
-                        "Length of bytes object not equal to G2Element::SIZE");
-                }
-                auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-                std::array<uint8_t, G2Element::SIZE> data;
-                std::copy(data_ptr, data_ptr + data.size(), data.data());
-                py::gil_scoped_release release;
-                return G2Element::FromBytes(data);
-            })
-        .def(
-            "from_bytes_unchecked",
-            [](py::buffer const b) {
-              py::buffer_info info = b.request();
-              if (info.format != py::format_descriptor<uint8_t>::format() ||
-                  info.ndim != 1)
-                  throw std::runtime_error("Incompatible buffer format!");
-
-              if ((int)info.size != G2Element::SIZE) {
-                  throw std::invalid_argument(
-                      "Length of bytes object not equal to G2Element::SIZE");
-              }
-              auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-              return G2Element::FromBytesUnchecked({data_ptr, G2Element::SIZE});
-            })
-        .def("generator", &G2Element::Generator)
-        .def("from_message", py::overload_cast<const std::vector<uint8_t>&, const uint8_t*, int, bool>(&G2Element::FromMessage), py::call_guard<py::gil_scoped_release>())
-        .def("pair", &G2Element::Pair, py::call_guard<py::gil_scoped_release>())
-        .def("negate", &G2Element::Negate, py::call_guard<py::gil_scoped_release>())
-        .def(
-            "__deepcopy__",
-            [](const G2Element &g2, const py::object &memo) {
-                return G2Element(g2);
-            })
-        .def(py::self == py::self)
-        .def(py::self != py::self)
-
-        .def(
-            "__add__",
-            [](G2Element &self, G2Element &other) {
-                py::gil_scoped_release release;
-                return self + other;
-            },
-            py::is_operator())
-        .def(
-            "__mul__",
-            [](G2Element &self, bn_t other) {
-                py::gil_scoped_release release;
-                return self * (*(bn_t *)&other);
-            },
-            py::is_operator())
-        .def(
-            "__rmul__",
-            [](G2Element &self, bn_t other) {
-                py::gil_scoped_release release;
-                return self * (*(bn_t *)&other);
-            },
-            py::is_operator())
-
-        .def(
-            "__repr__",
-            [](const G2Element &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return "<G2Element " + s.str() + ">";
-            })
-        .def(
-            "__str__",
-            [](const G2Element &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return s.str();
-            })
-        .def(
-            "__bytes__",
-            [](const G2Element &ele) {
-                vector<uint8_t> out;
-                {
-                    py::gil_scoped_release release;
-                    out = ele.Serialize();
-                }
-                py::bytes ans = py::bytes(
-                    reinterpret_cast<const char *>(out.data()), G2Element::SIZE);
-                return ans;
-            })
-        .def("__deepcopy__", [](const G2Element &ele, const py::object &memo) {
-            return G2Element(ele);
-        });
-
-    py::class_<GTElement>(m, "GTElement")
-        .def_property_readonly_static(
-            "SIZE", [](py::object self) { return GTElement::SIZE; })
-        .def(py::init(&GTElement::FromByteVector), py::call_guard<py::gil_scoped_release>())
-        .def(py::init([](py::buffer const b) {
-            py::buffer_info info = b.request();
-            if (info.format != py::format_descriptor<uint8_t>::format() ||
-                info.ndim != 1)
-                throw std::runtime_error("Incompatible buffer format!");
-
-            if ((int)info.size != GTElement::SIZE) {
-                throw std::invalid_argument(
-                    "Length of bytes object not equal to GTElement::SIZE");
-            }
-            auto data_ptr = static_cast<uint8_t *>(info.ptr);
-            std::array<uint8_t, GTElement::SIZE> data;
-            std::copy(data_ptr, data_ptr + data.size(), data.data());
-            py::gil_scoped_release release;
-            return GTElement::FromBytes(data);
-        }))
-        .def(py::init([](py::int_ pyint) {
-            std::array<uint8_t, GTElement::SIZE> buffer{};
-            if (PyLong_AsByteArray(
-                    (PyLongObject *)pyint.ptr(),
-                    buffer.data(),
-                    buffer.size(),
-                    0,
-                    0) < 0) {
-                throw std::invalid_argument("Failed to cast int to GTElement");
-            }
-            py::gil_scoped_release release;
-            return GTElement::FromBytes(buffer);
-        }))
-        .def(
-            "from_bytes",
-            [](py::buffer const b) {
-                py::buffer_info info = b.request();
-                if (info.format != py::format_descriptor<uint8_t>::format() ||
-                    info.ndim != 1)
-                    throw std::runtime_error("Incompatible buffer format!");
-
-                if ((int)info.size != GTElement::SIZE) {
-                    throw std::invalid_argument(
-                        "Length of bytes object not equal to GTElement::SIZE");
-                }
-                auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-                std::array<uint8_t, GTElement::SIZE> data;
-                std::copy(data_ptr, data_ptr + data.size(), data.data());
-                py::gil_scoped_release release;
-                return GTElement::FromBytes(data);
-            })
-        .def(
-            "from_bytes_unchecked",
-            [](py::buffer const b) {
-                py::buffer_info info = b.request();
-                if (info.format != py::format_descriptor<uint8_t>::format() ||
-                    info.ndim != 1)
-                    throw std::runtime_error("Incompatible buffer format!");
-
-                if ((int)info.size != GTElement::SIZE) {
-                    throw std::invalid_argument(
-                        "Length of bytes object not equal to GTElement::SIZE");
-                }
-                auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
-                std::array<uint8_t, GTElement::SIZE> data;
-                std::copy(data_ptr, data_ptr + data.size(), data.data());
-                py::gil_scoped_release release;
-                return GTElement::FromBytesUnchecked(data);
-            })
-        .def("unity", &GTElement::Unity)
-        .def(py::self == py::self)
-        .def(py::self != py::self)
-        .def(
-            "__deepcopy__",
-            [](const GTElement &gt, const py::object &memo) {
-                return GTElement(gt);
-            })
-        .def(
-            "__repr__",
-            [](const GTElement &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return "<GTElement " + s.str() + ">";
-            })
-        .def(
-            "__str__",
-            [](const GTElement &ele) {
-                py::gil_scoped_release release;
-                std::stringstream s;
-                s << ele;
-                return s.str();
-            })
-        .def(
-            "__bytes__",
-            [](const GTElement &ele) {
-                uint8_t *out = new uint8_t[GTElement::SIZE];
-                {
-                    py::gil_scoped_release release;
-                    ele.Serialize(out);
-                }
-                py::bytes ans =
-                    py::bytes(reinterpret_cast<char *>(out), GTElement::SIZE);
-                delete[] out;
-                return ans;
-            })
-        .def(
-            "__mul__",
-            [](GTElement &self, GTElement &other) {
-                py::gil_scoped_release release;
-                return self * other;
-            },
-            py::is_operator())
-        .def("__deepcopy__", [](const GTElement &ele, const py::object &memo) {
-            return GTElement(ele);
-        });
-
-    m.attr("PublicKeyMPL") = m.attr("G1Element");
-    m.attr("SignatureMPL") = m.attr("G2Element");
-
-#ifdef VERSION_INFO
-    m.attr("__version__") = VERSION_INFO;
-#else
-    m.attr("__version__") = "dev";
-#endif
-}
diff --git a/src/dashbls/python-bindings/test.py b/src/dashbls/python-bindings/test.py
deleted file mode 100644
index 971d878591bb..000000000000
--- a/src/dashbls/python-bindings/test.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# flake8: noqa: E501
-import binascii
-import time
-from copy import deepcopy
-
-from blspy import (
-    AugSchemeMPL,
-    BasicSchemeMPL,
-    G1Element,
-    G2Element,
-    PopSchemeMPL,
-    PrivateKey,
-    Util,
-)
-
-
-def test_schemes():
-    # fmt: off
-    seed = bytes([
-        0, 50, 6, 244, 24, 199, 1, 25, 52, 88, 192, 19, 18, 12, 89, 6,
-        220, 18, 102, 58, 209, 82, 12, 62, 89, 110, 182, 9, 44, 20, 254, 22
-    ])
-    # fmt: on
-    msg = bytes([100, 2, 254, 88, 90, 45, 23])
-    msg2 = bytes([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-    sk = BasicSchemeMPL.key_gen(seed)
-    pk = sk.get_g1()
-
-    assert sk == PrivateKey.from_bytes(bytes(sk))
-    assert pk == G1Element.from_bytes(bytes(pk))
-
-    for Scheme in (BasicSchemeMPL, AugSchemeMPL, PopSchemeMPL):
-        sig = Scheme.sign(sk, msg)
-        assert sig == G2Element.from_bytes(bytes(sig))
-        assert Scheme.verify(pk, msg, sig)
-
-    seed = bytes([1]) + seed[1:]
-    sk1 = BasicSchemeMPL.key_gen(seed)
-    pk1 = sk1.get_g1()
-    seed = bytes([2]) + seed[1:]
-    sk2 = BasicSchemeMPL.key_gen(seed)
-    pk2 = sk2.get_g1()
-
-    for Scheme in (BasicSchemeMPL, AugSchemeMPL, PopSchemeMPL):
-        # Aggregate same message
-        agg_pk = pk1 + pk2
-        if Scheme is AugSchemeMPL:
-            sig1 = Scheme.sign(sk1, msg, agg_pk)
-            sig2 = Scheme.sign(sk2, msg, agg_pk)
-        else:
-            sig1 = Scheme.sign(sk1, msg)
-            sig2 = Scheme.sign(sk2, msg)
-        agg_sig = Scheme.aggregate([sig1, sig2])
-
-        assert Scheme.verify(agg_pk, msg, agg_sig)
-
-        # Aggregate different message
-        sig1 = Scheme.sign(sk1, msg)
-        sig2 = Scheme.sign(sk2, msg2)
-        agg_sig = Scheme.aggregate([sig1, sig2])
-        assert Scheme.aggregate_verify([pk1, pk2], [msg, msg2], agg_sig)
-
-        # Manual pairing calculation and verification
-        if Scheme is AugSchemeMPL:
-            # AugSchemeMPL requires prepending the public key to message
-            aug_msg1 = bytes(pk1) + msg
-            aug_msg2 = bytes(pk2) + msg2
-        else:
-            aug_msg1 = msg
-            aug_msg2 = msg2
-        pair1 = pk1.pair(Scheme.g2_from_message(aug_msg1))
-        pair2 = pk2.pair(Scheme.g2_from_message(aug_msg2))
-        pair = pair1 * pair2
-        agg_sig_pair = G1Element.generator().pair(agg_sig)
-        assert pair == agg_sig_pair
-
-        # HD keys
-        child = Scheme.derive_child_sk(sk1, 123)
-        childU = Scheme.derive_child_sk_unhardened(sk1, 123)
-        childUPk = Scheme.derive_child_pk_unhardened(pk1, 123)
-
-        sig_child = Scheme.sign(child, msg)
-        assert Scheme.verify(child.get_g1(), msg, sig_child)
-
-        sigU_child = Scheme.sign(childU, msg)
-        assert Scheme.verify(childUPk, msg, sigU_child)
-
-
-def test_vectors_invalid():
-    # Invalid inputs from https://github.com/algorand/bls_sigs_ref/blob/master/python-impl/serdesZ.py
-    invalid_inputs_1 = [
-        # infinity points: too short
-        "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # infinity points: not all zeros
-        "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000",
-        # bad tags
-        "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        # wrong length for compresed point
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaaaa",
-        # invalid x-coord
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        # invalid elm of Fp --- equal to p (must be strictly less)
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-    ]
-    invalid_inputs_2 = [
-        # infinity points: too short
-        "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # infinity points: not all zeros
-        "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000",
-        # bad tags
-        "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # wrong length for compressed point
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # invalid x-coord
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaa7",
-        # invalid elm of Fp --- equal to p (must be strictly less)
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-    ]
-
-    for s in invalid_inputs_1:
-        bytes_ = binascii.unhexlify(s)
-        try:
-            g1 = G1Element(bytes_)
-            assert False, "Failed to disallow creation of G1 element."
-        except Exception as e:
-            pass
-
-    for s in invalid_inputs_2:
-        bytes_ = binascii.unhexlify(s)
-        try:
-            g2 = G2Element(bytes_)
-            assert False, "Failed to disallow creation of G2 element."
-        except Exception as e:
-            pass
-
-
-def test_vectors_valid():
-    # The following code was used to generate these vectors
-    """
-    from py_ecc.bls import (
-        G2Basic,
-        G2MessageAugmentation as G2MA,
-        G2ProofOfPossession as G2Pop,
-    )
-
-    secret1 = bytes([1] * 32)
-    secret2 = bytes([x * 314159 % 256 for x in range(32)])
-    sk1 = int.from_bytes(secret1, 'big')
-    sk2 = int.from_bytes(secret2, 'big')
-    msg = bytes([3, 1, 4, 1, 5, 9])
-    pk1 = G2Basic.SkToPk(sk1)
-    pk2 = G2Basic.SkToPk(sk2)
-
-    for Scheme in (G2Basic, G2MA, G2Pop):
-        sig1 = Scheme.Sign(sk1, msg)
-        sig2 = Scheme.Sign(sk2, msg)
-        sig_agg = Scheme.Aggregate([sig1, sig2])
-        print(sig1)
-        print(sig2)
-        print(sig_agg)
-    """
-
-    ref_sig1Basic = b"\x96\xba4\xfa\xc3<\x7f\x12\x9d`*\x0b\xc8\xa3\xd4?\x9a\xbc\x01N\xce\xaa\xb75\x91F\xb4\xb1P\xe5{\x80\x86Es\x8f5g\x1e\x9e\x10\xe0\xd8b\xa3\x0c\xabp\x07N\xb5\x83\x1d\x13\xe6\xa5\xb1b\xd0\x1e\xeb\xe6\x87\xd0\x16J\xdb\xd0\xa8d7\n|\"*'h\xd7pM\xa2T\xf1\xbf\x18#f[\xc26\x1f\x9d\xd8\xc0\x0e\x99"
-    ref_sig2Basic = b'\xa4\x02y\t2\x13\x0fvj\xf1\x1b\xa7\x16Sf\x83\xd8\xc4\xcf\xa5\x19G\xe4\xf9\x08\x1f\xed\xd6\x92\xd6\xdc\x0c\xac[\x90K\xee^\xa6\xe2Ui\xe3m{\xe4\xcaY\x06\x9a\x96\xe3K\x7fp\x07X\xb7\x16\xf9IJ\xaaY\xa9nt\xd1J;U*\x9ak\xc1)\xe7\x17\x19[\x9d`\x06\xfdm\\\xefGh\xc0"\xe0\xf71j\xbf'
-    ref_sigABasic = b"\x98|\xfd;\xcdb(\x02\x87\x02t\x83\xf2\x9cU$^\xd81\xf5\x1d\xd6\xbd\x99\x9ao\xf1\xa1\xf1\xf1\xf0\xb6Gw\x8b\x01g5\x9cqPUX\xa7n\x15\x8ef\x18\x1e\xe5\x12Y\x05\xa6B$k\x01\xe7\xfa^\xe5=h\xa4\xfe\x9b\xfb)\xa8\xe2f\x01\xf0\xb9\xadW}\xdd\x18\x87js1|!n\xa6\x1fC\x04\x14\xecQ\xc5"
-    ref_sig1Aug = b'\x81\x80\xf0,\xcbr\xe9"\xb1R\xfc\xed\xbe\x0e\x1d\x19R\x105Opp6X\xe8\xe0\x8c\xbe\xbf\x11\xd4\x97\x0e\xabj\xc3\xcc\xf7\x15\xf3\xfb\x87m\xf9\xa9yz\xbd\x0c\x1a\xf6\x1a\xae\xad\xc9,,\xfe\\\nV\xc1F\xcc\x8c?qQ\xa0s\xcf_\x16\xdf8$g$\xc4\xae\xd7?\xf3\x0e\xf5\xda\xa6\xaa\xca\xed\x1a&\xec\xaa3k'
-    ref_sig2Aug = b'\x99\x11\x1e\xea\xfbA-\xa6\x1eL7\xd3\xe8\x06\xc6\xfdj\xc9\xf3\x87\x0eT\xda\x92"\xbaNIH"\xc5\xb7eg1\xfazdY4\xd0KU\x9e\x92a\xb8b\x01\xbb\xeeW\x05RP\xa4Y\xa2\xda\x10\xe5\x1f\x9c\x1aiA)\x7f\xfc]\x97\nUr6\xd0\xbd\xeb|\xf8\xff\x18\x80\x0b\x08c8q\xa0\xf0\xa7\xeaB\xf4t\x80'
-    ref_sigAAug = b"\x8c]\x03\xf9\xda\xe7~\x19\xa5\x94Z\x06\xa2\x14\x83n\xdb\x8e\x03\xb8QR]\x84\xb9\xded@\xe6\x8f\xc0\xcas\x03\xee\xed9\r\x86<\x9bU\xa8\xcfmY\x14\n\x01\xb5\x88G\x88\x1e\xb5\xafgsMD\xb2UVF\xc6al9\xab\x88\xd2S)\x9a\xcc\x1e\xb1\xb1\x9d\xdb\x9b\xfc\xbev\xe2\x8a\xdd\xf6q\xd1\x16\xc0R\xbb\x18G"
-    ref_sig1Pop = b"\x95P\xfbN\x7f~\x8c\xc4\xa9\x0b\xe8V\n\xb5\xa7\x98\xb0\xb20\x00\xb6\xa5J!\x17R\x02\x10\xf9\x86\xf3\xf2\x81\xb3v\xf2Y\xc0\xb7\x80b\xd1\xeb1\x92\xb3\xd9\xbb\x04\x9fY\xec\xc1\xb0:pI\xebf^\r\xf3d\x94\xaeL\xb5\xf1\x13l\xca\xee\xfc\x99X\xcb0\xc33==C\xf0qH\xc3\x86)\x9a{\x1b\xfc\r\xc5\xcf|"
-    ref_sig2Pop = b"\xa6\x906\xbc\x11\xae^\xfc\xbfa\x80\xaf\xe3\x9a\xdd\xde~'s\x1e\xc4\x02W\xbf\xdc<7\xf1{\x8d\xf6\x83\x06\xa3N\xbd\x10\xe9\xe3*5%7P\xdf\\\x87\xc2\x14/\x82\x07\xe8\xd5eG\x12\xb4\xe5T\xf5\x85\xfbhF\xff8\x04\xe4)\xa9\xf8\xa1\xb4\xc5ku\xd0\x86\x9e\xd6u\x80\xd7\x89\x87\x0b\xab\xe2\xc7\xc8\xa9\xd5\x1e{*"
-    ref_sigAPop = b"\xa4\xeat+\xcd\xc1U>\x9c\xa4\xe5`\xbe~^ln\xfajd\xdd\xdf\x9c\xa3\xbb(T#=\x85\xa6\xaa\xc1\xb7n\xc7\xd1\x03\xdbN3\x14\x8b\x82\xaf\x99#\xdb\x05\x93Jn\xce\x9aq\x01\xcd\x8a\x9dG\xce'\x97\x80V\xb0\xf5\x90\x00!\x81\x8cEi\x8a\xfd\xd6\xcf\x8ako\x7f\xee\x1f\x0bCqoU\xe4\x13\xd4\xb8z`9"
-
-    secret1 = bytes([1] * 32)
-    secret2 = bytes([x * 314159 % 256 for x in range(32)])
-    sk1 = PrivateKey.from_bytes(secret1)
-    sk2 = PrivateKey.from_bytes(secret2)
-
-    msg = bytes([3, 1, 4, 1, 5, 9])
-    sig1Basic = BasicSchemeMPL.sign(sk1, msg)
-    sig2Basic = BasicSchemeMPL.sign(sk2, msg)
-    sigABasic = BasicSchemeMPL.aggregate([sig1Basic, sig2Basic])
-    sig1Aug = AugSchemeMPL.sign(sk1, msg)
-    sig2Aug = AugSchemeMPL.sign(sk2, msg)
-    sigAAug = AugSchemeMPL.aggregate([sig1Aug, sig2Aug])
-    sig1Pop = PopSchemeMPL.sign(sk1, msg)
-    sig2Pop = PopSchemeMPL.sign(sk2, msg)
-    sigAPop = PopSchemeMPL.aggregate([sig1Pop, sig2Pop])
-
-    assert bytes(sig1Basic) == ref_sig1Basic
-    assert bytes(sig2Basic) == ref_sig2Basic
-    assert bytes(sigABasic) == ref_sigABasic
-    assert bytes(sig1Aug) == ref_sig1Aug
-    assert bytes(sig2Aug) == ref_sig2Aug
-    assert bytes(sigAAug) == ref_sigAAug
-    assert bytes(sig1Pop) == ref_sig1Pop
-    assert bytes(sig2Pop) == ref_sig2Pop
-    assert bytes(sigAPop) == ref_sigAPop
-
-
-def test_readme():
-    seed: bytes = bytes(
-        [
-            0,
-            50,
-            6,
-            244,
-            24,
-            199,
-            1,
-            25,
-            52,
-            88,
-            192,
-            19,
-            18,
-            12,
-            89,
-            6,
-            220,
-            18,
-            102,
-            58,
-            209,
-            82,
-            12,
-            62,
-            89,
-            110,
-            182,
-            9,
-            44,
-            20,
-            254,
-            22,
-        ]
-    )
-    sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-    pk: G1Element = sk.get_g1()
-
-    message: bytes = bytes([1, 2, 3, 4, 5])
-    signature: G2Element = AugSchemeMPL.sign(sk, message)
-
-    ok: bool = AugSchemeMPL.verify(pk, message, signature)
-    assert ok
-
-    sk_bytes: bytes = bytes(sk)  # 32 bytes
-    pk_bytes: bytes = bytes(pk)  # 48 bytes
-    signature_bytes: bytes = bytes(signature)  # 96 bytes
-
-    print(sk_bytes.hex(), pk_bytes.hex(), signature_bytes.hex())
-
-    sk = PrivateKey.from_bytes(sk_bytes)
-    pk = G1Element.from_bytes(pk_bytes)
-    signature = G2Element.from_bytes(signature_bytes)
-
-    seed = bytes([1]) + seed[1:]
-    sk1: PrivateKey = AugSchemeMPL.key_gen(seed)
-    seed = bytes([2]) + seed[1:]
-    sk2: PrivateKey = AugSchemeMPL.key_gen(seed)
-    message2: bytes = bytes([1, 2, 3, 4, 5, 6, 7])
-
-    pk1: G1Element = sk1.get_g1()
-    sig1: G2Element = AugSchemeMPL.sign(sk1, message)
-
-    pk2: G1Element = sk2.get_g1()
-    sig2: G2Element = AugSchemeMPL.sign(sk2, message2)
-
-    agg_sig: G2Element = AugSchemeMPL.aggregate([sig1, sig2])
-
-    ok = AugSchemeMPL.aggregate_verify([pk1, pk2], [message, message2], agg_sig)
-    assert ok
-
-    seed = bytes([3]) + seed[1:]
-    sk3: PrivateKey = AugSchemeMPL.key_gen(seed)
-    pk3: G1Element = sk3.get_g1()
-    message3: bytes = bytes([100, 2, 254, 88, 90, 45, 23])
-    sig3: G2Element = AugSchemeMPL.sign(sk3, message3)
-
-    agg_sig_final: G2Element = AugSchemeMPL.aggregate([agg_sig, sig3])
-    ok = AugSchemeMPL.aggregate_verify(
-        [pk1, pk2, pk3], [message, message2, message3], agg_sig_final
-    )
-    assert ok
-
-    pop_sig1: G2Element = PopSchemeMPL.sign(sk1, message)
-    pop_sig2: G2Element = PopSchemeMPL.sign(sk2, message)
-    pop_sig3: G2Element = PopSchemeMPL.sign(sk3, message)
-    pop1: G2Element = PopSchemeMPL.pop_prove(sk1)
-    pop2: G2Element = PopSchemeMPL.pop_prove(sk2)
-    pop3: G2Element = PopSchemeMPL.pop_prove(sk3)
-
-    ok = PopSchemeMPL.pop_verify(pk1, pop1)
-    assert ok
-    ok = PopSchemeMPL.pop_verify(pk2, pop2)
-    assert ok
-    ok = PopSchemeMPL.pop_verify(pk3, pop3)
-    assert ok
-
-    pop_sig_agg: G2Element = PopSchemeMPL.aggregate([pop_sig1, pop_sig2, pop_sig3])
-
-    ok = PopSchemeMPL.fast_aggregate_verify([pk1, pk2, pk3], message, pop_sig_agg)
-    assert ok
-
-    pop_agg_pk: G1Element = pk1 + pk2 + pk3
-    ok = PopSchemeMPL.verify(pop_agg_pk, message, pop_sig_agg)
-    assert ok
-
-    pop_agg_sk: PrivateKey = PrivateKey.aggregate([sk1, sk2, sk3])
-    ok = PopSchemeMPL.sign(pop_agg_sk, message) == pop_sig_agg
-    assert ok
-
-    master_sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-    child: PrivateKey = AugSchemeMPL.derive_child_sk(master_sk, 152)
-    grandchild: PrivateKey = AugSchemeMPL.derive_child_sk(child, 952)
-
-    master_pk: G1Element = master_sk.get_g1()
-    child_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(master_sk, 22)
-    grandchild_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(child_u, 0)
-
-    child_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(master_pk, 22)
-    grandchild_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(child_u_pk, 0)
-
-    ok = grandchild_u_pk == grandchild_u.get_g1()
-    assert ok
-
-
-def test_aggregate_verify_zero_items():
-    assert AugSchemeMPL.aggregate_verify([], [], G2Element())
-
-
-def test_invalid_points():
-    sk1 = BasicSchemeMPL.key_gen(b"1" *32)
-    good_point = sk1.get_g1()
-    good_point_bytes = bytes(good_point)
-    start = time.time()
-    for i in range(2000):
-        gp1 = G1Element.from_bytes(good_point_bytes)
-    print(f"from_bytes avg: {(time.time() - start) }")
-
-    start = time.time()
-    for i in range(2000):
-        gp2 = G1Element.from_bytes_unchecked(good_point_bytes)
-    print(f"from_bytes_unchecked avg: {(time.time() - start) }")
-    assert gp1 == gp2
-
-    bad_point_hex: str = "8d5d0fb73b9c92df4eab4216e48c3e358578b4cc30f82c268bd6fef3bd34b558628daf1afef798d4c3b0fcd8b28c8973";
-    try:
-        G1Element.from_bytes(bytes.fromhex(bad_point_hex))
-        assert False
-    except ValueError:
-        pass
-
-    p: G1Element = G1Element.from_bytes_unchecked(bytes.fromhex(bad_point_hex))
-
-    bad_g2_point_hex = "8f2886c94eaeac335c8414cbf14c16681b225380cfee3293becc4531d5b415984b4ea4050d9ecda11fbc21c60627e9d212dfcb17d2b5ae399aa3fbcb099e05baa496b852ad976fb633cc6766b02fca4da549dc063908463b2906ad64e8b310ad"
-
-    try:
-        G2Element.from_bytes(bytes.fromhex(bad_g2_point_hex))
-        assert False
-    except ValueError:
-        pass
-
-
-
-test_schemes()
-test_vectors_invalid()
-test_vectors_valid()
-test_readme()
-test_aggregate_verify_zero_items()
-test_invalid_points()
-
-print("\nAll tests passed.")
-
-"""
-Copyright 2020 Chia Network Inc
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/README.md b/src/dashbls/python-impl/README.md
deleted file mode 100644
index 4ee657903a2e..000000000000
--- a/src/dashbls/python-impl/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# BLS12-381 and Signatures in python
-
-Implements the BLS12 curve and optimal ate pairing, as well
-as BLS signatures and aggregation. Use for reference / educational purposes only.
-
-For an optimized implementation, use the [Python bindings](https://github.com/Chia-Network/bls-signatures/tree/main/python-bindings).
-
-For a good introduction to pairings, read [Pairings for Beginners](https://static1.squarespace.com/static/5fdbb09f31d71c1227082339/t/5ff394720493bd28278889c6/1609798774687/PairingsForBeginners.pdf) by Craig Costello.
-
-Map to curve implementation from [Algorand](https://github.com/algorand/bls_sigs_ref/).
-
-Run the tests with `python impl-test.py`.
diff --git a/src/dashbls/python-impl/bls12381.py b/src/dashbls/python-impl/bls12381.py
deleted file mode 100644
index c3a16fe2254a..000000000000
--- a/src/dashbls/python-impl/bls12381.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# flake8: noqa
-from fields import Fq, Fq2
-
-# BLS parameter used to generate the other parameters
-# Spec is found here: https://github.com/zkcrypto/pairing/tree/master/src/bls12_381
-x = -0xD201000000010000
-
-# 381 bit prime
-# Also see fields:bls12381_q
-q = 0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAAAB
-
-# a,b and a2, b2, define the elliptic curve and twisted curve.
-# y^2 = x^3 + 4
-# y^2 = x^3 + 4(u + 1)
-a = Fq(q, 0)
-b = Fq(q, 4)
-a_twist = Fq2(q, 0, 0)
-b_twist = Fq2(q, 4, 4)
-
-# The generators for g1 and g2
-gx = Fq(
-    q,
-    0x17F1D3A73197D7942695638C4FA9AC0FC3688C4F9774B905A14E3A3F171BAC586C55E83FF97A1AEFFB3AF00ADB22C6BB,
-)
-gy = Fq(
-    q,
-    0x08B3F481E3AAA0F1A09E30ED741D8AE4FCF5E095D5D00AF600DB18CB2C04B3EDD03CC744A2888AE40CAA232946C5E7E1,
-)
-
-g2x = Fq2(
-    q,
-    352701069587466618187139116011060144890029952792775240219908644239793785735715026873347600343865175952761926303160,
-    3059144344244213709971259814753781636986470325476647558659373206291635324768958432433509563104347017837885763365758,
-)
-g2y = Fq2(
-    q,
-    1985150602287291935568054521177171638300868978215655730859378665066344726373823718423869104263333984641494340347905,
-    927553665492332455747201965776037880757740193453592970025027978793976877002675564980949289727957565575433344219582,
-)
-
-# The order of all three groups (g1, g2, and gt). Note, the elliptic curve E_twist
-# actually has more valid points than this. This is relevant when hashing onto the
-# curve, where we use a point that is not in g2, and map it into g2.
-n = 0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001
-
-# Cofactor used to generate r torsion points
-h = 0x396C8C005555E1568C00AAAB0000AAAB
-
-# https://tools.ietf.org/html/draft-irtf-cfrg-hash-to-curve-07#section-8.8.2
-h_eff = 0xBC69F08F2EE75B3584C6A0EA91B352888E2A8E9145AD7689986FF031508FFE1329C2F178731DB956D82BF015D1212B02EC0EC69D7477C1AE954CBC06689F6A359894C0ADEBBF6B4E8020005AAA95551
-
-# Embedding degree
-k = 12
-
-# sqrt(-3) mod q
-sqrt_n3 = 1586958781458431025242759403266842894121773480562120986020912974854563298150952611241517463240701
-
-# (sqrt(-3) - 1) / 2 mod q
-sqrt_n3m1o2 = 793479390729215512621379701633421447060886740281060493010456487427281649075476305620758731620350
-
-# This is the normal elliptic curve. G1 points are on here.
-def parameters():
-    return (q, a, b, gx, gy, g2x, g2y, n, h, x, k, sqrt_n3, sqrt_n3m1o2)
-
-
-# This is the sextic twist used to send elements of G2 from
-# coordinates in Fq12 to coordinates in Fq2. It's isomorphic
-# to the above elliptic curve. See Page 63 of Costello.
-def parameters_twist():
-    return (
-        q,
-        a_twist,
-        b_twist,
-        gx,
-        gy,
-        g2x,
-        g2y,
-        n,
-        h_eff,
-        x,
-        k,
-        sqrt_n3,
-        sqrt_n3m1o2,
-    )
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/ec.py b/src/dashbls/python-impl/ec.py
deleted file mode 100644
index 36f573d11b16..000000000000
--- a/src/dashbls/python-impl/ec.py
+++ /dev/null
@@ -1,586 +0,0 @@
-from __future__ import annotations
-
-from collections import namedtuple
-from copy import deepcopy
-from typing import List, Optional
-
-import bls12381
-from fields import FieldExtBase, Fq, Fq2, Fq6, Fq12
-from util import hash256
-
-# Struct for elliptic curve parameters
-EC = namedtuple("EC", "q a b gx gy g2x g2y n h x k sqrt_n3 sqrt_n3m1o2")
-
-default_ec = EC(*bls12381.parameters())
-default_ec_twist = EC(*bls12381.parameters_twist())
-
-
-class AffinePoint:
-    """
-    Elliptic curve point, can represent any curve, and use Fq or Fq2
-    coordinates.
-    """
-
-    def __init__(self, x, y, infinity: bool, ec=default_ec):
-        if (
-            (not isinstance(x, Fq) and not isinstance(x, FieldExtBase))
-            or (not isinstance(y, Fq) and not isinstance(y, FieldExtBase))
-            or type(x) != type(y)
-        ):
-            raise Exception("x,y should be field elements")
-        self.FE = type(x)
-        self.x = x
-        self.y = y
-        self.infinity = infinity
-        self.ec = ec
-
-    def is_on_curve(self) -> bool:
-        """
-        Check that y^2 = x^3 + ax + b.
-        """
-        if self.infinity:
-            return True
-        left = self.y * self.y
-        right = self.x * self.x * self.x + self.ec.a * self.x + self.ec.b
-
-        return left == right
-
-    def __add__(self, other: AffinePoint) -> AffinePoint:
-        if other == 0:
-            return self
-        if not isinstance(other, AffinePoint):
-            raise Exception("Incorrect object")
-
-        return add_points(self, other, self.ec, self.FE)
-
-    def __radd__(self, other: AffinePoint) -> AffinePoint:
-        return self.__add__(other)
-
-    def __sub__(self, other: AffinePoint) -> AffinePoint:
-        return self.__add__(other.negate())
-
-    def __rsub__(self, other: AffinePoint) -> AffinePoint:
-        return self.negate().__add__(other)
-
-    def __str__(self) -> str:
-        return (
-            "AffinePoint(x="
-            + self.x.__str__()
-            + ", y="
-            + self.y.__str__()
-            + ", i="
-            + str(self.infinity)
-            + ")\n"
-        )
-
-    def __repr__(self) -> str:
-        return (
-            "AffinePoint(x="
-            + self.x.__repr__()
-            + ", y="
-            + self.y.__repr__()
-            + ", i="
-            + str(self.infinity)
-            + ")\n"
-        )
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, AffinePoint):
-            return False
-        return (
-            self.x == other.x and self.y == other.y and self.infinity == other.infinity
-        )
-
-    def __ne__(self, other) -> bool:
-        return not self.__eq__(other)
-
-    def __mul__(self, c) -> AffinePoint:
-        if not isinstance(c, Fq) and not isinstance(c, int):
-            raise ValueError("Error, must be int or Fq")
-        return scalar_mult_jacobian(c, self.to_jacobian(), self.ec).to_affine()
-
-    def negate(self) -> AffinePoint:
-        return AffinePoint(self.x, -self.y, self.infinity, self.ec)
-
-    def __rmul__(self, c: Fq) -> AffinePoint:
-        return self.__mul__(c)
-
-    def to_jacobian(self) -> JacobianPoint:
-        return JacobianPoint(
-            self.x, self.y, self.FE.one(self.ec.q), self.infinity, self.ec
-        )
-
-    def __deepcopy__(self, memo) -> AffinePoint:
-        return AffinePoint(
-            deepcopy(self.x, memo), deepcopy(self.y, memo), self.infinity, self.ec
-        )
-
-
-class JacobianPoint:
-    """
-    Elliptic curve point, can represent any curve, and use Fq or Fq2
-    coordinates. Uses Jacobian coordinates so that point addition
-    does not require slow inversion.
-    """
-
-    def __init__(self, x, y, z, infinity: bool, ec=default_ec):
-
-        if (
-            not isinstance(x, Fq)
-            and not isinstance(x, FieldExtBase)
-            or (not isinstance(y, Fq) and not isinstance(y, FieldExtBase))
-            or (not isinstance(z, Fq) and not isinstance(z, FieldExtBase))
-        ):
-            raise Exception("x,y should be field elements")
-        self.FE = type(x)
-        self.x = x
-        self.y = y
-        self.z = z
-        self.infinity = infinity
-        self.ec = ec
-
-    def is_on_curve(self) -> bool:
-        if self.infinity:
-            return True
-        return self.to_affine().is_on_curve()
-
-    def negate(self) -> JacobianPoint:
-        return self.to_affine().negate().to_jacobian()
-
-    def to_affine(self) -> AffinePoint:
-        if self.infinity:
-            return AffinePoint(
-                Fq.zero(self.ec.q), Fq.zero(self.ec.q), self.infinity, self.ec
-            )
-        new_x = self.x / (self.z ** 2)
-        new_y = self.y / (self.z ** 3)
-        return AffinePoint(new_x, new_y, self.infinity, self.ec)
-
-    def check_valid(self) -> None:
-        assert self.is_on_curve()
-        assert self * self.ec.n == G2Infinity()
-
-    def get_fingerprint(self) -> int:
-        ser = bytes(self)
-        return int.from_bytes(hash256(ser)[:4], "big")
-
-    def __add__(self, other: JacobianPoint) -> JacobianPoint:
-        if other == 0:
-            return self
-        if not isinstance(other, JacobianPoint):
-            raise ValueError("Incorrect object")
-
-        return add_points_jacobian(self, other, self.ec, self.FE)
-
-    def __radd__(self, other: JacobianPoint) -> JacobianPoint:
-        return self.__add__(other)
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, JacobianPoint):
-            return False
-        return self.to_affine() == other.to_affine()
-
-    def __ne__(self, other) -> bool:
-        return not self.__eq__(other)
-
-    def __mul__(self, c) -> JacobianPoint:
-        if not isinstance(c, int) and not isinstance(c, Fq):
-            raise ValueError("Error, must be int or Fq")
-        return scalar_mult_jacobian(c, self, self.ec)
-
-    def __rmul__(self, c) -> JacobianPoint:
-        return self.__mul__(c)
-
-    def __neg__(self) -> JacobianPoint:
-        return self.to_affine().negate().to_jacobian()
-
-    def __str__(self) -> str:
-        return (
-            "JacobianPoint(x="
-            + self.x.__str__()
-            + ", y="
-            + self.y.__str__()
-            + "z="
-            + self.z.__str__()
-            + ", i="
-            + str(self.infinity)
-            + ")\n"
-        )
-
-    def __repr__(self) -> str:
-        return self.__str__()
-
-    def __bytes__(self) -> bytes:
-        return point_to_bytes(self, self.ec, self.FE)
-
-    def __deepcopy__(self, memo) -> JacobianPoint:
-        return JacobianPoint(
-            deepcopy(self.x, memo),
-            deepcopy(self.y, memo),
-            deepcopy(self.z, memo),
-            self.infinity,
-            self.ec,
-        )
-
-    def __hash__(self) -> int:
-        return int.from_bytes(bytes(self), "big")
-
-
-def sign_Fq(element, ec=default_ec) -> bool:
-    return element > Fq(ec.q, ((ec.q - 1) // 2))
-
-
-def sign_Fq2(element, ec=default_ec_twist) -> bool:
-    if element[1] == Fq(ec.q, 0):
-        return sign_Fq(element[0])
-
-    return element[1] > Fq(ec.q, ((ec.q - 1) // 2))
-
-
-def point_to_bytes(point_j: JacobianPoint, ec, FE) -> bytes:
-    # Zcash serialization described in https://datatracker.ietf.org/doc/draft-irtf-cfrg-pairing-friendly-curves/
-    point = point_j.to_affine()
-    output = bytearray(bytes(point.x))
-
-    # If the y coordinate is the bigger one of the two, set the first
-    # bit to 1.
-    if point.infinity:
-        return bytes([0x40]) + bytes([0] * (len(output) - 1))
-
-    if FE == Fq:
-        sign = sign_Fq(point.y, ec)
-    else:
-        sign = sign_Fq2(point.y, ec)
-
-    if sign:
-        output[0] |= 0xA0
-    else:
-        output[0] |= 0x80
-    return bytes(output)
-
-
-def bytes_to_point(buffer: bytes, ec, FE) -> JacobianPoint:
-    # Zcash deserialization described in https://datatracker.ietf.org/doc/draft-irtf-cfrg-pairing-friendly-curves/
-
-    if FE == Fq:
-        if len(buffer) != 48:
-            raise ValueError("G1Elements must be 48 bytes")
-    elif FE == Fq2:
-        if len(buffer) != 96:
-            raise ValueError("G2Elements must be 96 bytes")
-    else:
-        raise ValueError("Invalid FE")
-
-    m_byte = buffer[0] & 0xE0
-
-    if m_byte in [0x20, 0x60, 0xE0]:
-        raise ValueError("Invalid first three bits")
-
-    C_bit = (m_byte & 0x80) >> 7  # First bit
-    I_bit = (m_byte & 0x40) >> 6  # Second bit
-    S_bit = (m_byte & 0x20) >> 5  # Third bit
-
-    if C_bit == 0:
-        raise ValueError("First bit must be 1 (only compressed points)")
-
-    buffer = bytes([buffer[0] & 0x1F]) + buffer[1:]
-
-    if I_bit == 1:
-        if any([e != 0 for e in buffer]):
-            raise ValueError("Point at infinity set, but data not all zeroes")
-        return AffinePoint(FE.zero(ec.q), FE.zero(ec.q), True, ec).to_jacobian()
-
-    x = FE.from_bytes(buffer, ec.q)
-    y_value = y_for_x(x, ec, FE)
-
-    if FE == Fq:
-        sign_fn = sign_Fq
-    else:
-        sign_fn = sign_Fq2
-
-    if sign_fn(y_value, ec) == S_bit:
-        y = y_value
-    else:
-        y = -y_value
-
-    return AffinePoint(x, y, False, ec).to_jacobian()
-
-
-def y_for_x(x, ec=default_ec, FE=Fq):
-    """
-    Solves y = sqrt(x^3 + ax + b) for both valid ys.
-    """
-    if not isinstance(x, FE):
-        x = FE(ec.q, x)
-
-    u = x * x * x + ec.a * x + ec.b
-
-    y = u.modsqrt()
-    if y == 0 or not AffinePoint(x, y, False, ec).is_on_curve():
-        raise ValueError("No y for point x")
-    return y
-
-
-def double_point(p1: AffinePoint, ec=default_ec, FE=Fq) -> AffinePoint:
-    """
-    Basic elliptic curve point doubling
-    """
-    x, y = p1.x, p1.y
-    left = Fq(ec.q, 3) * x * x
-    left = left + ec.a
-    s = left / (Fq(ec.q, 2) * y)
-    new_x = s * s - x - x
-    new_y = s * (x - new_x) - y
-    return AffinePoint(new_x, new_y, False, ec)
-
-
-def add_points(p1: AffinePoint, p2: AffinePoint, ec=default_ec, FE=Fq) -> AffinePoint:
-    """
-    Basic elliptic curve point addition.
-    """
-    assert p1.is_on_curve()
-    assert p2.is_on_curve()
-    if p1.infinity:
-        return p2
-    if p2.infinity:
-        return p1
-    if p1 == p2:
-        return double_point(p1, ec, FE)
-    if p1.x == p2.x:
-        return AffinePoint(FE.zero(ec.q), FE.zero(ec.q), True, ec)
-
-    x1, y1 = p1.x, p1.y
-    x2, y2 = p2.x, p2.y
-    s = (y2 - y1) / (x2 - x1)
-    new_x = s * s - x1 - x2
-    new_y = s * (x1 - new_x) - y1
-    return AffinePoint(new_x, new_y, False, ec)
-
-
-def double_point_jacobian(p1: JacobianPoint, ec=default_ec, FE=Fq) -> JacobianPoint:
-    """
-    Jacobian elliptic curve point doubling, see
-    http://www.hyperelliptic.org/EFD/oldefd/jacobian.html
-    """
-    X, Y, Z = p1.x, p1.y, p1.z
-    if Y == FE.zero(ec.q) or p1.infinity:
-        return JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-
-    # S = 4*X*Y^2
-    S = Fq(ec.q, 4) * X * Y * Y
-
-    Z_sq = Z * Z
-    Z_4th = Z_sq * Z_sq
-    Y_sq = Y * Y
-    Y_4th = Y_sq * Y_sq
-
-    # M = 3*X^2 + a*Z^4
-    M = Fq(ec.q, 3) * X * X
-    M += ec.a * Z_4th
-
-    # X' = M^2 - 2*S
-    X_p = M * M - Fq(ec.q, 2) * S
-    # Y' = M*(S - X') - 8*Y^4
-    Y_p = M * (S - X_p) - Fq(ec.q, 8) * Y_4th
-    # Z' = 2*Y*Z
-    Z_p = Fq(ec.q, 2) * Y * Z
-    return JacobianPoint(X_p, Y_p, Z_p, False, ec)
-
-
-def add_points_jacobian(
-    p1: JacobianPoint, p2: JacobianPoint, ec=default_ec, FE=Fq
-) -> JacobianPoint:
-    """
-    Jacobian elliptic curve point addition, see
-    http://www.hyperelliptic.org/EFD/oldefd/jacobian.html
-    """
-    if p1.infinity:
-        return p2
-    if p2.infinity:
-        return p1
-    # U1 = X1*Z2^2
-    U1 = p1.x * (p2.z ** 2)
-    # U2 = X2*Z1^2
-    U2 = p2.x * (p1.z ** 2)
-    # S1 = Y1*Z2^3
-    S1 = p1.y * (p2.z ** 3)
-    # S2 = Y2*Z1^3
-    S2 = p2.y * (p1.z ** 3)
-    if U1 == U2:
-        if S1 != S2:
-            return JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-        else:
-            return double_point_jacobian(p1, ec, FE)
-
-    # H = U2 - U1
-    H = U2 - U1
-    # R = S2 - S1
-    R = S2 - S1
-    H_sq = H * H
-    H_cu = H * H_sq
-    # X3 = R^2 - H^3 - 2*U1*H^2
-    X3 = R * R - H_cu - Fq(ec.q, 2) * U1 * H_sq
-    # Y3 = R*(U1*H^2 - X3) - S1*H^3
-    Y3 = R * (U1 * H_sq - X3) - S1 * H_cu
-    # Z3 = H*Z1*Z2
-    Z3 = H * p1.z * p2.z
-    return JacobianPoint(X3, Y3, Z3, False, ec)
-
-
-def scalar_mult(c, p1: AffinePoint, ec=default_ec, FE=Fq) -> AffinePoint:
-    """
-    Double and add, see
-    https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication
-    """
-    if p1.infinity or c % ec.q == 0:
-        return AffinePoint(FE.zero(ec.q), FE.zero(ec.q), ec)
-    result = AffinePoint(FE.zero(ec.q), FE.zero(ec.q), True, ec)
-    addend = p1
-    while c > 0:
-        if c & 1:
-            result += addend
-
-        # double point
-        addend += addend
-        c = c >> 1
-
-    return result
-
-
-def scalar_mult_jacobian(c, p1: JacobianPoint, ec=default_ec, FE=Fq) -> JacobianPoint:
-    """
-    Double and add, see
-    https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication
-    """
-    if isinstance(c, FE):
-        c = c.value
-    if p1.infinity or c % ec.q == 0:
-        return JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-
-    result = JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-    addend = p1
-    while c > 0:
-        if c & 1:
-            result += addend
-        # double point
-        addend += addend
-        c = c >> 1
-    return result
-
-
-def G1Generator(ec=default_ec) -> JacobianPoint:
-    return AffinePoint(ec.gx, ec.gy, False, ec).to_jacobian()
-
-
-def G2Generator(ec=default_ec_twist) -> JacobianPoint:
-    return AffinePoint(ec.g2x, ec.g2y, False, ec).to_jacobian()
-
-
-def G1Infinity(ec=default_ec, FE=Fq) -> JacobianPoint:
-    return JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-
-
-def G2Infinity(ec=default_ec_twist, FE=Fq2) -> JacobianPoint:
-    return JacobianPoint(FE.one(ec.q), FE.one(ec.q), FE.zero(ec.q), True, ec)
-
-
-def G1FromBytes(buffer: bytes, ec=default_ec, FE=Fq) -> JacobianPoint:
-    return bytes_to_point(buffer, ec, FE)
-
-
-def G2FromBytes(buffer: bytes, ec=default_ec_twist, FE=Fq2):
-    return bytes_to_point(buffer, ec, FE)
-
-
-def untwist(point: AffinePoint, ec=default_ec) -> AffinePoint:
-    """
-    Given a point on G2 on the twisted curve, this converts its
-    coordinates back from Fq2 to Fq12. See Craig Costello book, look
-    up twists.
-    """
-    f = Fq12.one(ec.q)
-    wsq = Fq12(ec.q, f.root, Fq6.zero(ec.q))
-    wcu = Fq12(ec.q, Fq6.zero(ec.q), f.root)
-    return AffinePoint(point.x / wsq, point.y / wcu, False, ec)
-
-
-def twist(point: AffinePoint, ec=default_ec_twist) -> AffinePoint:
-    """
-    Given an untwisted point, this converts it's
-    coordinates to a point on the twisted curve. See Craig Costello
-    book, look up twists.
-    """
-    f = Fq12.one(ec.q)
-    wsq = Fq12(ec.q, f.root, Fq6.zero(ec.q))
-    wcu = Fq12(ec.q, Fq6.zero(ec.q), f.root)
-    new_x = point.x * wsq
-    new_y = point.y * wcu
-    return AffinePoint(new_x, new_y, False, ec)
-
-
-# Isogeny map evaluation specified by map_coeffs
-#
-# map_coeffs should be specified as (xnum, xden, ynum, yden)
-#
-# This function evaluates the isogeny over Jacobian projective coordinates.
-# For details, see Section 4.3 of
-#    Wahby and Boneh, "Fast and simple constant-time hashing to the BLS12-381 elliptic curve."
-#    ePrint # 2019/403, https://ia.cr/2019/403.
-def eval_iso(P: JacobianPoint, map_coeffs, ec) -> JacobianPoint:
-    (x, y, z) = (P.x, P.y, P.z)
-    mapvals: List[Optional[Fq2]] = [None] * 4
-
-    # Precompute the required powers of Z^2
-    maxord = max(len(coeffs) for coeffs in map_coeffs)
-    zpows: List[Optional[Fq2]] = [None] * maxord
-    zpows[0] = z ** 0  # type: ignore
-    zpows[1] = z ** 2  # type: ignore
-    for idx in range(2, len(zpows)):
-        assert zpows[idx - 1] is not None
-        assert zpows[1] is not None
-        zpows[idx] = zpows[idx - 1] * zpows[1]
-
-    # Compute the numerator and denominator of the X and Y maps via Horner's rule
-    for (idx, coeffs) in enumerate(map_coeffs):
-        coeffs_z = [
-            zpow * c for (zpow, c) in zip(reversed(coeffs), zpows[: len(coeffs)])
-        ]
-        tmp = coeffs_z[0]
-        for coeff in coeffs_z[1:]:
-            tmp *= x
-            tmp += coeff
-        mapvals[idx] = tmp
-
-    # xden is of order 1 less than xnum, so one needs to multiply it by an extra factor of Z^2
-    assert len(map_coeffs[1]) + 1 == len(map_coeffs[0])
-    assert zpows[1] is not None
-    assert mapvals[1] is not None
-    mapvals[1] *= zpows[1]
-
-    # Multiply the result of Y map by the y-coordinate y / z^3
-    assert mapvals[2] is not None
-    assert mapvals[3] is not None
-    mapvals[2] *= y
-    mapvals[3] *= z ** 3
-
-    Z = mapvals[1] * mapvals[3]
-    X = mapvals[0] * mapvals[3] * Z
-    Y = mapvals[2] * mapvals[1] * Z * Z
-    return JacobianPoint(X, Y, Z, P.infinity, ec)
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/fields.py b/src/dashbls/python-impl/fields.py
deleted file mode 100644
index 418ce50732c8..000000000000
--- a/src/dashbls/python-impl/fields.py
+++ /dev/null
@@ -1,763 +0,0 @@
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-
-class Fq:
-    """
-    Represents an element of a finite field mod a prime q.
-    """
-
-    value: int
-    extension: int = 1
-
-    def __init__(self, Q: int, value: int):
-        self.Q = Q
-        self.value = value % Q
-
-    def __neg__(self) -> Fq:
-        return Fq(self.Q, -self.value)
-
-    def __add__(self, other: Fq) -> Fq:
-        if not isinstance(other, Fq):
-            return NotImplemented
-        return Fq(self.Q, self.value + other.value)
-
-    def __radd__(self, other: Fq) -> Fq:
-        if not isinstance(other, Fq):
-            return NotImplemented
-        return self.__add__(other)
-
-    def __sub__(self, other: Fq) -> Fq:
-        if not isinstance(other, Fq):
-            return NotImplemented
-        return Fq(self.Q, self.value - other.value)
-
-    def __rsub__(self, other: Fq) -> Fq:
-        if not isinstance(other, Fq):
-            return NotImplemented
-        return Fq(self.Q, other.value - self.value)
-
-    def __mul__(self, other: Fq) -> Fq:
-        if not isinstance(other, Fq):
-            return NotImplemented
-        return Fq(self.Q, self.value * other.value)
-
-    def __rmul__(self, other: Fq) -> Fq:
-        return self.__mul__(other)
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, type(self)):
-            return False
-        else:
-            return self.value == other.value and self.Q == other.Q
-
-    def __lt__(self, other: Fq) -> bool:
-        return self.value < other.value
-
-    def __gt__(self, other: Fq) -> bool:
-        return self.value > other.value
-
-    def __le__(self, other: Fq) -> bool:
-        return self.value <= other.value
-
-    def __ge__(self, other: Fq) -> bool:
-        return self.value >= other.value
-
-    def __str__(self):
-        s = hex(self.value)
-        s2 = s[0:7] + ".." + s[-5:] if len(s) > 10 else s
-        return "Fq(" + s2 + ")"
-
-    def __repr__(self):
-        return "Fq(" + hex(self.value) + ")"
-
-    def __bytes__(self):
-        return self.value.to_bytes(48, "big")
-
-    @staticmethod
-    def from_bytes(buffer: bytes, q: int):
-        assert len(buffer) == 48
-        return Fq(q, int.from_bytes(buffer, "big"))
-
-    def __pow__(self, other) -> Fq:
-        if other == 0:
-            return Fq(self.Q, 1)
-        elif other == 1:
-            return Fq(self.Q, self.value)
-        elif other % 2 == 0:
-            return Fq(self.Q, self.value * self.value) ** (other // 2)
-        else:
-            return Fq(self.Q, self.value * self.value) ** (other // 2) * self
-
-    def qi_power(self, i: int) -> Fq:
-        return self
-
-    def __invert__(self) -> Fq:
-        """
-        Extended euclidian algorithm for inversion.
-        """
-        x0, x1, y0, y1 = 1, 0, 0, 1
-        a = int(self.Q)
-        b = int(self.value)
-        while a != 0:
-            q, b, a = b // a, a, b % a
-            x0, x1 = x1, x0 - q * x1
-            y0, y1 = y1, y0 - q * y1
-        return Fq(self.Q, x0)
-
-    def __floordiv__(self, other) -> Fq:
-        if isinstance(other, int) and not isinstance(other, type(self)):
-            other = Fq(self.Q, other)
-        return self * ~other
-
-    __truediv__ = __floordiv__
-
-    def __iter__(self):
-        yield self
-
-    def modsqrt(self) -> Fq:
-        if int(self.value) == 0:
-            return Fq(self.Q, 0)
-        if pow(int(self.value), (self.Q - 1) // 2, self.Q) != 1:
-            raise ValueError("No sqrt exists")
-        if self.Q % 4 == 3:
-            return Fq(self.Q, pow(int(self.value), (self.Q + 1) // 4, self.Q))
-        if self.Q % 8 == 5:
-            return Fq(self.Q, pow(int(self.value), (self.Q + 3) // 8, self.Q))
-
-        # p % 8 == 1. Tonelli Shanks algorithm for finding square root
-        S = 0
-        q = self.Q - 1
-
-        while q % 2 == 0:
-            q = q // 2
-            S += 1
-
-        z = 0
-        for i in range(self.Q):
-            euler = pow(i, (self.Q - 1) // 2, self.Q)
-            if euler == -1 % self.Q:
-                z = i
-                break
-
-        M = S
-        c = pow(z, q, self.Q)
-        t = pow(self.value, q, self.Q)
-        R = pow(self.value, (q + 1) // 2, self.Q)
-
-        while True:
-            if t == 0:
-                return Fq(self.Q, 0)
-            if t == 1:
-                return Fq(self.Q, R)
-            i = 0
-            f = t
-            while f != 1:
-                f = pow(f, 2, self.Q)
-                i += 1
-            b = pow(c, pow(2, M - i - 1, self.Q), self.Q)
-            M = i
-            c = pow(b, 2, self.Q)
-            t = (t * c) % self.Q
-            R = (R * b) % self.Q
-
-    def __deepcopy__(self, memo) -> Fq:
-        return Fq(self.Q, self.value)
-
-    @classmethod
-    def zero(cls, Q: int) -> Fq:
-        return Fq(Q, 0)
-
-    @classmethod
-    def one(cls, Q: int) -> Fq:
-        return Fq(Q, 1)
-
-    @classmethod
-    def from_fq(cls, Q: int, fq: Fq) -> Fq:
-        return fq
-
-
-class FieldExtBase(tuple):
-    """
-    Represents an extension of a field (or extension of an extension).
-    The elements of the tuple can be other FieldExtBase or they can be
-    Fq elements. For example, Fq2 = (Fq, Fq). Fq12 = (Fq6, Fq6), etc.
-    """
-
-    root = None
-    extension: int
-    embedding: int
-    basefield: Any
-    Q: int
-
-    def __new__(cls, Q, *args):
-        new_args = args[:]
-        try:
-            arg_extension = args[0].extension
-            args[1].extension
-        except AttributeError:
-            if len(args) != 2:
-                raise Exception("Invalid number of arguments")
-            arg_extension = 1
-            new_args = [Fq(Q, a) for a in args]
-        if arg_extension != 1:
-            if len(args) != cls.embedding:
-                raise Exception("Invalid number of arguments")
-            for arg in new_args:
-                assert arg.extension == arg_extension
-        assert all(isinstance(arg, cls.basefield) for arg in new_args)
-        ret = super().__new__(cls, new_args)
-        ret.Q = Q
-        return ret
-
-    def __neg__(self):
-        cls = type(self)
-        ret = super().__new__(cls, (-x for x in self))
-        ret.Q = self.Q
-        ret.root = self.root
-        return ret
-
-    def __add__(self, other):
-        cls = type(self)
-        if not isinstance(other, cls):
-            if type(other) != int and other.extension > self.extension:
-                return NotImplemented
-            other_new = [cls.basefield.zero(self.Q) for _ in self]
-            other_new[0] = other_new[0] + other
-        else:
-            other_new = other
-
-        ret = super().__new__(cls, (a + b for a, b in zip(self, other_new)))
-        ret.Q = self.Q
-        ret.root = self.root
-        return ret
-
-    def __radd__(self, other):
-        return self.__add__(other)
-
-    def __sub__(self, other):
-        return self + (-other)
-
-    def __rsub__(self, other):
-        return (-self) + other
-
-    def __mul__(self, other):
-        cls = type(self)
-        if isinstance(other, int):
-            ret = super().__new__(cls, (a * other for a in self))
-            ret.Q = self.Q
-            ret.root = self.root
-            return ret
-        if cls.extension < other.extension:
-            return NotImplemented
-
-        buf = [cls.basefield.zero(self.Q) for _ in self]
-
-        for i, x in enumerate(self):
-            if cls.extension == other.extension:
-                for j, y in enumerate(other):
-                    if x and y:
-                        if i + j >= self.embedding:
-                            buf[(i + j) % self.embedding] += x * y * self.root
-                        else:
-                            buf[(i + j) % self.embedding] += x * y
-            else:
-                if x:
-                    buf[i] = x * other
-        ret = super().__new__(cls, buf)
-        ret.Q = self.Q
-        ret.root = self.root
-        return ret
-
-    def __rmul__(self, other):
-        return self.__mul__(other)
-
-    def __floordiv__(self, other):
-        return self * ~other
-
-    def __eq__(self, other):
-        if not isinstance(other, type(self)):
-            if isinstance(other, FieldExtBase) or isinstance(other, int):
-                if (
-                    not isinstance(other, FieldExtBase)
-                    or self.extension > other.extension
-                ):
-                    for i in range(1, self.embedding):
-                        if self[i] != (type(self.root).zero(self.Q)):
-                            return False
-                    return self[0] == other
-                return NotImplemented
-            return NotImplemented
-        else:
-            return super().__eq__(other) and self.Q == other.Q
-
-    def __lt__(self, other):
-        # Reverse the order for comparison (3i + 1 > 2i + 7)
-        return self[::-1].__lt__(other[::-1])
-
-    def __gt__(self, other):
-        return super().__gt__(other)
-
-    def __neq__(self, other):
-        return not self.__eq__(other)
-
-    def __str__(self):
-        return (
-            "Fq"
-            + str(self.extension)
-            + "("
-            + ", ".join([a.__str__() for a in self])
-            + ")"
-        )
-
-    def __repr__(self):
-        return (
-            "Fq"
-            + str(self.extension)
-            + "("
-            + ", ".join([a.__repr__() for a in self])
-            + ")"
-        )
-
-    # Returns the concatenated coordinates in big endian bytes
-    def __bytes__(self):
-        sum_bytes = bytes([])
-        for x in reversed(self):
-            if type(x) != FieldExtBase and type(x) != Fq:
-                x = Fq.from_fq(self.Q, x)
-            sum_bytes += bytes(x)
-        return sum_bytes
-
-    @classmethod
-    def from_bytes(cls, buffer: bytes, Q: int):
-        assert len(buffer) == cls.extension * 48
-        embedded_size = 48 * (cls.extension // cls.embedding)
-        tup = []
-        for i in range(cls.embedding):
-            tup.append(buffer[i * embedded_size : (i + 1) * embedded_size])
-        return cls(Q, *[cls.basefield.from_bytes(b, Q) for b in reversed(tup)])
-
-    __truediv__ = __floordiv__
-
-    def __pow__(self, e):
-        assert isinstance(e, int) and e >= 0
-        ans = type(self).one(self.Q)
-        base = self
-        ans.root = self.root
-
-        while e:
-            if e & 1:
-                ans *= base
-
-            base *= base
-            e >>= 1
-
-        return ans
-
-    def __bool__(self):
-        return any(x for x in self)
-
-    def set_root(self, _root):
-        self.root = _root
-
-    @classmethod
-    def zero(cls, Q):
-        return cls.from_fq(Q, Fq(Q, 0))
-
-    @classmethod
-    def one(cls, Q):
-        return cls.from_fq(Q, Fq(Q, 1))
-
-    @classmethod
-    def from_fq(cls, Q, fq):
-        y = cls.basefield.from_fq(Q, fq)
-        z = cls.basefield.zero(Q)
-        ret = super().__new__(cls, (z if i else y for i in range(cls.embedding)))
-        ret.Q = Q
-        if cls == Fq2:
-            ret.set_root(Fq(Q, -1))
-        elif cls == Fq6:
-            ret.set_root(Fq2(Q, Fq.one(Q), Fq.one(Q)))
-        elif cls == Fq12:
-            r = Fq6(Q, Fq2.zero(Q), Fq2.one(Q), Fq2.zero(Q))
-            ret.set_root(r)
-        return ret
-
-    def __deepcopy__(self, memo):
-        cls = type(self)
-        ret = super().__new__(cls, (deepcopy(a, memo) for a in self))
-        ret.Q = self.Q
-        ret.root = self.root
-        return ret
-
-    def qi_power(self, i):
-        if self.Q != bls12381_q:
-            raise NotImplementedError
-        cls = type(self)
-        i %= cls.extension
-        if i == 0:
-            return self
-        ret = super().__new__(
-            cls,
-            (
-                a.qi_power(i) * frob_coeffs[cls.extension, i, j] if j else a.qi_power(i)
-                for j, a in enumerate(self)
-            ),
-        )
-        ret.Q = self.Q
-        ret.root = self.root
-        return ret
-
-
-class Fq2(FieldExtBase):
-    # Fq2 is constructed as Fq(u) / (u2 - β) where β = -1
-    extension = 2
-    embedding = 2
-    basefield = Fq
-
-    def __init__(self, Q, *args):
-        super().set_root(Fq(Q, -1))
-
-    def __invert__(self) -> Fq2:
-        a, b = self
-        factor = ~(a * a + b * b)
-        ret = Fq2(self.Q, a * factor, -b * factor)
-        return ret
-
-    def mul_by_nonresidue(self) -> Fq2:
-        # multiply by u + 1
-        a, b = self
-        return Fq2(self.Q, a - b, a + b)
-
-    def modsqrt(self) -> Fq2:
-        """
-        Using algorithm 8 (complex method) for square roots in
-        https://eprint.iacr.org/2012/685.pdf
-        This is necessary for computing y value given an x value.
-        """
-        a0, a1 = self
-        if a1 == Fq.zero(self.Q):
-            return a0.modsqrt()
-        alpha = pow(a0, 2) + pow(a1, 2)
-        gamma = pow(alpha, (self.Q - 1) // 2)
-        if gamma == Fq(self.Q, -1):
-            raise ValueError("No sqrt exists")
-        alpha = alpha.modsqrt()
-        delta = (a0 + alpha) * ~Fq(self.Q, 2)
-        gamma = pow(delta, (self.Q - 1) // 2)
-        if gamma == Fq(self.Q, -1):
-            delta = (a0 - alpha) * ~Fq(self.Q, 2)
-
-        x0 = delta.modsqrt()
-        x1 = a1 * ~(Fq(self.Q, 2) * x0)
-        return Fq2(self.Q, x0, x1)
-
-
-class Fq6(FieldExtBase):
-    # Fq6 is constructed as Fq2(v) / (v3 - ξ) where ξ = u + 1
-    extension = 6
-    embedding = 3
-    basefield = Fq2
-
-    def __init__(self, Q: int, *args):
-        super().set_root(Fq2(Q, Fq.one(Q), Fq.one(Q)))
-
-    def __invert__(self) -> Fq6:
-        a, b, c = self
-        g0 = a * a - b * c.mul_by_nonresidue()
-        g1 = (c * c).mul_by_nonresidue() - a * b
-        g2 = b * b - a * c
-        factor = ~(g0 * a + (g1 * c + g2 * b).mul_by_nonresidue())
-        # TODO: no inverse
-
-        return Fq6(self.Q, g0 * factor, g1 * factor, g2 * factor)
-
-    def mul_by_nonresidue(self) -> Fq6:
-        # multiply by v
-        a, b, c = self
-        return Fq6(self.Q, c * self.root, a, b)
-
-
-class Fq12(FieldExtBase):
-    # Fq12 is constructed as Fq6(w) / (w2 - γ) where γ = v
-    extension = 12
-    embedding = 2
-    basefield = Fq6
-
-    def __init__(self, Q, *args):
-        super().set_root(Fq6(Q, Fq2.zero(Q), Fq2.one(Q), Fq2.zero(Q)))
-
-    def __invert__(self) -> Fq12:
-        a, b = self
-        factor = ~(a * a - (b * b).mul_by_nonresidue())
-        return Fq12(self.Q, a * factor, -b * factor)
-
-
-# Because fields aren't done with metaclasses, and we need to
-# avoid circular imports, we put a hack here for bls12381 for now.
-bls12381_q = (
-    q
-) = 0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAAAB
-
-# roots of unity, used for computing square roots in Fq2
-rv1 = 0x6AF0E0437FF400B6831E36D6BD17FFE48395DABC2D3435E77F76E17009241C5EE67992F72EC05F4C81084FBEDE3CC09
-roots_of_unity = (Fq2(q, 1, 0), Fq2(q, 0, 1), Fq2(q, rv1, rv1), Fq2(q, rv1, q - rv1))
-del rv1
-
-# Frobenius coefficients for raising elements to q**i -th powers
-# These are specific to this given q
-frob_coeffs = {
-    (2, 1, 1): Fq(q, -1),
-    (6, 1, 1): Fq2(
-        q,
-        Fq(q, 0x0),
-        Fq(
-            q,
-            0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAC,
-        ),
-    ),  # noga: E501
-    (6, 1, 2): Fq2(
-        q,
-        Fq(
-            q,
-            0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAD,
-        ),
-        Fq(q, 0x0),
-    ),  # noga: E501
-    (6, 2, 1): Fq2(
-        q,
-        Fq(
-            q,
-            0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFE,
-        ),
-        Fq(q, 0x0),
-    ),  # noga: E501
-    (6, 2, 2): Fq2(
-        q,
-        Fq(
-            q,
-            0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAC,
-        ),
-        Fq(q, 0x0),
-    ),
-    (6, 3, 1): Fq2(q, Fq(q, 0x0), Fq(q, 0x1)),
-    (6, 3, 2): Fq2(
-        q,
-        Fq(
-            q,
-            0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAAAA,
-        ),
-        Fq(q, 0x0),
-    ),
-    (6, 4, 1): Fq2(
-        q,
-        Fq(
-            q,
-            0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAC,
-        ),
-        Fq(q, 0x0),
-    ),
-    (6, 4, 2): Fq2(
-        q,
-        Fq(
-            q,
-            0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFE,
-        ),
-        Fq(q, 0x0),
-    ),
-    (6, 5, 1): Fq2(
-        q,
-        Fq(q, 0x0),
-        Fq(
-            q,
-            0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFE,
-        ),
-    ),
-    (6, 5, 2): Fq2(
-        q,
-        Fq(
-            q,
-            0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFF,
-        ),
-        Fq(q, 0x0),
-    ),
-    (12, 1, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x1904D3BF02BB0667C231BEB4202C0D1F0FD603FD3CBD5F4F7B2443D784BAB9C4F67EA53D63E7813D8D0775ED92235FB8,
-            ),
-            Fq(
-                q,
-                0xFC3E2B36C4E03288E9E902231F9FB854A14787B6C7B36FEC0C8EC971F63C5F282D5AC14D6C7EC22CF78A126DDC4AF3,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 2, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFF,
-            ),
-            Fq(q, 0x0),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 3, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x135203E60180A68EE2E9C448D77A2CD91C3DEDD930B1CF60EF396489F61EB45E304466CF3E67FA0AF1EE7B04121BDEA2,
-            ),
-            Fq(
-                q,
-                0x6AF0E0437FF400B6831E36D6BD17FFE48395DABC2D3435E77F76E17009241C5EE67992F72EC05F4C81084FBEDE3CC09,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 4, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFE,
-            ),
-            Fq(q, 0x0),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 5, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x144E4211384586C16BD3AD4AFA99CC9170DF3560E77982D0DB45F3536814F0BD5871C1908BD478CD1EE605167FF82995,
-            ),
-            Fq(
-                q,
-                0x5B2CFD9013A5FD8DF47FA6B48B1E045F39816240C0B8FEE8BEADF4D8E9C0566C63A3E6E257F87329B18FAE980078116,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 6, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAAAA,
-            ),
-            Fq(q, 0x0),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 7, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0xFC3E2B36C4E03288E9E902231F9FB854A14787B6C7B36FEC0C8EC971F63C5F282D5AC14D6C7EC22CF78A126DDC4AF3,
-            ),
-            Fq(
-                q,
-                0x1904D3BF02BB0667C231BEB4202C0D1F0FD603FD3CBD5F4F7B2443D784BAB9C4F67EA53D63E7813D8D0775ED92235FB8,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 8, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAC,
-            ),
-            Fq(q, 0x0),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 9, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x6AF0E0437FF400B6831E36D6BD17FFE48395DABC2D3435E77F76E17009241C5EE67992F72EC05F4C81084FBEDE3CC09,
-            ),
-            Fq(
-                q,
-                0x135203E60180A68EE2E9C448D77A2CD91C3DEDD930B1CF60EF396489F61EB45E304466CF3E67FA0AF1EE7B04121BDEA2,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 10, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x1A0111EA397FE699EC02408663D4DE85AA0D857D89759AD4897D29650FB85F9B409427EB4F49FFFD8BFD00000000AAAD,
-            ),
-            Fq(q, 0x0),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-    (12, 11, 1): Fq6(
-        q,
-        Fq2(
-            q,
-            Fq(
-                q,
-                0x5B2CFD9013A5FD8DF47FA6B48B1E045F39816240C0B8FEE8BEADF4D8E9C0566C63A3E6E257F87329B18FAE980078116,
-            ),
-            Fq(
-                q,
-                0x144E4211384586C16BD3AD4AFA99CC9170DF3560E77982D0DB45F3536814F0BD5871C1908BD478CD1EE605167FF82995,
-            ),
-        ),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-        Fq2(q, Fq(q, 0x0), Fq(q, 0x0)),
-    ),
-}
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/hash_to_field.py b/src/dashbls/python-impl/hash_to_field.py
deleted file mode 100644
index eb417219ea9c..000000000000
--- a/src/dashbls/python-impl/hash_to_field.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/python
-#
-# pure Python implementation of hash-to-field as specified in
-#     https://github.com/pairingwg/bls_standard/blob/master/minutes/spec-v1.md
-
-import hashlib
-
-from bls12381 import q
-
-
-# defined in RFC 3447, section 4.1
-def I2OSP(val, length):
-    if val < 0 or val >= (1 << (8 * length)):
-        raise ValueError("bad I2OSP call: val=%d length=%d" % (val, length))
-    ret = [0] * length
-    val_ = val
-    for idx in reversed(range(0, length)):
-        ret[idx] = val_ & 0xFF
-        val_ = val_ >> 8
-    ret = bytes(ret)
-    assert ret == int(val).to_bytes(length, "big"), "oops: %s %s" % (
-        str(ret),
-        str(int(val).to_bytes(length, "big")),
-    )
-    return ret
-
-
-# defined in RFC 3447, section 4.2
-def OS2IP(octets):
-    ret = 0
-    for o in octets:
-        ret = ret << 8
-        ret += o
-    assert ret == int.from_bytes(octets, "big")
-    return ret
-
-
-# expand_message_xmd from draft-irtf-cfrg-hash-to-curve-06
-def _strxor(str1, str2):
-    return bytes(s1 ^ s2 for (s1, s2) in zip(str1, str2))
-
-
-def expand_message_xmd(msg, DST, len_in_bytes, hash_fn):
-    # input and output lengths for hash_fn
-    b_in_bytes = hash_fn().digest_size
-    r_in_bytes = hash_fn().block_size
-
-    # ell, DST_prime, etc
-    ell = (len_in_bytes + b_in_bytes - 1) // b_in_bytes
-    if ell > 255:
-        raise ValueError("expand_message_xmd: ell=%d out of range" % ell)
-    DST_prime = DST + I2OSP(len(DST), 1)
-    Z_pad = I2OSP(0, r_in_bytes)
-    l_i_b_str = I2OSP(len_in_bytes, 2)
-
-    b_0 = hash_fn(Z_pad + msg + l_i_b_str + I2OSP(0, 1) + DST_prime).digest()
-    b_vals = [None] * ell
-    b_vals[0] = hash_fn(b_0 + I2OSP(1, 1) + DST_prime).digest()
-    for idx in range(1, ell):
-        b_vals[idx] = hash_fn(
-            _strxor(b_0, b_vals[idx - 1]) + I2OSP(idx + 1, 1) + DST_prime
-        ).digest()
-    pseudo_random_bytes = b"".join(b_vals)
-    return pseudo_random_bytes[0:len_in_bytes]
-
-
-def expand_message_xof(msg, DST, len_in_bytes, hash_fn):
-    DST_prime = DST + I2OSP(len(DST), 1)
-    msg_prime = msg + I2OSP(len_in_bytes, 2) + DST_prime
-    return hash_fn(msg_prime).digest(len_in_bytes)
-
-
-# hash_to_field from draft-irtf-cfrg-hash-to-curve-06
-def hash_to_field(msg, count, DST, modulus, degree, blen, expand_fn, hash_fn):
-    # get pseudorandom bytes
-    len_in_bytes = count * degree * blen
-    pseudo_random_bytes = expand_fn(msg, DST, len_in_bytes, hash_fn)
-
-    u_vals = [None] * count
-    for idx in range(0, count):
-        e_vals = [None] * degree
-        for jdx in range(0, degree):
-            elm_offset = blen * (jdx + idx * degree)
-            tv = pseudo_random_bytes[elm_offset : elm_offset + blen]
-            e_vals[jdx] = OS2IP(tv) % modulus
-        u_vals[idx] = e_vals
-    return u_vals
-
-
-def Hp(msg, count, dst):
-    if not isinstance(msg, bytes):
-        raise ValueError("Hp can't hash anything but bytes")
-    return hash_to_field(msg, count, dst, q, 1, 64, expand_message_xmd, hashlib.sha256)
-
-
-def Hp2(msg, count, dst):
-    if not isinstance(msg, bytes):
-        raise ValueError("Hp2 can't hash anything but bytes")
-    return hash_to_field(msg, count, dst, q, 2, 64, expand_message_xmd, hashlib.sha256)
diff --git a/src/dashbls/python-impl/hd_keys.py b/src/dashbls/python-impl/hd_keys.py
deleted file mode 100644
index 1acdb311e00a..000000000000
--- a/src/dashbls/python-impl/hd_keys.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from ec import G1Generator, G2Generator, JacobianPoint, default_ec
-from hkdf import extract_expand
-from private_key import PrivateKey
-from util import hash256
-
-
-def key_gen(seed: bytes) -> PrivateKey:
-    # KeyGen
-    # 1. PRK = HKDF-Extract("BLS-SIG-KEYGEN-SALT-", IKM || I2OSP(0, 1))
-    # 2. OKM = HKDF-Expand(PRK, keyInfo || I2OSP(L, 2), L)
-    # 3. SK = OS2IP(OKM) mod r
-    # 4. return SK
-
-    L = 48
-    # `ceil((3 * ceil(log2(r))) / 16)`, where `r` is the order of the BLS 12-381 curve
-    okm = extract_expand(L, seed + bytes([0]), b"BLS-SIG-KEYGEN-SALT-", bytes([0, L]))
-    return PrivateKey(int.from_bytes(okm, "big") % default_ec.n)
-
-
-def ikm_to_lamport_sk(ikm: bytes, salt: bytes) -> bytes:
-    return extract_expand(32 * 255, ikm, salt, b"")
-
-
-def parent_sk_to_lamport_pk(parent_sk: PrivateKey, index: int) -> bytes:
-    salt = index.to_bytes(4, "big")
-    ikm = bytes(parent_sk)
-    not_ikm = bytes([e ^ 0xFF for e in ikm])  # Flip bits
-    lamport0 = ikm_to_lamport_sk(ikm, salt)
-    lamport1 = ikm_to_lamport_sk(not_ikm, salt)
-
-    lamport_pk = bytes()
-    for i in range(255):
-        lamport_pk += hash256(lamport0[i * 32 : (i + 1) * 32])
-    for i in range(255):
-        lamport_pk += hash256(lamport1[i * 32 : (i + 1) * 32])
-
-    return hash256(lamport_pk)
-
-
-def derive_child_sk(parent_sk: PrivateKey, index: int) -> PrivateKey:
-    """
-    Derives a hardened EIP-2333 child private key, from a parent private key,
-    at the specified index.
-    """
-    lamport_pk = parent_sk_to_lamport_pk(parent_sk, index)
-    return key_gen(lamport_pk)
-
-
-def derive_child_sk_unhardened(parent_sk: PrivateKey, index: int) -> PrivateKey:
-    """
-    Derives an unhardened BIP-32 child private key, from a parent private key,
-    at the specified index. WARNING: this key is not as secure as a hardened key.
-    """
-    h = hash256(bytes(parent_sk.get_g1()) + index.to_bytes(4, "big"))
-    return PrivateKey.aggregate([PrivateKey.from_bytes(h), parent_sk])
-
-
-def derive_child_g1_unhardened(parent_pk: JacobianPoint, index: int) -> JacobianPoint:
-    """
-    Derives an unhardened BIP-32 child public key, from a parent public key,
-    at the specified index. WARNING: this key is not as secure as a hardened key.
-    """
-    h = hash256(bytes(parent_pk) + index.to_bytes(4, "big"))
-    return parent_pk + PrivateKey.from_bytes(h).value * G1Generator()
-
-
-def derive_child_g2_unhardened(parent_pk: JacobianPoint, index: int) -> JacobianPoint:
-    """
-    Derives an unhardened BIP-32 child public key, from a parent public key,
-    at the specified index. WARNING: this key is not as secure as a hardened key.
-    """
-    h = hash256(bytes(parent_pk) + index.to_bytes(4, "big"))
-    return parent_pk + PrivateKey.from_bytes(h) * G2Generator()
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/hkdf.py b/src/dashbls/python-impl/hkdf.py
deleted file mode 100644
index 02c21bb4f74e..000000000000
--- a/src/dashbls/python-impl/hkdf.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import hashlib
-import hmac
-from math import ceil
-
-BLOCK_SIZE = 32
-
-
-def extract(salt: bytes, ikm: bytes) -> bytes:
-    h = hmac.new(salt, ikm, hashlib.sha256)
-    return h.digest()
-
-
-def expand(L: int, prk: bytes, info: bytes) -> bytes:
-    N: int = ceil(L / BLOCK_SIZE)
-    bytes_written: int = 0
-    okm: bytes = b""
-
-    for i in range(1, N + 1):
-        if i == 1:
-            h = hmac.new(prk, info + bytes([1]), hashlib.sha256)
-            T: bytes = h.digest()
-        else:
-            h = hmac.new(prk, T + info + bytes([i]), hashlib.sha256)
-            T = h.digest()
-        to_write = L - bytes_written
-        if to_write > BLOCK_SIZE:
-            to_write = BLOCK_SIZE
-        okm += T[:to_write]
-        bytes_written += to_write
-    assert bytes_written == L
-    return okm
-
-
-def extract_expand(L: int, key: bytes, salt: bytes, info: bytes) -> bytes:
-    prk = extract(salt, key)
-    return expand(L, prk, info)
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/impl-test.py b/src/dashbls/python-impl/impl-test.py
deleted file mode 100644
index 0b5141075672..000000000000
--- a/src/dashbls/python-impl/impl-test.py
+++ /dev/null
@@ -1,663 +0,0 @@
-import hashlib
-from copy import deepcopy
-from secrets import token_bytes
-
-from ec import (G1FromBytes, G1Generator, G1Infinity, G2FromBytes, G2Generator,
-                G2Infinity, JacobianPoint, default_ec, default_ec_twist,
-                sign_Fq2, twist, untwist, y_for_x)
-from fields import Fq, Fq2, Fq6, Fq12
-from hash_to_field import expand_message_xmd
-from hkdf import expand, extract
-from op_swu_g2 import g2_map
-from pairing import ate_pairing
-from private_key import PrivateKey
-from schemes import AugSchemeMPL, BasicSchemeMPL, PopSchemeMPL
-
-G1Element = JacobianPoint
-G2Element = JacobianPoint
-
-
-def test_hkdf():
-    def test_one_case(
-        ikm_hex, salt_hex, info_hex, prk_expected_hex, okm_expected_hex, L
-    ):
-        prk = extract(bytes.fromhex(salt_hex), bytes.fromhex(ikm_hex))
-        okm = expand(L, prk, bytes.fromhex(info_hex))
-        assert len(bytes.fromhex(prk_expected_hex)) == 32
-        assert L == len(bytes.fromhex(okm_expected_hex))
-        assert prk == bytes.fromhex(prk_expected_hex)
-        assert okm == bytes.fromhex(okm_expected_hex)
-
-    test_case_1 = (
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "000102030405060708090a0b0c",
-        "f0f1f2f3f4f5f6f7f8f9",
-        "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5",
-        "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865",
-        42,
-    )
-    test_case_2 = (
-        "000102030405060708090a0b0c0d0e0f"
-        "101112131415161718191a1b1c1d1e1f"
-        "202122232425262728292a2b2c2d2e2f"
-        "303132333435363738393a3b3c3d3e3f"
-        "404142434445464748494a4b4c4d4e4f",
-        "606162636465666768696a6b6c6d6e6f"
-        "707172737475767778797a7b7c7d7e7f"
-        "808182838485868788898a8b8c8d8e8f"
-        "909192939495969798999a9b9c9d9e9f"
-        "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
-        "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-        "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-        "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-        "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-        "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
-        "06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244",
-        "b11e398dc80327a1c8e7f78c596a4934"
-        "4f012eda2d4efad8a050cc4c19afa97c"
-        "59045a99cac7827271cb41c65e590e09"
-        "da3275600c2f09b8367793a9aca3db71"
-        "cc30c58179ec3e87c14c01d5c1f3434f"
-        "1d87",
-        82,
-    )
-    test_case_3 = (
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "",
-        "",
-        "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04",
-        "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8",
-        42,
-    )
-    test_case_4 = (
-        "8704f9ac024139fe62511375cf9bc534c0507dcf00c41603ac935cd5943ce0b4b88599390de14e743ca2f56a73a04eae13aa3f3b969b39d8701e0d69a6f8d42f",
-        "53d8e19b",
-        "",
-        "eb01c9cd916653df76ffa61b6ab8a74e254ebfd9bfc43e624cc12a72b0373dee",
-        "8faabea85fc0c64e7ca86217cdc6dcdc88551c3244d56719e630a3521063082c46455c2fd5483811f9520a748f0099c1dfcfa52c54e1c22b5cdf70efb0f3c676",
-        64,
-    )
-
-    test_one_case(*test_case_1)
-    test_one_case(*test_case_2)
-    test_one_case(*test_case_3)
-    test_one_case(*test_case_4)
-
-
-def test_eip2333():
-    def test_one_case(seed_hex, master_sk_hex, child_sk_hex, child_index):
-        master = BasicSchemeMPL.key_gen(bytes.fromhex(seed_hex))
-        child = BasicSchemeMPL.derive_child_sk(master, child_index)
-
-        assert len(bytes(master)) == 32
-        assert len(bytes(child)) == 32
-        assert bytes(master) == bytes.fromhex(master_sk_hex)
-        assert bytes(child) == bytes.fromhex(child_sk_hex)
-
-    test_case_1 = (
-        "3141592653589793238462643383279502884197169399375105820974944592",
-        "4ff5e145590ed7b71e577bb04032396d1619ff41cb4e350053ed2dce8d1efd1c",
-        "5c62dcf9654481292aafa3348f1d1b0017bbfb44d6881d26d2b17836b38f204d",
-        3141592653,
-    )
-    test_case_2 = (
-        "0099FF991111002299DD7744EE3355BBDD8844115566CC55663355668888CC00",
-        "1ebd704b86732c3f05f30563dee6189838e73998ebc9c209ccff422adee10c4b",
-        "1b98db8b24296038eae3f64c25d693a269ef1e4d7ae0f691c572a46cf3c0913c",
-        4294967295,
-    )
-    test_case_3 = (
-        "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
-        "614d21b10c0e4996ac0608e0e7452d5720d95d20fe03c59a3321000a42432e1a",
-        "08de7136e4afc56ae3ec03b20517d9c1232705a747f588fd17832f36ae337526",
-        42,
-    )
-    test_case_intermediate = (
-        "c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04",
-        "0befcabff4a664461cc8f190cdd51c05621eb2837c71a1362df5b465a674ecfb",
-        "1a1de3346883401f1e3b2281be5774080edb8e5ebe6f776b0f7af9fea942553a",
-        0,
-    )
-    test_one_case(*test_case_1)
-    test_one_case(*test_case_2)
-    test_one_case(*test_case_3)
-    test_one_case(*test_case_intermediate)
-
-
-def test_fields():
-    a = Fq(17, 30)
-    b = Fq(17, -18)
-    c = Fq2(17, a, b)
-    d = Fq2(17, a + a, Fq(17, -5))
-    e = c * d
-    f = e * d
-    assert f != e
-    e_sq = e * e
-    e_sqrt = e_sq.modsqrt()
-    assert pow(e_sqrt, 2) == e_sq
-
-    a2 = Fq(
-        172487123095712930573140951348,
-        3012492130751239573498573249085723940848571098237509182375,
-    )
-    b2 = Fq(172487123095712930573140951348, 3432984572394572309458723045723849)
-    c2 = Fq2(172487123095712930573140951348, a2, b2)
-    assert b2 != c2
-
-    g = Fq6(17, c, d, d * d * c)
-    h = Fq6(17, a + a * c, c * b * a, b * b * d * Fq(17, 21))
-    i = Fq12(17, g, h)
-    assert ~(~i) == i
-    assert (~(i.root)) * i.root == Fq6.one(17)
-    x = Fq12(17, Fq6.zero(17), i.root)
-    assert (~x) * x == Fq12.one(17)
-
-    j = Fq6(17, a + a * c, Fq2.zero(17), Fq2.zero(17))
-    j2 = Fq6(17, a + a * c, Fq2.zero(17), Fq2.one(17))
-    assert j == (a + a * c)
-    assert j2 != (a + a * c)
-    assert j != j2
-
-    # Test frob_coeffs
-    one = Fq(default_ec.q, 1)
-    two = one + one
-    a = Fq2(default_ec.q, two, two)
-    b = Fq6(default_ec.q, a, a, a)
-    c = Fq12(default_ec.q, b, b)
-    for base in (a, b, c):
-        for expo in range(1, base.extension):
-            assert base.qi_power(expo) == pow(base, pow(default_ec.q, expo))
-
-
-def test_ec():
-    q = default_ec.q
-    g = G1Generator()
-
-    assert g.is_on_curve()
-    assert 2 * g == g + g
-    assert (3 * g).is_on_curve()
-    assert 3 * g == g + g + g
-
-    g2 = G2Generator()
-    assert g2.x * (Fq(q, 2) * g2.y) == Fq(q, 2) * (g2.x * g2.y)
-    assert g2.is_on_curve()
-    s = g2 + g2
-    assert untwist(twist(s.to_affine())) == s.to_affine()
-    assert untwist(5 * twist(s.to_affine())) == (5 * s).to_affine()
-    assert 5 * twist(s.to_affine()) == twist((5 * s).to_affine())
-    assert s.is_on_curve()
-    assert g2.is_on_curve()
-    assert g2 + g2 == 2 * g2
-    assert g2 * 5 == (g2 * 2) + (2 * g2) + g2
-    y = y_for_x(g2.x, default_ec_twist, Fq2)
-    assert y == g2.y or -y == g2.y
-
-    g_j = G1Generator()
-    g2_j = G2Generator()
-    g2_j2 = G2Generator() * 2
-    assert g.to_affine().to_jacobian() == g
-    assert (g_j * 2).to_affine() == g.to_affine() * 2
-    assert (g2_j + g2_j2).to_affine() == g2.to_affine() * 3
-
-
-def test_edge_case_sign_Fq2():
-    q = default_ec.q
-    a = Fq(q, 62323)
-    test_case_1 = Fq2(q, a, Fq(q, 0))
-    test_case_2 = Fq2(q, -a, Fq(q, 0))
-    assert sign_Fq2(test_case_1) != sign_Fq2(test_case_2)
-
-    test_case_3 = Fq2(q, Fq(q, 0), a)
-    test_case_4 = Fq2(q, Fq(q, 0), -a)
-
-    assert sign_Fq2(test_case_3) != sign_Fq2(test_case_4)
-
-
-def test_xmd():
-    msg = token_bytes(48)
-    dst = token_bytes(16)
-    ress = {}
-    for length in range(16, 8192):
-        result = expand_message_xmd(msg, dst, length, hashlib.sha512)
-        assert length == len(result)
-        key = result[:16]
-        ress[key] = ress.get(key, 0) + 1
-    assert all(x == 1 for x in ress.values())
-
-
-def test_swu():
-    dst_1 = b"QUUX-V01-CS02-with-BLS12381G2_XMD:SHA-256_SSWU_RO_"
-    msg_1 = b"abcdef0123456789"
-    res = g2_map(msg_1, dst_1).to_affine()
-    assert (
-        res.x[0].value
-        == 0x121982811D2491FDE9BA7ED31EF9CA474F0E1501297F68C298E9F4C0028ADD35AEA8BB83D53C08CFC007C1E005723CD0
-    )
-    assert (
-        res.x[1].value
-        == 0x190D119345B94FBD15497BCBA94ECF7DB2CBFD1E1FE7DA034D26CBBA169FB3968288B3FAFB265F9EBD380512A71C3F2C
-    )
-    assert (
-        res.y[0].value
-        == 0x05571A0F8D3C08D094576981F4A3B8EDA0A8E771FCDCC8ECCEAF1356A6ACF17574518ACB506E435B639353C2E14827C8
-    )
-    assert (
-        res.y[1].value
-        == 0x0BB5E7572275C567462D91807DE765611490205A941A5A6AF3B1691BFE596C31225D3AABDF15FAFF860CB4EF17C7C3BE
-    )
-
-
-def test_elements():
-    i1 = int.from_bytes(bytes([1, 2]), byteorder="big")
-    i2 = int.from_bytes(bytes([3, 1, 4, 1, 5, 9]), byteorder="big")
-    b1 = i1
-    b2 = i2
-    g1 = G1Generator()
-    g2 = G2Generator()
-    u1 = G1Infinity()
-    u2 = G2Infinity()
-
-    x1 = g1 * b1
-    x2 = g1 * b2
-    y1 = g2 * b1
-    y2 = g2 * b2
-
-    # G1
-    assert x1 != x2
-    assert x1 * b1 == b1 * x1
-    assert x1 * b1 != x1 * b2
-
-    left = x1 + u1
-    right = x1
-
-    assert left == right
-    assert x1 + x2 == x2 + x1
-    assert x1 + x1.negate() == u1
-    assert x1 == G1FromBytes(bytes(x1))
-    copy = deepcopy(x1)
-    assert x1 == copy
-    x1 += x2
-    assert x1 != copy
-
-    # G2
-    assert y1 != y2
-    assert y1 * b1 == b1 * y1
-    assert y1 * b1 != y1 * b2
-    assert y1 + u2 == y1
-    assert y1 + y2 == y2 + y1
-    assert y1 + y1.negate() == u2
-    assert y1 == G2FromBytes(bytes(y1))
-    copy = deepcopy(y1)
-    assert y1 == copy
-    y1 += y2
-    assert y1 != copy
-
-    # pairing operation
-    pair = ate_pairing(x1, y1)
-    assert pair != ate_pairing(x1, y2)
-    assert pair != ate_pairing(x2, y1)
-    copy = deepcopy(pair)
-    assert pair == copy
-    pair = None
-    assert pair != copy
-
-    sk = 728934712938472938472398074
-    pk = sk * g1
-    Hm = y2 * 12371928312 + y2 * 12903812903891023
-
-    sig = Hm * sk
-
-    assert ate_pairing(g1, sig) == ate_pairing(pk, Hm)
-
-
-def test_chia_vectors_1():
-    seed1: bytes = bytes([0x00] * 32)
-    seed2: bytes = bytes([0x01] * 32)
-    msg1: bytes = bytes([7, 8, 9])
-    msg2: bytes = bytes([10, 11, 12])
-    sk1 = BasicSchemeMPL.key_gen(seed1)
-    sk2 = BasicSchemeMPL.key_gen(seed2)
-    assert (
-        bytes(sk1).hex()
-        == "4a353be3dac091a0a7e640620372f5e1e2e4401717c1e79cac6ffba8f6905604"
-    )
-    assert (
-        bytes(sk1.get_g1()).hex()
-        == "85695fcbc06cc4c4c9451f4dce21cbf8de3e5a13bf48f44cdbb18e2038ba7b8bb1632d7911ef1e2e08749bddbf165352"
-    )
-
-    sig1 = BasicSchemeMPL.sign(sk1, msg1)
-    sig2 = BasicSchemeMPL.sign(sk2, msg2)
-
-    assert (
-        bytes(sig1).hex()
-        == "b8faa6d6a3881c9fdbad803b170d70ca5cbf1e6ba5a586262df368c75acd1d1ffa3ab6ee21c71f844494659878f5eb230c958dd576b08b8564aad2ee0992e85a1e565f299cd53a285de729937f70dc176a1f01432129bb2b94d3d5031f8065a1"
-    )
-    assert bytes(sig2).hex() == (
-        "a9c4d3e689b82c7ec7e838dac2380cb014f9a08f6cd6ba044c263746e39a8f7a60ffee4afb7"
-        "8f146c2e421360784d58f0029491e3bd8ab84f0011d258471ba4e87059de295d9aba845c044e"
-        "e83f6cf2411efd379ef38bf4cf41d5f3c0ae1205d"
-    )
-
-    agg_sig_1 = BasicSchemeMPL.aggregate([sig1, sig2])
-
-    assert bytes(agg_sig_1).hex() == (
-        "aee003c8cdaf3531b6b0ca354031b0819f7586b5846796615aee8108fec75ef838d181f9d24"
-        "4a94d195d7b0231d4afcf06f27f0cc4d3c72162545c240de7d5034a7ef3a2a03c0159de982fb"
-        "c2e7790aeb455e27beae91d64e077c70b5506dea3"
-    )
-
-    assert BasicSchemeMPL.aggregate_verify(
-        [sk1.get_g1(), sk2.get_g1()], [msg1, msg2], agg_sig_1
-    )
-
-    msg3: bytes = bytes([1, 2, 3])
-    msg4: bytes = bytes([1, 2, 3, 4])
-    msg5: bytes = bytes([1, 2])
-
-    sig3 = BasicSchemeMPL.sign(sk1, msg3)
-    sig4 = BasicSchemeMPL.sign(sk1, msg4)
-    sig5 = BasicSchemeMPL.sign(sk2, msg5)
-
-    agg_sig_2 = BasicSchemeMPL.aggregate([sig3, sig4, sig5])
-    assert BasicSchemeMPL.aggregate_verify(
-        [sk1.get_g1(), sk1.get_g1(), sk2.get_g1()], [msg3, msg4, msg5], agg_sig_2
-    )
-
-    assert bytes(agg_sig_2).hex() == (
-        "a0b1378d518bea4d1100adbc7bdbc4ff64f2c219ed6395cd36fe5d2aa44a4b8e710b607afd9"
-        "65e505a5ac3283291b75413d09478ab4b5cfbafbeea366de2d0c0bcf61deddaa521f6020460f"
-        "d547ab37659ae207968b545727beba0a3c5572b9c"
-    )
-
-
-def test_chia_vectors_2():
-    msg1 = bytes([1, 2, 3, 40])
-    msg2 = bytes([5, 6, 70, 201])
-    msg3 = bytes([9, 10, 11, 12, 13])
-    msg4 = bytes([15, 63, 244, 92, 0, 1])
-
-    seed1 = bytes([0x02] * 32)
-    seed2 = bytes([0x03] * 32)
-
-    sk1 = AugSchemeMPL.key_gen(seed1)
-    sk2 = AugSchemeMPL.key_gen(seed2)
-
-    pk1 = sk1.get_g1()
-    pk2 = sk2.get_g1()
-
-    sig1 = AugSchemeMPL.sign(sk1, msg1)
-    sig2 = AugSchemeMPL.sign(sk2, msg2)
-    sig3 = AugSchemeMPL.sign(sk2, msg1)
-    sig4 = AugSchemeMPL.sign(sk1, msg3)
-    sig5 = AugSchemeMPL.sign(sk1, msg1)
-    sig6 = AugSchemeMPL.sign(sk1, msg4)
-
-    agg_sig_l = AugSchemeMPL.aggregate([sig1, sig2])
-    agg_sig_r = AugSchemeMPL.aggregate([sig3, sig4, sig5])
-    agg_sig = AugSchemeMPL.aggregate([agg_sig_l, agg_sig_r, sig6])
-
-    assert AugSchemeMPL.aggregate_verify(
-        [pk1, pk2, pk2, pk1, pk1, pk1], [msg1, msg2, msg1, msg3, msg1, msg4], agg_sig
-    )
-
-    assert bytes(agg_sig).hex() == (
-        "a1d5360dcb418d33b29b90b912b4accde535cf0e52caf467a005dc632d9f7af44b6c4e9acd4"
-        "6eac218b28cdb07a3e3bc087df1cd1e3213aa4e11322a3ff3847bbba0b2fd19ddc25ca964871"
-        "997b9bceeab37a4c2565876da19382ea32a962200"
-    )
-
-
-def test_chia_vectors_3():
-    seed1: bytes = bytes([0x04] * 32)
-    sk1 = PopSchemeMPL.key_gen(seed1)
-    proof = PopSchemeMPL.pop_prove(sk1)
-    assert (
-        bytes(proof).hex()
-        == "84f709159435f0dc73b3e8bf6c78d85282d19231555a8ee3b6e2573aaf66872d9203fefa1ef"
-        "700e34e7c3f3fb28210100558c6871c53f1ef6055b9f06b0d1abe22ad584ad3b957f3018a8f5"
-        "8227c6c716b1e15791459850f2289168fa0cf9115"
-    )
-
-
-def test_pyecc_vectors():
-    ref_sig1Basic = b"\x96\xba4\xfa\xc3<\x7f\x12\x9d`*\x0b\xc8\xa3\xd4?\x9a\xbc\x01N\xce\xaa\xb75\x91F\xb4\xb1P\xe5{\x80\x86Es\x8f5g\x1e\x9e\x10\xe0\xd8b\xa3\x0c\xabp\x07N\xb5\x83\x1d\x13\xe6\xa5\xb1b\xd0\x1e\xeb\xe6\x87\xd0\x16J\xdb\xd0\xa8d7\n|\"*'h\xd7pM\xa2T\xf1\xbf\x18#f[\xc26\x1f\x9d\xd8\xc0\x0e\x99"
-    ref_sig2Basic = b'\xa4\x02y\t2\x13\x0fvj\xf1\x1b\xa7\x16Sf\x83\xd8\xc4\xcf\xa5\x19G\xe4\xf9\x08\x1f\xed\xd6\x92\xd6\xdc\x0c\xac[\x90K\xee^\xa6\xe2Ui\xe3m{\xe4\xcaY\x06\x9a\x96\xe3K\x7fp\x07X\xb7\x16\xf9IJ\xaaY\xa9nt\xd1J;U*\x9ak\xc1)\xe7\x17\x19[\x9d`\x06\xfdm\\\xefGh\xc0"\xe0\xf71j\xbf'
-    ref_sigABasic = b"\x98|\xfd;\xcdb(\x02\x87\x02t\x83\xf2\x9cU$^\xd81\xf5\x1d\xd6\xbd\x99\x9ao\xf1\xa1\xf1\xf1\xf0\xb6Gw\x8b\x01g5\x9cqPUX\xa7n\x15\x8ef\x18\x1e\xe5\x12Y\x05\xa6B$k\x01\xe7\xfa^\xe5=h\xa4\xfe\x9b\xfb)\xa8\xe2f\x01\xf0\xb9\xadW}\xdd\x18\x87js1|!n\xa6\x1fC\x04\x14\xecQ\xc5"
-    ref_sig1Aug = b'\x81\x80\xf0,\xcbr\xe9"\xb1R\xfc\xed\xbe\x0e\x1d\x19R\x105Opp6X\xe8\xe0\x8c\xbe\xbf\x11\xd4\x97\x0e\xabj\xc3\xcc\xf7\x15\xf3\xfb\x87m\xf9\xa9yz\xbd\x0c\x1a\xf6\x1a\xae\xad\xc9,,\xfe\\\nV\xc1F\xcc\x8c?qQ\xa0s\xcf_\x16\xdf8$g$\xc4\xae\xd7?\xf3\x0e\xf5\xda\xa6\xaa\xca\xed\x1a&\xec\xaa3k'
-    ref_sig2Aug = b'\x99\x11\x1e\xea\xfbA-\xa6\x1eL7\xd3\xe8\x06\xc6\xfdj\xc9\xf3\x87\x0eT\xda\x92"\xbaNIH"\xc5\xb7eg1\xfazdY4\xd0KU\x9e\x92a\xb8b\x01\xbb\xeeW\x05RP\xa4Y\xa2\xda\x10\xe5\x1f\x9c\x1aiA)\x7f\xfc]\x97\nUr6\xd0\xbd\xeb|\xf8\xff\x18\x80\x0b\x08c8q\xa0\xf0\xa7\xeaB\xf4t\x80'
-    ref_sigAAug = b"\x8c]\x03\xf9\xda\xe7~\x19\xa5\x94Z\x06\xa2\x14\x83n\xdb\x8e\x03\xb8QR]\x84\xb9\xded@\xe6\x8f\xc0\xcas\x03\xee\xed9\r\x86<\x9bU\xa8\xcfmY\x14\n\x01\xb5\x88G\x88\x1e\xb5\xafgsMD\xb2UVF\xc6al9\xab\x88\xd2S)\x9a\xcc\x1e\xb1\xb1\x9d\xdb\x9b\xfc\xbev\xe2\x8a\xdd\xf6q\xd1\x16\xc0R\xbb\x18G"
-    ref_sig1Pop = b"\x95P\xfbN\x7f~\x8c\xc4\xa9\x0b\xe8V\n\xb5\xa7\x98\xb0\xb20\x00\xb6\xa5J!\x17R\x02\x10\xf9\x86\xf3\xf2\x81\xb3v\xf2Y\xc0\xb7\x80b\xd1\xeb1\x92\xb3\xd9\xbb\x04\x9fY\xec\xc1\xb0:pI\xebf^\r\xf3d\x94\xaeL\xb5\xf1\x13l\xca\xee\xfc\x99X\xcb0\xc33==C\xf0qH\xc3\x86)\x9a{\x1b\xfc\r\xc5\xcf|"
-    ref_sig2Pop = b"\xa6\x906\xbc\x11\xae^\xfc\xbfa\x80\xaf\xe3\x9a\xdd\xde~'s\x1e\xc4\x02W\xbf\xdc<7\xf1{\x8d\xf6\x83\x06\xa3N\xbd\x10\xe9\xe3*5%7P\xdf\\\x87\xc2\x14/\x82\x07\xe8\xd5eG\x12\xb4\xe5T\xf5\x85\xfbhF\xff8\x04\xe4)\xa9\xf8\xa1\xb4\xc5ku\xd0\x86\x9e\xd6u\x80\xd7\x89\x87\x0b\xab\xe2\xc7\xc8\xa9\xd5\x1e{*"
-    ref_sigAPop = b"\xa4\xeat+\xcd\xc1U>\x9c\xa4\xe5`\xbe~^ln\xfajd\xdd\xdf\x9c\xa3\xbb(T#=\x85\xa6\xaa\xc1\xb7n\xc7\xd1\x03\xdbN3\x14\x8b\x82\xaf\x99#\xdb\x05\x93Jn\xce\x9aq\x01\xcd\x8a\x9dG\xce'\x97\x80V\xb0\xf5\x90\x00!\x81\x8cEi\x8a\xfd\xd6\xcf\x8ako\x7f\xee\x1f\x0bCqoU\xe4\x13\xd4\xb8z`9"
-
-    secret1 = bytes([1] * 32)
-    secret2 = bytes([x * 314159 % 256 for x in range(32)])
-    sk1 = PrivateKey.from_bytes(secret1)
-    sk2 = PrivateKey.from_bytes(secret2)
-
-    msg = bytes([3, 1, 4, 1, 5, 9])
-    sig1Basic = BasicSchemeMPL.sign(sk1, msg)
-    sig2Basic = BasicSchemeMPL.sign(sk2, msg)
-    sigABasic = BasicSchemeMPL.aggregate([sig1Basic, sig2Basic])
-    sig1Aug = AugSchemeMPL.sign(sk1, msg)
-    sig2Aug = AugSchemeMPL.sign(sk2, msg)
-    sigAAug = AugSchemeMPL.aggregate([sig1Aug, sig2Aug])
-    sig1Pop = PopSchemeMPL.sign(sk1, msg)
-    sig2Pop = PopSchemeMPL.sign(sk2, msg)
-    sigAPop = PopSchemeMPL.aggregate([sig1Pop, sig2Pop])
-
-    assert bytes(sig1Basic) == ref_sig1Basic
-    print(bytes(sig1Basic).hex())
-    assert bytes(sig2Basic) == ref_sig2Basic
-    assert bytes(sigABasic) == ref_sigABasic
-    assert bytes(sig1Aug) == ref_sig1Aug
-    assert bytes(sig2Aug) == ref_sig2Aug
-    assert bytes(sigAAug) == ref_sigAAug
-    assert bytes(sig1Pop) == ref_sig1Pop
-    assert bytes(sig2Pop) == ref_sig2Pop
-    assert bytes(sigAPop) == ref_sigAPop
-
-
-def test_vectors_invalid():
-    # Invalid inputs from https://github.com/algorand/bls_sigs_ref/blob/master/python-impl/serdesZ.py
-    invalid_inputs_1 = [
-        # infinity points: too short
-        "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # infinity points: not all zeros
-        "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000",
-        # bad tags
-        "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        # wrong length for compresed point
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaaaa",
-        # invalid x-coord
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa",
-        # invalid elm of Fp --- equal to p (must be strictly less)
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-    ]
-    invalid_inputs_2 = [
-        # infinity points: too short
-        "c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # infinity points: not all zeros
-        "c00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000",
-        # bad tags
-        "3a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "7a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "fa0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # wrong length for compressed point
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        # invalid x-coord
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaa7",
-        # invalid elm of Fp --- equal to p (must be strictly less)
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
-    ]
-
-    for s in invalid_inputs_1:
-        bytes_ = bytes.fromhex(s)
-        try:
-            g1 = G1FromBytes(bytes_)
-            assert g1 is not None
-            assert False, "Failed to disallow creation of G1 element."
-        except Exception:
-            pass
-
-    for s in invalid_inputs_2:
-        bytes_ = bytes.fromhex(s)
-        try:
-            g2 = G2FromBytes(bytes_)
-            assert g2 is not None
-            assert False, "Failed to disallow creation of G2 element."
-        except Exception:
-            pass
-
-
-def test_readme():
-    seed: bytes = bytes(
-        [
-            0,
-            50,
-            6,
-            244,
-            24,
-            199,
-            1,
-            25,
-            52,
-            88,
-            192,
-            19,
-            18,
-            12,
-            89,
-            6,
-            220,
-            18,
-            102,
-            58,
-            209,
-            82,
-            12,
-            62,
-            89,
-            110,
-            182,
-            9,
-            44,
-            20,
-            254,
-            22,
-        ]
-    )
-    sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-    pk: G1Element = sk.get_g1()
-
-    message: bytes = bytes([1, 2, 3, 4, 5])
-    signature: G2Element = AugSchemeMPL.sign(sk, message)
-
-    ok: bool = AugSchemeMPL.verify(pk, message, signature)
-    assert ok
-
-    sk_bytes: bytes = bytes(sk)  # 32 bytes
-    pk_bytes: bytes = bytes(pk)  # 48 bytes
-    signature_bytes: bytes = bytes(signature)  # 96 bytes
-
-    print(sk_bytes.hex(), pk_bytes.hex(), signature_bytes.hex())
-
-    sk = PrivateKey.from_bytes(sk_bytes)
-    assert sk is not None
-    pk = G1FromBytes(pk_bytes)
-    assert pk is not None
-    signature: G2Element = G2FromBytes(signature_bytes)
-
-    seed = bytes([1]) + seed[1:]
-    sk1: PrivateKey = AugSchemeMPL.key_gen(seed)
-    seed = bytes([2]) + seed[1:]
-    sk2: PrivateKey = AugSchemeMPL.key_gen(seed)
-    message2: bytes = bytes([1, 2, 3, 4, 5, 6, 7])
-
-    pk1: G1Element = sk1.get_g1()
-    sig1: G2Element = AugSchemeMPL.sign(sk1, message)
-
-    pk2: G1Element = sk2.get_g1()
-    sig2: G2Element = AugSchemeMPL.sign(sk2, message2)
-
-    agg_sig: G2Element = AugSchemeMPL.aggregate([sig1, sig2])
-
-    ok = AugSchemeMPL.aggregate_verify([pk1, pk2], [message, message2], agg_sig)
-    assert ok
-
-    seed = bytes([3]) + seed[1:]
-    sk3: PrivateKey = AugSchemeMPL.key_gen(seed)
-    pk3: G1Element = sk3.get_g1()
-    message3: bytes = bytes([100, 2, 254, 88, 90, 45, 23])
-    sig3: G2Element = AugSchemeMPL.sign(sk3, message3)
-
-    agg_sig_final: G2Element = AugSchemeMPL.aggregate([agg_sig, sig3])
-    ok = AugSchemeMPL.aggregate_verify(
-        [pk1, pk2, pk3], [message, message2, message3], agg_sig_final
-    )
-    assert ok
-
-    pop_sig1: G2Element = PopSchemeMPL.sign(sk1, message)
-    pop_sig2: G2Element = PopSchemeMPL.sign(sk2, message)
-    pop_sig3: G2Element = PopSchemeMPL.sign(sk3, message)
-    pop1: G2Element = PopSchemeMPL.pop_prove(sk1)
-    pop2: G2Element = PopSchemeMPL.pop_prove(sk2)
-    pop3: G2Element = PopSchemeMPL.pop_prove(sk3)
-
-    ok = PopSchemeMPL.pop_verify(pk1, pop1)
-    assert ok
-    ok = PopSchemeMPL.pop_verify(pk2, pop2)
-    assert ok
-    ok = PopSchemeMPL.pop_verify(pk3, pop3)
-    assert ok
-
-    pop_sig_agg: G2Element = PopSchemeMPL.aggregate([pop_sig1, pop_sig2, pop_sig3])
-
-    ok = PopSchemeMPL.fast_aggregate_verify([pk1, pk2, pk3], message, pop_sig_agg)
-    assert ok
-
-    pop_agg_pk: G1Element = pk1 + pk2 + pk3
-    ok = PopSchemeMPL.verify(pop_agg_pk, message, pop_sig_agg)
-    assert ok
-
-    pop_agg_sk: PrivateKey = PrivateKey.aggregate([sk1, sk2, sk3])
-    ok = PopSchemeMPL.sign(pop_agg_sk, message) == pop_sig_agg
-    assert ok
-
-    master_sk: PrivateKey = AugSchemeMPL.key_gen(seed)
-    child: PrivateKey = AugSchemeMPL.derive_child_sk(master_sk, 152)
-    grandchild: PrivateKey = AugSchemeMPL.derive_child_sk(child, 952)
-    assert grandchild is not None
-
-    master_pk: G1Element = master_sk.get_g1()
-    child_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(master_sk, 22)
-    grandchild_u: PrivateKey = AugSchemeMPL.derive_child_sk_unhardened(child_u, 0)
-
-    child_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(master_pk, 22)
-    grandchild_u_pk: G1Element = AugSchemeMPL.derive_child_pk_unhardened(child_u_pk, 0)
-
-    ok = grandchild_u_pk == grandchild_u.get_g1()
-    assert ok
-
-
-test_hkdf()
-test_eip2333()
-test_fields()
-test_ec()
-test_xmd()
-test_swu()
-test_edge_case_sign_Fq2()
-test_elements()
-test_chia_vectors_1()
-test_chia_vectors_2()
-test_chia_vectors_3()
-test_pyecc_vectors()
-test_vectors_invalid()
-test_readme()
diff --git a/src/dashbls/python-impl/op_swu_g2.py b/src/dashbls/python-impl/op_swu_g2.py
deleted file mode 100644
index afdb40cf714b..000000000000
--- a/src/dashbls/python-impl/op_swu_g2.py
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/python
-#
-# pure Python implementation of optimized simplified SWU map to BLS12-381 G2
-# https://github.com/algorand/bls_sigs_ref
-#
-# This software is (C) 2019 Algorand, Inc.
-#
-# Licensed under the MIT license (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://opensource.org/licenses/MIT
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from bls12381 import h_eff, q
-from ec import JacobianPoint, default_ec_twist, eval_iso
-from fields import Fq, Fq2, roots_of_unity
-from hash_to_field import Hp2
-from typing import Union
-
-
-def sgn0(x: Fq2) -> int:
-    # https://tools.ietf.org/html/draft-irtf-cfrg-hash-to-curve-07#section-4.1
-
-    sign_0: int = x[0].value % 2
-    zero_0: bool = x[0] == 0
-    sign_1: int = x[1].value % 2
-    return sign_0 or (zero_0 and sign_1)
-
-
-# distinguished non-square in Fp2 for SWU map
-xi_2 = Fq2(q, -2, -1)
-
-# 3-isogenous curve parameters
-Ell2p_a = Fq2(q, 0, 240)
-Ell2p_b = Fq2(q, 1012, 1012)
-
-
-# eta values, used for computing sqrt(g(X1(t)))
-# For details on how to compute, see ../sage-impl/opt_sswu_g2.sage
-ev1 = 0x699BE3B8C6870965E5BF892AD5D2CC7B0E85A117402DFD83B7F4A947E02D978498255A2AAEC0AC627B5AFBDF1BF1C90
-ev2 = 0x8157CD83046453F5DD0972B6E3949E4288020B5B8A9CC99CA07E27089A2CE2436D965026ADAD3EF7BABA37F2183E9B5
-ev3 = 0xAB1C2FFDD6C253CA155231EB3E71BA044FD562F6F72BC5BAD5EC46A0B7A3B0247CF08CE6C6317F40EDBC653A72DEE17
-ev4 = 0xAA404866706722864480885D68AD0CCAC1967C7544B447873CC37E0181271E006DF72162A3D3E0287BF597FBF7F8FC1
-etas = (Fq2(q, ev1, ev2), Fq2(q, q - ev2, ev1), Fq2(q, ev3, ev4), Fq2(q, q - ev4, ev3))
-del ev1, ev2, ev3, ev4
-
-
-#
-# Simplified SWU map, optimized and adapted to Ell2'
-#
-# This function maps an element of Fp^2 to the curve Ell2', 3-isogenous to Ell2.
-def osswu2_help(t):
-    assert isinstance(t, Fq2)
-
-    # first, compute X0(t), detecting and handling exceptional case
-    num_den_common = xi_2 ** 2 * t ** 4 + xi_2 * t ** 2
-    x0_num = Ell2p_b * (num_den_common + Fq(q, 1))
-    x0_den = -Ell2p_a * num_den_common
-    x0_den = Ell2p_a * xi_2 if x0_den == 0 else x0_den
-
-    # compute num and den of g(X0(t))
-    gx0_den = pow(x0_den, 3)
-    gx0_num = Ell2p_b * gx0_den
-    gx0_num += Ell2p_a * x0_num * pow(x0_den, 2)
-    gx0_num += pow(x0_num, 3)
-
-    # try taking sqrt of g(X0(t))
-    # this uses the trick for combining division and sqrt from Section 5 of
-    # Bernstein, Duif, Lange, Schwabe, and Yang, "High-speed high-security signatures."
-    # J Crypt Eng 2(2):77--89, Sept. 2012. http://ed25519.cr.yp.to/ed25519-20110926.pdf
-    tmp1 = pow(gx0_den, 7)  # v^7
-    tmp2 = gx0_num * tmp1  # u v^7
-    tmp1 = tmp1 * tmp2 * gx0_den  # u v^15
-    sqrt_candidate = tmp2 * pow(tmp1, (q ** 2 - 9) // 16)
-
-    # check if g(X0(t)) is square and return the sqrt if so
-    for root in roots_of_unity:
-        y0 = sqrt_candidate * root
-        if y0 ** 2 * gx0_den == gx0_num:
-            # found sqrt(g(X0(t))). force sign of y to equal sign of t
-            if sgn0(y0) != sgn0(t):
-                y0 = -y0
-            assert sgn0(y0) == sgn0(t)
-            return JacobianPoint(
-                x0_num * x0_den, y0 * pow(x0_den, 3), x0_den, False, default_ec_twist
-            )
-
-    # if we've gotten here, then g(X0(t)) is not square. convert srqt_candidate to sqrt(g(X1(t)))
-    (x1_num, x1_den) = (xi_2 * t ** 2 * x0_num, x0_den)
-    (gx1_num, gx1_den) = (xi_2 ** 3 * t ** 6 * gx0_num, gx0_den)
-    sqrt_candidate *= t ** 3
-    for eta in etas:
-        y1 = eta * sqrt_candidate
-        if y1 ** 2 * gx1_den == gx1_num:
-            # found sqrt(g(X1(t))). force sign of y to equal sign of t
-            if sgn0(y1) != sgn0(t):
-                y1 = -y1
-            assert sgn0(y1) == sgn0(t)
-            return JacobianPoint(
-                x1_num * x1_den, y1 * pow(x1_den, 3), x1_den, False, default_ec_twist
-            )
-
-    # if we got here, something is wrong
-    raise RuntimeError("osswu2_help failed for unknown reasons")
-
-
-#
-# 3-Isogeny from Ell2' to Ell2
-#
-# coefficients for the 3-isogeny map from Ell2' to Ell2
-xnum = (
-    Fq2(
-        q,
-        0x5C759507E8E333EBB5B7A9A47D7ED8532C52D39FD3A042A88B58423C50AE15D5C2638E343D9C71C6238AAAAAAAA97D6,
-        0x5C759507E8E333EBB5B7A9A47D7ED8532C52D39FD3A042A88B58423C50AE15D5C2638E343D9C71C6238AAAAAAAA97D6,
-    ),
-    Fq2(
-        q,
-        0x0,
-        0x11560BF17BAA99BC32126FCED787C88F984F87ADF7AE0C7F9A208C6B4F20A4181472AAA9CB8D555526A9FFFFFFFFC71A,
-    ),
-    Fq2(
-        q,
-        0x11560BF17BAA99BC32126FCED787C88F984F87ADF7AE0C7F9A208C6B4F20A4181472AAA9CB8D555526A9FFFFFFFFC71E,
-        0x8AB05F8BDD54CDE190937E76BC3E447CC27C3D6FBD7063FCD104635A790520C0A395554E5C6AAAA9354FFFFFFFFE38D,
-    ),
-    Fq2(
-        q,
-        0x171D6541FA38CCFAED6DEA691F5FB614CB14B4E7F4E810AA22D6108F142B85757098E38D0F671C7188E2AAAAAAAA5ED1,
-        0x0,
-    ),
-)
-xden = (
-    Fq2(
-        q,
-        0x0,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAA63,
-    ),
-    Fq2(
-        q,
-        0xC,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAA9F,
-    ),
-    Fq2(q, 0x1, 0x0),
-)
-ynum = (
-    Fq2(
-        q,
-        0x1530477C7AB4113B59A4C18B076D11930F7DA5D4A07F649BF54439D87D27E500FC8C25EBF8C92F6812CFC71C71C6D706,
-        0x1530477C7AB4113B59A4C18B076D11930F7DA5D4A07F649BF54439D87D27E500FC8C25EBF8C92F6812CFC71C71C6D706,
-    ),
-    Fq2(
-        q,
-        0x0,
-        0x5C759507E8E333EBB5B7A9A47D7ED8532C52D39FD3A042A88B58423C50AE15D5C2638E343D9C71C6238AAAAAAAA97BE,
-    ),
-    Fq2(
-        q,
-        0x11560BF17BAA99BC32126FCED787C88F984F87ADF7AE0C7F9A208C6B4F20A4181472AAA9CB8D555526A9FFFFFFFFC71C,
-        0x8AB05F8BDD54CDE190937E76BC3E447CC27C3D6FBD7063FCD104635A790520C0A395554E5C6AAAA9354FFFFFFFFE38F,
-    ),
-    Fq2(
-        q,
-        0x124C9AD43B6CF79BFBF7043DE3811AD0761B0F37A1E26286B0E977C69AA274524E79097A56DC4BD9E1B371C71C718B10,
-        0x0,
-    ),
-)
-yden = (
-    Fq2(
-        q,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFA8FB,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFA8FB,
-    ),
-    Fq2(
-        q,
-        0x0,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFA9D3,
-    ),
-    Fq2(
-        q,
-        0x12,
-        0x1A0111EA397FE69A4B1BA7B6434BACD764774B84F38512BF6730D2A0F6B0F6241EABFFFEB153FFFFB9FEFFFFFFFFAA99,
-    ),
-    Fq2(q, 0x1, 0x0),
-)
-
-
-# compute 3-isogeny map from Ell2' to Ell2
-def iso3(P):
-    return eval_iso(P, (xnum, xden, ynum, yden), default_ec_twist)
-
-
-#
-# map from Fq2 element(s) to point in G2 subgroup of Ell2
-#
-def opt_swu2_map(t: Fq2, t2: Union[Fq2, None] = None) -> JacobianPoint:
-    Pp = iso3(osswu2_help(t))
-    if t2 is not None:
-        Pp2 = iso3(osswu2_help(t2))
-        Pp = Pp + Pp2
-    return Pp * h_eff
-
-
-#
-# map from bytes() to point in G2 subgroup of Ell2
-#
-def g2_map(alpha: bytes, dst=None):
-    return opt_swu2_map(*(Fq2(q, *hh) for hh in Hp2(alpha, 2, dst)))
diff --git a/src/dashbls/python-impl/pairing.py b/src/dashbls/python-impl/pairing.py
deleted file mode 100644
index ca752311e5fc..000000000000
--- a/src/dashbls/python-impl/pairing.py
+++ /dev/null
@@ -1,136 +0,0 @@
-from collections import namedtuple
-from typing import List
-
-import bls12381
-from ec import AffinePoint, JacobianPoint, untwist
-from fields import Fq, Fq12
-
-# Struct for elliptic curve parameters
-EC = namedtuple("EC", "q a b gx gy g2x g2y n h x k sqrt_n3 sqrt_n3m1o2")
-
-default_ec = EC(*bls12381.parameters())
-default_ec_twist = EC(*bls12381.parameters())
-
-
-def int_to_bits(i: int) -> List[int]:
-    if i < 1:
-        return [0]
-    bits = []
-    while i != 0:
-        bits.append(i % 2)
-        i = i // 2
-    return list(reversed(bits))
-
-
-def double_line_eval(R: AffinePoint, P: AffinePoint, ec=default_ec):
-    """
-    Creates an equation for a line tangent to R,
-    and evaluates this at the point P. f(x) = y - sv - v.
-    f(P).
-    """
-    R12 = untwist(R)
-
-    slope = (Fq(ec.q, 3) * (R12.x ** 2) + ec.a) / (Fq(ec.q, 2) * R12.y)
-    v = R12.y - slope * R12.x
-
-    return P.y - P.x * slope - v
-
-
-def add_line_eval(R: AffinePoint, Q: AffinePoint, P: AffinePoint, ec=default_ec) -> Fq:
-    """
-    Creates an equation for a line between R and Q,
-    and evaluates this at the point P. f(x) = y - sv - v.
-    f(P).
-    """
-    R12 = untwist(R)
-    Q12 = untwist(Q)
-
-    # This is the case of a vertical line, where the denominator
-    # will be 0.
-    if R12 == Q12.negate():
-        return P.x - R12.x
-
-    slope = (Q12.y - R12.y) / (Q12.x - R12.x)
-    v = (Q12.y * R12.x - R12.y * Q12.x) / (R12.x - Q12.x)
-
-    return P.y - P.x * slope - v
-
-
-def miller_loop(T: int, P: AffinePoint, Q: AffinePoint, ec=default_ec) -> Fq12:
-    """
-    Performs a double and add algorithm for the ate pairing. This algorithm
-    is taken from Craig Costello's "Pairing for Beginners".
-    """
-    T_bits = int_to_bits(T)
-    R = Q
-    f = Fq12.one(ec.q)  # f is an element of Fq12
-    for i in range(1, len(T_bits)):
-        # Compute sloped line lrr
-        lrr = double_line_eval(R, P, ec)
-        f = f * f * lrr
-
-        R = Fq(ec.q, 2) * R
-        if T_bits[i] == 1:
-            # Compute sloped line lrq
-            lrq = add_line_eval(R, Q, P, ec)
-            f = f * lrq
-
-            R = R + Q
-    return f
-
-
-def final_exponentiation(element: Fq12, ec=default_ec) -> Fq12:
-    """
-    Performs a final exponentiation to map the result of the Miller
-    loop to a unique element of Fq12.
-    """
-    if ec.k == 12:
-        ans = element ** ((pow(ec.q, 4) - pow(ec.q, 2) + 1) // ec.n)
-        ans = ans.qi_power(2) * ans
-        ans = ans.qi_power(6) / ans
-        return ans
-    else:
-        return element ** ((pow(ec.q, ec.k) - 1) // ec.n)
-
-
-def ate_pairing(P: JacobianPoint, Q: JacobianPoint, ec=default_ec) -> Fq12:
-    """
-    Performs one ate pairing.
-    """
-    t = default_ec.x + 1
-    T = abs(t - 1)
-    element = miller_loop(T, P.to_affine(), Q.to_affine(), ec)
-    return final_exponentiation(element, ec)
-
-
-def ate_pairing_multi(
-    Ps: List[JacobianPoint], Qs: List[JacobianPoint], ec=default_ec
-) -> Fq12:
-    """
-    Computes multiple pairings at once. This is more efficient,
-    since we can multiply all the results of the miller loops,
-    and perform just one final exponentiation.
-    """
-    t = default_ec.x + 1
-    T = abs(t - 1)
-    prod = Fq12.one(ec.q)
-    for i in range(len(Qs)):
-        prod *= miller_loop(T, Ps[i].to_affine(), Qs[i].to_affine(), ec)
-    return final_exponentiation(prod, ec)
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/private_key.py b/src/dashbls/python-impl/private_key.py
deleted file mode 100644
index 200bd6304d12..000000000000
--- a/src/dashbls/python-impl/private_key.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from __future__ import annotations
-
-from ec import G1Generator, default_ec
-from hkdf import extract_expand
-
-
-class PrivateKey:
-    """
-    Private keys are just random integers between 1 and the group order.
-    """
-
-    PRIVATE_KEY_SIZE = 32
-
-    def __init__(self, value):
-        assert value < default_ec.n
-        self.value = value
-
-    @staticmethod
-    def from_bytes(buffer):
-        return PrivateKey(int.from_bytes(buffer, "big") % default_ec.n)
-
-    @staticmethod
-    def from_seed(seed):
-        L = 48
-        # `ceil((3 * ceil(log2(r))) / 16)`, where `r` is the order of the BLS 12-381 curve
-        okm = extract_expand(
-            L, seed + bytes([0]), b"BLS-SIG-KEYGEN-SALT-", bytes([0, L])
-        )
-        return PrivateKey(int.from_bytes(okm, "big") % default_ec.n)
-
-    @staticmethod
-    def from_int(n: int):
-        return PrivateKey(n % default_ec.n)
-
-    def get_g1(self):
-        return self.value * G1Generator()
-
-    def sign(self, m):
-        pass
-
-    def __eq__(self, other):
-        return self.value == other.value
-
-    def __hash__(self):
-        return self.value
-
-    def __bytes__(self):
-        return self.value.to_bytes(self.PRIVATE_KEY_SIZE, "big")
-
-    def size(self):
-        return self.PRIVATE_KEY_SIZE
-
-    def __str__(self):
-        return "PrivateKey(0x" + bytes(self).hex() + ")"
-
-    def __repr__(self):
-        return "PrivateKey(0x" + bytes(self).hex() + ")"
-
-    @staticmethod
-    def aggregate(private_keys):
-        """
-        Aggregates private keys together
-        """
-        return PrivateKey(sum(pk.value for pk in private_keys) % default_ec.n)
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/python-impl/schemes.py b/src/dashbls/python-impl/schemes.py
deleted file mode 100644
index 7b7a1d9730f1..000000000000
--- a/src/dashbls/python-impl/schemes.py
+++ /dev/null
@@ -1,209 +0,0 @@
-from typing import List
-
-from ec import G1Generator, JacobianPoint, default_ec
-from fields import Fq12
-from hd_keys import (derive_child_g1_unhardened, derive_child_sk,
-                     derive_child_sk_unhardened, key_gen)
-from op_swu_g2 import g2_map
-from pairing import ate_pairing_multi
-from private_key import PrivateKey
-
-basic_scheme_dst = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_"
-aug_scheme_dst = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_AUG_"
-pop_scheme_dst = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_"
-pop_scheme_pop_dst = b"BLS_POP_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_"
-
-
-def core_sign_mpl(sk: PrivateKey, message: bytes, dst: bytes) -> JacobianPoint:
-    return sk.value * g2_map(message, dst)
-
-
-def core_verify_mpl(
-    pk: JacobianPoint, message: bytes, signature: JacobianPoint, dst: bytes
-) -> bool:
-    try:
-        signature.check_valid()
-        pk.check_valid()
-    except AssertionError:
-        return False
-    q = g2_map(message, dst)
-    one = Fq12.one(default_ec.q)
-    pairing_result = ate_pairing_multi([pk, G1Generator().negate()], [q, signature])
-    return pairing_result == one
-
-
-def core_aggregate_mpl(signatures: List[JacobianPoint]) -> JacobianPoint:
-    if len(signatures) < 1:
-        raise ValueError("Must aggregate at least 1 signature")
-    aggregate = signatures[0]
-    aggregate.check_valid()
-    for signature in signatures[1:]:
-        signature.check_valid()
-        aggregate += signature
-    return aggregate
-
-
-def core_aggregate_verify(
-    pks: List[JacobianPoint], ms: List[bytes], signature: JacobianPoint, dst: bytes
-) -> bool:
-    if len(pks) != len(ms) or len(pks) < 1:
-        return False
-    try:
-        signature.check_valid()
-        qs = [signature]
-        ps = [G1Generator().negate()]
-        for i in range(len(pks)):
-            pks[i].check_valid()
-            qs.append(g2_map(ms[i], dst))
-            ps.append(pks[i])
-        return Fq12.one(default_ec.q) == ate_pairing_multi(ps, qs)
-
-    except AssertionError:
-        return False
-
-
-class BasicSchemeMPL:
-    @staticmethod
-    def key_gen(seed: bytes) -> PrivateKey:
-        return key_gen(seed)
-
-    @staticmethod
-    def sign(sk: PrivateKey, message: bytes) -> JacobianPoint:
-        return core_sign_mpl(sk, message, basic_scheme_dst)
-
-    @staticmethod
-    def verify(pk: JacobianPoint, message: bytes, signature: JacobianPoint) -> bool:
-        return core_verify_mpl(pk, message, signature, basic_scheme_dst)
-
-    @staticmethod
-    def aggregate(signatures: List[JacobianPoint]) -> JacobianPoint:
-        return core_aggregate_mpl(signatures)
-
-    @staticmethod
-    def aggregate_verify(
-        pks: List[JacobianPoint], ms: List[bytes], signature: JacobianPoint
-    ) -> bool:
-        if len(pks) != len(ms) or len(pks) < 1:
-            return False
-        if len(set(ms)) != len(ms):
-            # Disallow repeated messages
-            return False
-        return core_aggregate_verify(pks, ms, signature, basic_scheme_dst)
-
-    @staticmethod
-    def derive_child_sk(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk(sk, index)
-
-    @staticmethod
-    def derive_child_sk_unhardened(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk_unhardened(sk, index)
-
-    @staticmethod
-    def derive_child_pk_unhardened(pk: JacobianPoint, index: int) -> JacobianPoint:
-        return derive_child_g1_unhardened(pk, index)
-
-
-class AugSchemeMPL:
-    @staticmethod
-    def key_gen(seed: bytes) -> PrivateKey:
-        return key_gen(seed)
-
-    @staticmethod
-    def sign(sk: PrivateKey, message: bytes) -> JacobianPoint:
-        pk = sk.get_g1()
-        return core_sign_mpl(sk, bytes(pk) + message, aug_scheme_dst)
-
-    @staticmethod
-    def verify(pk: JacobianPoint, message: bytes, signature: JacobianPoint) -> bool:
-        return core_verify_mpl(pk, bytes(pk) + message, signature, aug_scheme_dst)
-
-    @staticmethod
-    def aggregate(signatures: List[JacobianPoint]) -> JacobianPoint:
-        return core_aggregate_mpl(signatures)
-
-    @staticmethod
-    def aggregate_verify(
-        pks: List[JacobianPoint], ms: List[bytes], signature: JacobianPoint
-    ) -> bool:
-        if len(pks) != len(ms) or len(pks) < 1:
-            return False
-        m_primes = [bytes(pks[i]) + ms[i] for i in range(len(pks))]
-        return core_aggregate_verify(pks, m_primes, signature, aug_scheme_dst)
-
-    @staticmethod
-    def derive_child_sk(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk(sk, index)
-
-    @staticmethod
-    def derive_child_sk_unhardened(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk_unhardened(sk, index)
-
-    @staticmethod
-    def derive_child_pk_unhardened(pk: JacobianPoint, index: int) -> JacobianPoint:
-        return derive_child_g1_unhardened(pk, index)
-
-
-class PopSchemeMPL:
-    @staticmethod
-    def key_gen(seed: bytes) -> PrivateKey:
-        return key_gen(seed)
-
-    @staticmethod
-    def sign(sk: PrivateKey, message: bytes) -> JacobianPoint:
-        return core_sign_mpl(sk, message, pop_scheme_dst)
-
-    @staticmethod
-    def verify(pk: JacobianPoint, message: bytes, signature: JacobianPoint) -> bool:
-        return core_verify_mpl(pk, message, signature, pop_scheme_dst)
-
-    @staticmethod
-    def aggregate(signatures: List[JacobianPoint]) -> JacobianPoint:
-        return core_aggregate_mpl(signatures)
-
-    @staticmethod
-    def aggregate_verify(
-        pks: List[JacobianPoint], ms: List[bytes], signature: JacobianPoint
-    ) -> bool:
-        if len(pks) != len(ms) or len(pks) < 1:
-            return False
-        return core_aggregate_verify(pks, ms, signature, pop_scheme_dst)
-
-    @staticmethod
-    def pop_prove(sk: PrivateKey) -> JacobianPoint:
-        pk: JacobianPoint = sk.get_g1()
-        return sk.value * g2_map(bytes(pk), pop_scheme_pop_dst)
-
-    @staticmethod
-    def pop_verify(pk: JacobianPoint, proof: JacobianPoint) -> bool:
-        try:
-            proof.check_valid()
-            pk.check_valid()
-            q = g2_map(bytes(pk), pop_scheme_pop_dst)
-            one = Fq12.one(default_ec.q)
-            pairing_result = ate_pairing_multi([pk, G1Generator().negate()], [q, proof])
-            return pairing_result == one
-        except AssertionError:
-            return False
-
-    @staticmethod
-    def fast_aggregate_verify(
-        pks: List[JacobianPoint], message: bytes, signature: JacobianPoint
-    ) -> bool:
-        if len(pks) < 1:
-            return False
-        aggregate: JacobianPoint = pks[0]
-        for pk in pks[1:]:
-            aggregate += pk
-        return core_verify_mpl(aggregate, message, signature, pop_scheme_dst)
-
-    @staticmethod
-    def derive_child_sk(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk(sk, index)
-
-    @staticmethod
-    def derive_child_sk_unhardened(sk: PrivateKey, index: int) -> PrivateKey:
-        return derive_child_sk_unhardened(sk, index)
-
-    @staticmethod
-    def derive_child_pk_unhardened(pk: JacobianPoint, index: int) -> JacobianPoint:
-        return derive_child_g1_unhardened(pk, index)
diff --git a/src/dashbls/python-impl/util.py b/src/dashbls/python-impl/util.py
deleted file mode 100644
index 09192fd681f4..000000000000
--- a/src/dashbls/python-impl/util.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import hashlib
-
-HMAC_BLOCK_SIZE = 64
-
-
-def hash256(m):
-    if type(m) != bytes:
-        m = m.encode("utf-8")
-    return hashlib.sha256(m).digest()
-
-
-def hash512(m):
-    if type(m) != bytes:
-        m = m.encode("utf-8")
-    return hash256(m + bytes([0])) + hash256(m + bytes([1]))
-
-
-def hmac256(m, k):
-    if type(m) != bytes and type(m) != bytearray:
-        m = m.encode("utf-8")
-    if type(k) != bytes and type(k) != bytearray:
-        k = k.encode("utf-8")
-    k = bytes(k)
-    if len(k) > HMAC_BLOCK_SIZE:
-        k = hash256(k)
-    while len(k) < HMAC_BLOCK_SIZE:
-        k += bytes([0])
-    opad = bytes([0x5C] * HMAC_BLOCK_SIZE)
-    ipad = bytes([0x36] * HMAC_BLOCK_SIZE)
-    kopad = bytes([k[i] ^ opad[i] for i in range(HMAC_BLOCK_SIZE)])
-    kipad = bytes([k[i] ^ ipad[i] for i in range(HMAC_BLOCK_SIZE)])
-    return hash256(kopad + hash256(kipad + m))
-
-
-"""
-Copyright 2020 Chia Network Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
diff --git a/src/dashbls/rust-bindings/.gitignore b/src/dashbls/rust-bindings/.gitignore
deleted file mode 100644
index cb117fd6ee83..000000000000
--- a/src/dashbls/rust-bindings/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Cargo.lock
-target
\ No newline at end of file
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/.rustfmt.toml b/src/dashbls/rust-bindings/bls-dash-sys/.rustfmt.toml
deleted file mode 100644
index f5fe8f31884f..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/.rustfmt.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-unstable_features = true
-
-blank_lines_lower_bound = 0
-condense_wildcard_suffixes = true
-error_on_line_overflow = true
-error_on_unformatted = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
-imports_granularity = "Crate"
-normalize_comments = true
-normalize_doc_attributes = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true
-use_try_shorthand = true
-wrap_comments = true
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/Cargo.toml b/src/dashbls/rust-bindings/bls-dash-sys/Cargo.toml
deleted file mode 100644
index c5a04be4deba..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "bls-dash-sys"
-description = ""
-version = "1.2.5"
-build = "build.rs"
-edition = "2021"
-
-[features]
-default = []
-apple = []
-
-[build-dependencies]
-cc = "1.0"
-bindgen = "0.65.1"
-glob ="0.3"
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/bindings.rs b/src/dashbls/rust-bindings/bls-dash-sys/bindings.rs
deleted file mode 100644
index 6d570a7f9321..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/bindings.rs
+++ /dev/null
@@ -1,440 +0,0 @@
-pub type G1Element = *mut ::std::os::raw::c_void;
-pub type G2Element = *mut ::std::os::raw::c_void;
-pub type PrivateKey = *mut ::std::os::raw::c_void;
-pub type CoreMPL = *mut ::std::os::raw::c_void;
-pub type BasicSchemeMPL = CoreMPL;
-pub type AugSchemeMPL = CoreMPL;
-pub type PopSchemeMPL = CoreMPL;
-pub type LegacySchemeMPL = CoreMPL;
-pub type BIP32ExtendedPrivateKey = *mut ::std::os::raw::c_void;
-pub type BIP32ExtendedPublicKey = *mut ::std::os::raw::c_void;
-pub type BIP32ChainCode = *mut ::std::os::raw::c_void;
-
-extern "C" {
-    pub fn G1ElementSize() -> ::std::os::raw::c_int;
-
-    pub fn G1ElementFromBytes(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        legacy: bool,
-        didErr: *mut bool,
-    ) -> G1Element;
-
-    pub fn G1ElementGenerator() -> G1Element;
-
-    pub fn G1ElementIsValid(el: G1Element) -> bool;
-
-    pub fn G1ElementGetFingerprint(el: G1Element, legacy: bool) -> u32;
-
-    pub fn G1ElementIsEqual(el1: G1Element, el2: G1Element) -> bool;
-
-    pub fn G1ElementAdd(el1: G1Element, el2: G1Element) -> G1Element;
-
-    pub fn G1ElementMul(el: G1Element, sk: PrivateKey) -> G1Element;
-
-    pub fn G1ElementNegate(el: G1Element) -> G1Element;
-
-    pub fn G1ElementCopy(el: G1Element) -> G1Element;
-
-    pub fn G1ElementSerialize(el: G1Element, legacy: bool) -> *mut ::std::os::raw::c_void;
-
-    pub fn G1ElementFree(el: G1Element);
-
-    pub fn G2ElementSize() -> ::std::os::raw::c_int;
-
-    pub fn G2ElementFromBytes(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        legacy: bool,
-        didErr: *mut bool,
-    ) -> G2Element;
-
-    pub fn G2ElementGenerator() -> G2Element;
-
-    pub fn G2ElementIsValid(el: G2Element) -> bool;
-
-    pub fn G2ElementIsEqual(el1: G2Element, el2: G2Element) -> bool;
-
-    pub fn G2ElementAdd(el1: G2Element, el2: G2Element) -> G2Element;
-
-    pub fn G2ElementMul(el: G2Element, sk: PrivateKey) -> G2Element;
-
-    pub fn G2ElementNegate(el: G2Element) -> G2Element;
-
-    pub fn G2ElementCopy(el: G2Element) -> G2Element;
-
-    pub fn G2ElementSerialize(el: G2Element, legacy: bool) -> *mut ::std::os::raw::c_void;
-
-    pub fn G2ElementFree(el: G2Element);
-
-    pub fn PrivateKeyFromBytes(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        modOrder: bool,
-        didErr: *mut bool,
-    ) -> PrivateKey;
-
-    pub fn PrivateKeyFromSeedBIP32(data: *const ::std::os::raw::c_void, len: usize) -> PrivateKey;
-
-    pub fn PrivateKeyAggregate(sks: *mut *mut ::std::os::raw::c_void, len: usize) -> PrivateKey;
-
-    pub fn PrivateKeyGetG1Element(sk: PrivateKey, didErr: *mut bool) -> G1Element;
-
-    pub fn PrivateKeyGetG2Element(sk: PrivateKey, didErr: *mut bool) -> G2Element;
-
-    pub fn PrivateKeyGetG2Power(sk: PrivateKey, el: G2Element) -> G2Element;
-
-    pub fn PrivateKeyIsEqual(sk1: PrivateKey, sk2: PrivateKey) -> bool;
-
-    pub fn PrivateKeySerialize(sk: PrivateKey) -> *mut ::std::os::raw::c_void;
-
-    pub fn PrivateKeyFree(sk: PrivateKey);
-
-    pub fn PrivateKeySizeBytes() -> usize;
-
-    pub fn SecFree(p: *mut ::std::os::raw::c_void);
-
-    pub fn AllocPtrArray(len: usize) -> *mut *mut ::std::os::raw::c_void;
-
-    pub fn SetPtrArray(
-        arrPtr: *mut *mut ::std::os::raw::c_void,
-        elemPtr: *mut ::std::os::raw::c_void,
-        index: ::std::os::raw::c_int,
-    );
-
-    pub fn FreePtrArray(inPtr: *mut *mut ::std::os::raw::c_void);
-
-    pub fn GetPtrAtIndex(
-        arrPtr: *mut *mut ::std::os::raw::c_void,
-        index: ::std::os::raw::c_int,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn SecAllocBytes(len: usize) -> *mut u8;
-
-    pub fn GetAddressAtIndex(
-        ptr: *mut u8,
-        index: ::std::os::raw::c_int,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn GetLastErrorMsg() -> *const ::std::os::raw::c_char;
-
-    pub fn CoreMPLKeyGen(
-        scheme: CoreMPL,
-        seed: *const ::std::os::raw::c_void,
-        seedLen: usize,
-        didErr: *mut bool,
-    ) -> PrivateKey;
-
-    pub fn CoreMPLSkToG1(scheme: CoreMPL, sk: PrivateKey) -> G1Element;
-
-    pub fn CoreMPLSign(
-        scheme: CoreMPL,
-        sk: PrivateKey,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-    ) -> G2Element;
-
-    pub fn CoreMPLVerify(
-        scheme: BasicSchemeMPL,
-        pk: G1Element,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn CoreMPLVerifySecure(
-        scheme: CoreMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        sig: G2Element,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-    ) -> bool;
-
-    pub fn CoreMPLAggregatePubKeys(
-        scheme: CoreMPL,
-        pubKeys: *mut *mut ::std::os::raw::c_void,
-        pkLen: usize,
-    ) -> G1Element;
-
-    pub fn CoreMPLAggregateSigs(
-        scheme: CoreMPL,
-        sigs: *mut *mut ::std::os::raw::c_void,
-        sigLen: usize,
-    ) -> G2Element;
-
-    pub fn CoreMPLDeriveChildSk(scheme: CoreMPL, sk: PrivateKey, index: u32) -> PrivateKey;
-
-    pub fn CoreMPLDeriveChildSkUnhardened(
-        scheme: CoreMPL,
-        sk: PrivateKey,
-        index: u32,
-    ) -> PrivateKey;
-
-    pub fn CoreMPLDeriveChildPkUnhardened(scheme: CoreMPL, sk: G1Element, index: u32) -> G1Element;
-
-    pub fn CoreMPLAggregateVerify(
-        scheme: CoreMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pkLen: usize,
-        msgs: *mut *mut ::std::os::raw::c_void,
-        msgLens: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn NewBasicSchemeMPL() -> BasicSchemeMPL;
-
-    pub fn BasicSchemeMPLAggregateVerify(
-        scheme: BasicSchemeMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        msgs: *mut *mut ::std::os::raw::c_void,
-        msgsLens: *const ::std::os::raw::c_void,
-        msgsLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn BasicSchemeMPLFree(scheme: BasicSchemeMPL);
-
-    pub fn NewAugSchemeMPL() -> AugSchemeMPL;
-
-    pub fn AugSchemeMPLSign(
-        scheme: AugSchemeMPL,
-        sk: PrivateKey,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-    ) -> G2Element;
-
-    pub fn AugSchemeMPLSignPrepend(
-        scheme: AugSchemeMPL,
-        sk: PrivateKey,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        prepPk: G1Element,
-    ) -> G2Element;
-
-    pub fn AugSchemeMPLVerify(
-        scheme: AugSchemeMPL,
-        pk: G1Element,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn AugSchemeMPLAggregateVerify(
-        scheme: AugSchemeMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        msgs: *mut *mut ::std::os::raw::c_void,
-        msgsLens: *const ::std::os::raw::c_void,
-        msgsLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn AugSchemeMPLFree(scheme: AugSchemeMPL);
-
-    pub fn NewPopSchemeMPL() -> PopSchemeMPL;
-
-    pub fn PopSchemeMPLPopProve(scheme: PopSchemeMPL, sk: PrivateKey) -> G2Element;
-
-    pub fn PopSchemeMPLPopVerify(scheme: PopSchemeMPL, pk: G1Element, sig: G2Element) -> bool;
-
-    pub fn PopSchemeMPLFastAggregateVerify(
-        scheme: PopSchemeMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        msgs: *const ::std::os::raw::c_void,
-        msgsLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn PopSchemeMPLFree(scheme: PopSchemeMPL);
-
-    pub fn NewLegacySchemeMPL() -> LegacySchemeMPL;
-
-    pub fn LegacySchemeMPLSign(
-        scheme: LegacySchemeMPL,
-        sk: PrivateKey,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-    ) -> G2Element;
-
-    pub fn LegacySchemeMPLSignPrepend(
-        scheme: LegacySchemeMPL,
-        sk: PrivateKey,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        prepPk: G1Element,
-    ) -> G2Element;
-
-    pub fn LegacySchemeMPLVerify(
-        scheme: LegacySchemeMPL,
-        pk: G1Element,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn LegacySchemeMPLVerifySecure(
-        scheme: LegacySchemeMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        sig: G2Element,
-        msg: *const ::std::os::raw::c_void,
-        msgLen: usize,
-    ) -> bool;
-
-    pub fn LegacySchemeMPLAggregateVerify(
-        scheme: LegacySchemeMPL,
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        msgs: *mut *mut ::std::os::raw::c_void,
-        msgsLens: *const ::std::os::raw::c_void,
-        msgsLen: usize,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn LegacySchemeMPLFree(scheme: LegacySchemeMPL);
-
-    pub fn ThresholdPrivateKeyShare(
-        sks: *mut *mut ::std::os::raw::c_void,
-        sksLen: usize,
-        hash: *const ::std::os::raw::c_void,
-        didErr: *mut bool,
-    ) -> PrivateKey;
-
-    pub fn ThresholdPrivateKeyRecover(
-        sks: *mut *mut ::std::os::raw::c_void,
-        sksLen: usize,
-        hashes: *mut *mut ::std::os::raw::c_void,
-        hashesLen: usize,
-        didErr: *mut bool,
-    ) -> PrivateKey;
-
-    pub fn ThresholdPublicKeyShare(
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        hash: *const ::std::os::raw::c_void,
-        didErr: *mut bool,
-    ) -> G1Element;
-
-    pub fn ThresholdPublicKeyRecover(
-        pks: *mut *mut ::std::os::raw::c_void,
-        pksLen: usize,
-        hashes: *mut *mut ::std::os::raw::c_void,
-        hashesLen: usize,
-        didErr: *mut bool,
-    ) -> G1Element;
-
-    pub fn ThresholdSignatureShare(
-        sigs: *mut *mut ::std::os::raw::c_void,
-        sigsLen: usize,
-        hash: *const ::std::os::raw::c_void,
-        didErr: *mut bool,
-    ) -> G2Element;
-
-    pub fn ThresholdSignatureRecover(
-        sigs: *mut *mut ::std::os::raw::c_void,
-        sigsLen: usize,
-        hashes: *mut *mut ::std::os::raw::c_void,
-        hashesLen: usize,
-        didErr: *mut bool,
-    ) -> G2Element;
-
-    pub fn ThresholdSign(sk: PrivateKey, hash: *const ::std::os::raw::c_void) -> G2Element;
-
-    pub fn ThresholdVerify(
-        pk: G1Element,
-        hash: *const ::std::os::raw::c_void,
-        sig: G2Element,
-    ) -> bool;
-
-    pub fn BIP32ChainCodeSerialize(cc: BIP32ChainCode) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ChainCodeIsEqual(cc1: BIP32ChainCode, cc2: BIP32ChainCode) -> bool;
-
-    pub fn BIP32ChainCodeFree(cc: BIP32ChainCode);
-
-    pub fn BIP32ExtendedPublicKeyFromBytes(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        legacy: bool,
-        didErr: *mut bool,
-    ) -> BIP32ExtendedPublicKey;
-
-    pub fn BIP32ExtendedPublicKeyPublicChild(
-        pk: BIP32ExtendedPublicKey,
-        index: u32,
-        legacy: bool,
-    ) -> BIP32ExtendedPublicKey;
-
-    pub fn BIP32ExtendedPublicKeyGetChainCode(pk: BIP32ExtendedPublicKey) -> BIP32ChainCode;
-
-    pub fn BIP32ExtendedPublicKeySerialize(
-        pk: BIP32ExtendedPublicKey,
-        legacy: bool,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ExtendedPublicKeyIsEqual(
-        pk1: BIP32ExtendedPublicKey,
-        pk2: BIP32ExtendedPublicKey,
-    ) -> bool;
-
-    pub fn BIP32ExtendedPublicKeyGetPublicKey(
-        pk: BIP32ExtendedPublicKey,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ExtendedPublicKeyFree(pk: BIP32ExtendedPublicKey);
-
-    pub fn BIP32ExtendedPrivateKeyFromBytes(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        didErr: *mut bool,
-    ) -> BIP32ExtendedPrivateKey;
-
-    pub fn BIP32ExtendedPrivateKeyFromSeed(
-        data: *const ::std::os::raw::c_void,
-        len: usize,
-        didErr: *mut bool,
-    ) -> BIP32ExtendedPrivateKey;
-
-    pub fn BIP32ExtendedPrivateKeyPrivateChild(
-        sk: BIP32ExtendedPrivateKey,
-        index: u32,
-        legacy: bool,
-    ) -> BIP32ExtendedPrivateKey;
-
-    pub fn BIP32ExtendedPrivateKeyPublicChild(
-        sk: BIP32ExtendedPrivateKey,
-        index: u32,
-    ) -> BIP32ExtendedPublicKey;
-
-    pub fn BIP32ExtendedPrivateKeyGetChainCode(sk: BIP32ExtendedPrivateKey) -> BIP32ChainCode;
-
-    pub fn BIP32ExtendedPrivateKeySerialize(
-        sk: BIP32ExtendedPrivateKey,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ExtendedPrivateKeyIsEqual(
-        sk1: BIP32ExtendedPrivateKey,
-        sk2: BIP32ExtendedPrivateKey,
-    ) -> bool;
-
-    pub fn BIP32ExtendedPrivateKeyGetPrivateKey(
-        sk: BIP32ExtendedPrivateKey,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ExtendedPrivateKeyGetExtendedPublicKey(
-        sk: BIP32ExtendedPrivateKey,
-        legacy: bool,
-        didErr: *mut bool,
-    ) -> BIP32ExtendedPublicKey;
-
-    pub fn BIP32ExtendedPrivateKeyGetPublicKey(
-        sk: BIP32ExtendedPrivateKey,
-        didErr: *mut bool,
-    ) -> *mut ::std::os::raw::c_void;
-
-    pub fn BIP32ExtendedPrivateKeyFree(sk: BIP32ExtendedPrivateKey);
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/build.rs b/src/dashbls/rust-bindings/bls-dash-sys/build.rs
deleted file mode 100644
index 0570baaa89b0..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/build.rs
+++ /dev/null
@@ -1,445 +0,0 @@
-use std::{env, fs, io, io::Write, path::{Path, PathBuf}, process::{Command, Output}};
-
-#[cfg(not(feature = "apple"))]
-fn create_cross_cmake_command() -> Command {
-    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-
-    let mut command = if target_arch.eq("wasm32") {
-        Command::new("emcmake")
-    } else {
-        Command::new("cmake")
-    };
-
-    if target_arch.eq("wasm32") {
-        command.arg("cmake");
-    }
-
-    command
-}
-
-fn handle_command_output(output: Output) {
-    io::stdout()
-        .write_all(&output.stdout)
-        .expect("should write output");
-
-    io::stderr()
-        .write_all(&output.stderr)
-        .expect("should write output");
-
-    assert!(output.status.success());
-}
-
-#[cfg(not(feature = "apple"))]
-fn main() {
-    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-    let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
-
-    // TODO: fix build for wasm32 on MacOS
-    //   errors with `error: linking with `rust-lld` failed: exit status: 1`
-    if target_arch.eq("wasm32") {
-        println!("Build for wasm32 is not fully supported");
-        return;
-    }
-    println!("cargo:warning=Building bls-signatures for non-Apple target: {}", target_arch);
-
-    let root_path = Path::new("../..")
-        .canonicalize()
-        .expect("can't get abs path");
-
-    let bls_dash_build_path = root_path.join("build");
-    let bls_dash_src_path = root_path.join("src");
-    let c_bindings_path = root_path.join("rust-bindings/bls-dash-sys/c-bindings");
-
-    println!("root {}", root_path.display());
-    println!("bls_dash_build_path {}", bls_dash_build_path.display());
-    println!("bls_dash_src_path {}", bls_dash_src_path.display());
-    // println!("c_bindings_path {}", c_bindings_path.display());
-
-    // Run cmake
-
-    println!("Run cmake:");
-
-    if bls_dash_build_path.exists() {
-        fs::remove_dir_all(&bls_dash_build_path).expect("can't clean build directory");
-    }
-
-    fs::create_dir_all(&bls_dash_build_path).expect("can't create build directory");
-
-
-    let cmake_command_binding = create_cross_cmake_command();
-    let mut cmake_command = cmake_command_binding;
-
-    cmake_command
-        .current_dir(&bls_dash_build_path)
-        .arg("-DBUILD_BLS_PYTHON_BINDINGS=0")
-        .arg("-DBUILD_BLS_TESTS=0")
-        .arg("-DBUILD_BLS_BENCHMARKS=0")
-        .arg("-DBUILD_BLS_JS_BINDINGS=0");
-
-    // configure CMake for Android
-    if target_os.eq("android") {
-        let cmake_toolchain_path = env::var("CMAKE_TOOLCHAIN_FILE")
-            .or_else(|_| env::var("CARGO_NDK_CMAKE_TOOLCHAIN_PATH"))
-            .expect("Neither CMAKE_TOOLCHAIN_FILE nor CARGO_NDK_CMAKE_TOOLCHAIN_PATH environment variables are set");
-
-        let ndk_target = match env::var("CARGO_NDK_TARGET_ARCH") {
-            Ok(value) => value, // If set, use the value directly.
-            Err(_) => {
-                match target_arch.as_str() {
-                    "aarch64" => "arm64-v8a".to_string(),
-                    "arm" => "armeabi-v7a".to_string(),
-                    "x86" => "x86".to_string(),
-                    "x86_64" => "x86_64".to_string(),
-                    _ => panic!("Unsupported target architecture for Android: {}", target_arch),
-                }
-            }
-        };
-
-        // Default to android-24 if ANDROID_PLATFORM is not specified
-        let android_abi = env::var("ANDROID_PLATFORM")
-            .or_else(|_| env::var("CARGO_NDK_ANDROID_PLATFORM"))
-            .unwrap_or_else(|_| "android-24".to_string());
-
-        cmake_command
-            .arg(format!("-DANDROID_PLATFORM={}", android_abi))
-            .arg(format!("-DANDROID_ABI={}", ndk_target))
-            .arg(format!("-DCMAKE_TOOLCHAIN_FILE={}", cmake_toolchain_path));
-    }
-
-    let cmake_output = cmake_command
-        .arg("..")
-        .output()
-        .expect("can't run cmake");
-
-    handle_command_output(cmake_output);
-
-    // Build deps for bls-signatures
-
-    println!("Build dependencies:");
-
-    let build_output = Command::new("cmake")
-        .args(["--build", ".", "--", "-j", "6"])
-        .current_dir(&bls_dash_build_path)
-        .output()
-        .expect("can't build bls-signatures deps");
-
-    handle_command_output(build_output);
-
-    // Collect include paths
-    let include_paths_file_path = bls_dash_build_path.join("include_paths.txt");
-
-    let include_paths =
-        fs::read_to_string(include_paths_file_path).expect("should read include paths from file");
-
-    let mut include_paths: Vec<_> = include_paths
-        .split(';')
-        .filter(|path| !path.is_empty())
-        .map(|path| PathBuf::from(path))
-        .collect();
-
-    include_paths.extend([
-        bls_dash_build_path.join("depends/relic-src/include"),
-        bls_dash_build_path.join("depends/relic/include"),
-        bls_dash_build_path.join("src"),
-        root_path.join("include/dashbls"),
-        bls_dash_build_path.join("depends/relic/include"),
-        bls_dash_build_path.join("depends/mimalloc/include"),
-        root_path.join("depends/relic/include"),
-        root_path.join("depends/mimalloc/include"),
-        bls_dash_src_path.clone(),
-    ]);
-
-    // Build c binding
-
-    println!("Build C binding:");
-
-    let mut cc = cc::Build::new();
-
-    let cpp_files_mask = c_bindings_path.join("**/*.cpp");
-
-    let cpp_files: Vec<_> = glob::glob(cpp_files_mask.to_str().unwrap())
-        .expect("can't get list of cpp files")
-        .filter_map(Result::ok)
-        .collect();
-
-    cc.files(cpp_files)
-        .includes(&include_paths)
-        .cpp(true)
-        .flag_if_supported("-std=c++14")
-        .target(&env::var("TARGET").unwrap());
-
-    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-
-    // Fix homebrew LLVM installation issue
-    if env::consts::OS == "macos" && target_arch == "wasm32" {
-        cc.archiver("llvm-ar");
-    }
-
-    if target_arch.eq("wasm32") {
-        cc.flag_if_supported("-ffreestanding")
-            .define("_LIBCPP_HAS_NO_THREADS", Some("1"));
-    }
-
-    if !cfg!(debug_assertions) {
-        cc.opt_level(2);
-    }
-
-    cc.compile("bls-dash-sys");
-
-    // // Link dependencies
-    // println!(
-    //     "cargo:rustc-link-search={}",
-    //     bls_dash_build_path.join("_deps/sodium-build").display()
-    // );
-
-    // println!("cargo:rustc-link-lib=static=sodium");
-
-    println!(
-        "cargo:rustc-link-search={}",
-        root_path.join("build/depends/relic/lib").display()
-    );
-
-    println!("cargo:rustc-link-lib=static=relic_s");
-
-    let mimalloc_dir = root_path.join("build/depends/mimalloc");
-    println!("cargo:rustc-link-search={}", mimalloc_dir.display());
-    let mimalloc_lib = if mimalloc_dir.join("libmimalloc-secure-debug.a").exists() {
-        "mimalloc-secure-debug"
-    } else {
-        "mimalloc-secure"
-    };
-    println!("cargo:rustc-link-lib=static={}", mimalloc_lib);
-
-    println!(
-        "cargo:rustc-link-search={}",
-        bls_dash_build_path.join("src").display()
-    );
-
-    println!("cargo:rustc-link-lib=static=dashbls");
-
-    // Link GMP if exists
-    let gmp_libraries_file_path = bls_dash_build_path.join("gmp_libraries.txt");
-
-    if gmp_libraries_file_path.exists() {
-        let gmp_libraries_path = PathBuf::from(
-            fs::read_to_string(gmp_libraries_file_path)
-                .expect("should read gmp includes from file"),
-        );
-
-        let gmp_libraries_parent_path = gmp_libraries_path
-            .parent()
-            .expect("can't get gmp libraries parent dir");
-
-        println!(
-            "cargo:rustc-link-search={}",
-            gmp_libraries_parent_path.display()
-        );
-
-        println!("cargo:rustc-link-lib=static=gmp");
-    }
-    println!("cargo:warning=########## bls_dash_build_path:{}", bls_dash_build_path.display());
-
-    // Generate rust code for c binding to src/lib.rs
-    // println!("Generate C binding for rust:");
-
-    // let mut builder = bindgen::Builder::default()
-    //     // .trust_clang_mangling(true)
-    //     // .wasm_import_module_name()
-    //     .size_t_is_usize(true)
-    //     .parse_callbacks(Box::new(bindgen::CargoCallbacks));
-
-    // let headers_to_process = [
-    //     "blschia.h",
-    //     "elements.h",
-    //     "privatekey.h",
-    //     "schemes.h",
-    //     "threshold.h",
-    //     "bip32/chaincode.h",
-    //     "bip32/extendedprivatekey.h",
-    //     "bip32/extendedpublickey.h",
-    // ];
-
-    // for header in headers_to_process {
-    //     builder = builder.header(c_bindings_path.join(header).to_str().unwrap())
-    // }
-
-    // if target_arch == "wasm32" {
-    //     builder = builder.clang_args(
-    //         include_paths
-    //             .iter()
-    //             .map(|path| format!("-I{}", path.display())),
-    //     );
-    // }
-
-    // let bindings = builder.generate().expect("Unable to generate bindings");
-
-    // let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
-
-    // bindings
-    //     .write_to_file(out_path.join("bindings.rs"))
-    //     .expect("couldn't write bindings");
-
-    // // Rerun build if files changed
-    // println!("cargo:rerun-if-changed={}", c_bindings_path.display());
-    println!("cargo:rerun-if-changed={}", bls_dash_src_path.display());
-}
-
-// fn main() {
-//     let target = env::var("TARGET").unwrap();
-//     println!("Building bls-signatures for apple target: {}", target);
-//     let root_path = Path::new("../..")
-//         .canonicalize()
-//         .expect("can't get abs path");
-//     let bls_dash_build_path = root_path.join("build");
-//     let bls_dash_src_path = root_path.join("src");
-//     let artefacts_path = bls_dash_build_path.join("artefacts");
-//     let target_path = artefacts_path.join(&target);
-//     let script = root_path.join("apple.rust.single.sh");
-//     if bls_dash_build_path.exists() {
-//         fs::remove_dir_all(&bls_dash_build_path).expect("can't clean build directory");
-//     }
-//     fs::create_dir_all(&bls_dash_build_path).expect("can't create build directory");
-//     let output = Command::new("sh")
-//         .current_dir(&root_path)
-//         .arg(script)
-//         .arg(target)
-//         .output()
-//         .expect("Failed to execute the shell script");
-//     handle_command_output(output);
-//     let library_path = target_path.join("libbls.a");
-//     if !fs::metadata(&library_path).is_ok() {
-//         panic!("Library file not found: {}", library_path.display());
-//     }
-//     println!("cargo:rustc-link-search={}", target_path.display());
-//     println!("cargo:rustc-link-lib=static=gmp");
-//     println!("cargo:rustc-link-lib=static=sodium");
-//     println!("cargo:rustc-link-lib=static=relic_s");
-//     println!("cargo:rustc-link-search={}", bls_dash_build_path.join("src").display());
-//     println!("cargo:rustc-link-lib=static=bls");
-//     println!("cargo:rerun-if-changed={}", bls_dash_src_path.display());
-// }
-
-#[cfg(feature = "apple")]
-fn main() {
-    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-
-    // TODO: fix build for wasm32 on MacOS
-    //   errors with `error: linking with `rust-lld` failed: exit status: 1`
-    if target_arch.eq("wasm32") {
-        println!("Build for wasm32 is not fully supported");
-        return;
-    }
-
-
-    let target = env::var("TARGET").unwrap();
-    println!("cargo:warning=Building bls-signatures for Apple target: {}", target);
-    let root_path = Path::new("../..")
-        .canonicalize()
-        .expect("can't get abs path");
-    let bls_dash_build_path = root_path.join("build");
-    let bls_dash_src_path = root_path.join("src");
-    let bls_dash_src_include_path = root_path.join("include/dashbls");
-    let c_bindings_path = root_path.join("rust-bindings/bls-dash-sys/c-bindings");
-    let artefacts_path = bls_dash_build_path.join("artefacts");
-    let target_path = artefacts_path.join(&target);
-    let script = root_path.join("apple.rust.deps.sh");
-    if bls_dash_build_path.exists() {
-        fs::remove_dir_all(&bls_dash_build_path).expect("can't clean build directory");
-    }
-    fs::create_dir_all(&bls_dash_build_path).expect("can't create build directory");
-
-    let cc_path_output = Command::new("xcrun")
-        .arg("--sdk")
-        .arg("iphoneos")
-        .arg("--find")
-        .arg("clang")
-        .output()
-        .expect("Failed to find clang");
-    let cc_path = String::from_utf8_lossy(&cc_path_output.stdout).trim().to_string();
-
-    let cxx_path_output = Command::new("xcrun")
-        .arg("--sdk")
-        .arg("iphoneos")
-        .arg("--find")
-        .arg("clang++")
-        .output()
-        .expect("Failed to find clang++");
-    let cxx_path = String::from_utf8_lossy(&cxx_path_output.stdout).trim().to_string();
-
-    // Print the paths for clang and clang++
-    println!("cargo:warning=CC path: {}", cc_path);
-    println!("cargo:warning=CXX path: {}", cxx_path);
-
-    std::env::set_var("CC", cc_path);
-    std::env::set_var("CXX", cxx_path);
-
-    let output = Command::new("sh")
-        .current_dir(&root_path)
-        .arg(script)
-        .arg(target.as_str())
-        .output()
-        .expect("Failed to execute the shell script");
-    handle_command_output(output);
-
-    let (arch, platform) = match target.as_str() {
-        "x86_64-apple-ios" => ("x86_64", "iphonesimulator"),
-        "aarch64-apple-ios" => ("arm64", "iphoneos"),
-        "aarch64-apple-ios-sim" => ("arm64", "iphonesimulator"),
-        "x86_64-apple-darwin" => ("x86_64", "macosx"),
-        "aarch64-apple-darwin" => ("arm64", "macosx"),
-        _ => panic!("Target {} not supported", target.as_str())
-    };
-    env::set_var("IPHONEOS_DEPLOYMENT_TARGET", "13.0");
-
-    // Collect include paths
-    let include_paths_file_path = bls_dash_build_path.join("include_paths.txt");
-
-    let include_paths =
-        fs::read_to_string(include_paths_file_path).expect("should read include paths from file");
-
-    let mut include_paths: Vec<_> = include_paths
-        .split(';')
-        .filter(|path| !path.is_empty())
-        .map(|path| PathBuf::from(path))
-        .collect();
-
-    include_paths.extend([
-        bls_dash_build_path.join(format!("relic-{}-{}/depends/relic-src/include", platform, arch)),
-        bls_dash_build_path.join(format!("relic-{}-{}/depends/relic/include", platform, arch)),
-        bls_dash_build_path.join("contrib/relic/src"),
-        root_path.join("src"),
-        root_path.join("include/dashbls"),
-        root_path.join("depends/relic/include"),
-        root_path.join("depends/mimalloc/include"),
-        root_path.join("depends/catch2/include"),
-        bls_dash_src_path.clone(),
-        bls_dash_src_include_path.clone()
-    ]);
-
-    let cpp_files: Vec<_> = glob::glob(c_bindings_path.join("**/*.cpp").to_str().unwrap())
-        .expect("can't get list of cpp files")
-        .filter_map(Result::ok)
-        .collect();
-
-    let mut cc = cc::Build::new();
-    cc.files(cpp_files)
-        .includes(&include_paths)
-        .cpp(true)
-        .flag("-Wno-unused-parameter")
-        .flag("-Wno-sign-compare")
-        .flag("-Wno-delete-non-abstract-non-virtual-dtor")
-        .flag("-std=c++14");
-
-    cc.compile("dashbls");
-
-    println!("cargo:rustc-link-search={}", target_path.display());
-    println!("cargo:rustc-link-lib=static=gmp");
-    //println!("cargo:rustc-link-lib=c++");
-    //println!("cargo:rustc-link-lib=c");
-    //println!("cargo:rustc-link-lib=static=sodium");
-    println!("cargo:rustc-link-lib=static=relic_s");
-    println!("cargo:rustc-link-lib=static=bls");
-    println!("cargo:rustc-link-search={}", bls_dash_src_path.display());
-    println!("cargo:rustc-link-lib=static=dashbls");
-    println!("cargo:rerun-if-changed={}", bls_dash_src_path.display());
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.cpp
deleted file mode 100644
index 177c4d737142..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <vector>
-#include "bls.hpp"
-#include "chaincode.h"
-
-void* BIP32ChainCodeSerialize(const BIP32ChainCode cc)
-{
-    const bls::ChainCode* ccPtr = (bls::ChainCode*)cc;
-    const std::vector<uint8_t> serialized = ccPtr->Serialize();
-    uint8_t* buffer = (uint8_t*)malloc(bls::ChainCode::SIZE);
-    memcpy(buffer, serialized.data(), bls::ChainCode::SIZE);
-    return (void*)buffer;
-}
-
-bool BIP32ChainCodeIsEqual(const BIP32ChainCode cc1, const BIP32ChainCode cc2)
-{
-    const bls::ChainCode* cc1Ptr = (bls::ChainCode*)cc1;
-    const bls::ChainCode* cc2Ptr = (bls::ChainCode*)cc2;
-    return *cc1Ptr == *cc2Ptr;
-}
-
-void BIP32ChainCodeFree(const BIP32ChainCode cc)
-{
-    const bls::ChainCode* ccPtr = (bls::ChainCode*)cc;
-    delete ccPtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.h
deleted file mode 100644
index 688cf3f51e65..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef BIP32CHAINCODE_H_
-#define BIP32CHAINCODE_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* BIP32ChainCode;
-
-void* BIP32ChainCodeSerialize(const BIP32ChainCode cc);
-bool BIP32ChainCodeIsEqual(const BIP32ChainCode cc1, const BIP32ChainCode cc2);
-void BIP32ChainCodeFree(const BIP32ChainCode cc);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // BIP32CHAINCODE_H_
\ No newline at end of file
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp
deleted file mode 100644
index 5e9efb8d81e2..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "extendedprivatekey.h"
-
-#include <vector>
-
-#include "../blschia.h"
-#include "../error.h"
-#include "bls.hpp"
-
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromBytes(const void* data, size_t len, bool* didErr)
-{
-    bls::ExtendedPrivateKey* el = nullptr;
-    try {
-        el = new bls::ExtendedPrivateKey(bls::ExtendedPrivateKey::FromBytes(
-            bls::Bytes((uint8_t*)data, len)));
-    } catch (const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromSeed(const void* data, const size_t len, bool* didErr)
-{
-    bls::ExtendedPrivateKey* el = nullptr;
-    try {
-        el = new bls::ExtendedPrivateKey(bls::ExtendedPrivateKey::FromSeed(
-            bls::Bytes((uint8_t*)data, len)));
-    } catch (const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyPrivateChild(
-    const BIP32ExtendedPrivateKey sk,
-    const uint32_t index,
-    const bool legacy)
-{
-    const bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    return new bls::ExtendedPrivateKey(skPtr->PrivateChild(index, legacy));
-}
-
-BIP32ExtendedPublicKey BIP32ExtendedPrivateKeyPublicChild(
-    const BIP32ExtendedPrivateKey sk,
-    const uint32_t index)
-{
-    const bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    return new bls::ExtendedPublicKey(skPtr->PublicChild(index));
-}
-
-BIP32ChainCode BIP32ExtendedPrivateKeyGetChainCode(const BIP32ExtendedPrivateKey sk)
-{
-    const bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    return new bls::ChainCode(skPtr->GetChainCode());
-}
-
-void* BIP32ExtendedPrivateKeySerialize(const BIP32ExtendedPrivateKey sk)
-{
-    const bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    uint8_t* buffer =
-        bls::Util::SecAlloc<uint8_t>(bls::ExtendedPrivateKey::SIZE);
-    skPtr->Serialize(buffer);
-
-    return (void*)buffer;
-}
-
-bool BIP32ExtendedPrivateKeyIsEqual(
-    const BIP32ExtendedPrivateKey sk1,
-    const BIP32ExtendedPrivateKey sk2)
-{
-    const bls::ExtendedPrivateKey* sk1Ptr = (bls::ExtendedPrivateKey*)sk1;
-    const bls::ExtendedPrivateKey* sk2Ptr = (bls::ExtendedPrivateKey*)sk2;
-    return *sk1Ptr == *sk2Ptr;
-}
-
-void* BIP32ExtendedPrivateKeyGetPrivateKey(const BIP32ExtendedPrivateKey sk)
-{
-    bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    return new bls::PrivateKey(skPtr->GetPrivateKey());
-}
-
-void* BIP32ExtendedPrivateKeyGetPublicKey(
-    const BIP32ExtendedPrivateKey sk,
-    bool* didErr)
-{
-    bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(skPtr->GetPublicKey());
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-BIP32ExtendedPublicKey BIP32ExtendedPrivateKeyGetExtendedPublicKey(
-    const BIP32ExtendedPrivateKey sk,
-    const bool legacy,
-    bool* didErr)
-{
-    bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    bls::ExtendedPublicKey* pk = nullptr;
-    try {
-        pk = new bls::ExtendedPublicKey(skPtr->GetExtendedPublicKey(legacy));
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return pk;
-}
-
-void BIP32ExtendedPrivateKeyFree(const BIP32ExtendedPrivateKey sk)
-{
-    const bls::ExtendedPrivateKey* skPtr = (bls::ExtendedPrivateKey*)sk;
-    delete skPtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h
deleted file mode 100644
index 8741737215d0..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef BIP32EXTENDEDPRIVATEKEY_H_
-#define BIP32EXTENDEDPRIVATEKEY_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "extendedpublickey.h"
-#include "chaincode.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* BIP32ExtendedPrivateKey;
-
-// ExtendedPrivateKey
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromBytes(
-    const void* data,
-    size_t len,
-    bool* didErr);
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromSeed(const void* data, const size_t len, bool* didErr);
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyPrivateChild(
-    const BIP32ExtendedPrivateKey sk,
-    const uint32_t index,
-    const bool legacy);
-BIP32ExtendedPublicKey BIP32ExtendedPrivateKeyPublicChild(
-    const BIP32ExtendedPrivateKey sk,
-    const uint32_t index);
-BIP32ChainCode BIP32ExtendedPrivateKeyGetChainCode(const BIP32ExtendedPrivateKey sk);
-void* BIP32ExtendedPrivateKeySerialize(const BIP32ExtendedPrivateKey sk);
-bool BIP32ExtendedPrivateKeyIsEqual(
-    const BIP32ExtendedPrivateKey sk1,
-    const BIP32ExtendedPrivateKey sk2);
-void* BIP32ExtendedPrivateKeyGetPrivateKey(const BIP32ExtendedPrivateKey sk);
-BIP32ExtendedPublicKey BIP32ExtendedPrivateKeyGetExtendedPublicKey(
-    const BIP32ExtendedPrivateKey sk,
-    const bool legacy,
-    bool* didErr);
-void* BIP32ExtendedPrivateKeyGetPublicKey(
-    const BIP32ExtendedPrivateKey sk,
-    bool* didErr);
-void BIP32ExtendedPrivateKeyFree(const BIP32ExtendedPrivateKey sk);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // BIP32EXTENDEDPRIVATEKEY_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp
deleted file mode 100644
index a52bcabe5605..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "extendedpublickey.h"
-
-#include <vector>
-
-#include "../blschia.h"
-#include "../error.h"
-#include "bls.hpp"
-
-BIP32ExtendedPublicKey BIP32ExtendedPublicKeyFromBytes(
-    const void* data,
-    size_t len,
-    const bool legacy,
-    bool* didErr)
-{
-    bls::ExtendedPublicKey* el = nullptr;
-    try {
-        el = new bls::ExtendedPublicKey(bls::ExtendedPublicKey::FromBytes(
-            bls::Bytes((uint8_t*)data, len),
-            legacy));
-    } catch (const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-BIP32ExtendedPublicKey BIP32ExtendedPublicKeyPublicChild(
-    const BIP32ExtendedPublicKey pk,
-    const uint32_t index,
-    const bool legacy)
-{
-    const bls::ExtendedPublicKey* pkPtr = (bls::ExtendedPublicKey*)pk;
-    return new bls::ExtendedPublicKey(pkPtr->PublicChild(index, legacy));
-}
-
-BIP32ChainCode BIP32ExtendedPublicKeyGetChainCode(const BIP32ExtendedPublicKey pk)
-{
-    const bls::ExtendedPublicKey* pkPtr = (bls::ExtendedPublicKey*)pk;
-    return new bls::ChainCode(pkPtr->GetChainCode());
-}
-
-void* BIP32ExtendedPublicKeyGetPublicKey(const BIP32ExtendedPublicKey pk) {
-    bls::ExtendedPublicKey* pkPtr = (bls::ExtendedPublicKey*)pk;
-    return new bls::G1Element(pkPtr->GetPublicKey());
-}
-
-void* BIP32ExtendedPublicKeySerialize(
-    const BIP32ExtendedPublicKey pk,
-    const bool legacy)
-{
-    const bls::ExtendedPublicKey* pkPtr = (bls::ExtendedPublicKey*)pk;
-    const std::vector<uint8_t> serialized = pkPtr->Serialize(legacy);
-    uint8_t* buffer = (uint8_t*)malloc(bls::ExtendedPublicKey::SIZE);
-    memcpy(buffer, serialized.data(), bls::ExtendedPublicKey::SIZE);
-    return (void*)buffer;
-}
-
-bool BIP32ExtendedPublicKeyIsEqual(
-    const BIP32ExtendedPublicKey pk1,
-    const BIP32ExtendedPublicKey pk2)
-{
-    const bls::ExtendedPublicKey* pk1Ptr = (bls::ExtendedPublicKey*)pk1;
-    const bls::ExtendedPublicKey* pk2Ptr = (bls::ExtendedPublicKey*)pk2;
-    return *pk1Ptr == *pk2Ptr;
-}
-
-void BIP32ExtendedPublicKeyFree(const BIP32ExtendedPublicKey pk)
-{
-    const bls::ExtendedPublicKey* pkPtr = (bls::ExtendedPublicKey*)pk;
-    delete pkPtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h
deleted file mode 100644
index 420da3156001..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef BIP32EXTENDEDPUBLICKEY_H_
-#define BIP32EXTENDEDPUBLICKEY_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "chaincode.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* BIP32ExtendedPublicKey;
-
-// ExtendedPublicKey
-BIP32ExtendedPublicKey BIP32ExtendedPublicKeyFromBytes(
-    const void* data,
-    size_t len,
-    const bool legacy,
-    bool* didErr);
-BIP32ExtendedPublicKey BIP32ExtendedPublicKeyPublicChild(
-    const BIP32ExtendedPublicKey pk,
-    const uint32_t index,
-    const bool legacy);
-BIP32ChainCode BIP32ExtendedPublicKeyGetChainCode(const BIP32ExtendedPublicKey pk);
-void* BIP32ExtendedPublicKeyGetPublicKey(const BIP32ExtendedPublicKey pk);
-void* BIP32ExtendedPublicKeySerialize(
-    const BIP32ExtendedPublicKey pk,
-    const bool legacy);
-bool BIP32ExtendedPublicKeyIsEqual(
-    const BIP32ExtendedPublicKey pk1,
-    const BIP32ExtendedPublicKey pk2);
-void BIP32ExtendedPublicKeyFree(const BIP32ExtendedPublicKey pk);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // BIP32EXTENDEDPUBLICKEY_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.cpp
deleted file mode 100644
index 2b3c274dc44c..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <string>
-#include <stdlib.h>
-#include "bls.hpp"
-#include "error.h"
-#include "blschia.h"
-
-// TODO: Revisit
-
-std::string gErrMsg;
-
-void SecFree(void *p) {
-    bls::Util::SecFree(p);
-}
-
-void** AllocPtrArray(size_t len) {
-    // caller to free
-    return (void**)bls::Util::SecAlloc<uint8_t>(sizeof(void*) * len);
-}
-
-void SetPtrArray(void** arrPtr, void* elemPtr, int index) {
-    arrPtr[index] = elemPtr;
-}
-
-void FreePtrArray(void** inPtr) {
-    bls::Util::SecFree(inPtr);
-}
-
-void* GetPtrAtIndex(void** arrPtr, int index) {
-    return arrPtr[index];
-}
-
-uint8_t* SecAllocBytes(size_t len) {
-    return (uint8_t*)bls::Util::SecAlloc<uint8_t>(sizeof(uint8_t) * len);
-}
-
-void* GetAddressAtIndex(uint8_t* ptr, int index) {
-    return (void*)&ptr[index];
-}
-
-const char* GetLastErrorMsg() {
-    return gErrMsg.c_str();
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.h
deleted file mode 100644
index ebc3b518dcfa..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef BLSCHIA_H_
-#define BLSCHIA_H_
-#include <stdbool.h>
-#include <stdint.h>
-#include "privatekey.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Export the BLS SecFree method
-void SecFree(void *p);
-
-typedef void** carr;
-
-// Additional C++ helper funcs for allocations
-void** AllocPtrArray(size_t len);
-void SetPtrArray(void **arrPtr, void *elemPtr, int index);
-void FreePtrArray(void **inPtr);
-void* GetPtrAtIndex(void **arrPtr, int index);
-
-// Allocates an array of bytes with size of passed in len argument
-uint8_t* SecAllocBytes(size_t len);
-
-void* GetAddressAtIndex(uint8_t *ptr, int index);
-
-const char* GetLastErrorMsg();
-
-#ifdef __cplusplus
-}
-#endif
-#endif // BLSCHIA_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.cpp
deleted file mode 100644
index 486ee32f4781..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "bls.hpp"
-#include "blschia.h"
-#include "error.h"
-#include "elements.h"
-
-// G1Element
-int G1ElementSize() {
-    return bls::G1Element::SIZE;
-}
-
-G1Element G1ElementFromBytes(const void* data, size_t len, bool legacy, bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)data, len), legacy)
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-G1Element G1ElementGenerator() {
-    return new bls::G1Element(bls::G1Element::Generator());
-}
-
-bool G1ElementIsValid(const G1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return elPtr->IsValid();
-}
-
-uint32_t G1ElementGetFingerprint(const G1Element el, const bool legacy) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return elPtr->GetFingerprint(legacy);
-}
-
-void* G1ElementSerialize(const G1Element el, const bool legacy) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    const std::vector<uint8_t> serialized = elPtr->Serialize(legacy);
-    uint8_t* buffer = (uint8_t*)malloc(bls::G1Element::SIZE);
-    memcpy(buffer, serialized.data(), bls::G1Element::SIZE);
-    return (void*)buffer;
-}
-
-bool G1ElementIsEqual(const G1Element el1, const G1Element el2) {
-    const bls::G1Element* el1Ptr = (bls::G1Element*)el1;
-    const bls::G1Element* el2Ptr = (bls::G1Element*)el2;
-    return *el1Ptr == *el2Ptr;
-}
-
-G1Element G1ElementAdd(const G1Element el1, const G1Element el2) {
-    const bls::G1Element* el1Ptr = (bls::G1Element*)el1;
-    const bls::G1Element* el2Ptr = (bls::G1Element*)el2;
-    return new bls::G1Element((*el1Ptr) + (*el2Ptr));
-}
-
-G1Element G1ElementMul(const G1Element el, const PrivateKey sk) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G1Element(*elPtr * *skPtr);
-}
-
-G1Element G1ElementNegate(const G1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    return new bls::G1Element(elPtr->Negate());
-}
-
-G1Element G1ElementCopy(const G1Element el) {
-    return new bls::G1Element(((bls::G1Element*)el)->Copy());
-}
-
-void G1ElementFree(const G1Element el) {
-    const bls::G1Element* elPtr = (bls::G1Element*)el;
-    delete elPtr;
-}
-
-// G2Element
-int G2ElementSize() {
-    return bls::G2Element::SIZE;
-}
-
-G2Element G2ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, len), legacy)
-        );
-        *didErr = false;
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-G2Element G2ElementGenerator() {
-    return new bls::G2Element(bls::G2Element::Generator());
-}
-
-bool G2ElementIsValid(const G2Element el) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return elPtr->IsValid();
-}
-
-void* G2ElementSerialize(const G2Element el, const bool legacy) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    const std::vector<uint8_t> serialized = elPtr->Serialize(legacy);
-    uint8_t* buffer = (uint8_t*)malloc(bls::G2Element::SIZE);
-    memcpy(buffer, serialized.data(), bls::G2Element::SIZE);
-    return (void*)buffer;
-}
-
-bool G2ElementIsEqual(const G2Element el1, const G2Element el2) {
-    const bls::G2Element* el1Ptr = (bls::G2Element*)el1;
-    const bls::G2Element* el2Ptr = (bls::G2Element*)el2;
-    return *el1Ptr == *el2Ptr;
-}
-
-G2Element G2ElementAdd(const G2Element el1, const G2Element el2) {
-    bls::G2Element* el1Ptr = (bls::G2Element*)el1;
-    bls::G2Element* el2Ptr = (bls::G2Element*)el2;
-    return new bls::G2Element(*el1Ptr + *el2Ptr);
-}
-
-G2Element G2ElementMul(const G2Element el, const PrivateKey sk) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(*elPtr * *skPtr);
-}
-
-G2Element G2ElementNegate(const G2Element el) {
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return new bls::G2Element(elPtr->Negate());
-}
-
-G2Element G2ElementCopy(const G1Element el) {
-    return new bls::G2Element(((bls::G2Element*)el)->Copy());
-}
-
-void G2ElementFree(const G2Element el) {
-    bls::G2Element* elPtr = (bls::G2Element*)el;
-    delete elPtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.h
deleted file mode 100644
index e6912125375a..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef ELEMENTS_H_
-#define ELEMENTS_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* G1Element;
-typedef void* G2Element;
-typedef void* PrivateKey;
-
-// G1Element
-int G1ElementSize();
-G1Element G1ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr);
-G1Element G1ElementGenerator();
-bool G1ElementIsValid(const G1Element el);
-uint32_t G1ElementGetFingerprint(const G1Element el, const bool legacy);
-bool G1ElementIsEqual(const G1Element el1, const G1Element el2);
-G1Element G1ElementAdd(const G1Element el1, const G1Element el2);
-G1Element G1ElementMul(const G1Element el, const PrivateKey sk);
-G1Element G1ElementNegate(const G1Element el);
-G1Element G1ElementCopy(const G1Element el);
-void* G1ElementSerialize(const G1Element el, const bool legacy);
-void G1ElementFree(const G1Element el);
-
-// G2Element
-int G2ElementSize();
-G2Element G2ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr);
-G2Element G2ElementGenerator();
-bool G2ElementIsValid(const G2Element el);
-bool G2ElementIsEqual(const G2Element el1, const G2Element el2);
-G2Element G2ElementAdd(const G2Element el1, const G2Element el2);
-G2Element G2ElementMul(const G2Element el, const PrivateKey sk);
-G2Element G2ElementNegate(const G2Element el);
-G2Element G2ElementCopy(const G2Element el);
-void* G2ElementSerialize(const G2Element el, const bool legacy);
-void G2ElementFree(const G2Element el);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // ELEMENTS_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/error.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/error.h
deleted file mode 100644
index 57525b77fa64..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/error.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2020 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef ERROR_H_
-#define ERROR_H_
-#include <string>
-
-extern std::string gErrMsg;
-
-#endif  // ERROR_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp
deleted file mode 100644
index ca1b2bcde719..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "bls.hpp"
-#include "privatekey.h"
-#include "blschia.h"
-#include "error.h"
-#include "utils.hpp"
-
-// private key bindings implementation
-PrivateKey PrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr) {
-    bls::PrivateKey* skPtr = nullptr;
-    try {
-        skPtr = new bls::PrivateKey(
-            bls::PrivateKey::FromBytes(
-                bls::Bytes((uint8_t*)data, len),
-                modOrder
-            )
-        );
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return skPtr;
-}
-
-PrivateKey PrivateKeyFromSeedBIP32(const void* data, const size_t len) {
-    return new bls::PrivateKey(
-        bls::PrivateKey::FromSeedBIP32(bls::Bytes((uint8_t*)data, len))
-    );
-}
-
-PrivateKey PrivateKeyAggregate(void** sks, const size_t len) {
-    return new bls::PrivateKey(
-        bls::PrivateKey::Aggregate(toBLSVector<bls::PrivateKey>(sks, len))
-    );
-}
-
-void* PrivateKeySerialize(const PrivateKey sk) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    uint8_t* buffer = bls::Util::SecAlloc<uint8_t>(bls::PrivateKey::PRIVATE_KEY_SIZE);
-    skPtr->Serialize(buffer);
-
-    return (void*)buffer;
-}
-
-size_t PrivateKeySizeBytes() {
-    return bls::PrivateKey::PRIVATE_KEY_SIZE;
-}
-
-bool PrivateKeyIsEqual(const PrivateKey sk1, const PrivateKey sk2) {
-    const bls::PrivateKey* sk1Ptr = (bls::PrivateKey*)sk1;
-    const bls::PrivateKey* sk2Ptr = (bls::PrivateKey*)sk2;
-    return *sk1Ptr == *sk2Ptr;
-}
-
-G1Element PrivateKeyGetG1Element(const PrivateKey sk, bool* didErr) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(skPtr->GetG1Element());
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-G2Element PrivateKeyGetG2Element(const PrivateKey sk, bool* didErr) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(skPtr->GetG2Element());
-        *didErr = false;
-    } catch (const std::exception& ex) {
-        // set err
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    return el;
-}
-
-G2Element PrivateKeyGetG2Power(const PrivateKey sk, const G2Element el) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    const bls::G2Element* elPtr = (bls::G2Element*)el;
-    return new bls::G2Element(skPtr->GetG2Power(*elPtr));
-}
-
-G2Element PrivateKeySignG2(const PrivateKey sk,
-                             uint8_t* msg,
-                             const size_t len,
-                             const uint8_t* dst,
-                             const size_t dstLen) {
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(skPtr->SignG2(msg, len, dst, dstLen));
-}
-
-void PrivateKeyFree(PrivateKey sk) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    delete skPtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.h
deleted file mode 100644
index bba2837a1753..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef PRIVATEKEY_H_
-#define PRIVATEKEY_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include "elements.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* PrivateKey;
-
-PrivateKey PrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr);
-PrivateKey PrivateKeyFromSeedBIP32(const void* data, const size_t len);
-PrivateKey PrivateKeyAggregate(void** sks, const size_t len);
-G1Element PrivateKeyGetG1Element(const PrivateKey sk, bool* didErr);
-G2Element PrivateKeyGetG2Element(const PrivateKey sk, bool* didErr);
-G2Element PrivateKeyGetG2Power(const PrivateKey sk, const G2Element el);
-bool PrivateKeyIsEqual(const PrivateKey sk1, const PrivateKey sk2);
-void* PrivateKeySerialize(const PrivateKey sk);
-void PrivateKeyFree(const PrivateKey sk);
-size_t PrivateKeySizeBytes();
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // PRIVATEKEY_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.cpp
deleted file mode 100644
index bc2e632c8027..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "schemes.h"
-
-#include <vector>
-
-#include "bls.hpp"
-#include "blschia.h"
-#include "elements.h"
-#include "error.h"
-#include "privatekey.h"
-#include "utils.hpp"
-
-// Implementation of bindings for CoreMPL class
-
-PrivateKey CoreMPLKeyGen(
-    const CoreMPL scheme,
-    const void* seed,
-    const size_t seedLen,
-    bool* didErr)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::PrivateKey* sk = nullptr;
-    try {
-        sk = new bls::PrivateKey(
-            schemePtr->KeyGen(bls::Bytes((uint8_t*)seed, seedLen)));
-    } catch (const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-G1Element CoreMPLSkToG1(const CoreMPL scheme, const PrivateKey sk)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G1Element(schemePtr->SkToG1(*skPtr));
-}
-
-G2Element CoreMPLSign(
-    CoreMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen)));
-}
-
-bool CoreMPLVerify(
-    const CoreMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->Verify(
-        *pkPtr, bls::Bytes((uint8_t*)msg, msgLen), *sigPtr);
-}
-
-bool CoreMPLVerifySecure(
-    const CoreMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const G2Element sig,
-    const void* msg,
-    const size_t msgLen)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const uint8_t* msgPtr = (uint8_t*)msg;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->VerifySecure(
-        vecPubKeys, *sigPtr, bls::Bytes(msgPtr, msgLen));
-}
-
-G1Element CoreMPLAggregatePubKeys(
-    const CoreMPL scheme,
-    void** pks,
-    const size_t pksLen)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    return new bls::G1Element(
-        schemePtr->Aggregate(toBLSVector<bls::G1Element>(pks, pksLen)));
-}
-
-G2Element CoreMPLAggregateSigs(
-    const CoreMPL scheme,
-    void** sigs,
-    const size_t sigsLen)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    return new bls::G2Element(
-        schemePtr->Aggregate(toBLSVector<bls::G2Element>(sigs, sigsLen)));
-}
-
-PrivateKey CoreMPLDeriveChildSk(
-    const CoreMPL scheme,
-    const PrivateKey sk,
-    const uint32_t index)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::PrivateKey(schemePtr->DeriveChildSk(*skPtr, index));
-}
-
-PrivateKey CoreMPLDeriveChildSkUnhardened(
-    CoreMPL scheme,
-    PrivateKey sk,
-    uint32_t index)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::PrivateKey(
-        schemePtr->DeriveChildSkUnhardened(*skPtr, index));
-}
-
-G1Element CoreMPLDeriveChildPkUnhardened(
-    CoreMPL scheme,
-    G1Element el,
-    uint32_t index)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    bls::G1Element* elPtr = (bls::G1Element*)el;
-    return new bls::G1Element(
-        schemePtr->DeriveChildPkUnhardened(*elPtr, index));
-}
-
-bool CoreMPLAggregateVerify(
-    const CoreMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig)
-{
-    bls::CoreMPL* schemePtr = (bls::CoreMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens =
-        std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs =
-        toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-// BasicSchemeMPL
-BasicSchemeMPL NewBasicSchemeMPL() { return new bls::BasicSchemeMPL(); }
-
-bool BasicSchemeMPLAggregateVerify(
-    BasicSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig)
-{
-    bls::BasicSchemeMPL* schemePtr = (bls::BasicSchemeMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens =
-        std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs =
-        toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-void BasicSchemeMPLFree(BasicSchemeMPL scheme)
-{
-    bls::BasicSchemeMPL* schemePtr = (bls::BasicSchemeMPL*)scheme;
-    delete schemePtr;
-}
-
-// AugSchemeMPL
-AugSchemeMPL NewAugSchemeMPL() { return new bls::AugSchemeMPL(); }
-
-G2Element AugSchemeMPLSign(
-    const AugSchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen)
-{
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen)));
-}
-
-G2Element AugSchemeMPLSignPrepend(
-    const AugSchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen,
-    const G1Element prepPk)
-{
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    const bls::G1Element* prepPkPtr = (bls::G1Element*)prepPk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen), *prepPkPtr));
-}
-
-bool AugSchemeMPLVerify(
-    const AugSchemeMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig)
-{
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const uint8_t* msgPtr = (uint8_t*)msg;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->Verify(*pkPtr, bls::Bytes(msgPtr, msgLen), *sigPtr);
-}
-
-bool AugSchemeMPLAggregateVerify(
-    const AugSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig)
-{
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens =
-        std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs =
-        toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-void AugSchemeMPLFree(AugSchemeMPL scheme)
-{
-    bls::AugSchemeMPL* schemePtr = (bls::AugSchemeMPL*)scheme;
-    delete schemePtr;
-}
-
-// PopSchemeMPL
-PopSchemeMPL NewPopSchemeMPL() { return new bls::PopSchemeMPL(); }
-
-G2Element PopSchemeMPLPopProve(
-    const PopSchemeMPL scheme,
-    const PrivateKey sk)
-{
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(schemePtr->PopProve(*skPtr));
-}
-
-bool PopSchemeMPLPopVerify(
-    const PopSchemeMPL scheme,
-    const G1Element pk,
-    const G2Element sig)
-{
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->PopVerify(*pkPtr, *sigPtr);
-}
-
-bool PopSchemeMPLFastAggregateVerify(
-    const PopSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig)
-{
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    return schemePtr->FastAggregateVerify(
-        vecPubKeys, bls::Bytes((uint8_t*)msg, msgLen), *sigPtr);
-}
-
-void PopSchemeMPLFree(PopSchemeMPL scheme)
-{
-    bls::PopSchemeMPL* schemePtr = (bls::PopSchemeMPL*)scheme;
-    delete schemePtr;
-}
-
-// LegacySchemeMPL
-LegacySchemeMPL NewLegacySchemeMPL() { return new bls::LegacySchemeMPL(); }
-
-G2Element LegacySchemeMPLSign(
-    const LegacySchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen)
-{
-    bls::LegacySchemeMPL* schemePtr = (bls::LegacySchemeMPL*)scheme;
-    const bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        schemePtr->Sign(*skPtr, bls::Bytes((uint8_t*)msg, msgLen)));
-}
-
-bool LegacySchemeMPLVerify(
-    const LegacySchemeMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig)
-{
-    bls::LegacySchemeMPL* schemePtr = (bls::LegacySchemeMPL*)scheme;
-    const bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    const uint8_t* msgPtr = (uint8_t*)msg;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return schemePtr->Verify(*pkPtr, bls::Bytes(msgPtr, msgLen), *sigPtr);
-}
-
-bool LegacySchemeMPLVerifySecure(
-    const LegacySchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const G2Element sig,
-    const void* msg,
-    const size_t msgLen)
-{
-    bls::LegacySchemeMPL* schemePtr = (bls::LegacySchemeMPL*)scheme;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const uint8_t* msgPtr = (uint8_t*)msg;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    // Because of scheme pointer it will call CoreMPL::VerifySecure with 'legacy' flag variant
-    return schemePtr->VerifySecure(
-        vecPubKeys, *sigPtr, bls::Bytes(msgPtr, msgLen));
-}
-
-bool LegacySchemeMPLAggregateVerify(
-    const LegacySchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig)
-{
-    bls::LegacySchemeMPL* schemePtr = (bls::LegacySchemeMPL*)scheme;
-    const size_t* msgLensPtr = (size_t*)msgsLens;
-    const bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    const std::vector<bls::G1Element> vecPubKeys =
-        toBLSVector<bls::G1Element>(pks, pksLen);
-    const std::vector<size_t> vecMsgsLens =
-        std::vector<size_t>(msgLensPtr, msgLensPtr + msgsLen);
-    const std::vector<bls::Bytes> vecMsgs =
-        toVectorBytes(msgs, msgsLen, vecMsgsLens);
-    return schemePtr->AggregateVerify(vecPubKeys, vecMsgs, *sigPtr);
-}
-
-void LegacySchemeMPLFree(LegacySchemeMPL scheme)
-{
-    bls::LegacySchemeMPL* schemePtr = (bls::LegacySchemeMPL*)scheme;
-    delete schemePtr;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.h
deleted file mode 100644
index 41b39a61038d..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef SCHEMES_H_
-#define SCHEMES_H_
-#include <stdbool.h>
-#include <stdlib.h>
-
-#include "elements.h"
-#include "privatekey.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* CoreMPL;
-typedef CoreMPL BasicSchemeMPL;
-typedef CoreMPL AugSchemeMPL;
-typedef CoreMPL PopSchemeMPL;
-typedef CoreMPL LegacySchemeMPL;
-
-// CoreMPL
-PrivateKey CoreMPLKeyGen(
-    const CoreMPL scheme,
-    const void* seed,
-    const size_t seedLen,
-    bool* didErr);
-G1Element CoreMPLSkToG1(const CoreMPL scheme, const PrivateKey sk);
-G2Element CoreMPLSign(
-    const CoreMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen);
-bool CoreMPLVerify(
-    const BasicSchemeMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig);
-bool CoreMPLVerifySecure(
-    const CoreMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const G2Element sig,
-    const void* msg,
-    const size_t msgLen);
-G1Element CoreMPLAggregatePubKeys(
-    const CoreMPL scheme,
-    void** pubKeys,
-    const size_t pkLen);
-G2Element CoreMPLAggregateSigs(
-    const CoreMPL scheme,
-    void** sigs,
-    const size_t sigLen);
-PrivateKey CoreMPLDeriveChildSk(
-    const CoreMPL scheme,
-    const PrivateKey sk,
-    const uint32_t index);
-PrivateKey CoreMPLDeriveChildSkUnhardened(
-    const CoreMPL scheme,
-    const PrivateKey sk,
-    const uint32_t index);
-G1Element CoreMPLDeriveChildPkUnhardened(
-    const CoreMPL scheme,
-    const G1Element sk,
-    const uint32_t index);
-bool CoreMPLAggregateVerify(
-    const CoreMPL scheme,
-    void** pks,
-    const size_t pkLen,
-    void** msgs,
-    const void* msgLens,
-    const size_t msgLen,
-    const G2Element sig);
-
-// BasicSchemeMPL
-BasicSchemeMPL NewBasicSchemeMPL();
-bool BasicSchemeMPLAggregateVerify(
-    BasicSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig);
-void BasicSchemeMPLFree(BasicSchemeMPL scheme);
-
-// AugSchemeMPL
-AugSchemeMPL NewAugSchemeMPL();
-G2Element AugSchemeMPLSign(
-    const AugSchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen);
-G2Element AugSchemeMPLSignPrepend(
-    const AugSchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen,
-    const G1Element prepPk);
-bool AugSchemeMPLVerify(
-    const AugSchemeMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig);
-bool AugSchemeMPLAggregateVerify(
-    const AugSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig);
-void AugSchemeMPLFree(AugSchemeMPL scheme);
-
-// PopSchemeMPL
-PopSchemeMPL NewPopSchemeMPL();
-G2Element PopSchemeMPLPopProve(
-    const PopSchemeMPL scheme,
-    const PrivateKey sk);
-bool PopSchemeMPLPopVerify(
-    const PopSchemeMPL scheme,
-    const G1Element pk,
-    const G2Element sig);
-bool PopSchemeMPLFastAggregateVerify(
-    const PopSchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const void* msgs,
-    const size_t msgsLen,
-    const G2Element sig);
-void PopSchemeMPLFree(PopSchemeMPL scheme);
-
-// LegacySchemeMPL
-LegacySchemeMPL NewLegacySchemeMPL();
-G2Element LegacySchemeMPLSign(
-    const LegacySchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen);
-G2Element LegacySchemeMPLSignPrepend(
-    const LegacySchemeMPL scheme,
-    const PrivateKey sk,
-    const void* msg,
-    const size_t msgLen,
-    const G1Element prepPk);
-bool LegacySchemeMPLVerify(
-    const LegacySchemeMPL scheme,
-    const G1Element pk,
-    const void* msg,
-    const size_t msgLen,
-    const G2Element sig);
-bool LegacySchemeMPLVerifySecure(
-    const LegacySchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    const G2Element sig,
-    const void* msg,
-    const size_t msgLen);
-bool LegacySchemeMPLAggregateVerify(
-    const LegacySchemeMPL scheme,
-    void** pks,
-    const size_t pksLen,
-    void** msgs,
-    const void* msgsLens,
-    const size_t msgsLen,
-    const G2Element sig);
-void LegacySchemeMPLFree(LegacySchemeMPL scheme);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // SCHEMES_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.cpp
deleted file mode 100644
index 2bb668483df5..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include <stdint.h>
-#include "bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-#include "blschia.h"
-#include "threshold.h"
-#include "utils.hpp"
-#include "error.h"
-
-std::vector<bls::Bytes> toVectorHashes(void** elems, const size_t len) {
-    std::vector<bls::Bytes> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        vec.push_back(
-            bls::Bytes((uint8_t*)elems[i], HashSize)
-        );
-    }
-    return vec;
-}
-
-PrivateKey ThresholdPrivateKeyShare(void** sks, const size_t sksLen, const void* hash, bool* didErr) {
-    bls::PrivateKey* sk = nullptr;
-    try {
-        sk = new bls::PrivateKey(
-            bls::Threshold::PrivateKeyShare(
-                toBLSVector<bls::PrivateKey>(sks, sksLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-PrivateKey ThresholdPrivateKeyRecover(void** sks,
-                                        const size_t sksLen,
-                                        void** hashes,
-                                        const size_t hashesLen,
-                                        bool* didErr) {
-    bls::PrivateKey* sk = nullptr;
-    std::vector<bls::Bytes> pop = toVectorHashes(hashes, hashesLen);
-    try {
-        sk = new bls::PrivateKey(
-            bls::Threshold::PrivateKeyRecover(
-                toBLSVector<bls::PrivateKey>(sks, sksLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return sk;
-}
-
-G1Element ThresholdPublicKeyShare(void** pks, const size_t pksLen, const void* hash, bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::Threshold::PublicKeyShare(
-                toBLSVector<bls::G1Element>(pks, pksLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-G1Element ThresholdPublicKeyRecover(void** pks,
-                                      const size_t pksLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr) {
-    bls::G1Element* el = nullptr;
-    try {
-        el = new bls::G1Element(
-            bls::Threshold::PublicKeyRecover(
-                toBLSVector<bls::G1Element>(pks, pksLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-G2Element ThresholdSignatureShare(void** sigs, const size_t sigsLen, const void* hash, bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::Threshold::SignatureShare(
-                toBLSVector<bls::G2Element>(sigs, sigsLen),
-                bls::Bytes((uint8_t*)hash, HashSize)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-G2Element ThresholdSignatureRecover(void** sigs,
-                                      const size_t sigsLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr) {
-    bls::G2Element* el = nullptr;
-    try {
-        el = new bls::G2Element(
-            bls::Threshold::SignatureRecover(
-                toBLSVector<bls::G2Element>(sigs, sigsLen),
-                toVectorHashes(hashes, hashesLen)
-            )
-        );
-    } catch(const std::exception& ex) {
-        gErrMsg = ex.what();
-        *didErr = true;
-        return nullptr;
-    }
-    *didErr = false;
-    return el;
-}
-
-G2Element ThresholdSign(const PrivateKey sk, const void* hash) {
-    bls::PrivateKey* skPtr = (bls::PrivateKey*)sk;
-    return new bls::G2Element(
-        bls::Threshold::Sign(*skPtr, bls::Bytes((uint8_t*)hash, HashSize))
-    );
-}
-
-bool ThresholdVerify(const G1Element pk, const void* hash, const G2Element sig) {
-    bls::G1Element* pkPtr = (bls::G1Element*)pk;
-    bls::G2Element* sigPtr = (bls::G2Element*)sig;
-    return bls::Threshold::Verify(*pkPtr, bls::Bytes((uint8_t*)hash, HashSize), *sigPtr);
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.h b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.h
deleted file mode 100644
index 054ddffcd89e..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef THRESHOLD_H_
-#define THRESHOLD_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "privatekey.h"
-#include "elements.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const int HashSize = 32;
-
-PrivateKey ThresholdPrivateKeyShare(void** sks, const size_t sksLen, const void* hash, bool* didErr);
-PrivateKey ThresholdPrivateKeyRecover(void** sks,
-                                        const size_t sksLen,
-                                        void** hashes,
-                                        const size_t hashesLen,
-                                        bool* didErr);
-
-G1Element ThresholdPublicKeyShare(void** pks, const size_t pksLen, const void* hash, bool* didErr);
-G1Element ThresholdPublicKeyRecover(void** pks,
-                                      const size_t pksLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr);
-
-G2Element ThresholdSignatureShare(void** sigs, const size_t sigsLen, const void* hash, bool* didErr);
-G2Element ThresholdSignatureRecover(void** sigs,
-                                      const size_t sigsLen,
-                                      void** hashes,
-                                      const size_t hashesLen,
-                                      bool* didErr);
-
-G2Element ThresholdSign(const PrivateKey sk, const void* hash);
-bool ThresholdVerify(const G1Element pk, const void* hash, const G2Element sig);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // THRESHOLD_H_
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.cpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.cpp
deleted file mode 100644
index 85ad174c84d3..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <vector>
-#include "bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-
-// helper functions
-template <class T>
-std::vector<T> toBLSVector(void** elems, const size_t len) {
-    std::vector<T> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        T* el = (T*)elems[i];
-        vec.push_back(*el);
-    }
-    return vec;
-}
-
-std::vector<bls::Bytes> toVectorBytes(void** elems, const size_t len, const std::vector<size_t> vecElemsLens) {
-    std::vector<bls::Bytes> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < len; ++i) {
-        uint8_t* elPtr = (uint8_t*)elems[i];
-        vec.push_back(bls::Bytes(elPtr, vecElemsLens[i]));
-    }
-    return vec;
-}
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.hpp b/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.hpp
deleted file mode 100644
index 42e7898a3fc4..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#include <vector>
-#include "bls.hpp"
-#include "privatekey.h"
-#include "elements.h"
-
-// helper functions
-template <class T>
-std::vector<T> toBLSVector(void** elems, const size_t len) {
-    std::vector<T> vec;
-    vec.reserve(len);
-    for (int i = 0 ; i < (int)len; ++i) {
-        const T* el = (T*)elems[i];
-        vec.push_back(*el);
-    }
-    return vec;
-}
-
-std::vector<bls::Bytes> toVectorBytes(void** elems, const size_t len, const std::vector<size_t> vecElemsLens);
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/include.h b/src/dashbls/rust-bindings/bls-dash-sys/include.h
deleted file mode 100644
index 4189a0748cac..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/include.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "c-bindings/blschia.h"
-#include "c-bindings/elements.h"
-#include "c-bindings/privatekey.h"
-#include "c-bindings/schemes.h"
-#include "c-bindings/threshold.h"
-#include "c-bindings/bip32/chaincode.h"
-#include "c-bindings/bip32/extendedprivatekey.h"
-#include "c-bindings/bip32/extendedpublickey.h"
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/src/lib.rs b/src/dashbls/rust-bindings/bls-dash-sys/src/lib.rs
deleted file mode 100644
index a24bad5d77c7..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![allow(non_upper_case_globals)]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-
-// include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-include!("../bindings.rs");
diff --git a/src/dashbls/rust-bindings/bls-dash-sys/tests/sign_and_verify.rs b/src/dashbls/rust-bindings/bls-dash-sys/tests/sign_and_verify.rs
deleted file mode 100644
index 6ceee4961c4b..000000000000
--- a/src/dashbls/rust-bindings/bls-dash-sys/tests/sign_and_verify.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use bls_dash_sys as sys;
-
-#[test]
-fn sign_and_verify() {
-    let seed = b"seedweedseedweedseedweedseedweed";
-    let bad_seed = b"weedseedweedseedweedseedweedseed";
-
-    unsafe {
-        let scheme = sys::NewAugSchemeMPL();
-        let mut did_err = false;
-
-        let sk = sys::CoreMPLKeyGen(
-            scheme,
-            seed.as_ptr() as *const _,
-            seed.len(),
-            &mut did_err as *mut _,
-        );
-        assert!(!did_err);
-
-        let pk = sys::PrivateKeyGetG1Element(sk, &mut did_err as *mut _);
-        assert!(!did_err);
-
-        let sk2 = sys::CoreMPLKeyGen(
-            scheme,
-            bad_seed.as_ptr() as *const _,
-            bad_seed.len(),
-            &mut did_err as *mut _,
-        );
-        assert!(!did_err);
-
-        let pk2 = sys::PrivateKeyGetG1Element(sk2, &mut did_err as *mut _);
-        assert!(!did_err);
-
-        let message = b"Evgeny owns 1337 dash no cap";
-        let sig = sys::CoreMPLSign(scheme, sk, message.as_ptr() as *const _, message.len());
-
-        let verify =
-            sys::CoreMPLVerify(scheme, pk, message.as_ptr() as *const _, message.len(), sig);
-        assert!(verify);
-
-        let verify_bad = sys::CoreMPLVerify(
-            scheme,
-            pk2,
-            message.as_ptr() as *const _,
-            message.len(),
-            sig,
-        );
-        assert!(!verify_bad);
-
-        sys::G2ElementFree(sig);
-        sys::G1ElementFree(pk2);
-        sys::PrivateKeyFree(sk2);
-        sys::G1ElementFree(pk);
-        sys::PrivateKeyFree(sk);
-        sys::AugSchemeMPLFree(scheme);
-    }
-}
-
-#[test]
-fn test_private_key_from_bip32() {
-    use std::slice;
-    let long_seed: [u8; 32] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2];
-    let long_private_key_test_data: [u8; 32] = [50, 67, 148, 112, 207, 6, 210, 118, 137, 125, 27, 144, 105, 189, 214, 228, 68, 83, 144, 205, 80, 105, 133, 222, 14, 26, 28, 136, 167, 111, 241, 118];
-    let short_seed: [u8; 10] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    let short_private_key_test_data: [u8; 32] = [70, 137, 28, 44, 236, 73, 89, 60, 129, 146, 30, 71, 61, 183, 72, 0, 41, 224, 252, 30, 185, 51, 198, 185, 61, 129, 245, 55, 14, 177, 159, 189];
-    unsafe {
-        let c_private_key = sys::PrivateKeyFromSeedBIP32(long_seed.as_ptr() as *const _, long_seed.len());
-        let serialized = sys::PrivateKeySerialize(c_private_key) as *const u8;
-        let data = slice::from_raw_parts(serialized, sys::PrivateKeySizeBytes());
-        assert_eq!(data, &long_private_key_test_data);
-        sys::PrivateKeyFree(c_private_key);
-
-        let c_private_key = sys::PrivateKeyFromSeedBIP32(short_seed.as_ptr() as *const _, short_seed.len());
-        let serialized = sys::PrivateKeySerialize(c_private_key) as *const u8;
-        let data = slice::from_raw_parts(serialized, sys::PrivateKeySizeBytes());
-        assert_eq!(data, &short_private_key_test_data);
-        sys::PrivateKeyFree(c_private_key);
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/.rustfmt.toml b/src/dashbls/rust-bindings/bls-signatures/.rustfmt.toml
deleted file mode 100644
index f5fe8f31884f..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/.rustfmt.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-unstable_features = true
-
-blank_lines_lower_bound = 0
-condense_wildcard_suffixes = true
-error_on_line_overflow = true
-error_on_unformatted = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
-imports_granularity = "Crate"
-normalize_comments = true
-normalize_doc_attributes = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true
-use_try_shorthand = true
-wrap_comments = true
diff --git a/src/dashbls/rust-bindings/bls-signatures/Cargo.toml b/src/dashbls/rust-bindings/bls-signatures/Cargo.toml
deleted file mode 100644
index 5365ee42737f..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "bls-signatures"
-description = ""
-version = "1.2.5"
-edition = "2021"
-
-[features]
-legacy = []
-bip32 = []
-use_serde = ["serde"]
-dash_helpers = ["rand"]
-default = [ "legacy", "bip32", "dash_helpers", "use_serde"]
-apple = ["bls-dash-sys/apple"]
-
-[dependencies]
-bls-dash-sys = { path = "../bls-dash-sys" }
-serde = { version= "1.0.160", features = ["derive"], optional = true}
-rand = { version= "0.8.5", optional = true}
-hex = { version = "0.4.3"}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/bip32/chain_code.rs b/src/dashbls/rust-bindings/bls-signatures/src/bip32/chain_code.rs
deleted file mode 100644
index f5271cc45b64..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/bip32/chain_code.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use std::ffi::c_void;
-
-use bls_dash_sys::{BIP32ChainCodeFree, BIP32ChainCodeIsEqual, BIP32ChainCodeSerialize};
-
-pub const BIP32_CHAIN_CODE_SIZE: usize = 32;
-
-#[derive(Debug)]
-pub struct ChainCode {
-    pub(crate) c_chain_code: *mut c_void,
-}
-
-impl ChainCode {
-    pub fn serialize(&self) -> Box<[u8; BIP32_CHAIN_CODE_SIZE]> {
-        unsafe {
-            let malloc_ptr = BIP32ChainCodeSerialize(self.c_chain_code);
-            Box::from_raw(malloc_ptr as *mut _)
-        }
-    }
-}
-
-impl PartialEq for ChainCode {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe { BIP32ChainCodeIsEqual(self.c_chain_code, other.c_chain_code) }
-    }
-}
-
-impl Eq for ChainCode {}
-
-impl Drop for ChainCode {
-    fn drop(&mut self) {
-        unsafe { BIP32ChainCodeFree(self.c_chain_code) }
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/bip32/mod.rs b/src/dashbls/rust-bindings/bls-signatures/src/bip32/mod.rs
deleted file mode 100644
index 6b3a64326ecb..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/bip32/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod chain_code;
-mod private_key;
-mod public_key;
-
-pub use chain_code::*;
-pub use private_key::*;
-pub use public_key::*;
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/bip32/private_key.rs b/src/dashbls/rust-bindings/bls-signatures/src/bip32/private_key.rs
deleted file mode 100644
index 08c217c2a881..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/bip32/private_key.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use std::ffi::c_void;
-
-use bls_dash_sys::{
-    BIP32ExtendedPrivateKeyFree, BIP32ExtendedPrivateKeyFromBytes, BIP32ExtendedPrivateKeyFromSeed,
-    BIP32ExtendedPrivateKeyGetChainCode, BIP32ExtendedPrivateKeyGetExtendedPublicKey,
-    BIP32ExtendedPrivateKeyGetPrivateKey, BIP32ExtendedPrivateKeyGetPublicKey,
-    BIP32ExtendedPrivateKeyIsEqual, BIP32ExtendedPrivateKeyPrivateChild,
-    BIP32ExtendedPrivateKeyPublicChild, BIP32ExtendedPrivateKeySerialize,
-};
-
-use crate::{
-    bip32::{chain_code::ChainCode, ExtendedPublicKey},
-    utils::{c_err_to_result, SecureBox},
-    BlsError, G1Element, PrivateKey,
-};
-
-pub const BIP32_EXTENDED_PRIVATE_KEY_SIZE: usize = 77;
-
-#[derive(Debug)]
-pub struct ExtendedPrivateKey {
-    c_extended_private_key: *mut c_void,
-}
-
-impl PartialEq for ExtendedPrivateKey {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe {
-            BIP32ExtendedPrivateKeyIsEqual(
-                self.c_extended_private_key,
-                other.c_extended_private_key,
-            )
-        }
-    }
-}
-
-impl Eq for ExtendedPrivateKey {}
-
-impl ExtendedPrivateKey {
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, BlsError> {
-        if bytes.len() != BIP32_EXTENDED_PRIVATE_KEY_SIZE {
-            return Err(BlsError {
-                msg: format!(
-                    "Extended Private Key size must be {}, got {}",
-                    BIP32_EXTENDED_PRIVATE_KEY_SIZE,
-                    bytes.len()
-                ),
-            });
-        }
-        Ok(ExtendedPrivateKey {
-            c_extended_private_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPrivateKeyFromBytes(bytes.as_ptr() as *const _, bytes.len(), did_err)
-            })?,
-        })
-    }
-
-    pub fn from_seed(bytes: &[u8]) -> Result<Self, BlsError> {
-        Ok(ExtendedPrivateKey {
-            c_extended_private_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPrivateKeyFromSeed(bytes.as_ptr() as *const _, bytes.len(), did_err)
-            })?,
-        })
-    }
-
-    pub(crate) fn private_child_with_legacy_flag(&self, index: u32, legacy: bool) -> Self {
-        ExtendedPrivateKey {
-            c_extended_private_key: unsafe {
-                BIP32ExtendedPrivateKeyPrivateChild(self.c_extended_private_key, index, legacy)
-            },
-        }
-    }
-
-    pub fn private_child(&self, index: u32) -> Self {
-        self.private_child_with_legacy_flag(index, false)
-    }
-
-    pub fn public_child(&self, index: u32) -> ExtendedPublicKey {
-        ExtendedPublicKey {
-            c_extended_public_key: unsafe {
-                BIP32ExtendedPrivateKeyPublicChild(self.c_extended_private_key, index)
-            },
-        }
-    }
-
-    pub(crate) fn extended_public_key_with_legacy_flag(
-        &self,
-        legacy: bool,
-    ) -> Result<ExtendedPublicKey, BlsError> {
-        Ok(ExtendedPublicKey {
-            c_extended_public_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPrivateKeyGetExtendedPublicKey(
-                    self.c_extended_private_key,
-                    legacy,
-                    did_err,
-                )
-            })?,
-        })
-    }
-
-    pub fn extended_public_key(&self) -> Result<ExtendedPublicKey, BlsError> {
-        self.extended_public_key_with_legacy_flag(false)
-    }
-
-    pub fn public_key(&self) -> Result<G1Element, BlsError> {
-        Ok(G1Element {
-            c_element: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPrivateKeyGetPublicKey(self.c_extended_private_key, did_err)
-            })?,
-        })
-    }
-
-    pub fn private_key(&self) -> PrivateKey {
-        PrivateKey {
-            c_private_key: unsafe {
-                BIP32ExtendedPrivateKeyGetPrivateKey(self.c_extended_private_key)
-            },
-        }
-    }
-
-    pub fn serialize(&self) -> SecureBox {
-        unsafe {
-            let secalloc_ptr = BIP32ExtendedPrivateKeySerialize(self.c_extended_private_key);
-            SecureBox::from_ptr(secalloc_ptr as *mut u8, BIP32_EXTENDED_PRIVATE_KEY_SIZE)
-        }
-    }
-
-    pub fn chain_code(&self) -> ChainCode {
-        ChainCode {
-            c_chain_code: unsafe {
-                BIP32ExtendedPrivateKeyGetChainCode(self.c_extended_private_key)
-            },
-        }
-    }
-}
-
-impl Drop for ExtendedPrivateKey {
-    fn drop(&mut self) {
-        unsafe { BIP32ExtendedPrivateKeyFree(self.c_extended_private_key) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn serialize_deserialize() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-
-        let private_key_bytes = private_key.serialize();
-        let private_key_2 = ExtendedPrivateKey::from_bytes(private_key_bytes.as_ref())
-            .expect("cannot deserialize extended private key");
-
-        assert_eq!(private_key, private_key_2);
-        assert_eq!(private_key.private_key(), private_key_2.private_key());
-        assert_eq!(private_key.public_key(), private_key_2.public_key());
-    }
-
-    #[test]
-    fn hierarchical_deterministic_keys() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key()
-            .expect("cannot get extended public key");
-
-        let private_child = private_key.private_child(1337);
-        let private_grandchild = private_child.private_child(420);
-
-        let public_child = public_key.public_child(1337);
-        let public_grandchild = public_child.public_child(420);
-
-        assert_eq!(
-            public_grandchild,
-            private_grandchild
-                .extended_public_key()
-                .expect("cannot get extended public key")
-        );
-    }
-
-    #[test]
-    fn public_keys_match() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key()
-            .expect("cannot get extended public key");
-
-        assert_eq!(private_key.public_key(), Ok(public_key.public_key()));
-    }
-
-    #[test]
-    fn fingerprint_for_short_bip32_seed() {
-        assert_eq!(
-            ExtendedPrivateKey::from_seed(&[1u8, 50, 6, 244, 24, 199, 1, 25])
-                .expect("cannot generate extended private key")
-                .public_key()
-                .expect("cannot get public key from extended private key")
-                .fingerprint_legacy(),
-            0xa4700b27
-        );
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/bip32/public_key.rs b/src/dashbls/rust-bindings/bls-signatures/src/bip32/public_key.rs
deleted file mode 100644
index 38265939dca1..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/bip32/public_key.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use std::ffi::c_void;
-
-use bls_dash_sys::{
-    BIP32ExtendedPublicKeyFree, BIP32ExtendedPublicKeyFromBytes,
-    BIP32ExtendedPublicKeyGetChainCode, BIP32ExtendedPublicKeyGetPublicKey,
-    BIP32ExtendedPublicKeyIsEqual, BIP32ExtendedPublicKeyPublicChild,
-    BIP32ExtendedPublicKeySerialize,
-};
-
-use crate::{bip32::chain_code::ChainCode, utils::c_err_to_result, BlsError, G1Element};
-
-pub const BIP32_EXTENDED_PUBLIC_KEY_SIZE: usize = 93;
-
-#[derive(Debug)]
-pub struct ExtendedPublicKey {
-    pub(crate) c_extended_public_key: *mut c_void,
-}
-
-impl PartialEq for ExtendedPublicKey {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe {
-            BIP32ExtendedPublicKeyIsEqual(self.c_extended_public_key, other.c_extended_public_key)
-        }
-    }
-}
-
-impl Eq for ExtendedPublicKey {}
-
-impl ExtendedPublicKey {
-    pub(crate) fn from_bytes_with_legacy_flag(
-        bytes: &[u8],
-        legacy: bool,
-    ) -> Result<Self, BlsError> {
-        if bytes.len() != BIP32_EXTENDED_PUBLIC_KEY_SIZE {
-            return Err(BlsError {
-                msg: format!(
-                    "Extended Public Key size must be {}, got {}",
-                    BIP32_EXTENDED_PUBLIC_KEY_SIZE,
-                    bytes.len()
-                ),
-            });
-        }
-        Ok(ExtendedPublicKey {
-            c_extended_public_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPublicKeyFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
-            })?,
-        })
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, false)
-    }
-
-    pub(crate) fn public_child_with_legacy_flag(&self, index: u32, legacy: bool) -> Self {
-        ExtendedPublicKey {
-            c_extended_public_key: unsafe {
-                BIP32ExtendedPublicKeyPublicChild(self.c_extended_public_key, index, legacy)
-            },
-        }
-    }
-
-    pub fn public_child(&self, index: u32) -> Self {
-        self.public_child_with_legacy_flag(index, false)
-    }
-
-    pub(crate) fn serialize_with_legacy_flag(
-        &self,
-        legacy: bool,
-    ) -> Box<[u8; BIP32_EXTENDED_PUBLIC_KEY_SIZE]> {
-        unsafe {
-            let malloc_ptr = BIP32ExtendedPublicKeySerialize(self.c_extended_public_key, legacy);
-            Box::from_raw(malloc_ptr as *mut _)
-        }
-    }
-
-    pub fn serialize(&self) -> Box<[u8; BIP32_EXTENDED_PUBLIC_KEY_SIZE]> {
-        self.serialize_with_legacy_flag(false)
-    }
-
-    pub fn chain_code(&self) -> ChainCode {
-        ChainCode {
-            c_chain_code: unsafe { BIP32ExtendedPublicKeyGetChainCode(self.c_extended_public_key) },
-        }
-    }
-
-    pub fn public_key(&self) -> G1Element {
-        G1Element {
-            c_element: unsafe { BIP32ExtendedPublicKeyGetPublicKey(self.c_extended_public_key) },
-        }
-    }
-}
-
-impl Drop for ExtendedPublicKey {
-    fn drop(&mut self) {
-        unsafe { BIP32ExtendedPublicKeyFree(self.c_extended_public_key) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::bip32::ExtendedPrivateKey;
-
-    #[test]
-    fn serialize_deserialize() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key()
-            .expect("cannot get extended public key");
-
-        let public_key_bytes = public_key.serialize();
-        let public_key_2 = ExtendedPublicKey::from_bytes(public_key_bytes.as_ref())
-            .expect("cannot deserialize extended public key");
-
-        assert_eq!(public_key, public_key_2);
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/elements.rs b/src/dashbls/rust-bindings/bls-signatures/src/elements.rs
deleted file mode 100644
index 76de9a6e7bdf..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/elements.rs
+++ /dev/null
@@ -1,411 +0,0 @@
-use std::ffi::c_void;
-use std::fmt::Debug;
-use std::fmt::Formatter;
-
-use bls_dash_sys::{CoreMPLDeriveChildPkUnhardened, G1ElementFree, G1ElementFromBytes, G1ElementGenerator, G1ElementGetFingerprint, G1ElementIsEqual, G1ElementSerialize, G1ElementCopy, G2ElementCopy, G2ElementFree, G2ElementFromBytes, G2ElementIsEqual, G2ElementSerialize, ThresholdPublicKeyRecover, ThresholdSignatureRecover};
-#[cfg(feature = "use_serde")]
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-use crate::{schemes::Scheme, utils::c_err_to_result, BlsError, BasicSchemeMPL};
-
-// TODO Split into modules
-
-pub const G1_ELEMENT_SIZE: usize = 48; // TODO somehow extract it from bls library
-pub const G2_ELEMENT_SIZE: usize = 96; // TODO somehow extract it from bls library
-
-#[cfg(feature = "dash_helpers")]
-pub type PublicKey = G1Element;
-
-#[cfg(feature = "dash_helpers")]
-pub type Signature = G2Element;
-
-pub struct G1Element {
-    pub(crate) c_element: *mut c_void,
-}
-
-// G1Element is immutable and thread safe
-unsafe impl Send for G1Element {}
-unsafe impl Sync for G1Element {}
-
-impl PartialEq for G1Element {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe { G1ElementIsEqual(self.c_element, other.c_element) }
-    }
-}
-
-impl Debug for G1Element {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let g1_hex = hex::encode(self.to_bytes().as_slice());
-
-        write!(f, "G1Element({:?})", g1_hex)
-    }
-}
-
-impl Eq for G1Element {}
-
-impl G1Element {
-    pub fn generate() -> Self {
-        let c_element = unsafe { G1ElementGenerator() };
-
-        G1Element { c_element }
-    }
-
-    #[cfg(feature = "dash_helpers")]
-    pub fn verify(&self, signature: &G2Element, message: &[u8]) -> bool {
-        self.verify_basic(signature, message)
-    }
-
-    pub fn verify_basic(&self, signature: &G2Element, message: &[u8]) -> bool {
-        let basic_scheme = BasicSchemeMPL::new();
-        basic_scheme.verify(self, message, signature)
-    }
-
-    pub(crate) fn from_bytes_with_legacy_flag(
-        bytes: &[u8],
-        legacy: bool,
-    ) -> Result<Self, BlsError> {
-        if bytes.len() != G1_ELEMENT_SIZE {
-            return Err(BlsError {
-                msg: format!(
-                    "G1 Element size must be {}, got {}",
-                    G1_ELEMENT_SIZE,
-                    bytes.len()
-                ),
-            });
-        }
-        Ok(G1Element {
-            c_element: c_err_to_result(|did_err| unsafe {
-                G1ElementFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
-            })?,
-        })
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, false)
-    }
-
-    pub(crate) fn to_bytes_with_legacy_flag(&self, legacy: bool) -> Box<[u8; G1_ELEMENT_SIZE]> {
-        unsafe {
-            let malloc_ptr = G1ElementSerialize(self.c_element, legacy);
-            Box::from_raw(malloc_ptr as *mut _)
-        }
-    }
-
-    pub fn to_bytes(&self) -> Box<[u8; G1_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(false)
-    }
-
-    pub fn derive_child_public_key_unhardened(
-        &self,
-        scheme: &impl Scheme,
-        index: u32,
-    ) -> G1Element {
-        G1Element {
-            c_element: unsafe {
-                CoreMPLDeriveChildPkUnhardened(scheme.as_mut_ptr(), self.c_element, index)
-            },
-        }
-    }
-
-    pub(crate) fn fingerprint_with_legacy_flag(&self, legacy: bool) -> u32 {
-        unsafe { G1ElementGetFingerprint(self.c_element, legacy) }
-    }
-
-    pub fn fingerprint(&self) -> u32 {
-        self.fingerprint_with_legacy_flag(false)
-    }
-
-    pub fn threshold_recover(
-        bls_ids_with_elements: &[(Vec<u8>, G1Element)],
-    ) -> Result<Self, BlsError> {
-        unsafe {
-            let len = bls_ids_with_elements.len();
-            let (c_hashes, c_elements): (Vec<_>, Vec<_>) = bls_ids_with_elements
-                .iter()
-                .map(|(hash, element)| {
-                    (
-                        hash.as_ptr() as *mut c_void,
-                        element.c_element as *mut c_void,
-                    )
-                })
-                .unzip();
-            let c_hashes_ptr = c_hashes.as_ptr() as *mut *mut c_void;
-            let c_elements_ptr = c_elements.as_ptr() as *mut *mut c_void;
-            Ok(G1Element {
-                c_element: c_err_to_result(|did_err| {
-                    ThresholdPublicKeyRecover(c_elements_ptr, len, c_hashes_ptr, len, did_err)
-                })?,
-            })
-        }
-    }
-}
-
-impl Clone for G1Element {
-    fn clone(&self) -> Self {
-        unsafe {
-            G1Element{c_element: G1ElementCopy(self.c_element)}
-        }
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Serialize trait for G1Element
-impl Serialize for G1Element {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let bytes = *self.to_bytes();
-        serializer.serialize_bytes(&bytes)
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Deserialize trait for G1Element
-impl<'de> Deserialize<'de> for G1Element {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct G1ElementVisitor;
-
-        impl<'de> serde::de::Visitor<'de> for G1ElementVisitor {
-            type Value = G1Element;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str("a byte array representing a G1Element")
-            }
-
-            fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                G1Element::from_bytes(bytes).map_err(serde::de::Error::custom)
-            }
-        }
-
-        deserializer.deserialize_bytes(G1ElementVisitor)
-    }
-}
-
-impl Drop for G1Element {
-    fn drop(&mut self) {
-        unsafe { G1ElementFree(self.c_element) }
-    }
-}
-
-pub struct G2Element {
-    pub(crate) c_element: *mut c_void,
-}
-
-// G2Element is immutable and thread safe
-unsafe impl Send for G2Element {}
-unsafe impl Sync for G2Element {}
-
-impl PartialEq for G2Element {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe { G2ElementIsEqual(self.c_element, other.c_element) }
-    }
-}
-
-impl Debug for G2Element {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let g2_hex = hex::encode(self.to_bytes().as_slice());
-
-        write!(f, "G2Element({:?})", g2_hex)
-    }
-}
-
-impl Eq for G2Element {}
-
-impl G2Element {
-    pub(crate) fn from_bytes_with_legacy_flag(
-        bytes: &[u8],
-        legacy: bool,
-    ) -> Result<Self, BlsError> {
-        if bytes.len() != G2_ELEMENT_SIZE {
-            return Err(BlsError {
-                msg: format!(
-                    "G2 Element size must be {}, got {}",
-                    G2_ELEMENT_SIZE,
-                    bytes.len()
-                ),
-            });
-        }
-        Ok(G2Element {
-            c_element: c_err_to_result(|did_err| unsafe {
-                G2ElementFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
-            })?,
-        })
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, false)
-    }
-
-    pub(crate) fn to_bytes_with_legacy_flag(&self, legacy: bool) -> Box<[u8; G2_ELEMENT_SIZE]> {
-        unsafe {
-            let malloc_ptr = G2ElementSerialize(self.c_element, legacy);
-            Box::from_raw(malloc_ptr as *mut _)
-        }
-    }
-
-    pub fn to_bytes(&self) -> Box<[u8; G2_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(false)
-    }
-
-    pub fn threshold_recover(
-        bls_ids_with_elements: &[(Vec<u8>, G2Element)],
-    ) -> Result<Self, BlsError> {
-        unsafe {
-            let len = bls_ids_with_elements.len();
-            let (c_hashes, c_elements): (Vec<_>, Vec<_>) = bls_ids_with_elements
-                .iter()
-                .map(|(hash, element)| {
-                    (
-                        hash.as_ptr() as *mut c_void,
-                        element.c_element as *mut c_void,
-                    )
-                })
-                .unzip();
-            let c_hashes_ptr = c_hashes.as_ptr() as *mut *mut c_void;
-            let c_elements_ptr = c_elements.as_ptr() as *mut *mut c_void;
-            Ok(G2Element {
-                c_element: c_err_to_result(|did_err| {
-                    ThresholdSignatureRecover(c_elements_ptr, len, c_hashes_ptr, len, did_err)
-                })?,
-            })
-        }
-    }
-}
-
-impl Clone for G2Element {
-    fn clone(&self) -> Self {
-        unsafe {
-            G2Element{c_element: G2ElementCopy(self.c_element)}
-        }
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Serialize trait for G1Element
-impl Serialize for G2Element {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let bytes = *self.to_bytes();
-        serializer.serialize_bytes(&bytes)
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Deserialize trait for G1Element
-impl<'de> Deserialize<'de> for G2Element {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct G2ElementVisitor;
-
-        impl<'de> serde::de::Visitor<'de> for G2ElementVisitor {
-            type Value = G2Element;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str("a byte array representing a G2Element")
-            }
-
-            fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                G2Element::from_bytes(bytes).map_err(serde::de::Error::custom)
-            }
-        }
-
-        deserializer.deserialize_bytes(G2ElementVisitor)
-    }
-}
-
-impl Drop for G2Element {
-    fn drop(&mut self) {
-        unsafe { G2ElementFree(self.c_element) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::thread;
-    use super::*;
-    use crate::{
-        schemes::{AugSchemeMPL, Scheme},
-        PrivateKey,
-    };
-
-    #[test]
-    fn g1_serialize_deserialize() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let scheme = AugSchemeMPL::new();
-        let sk = PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-
-        let g1 = sk.g1_element().expect("cannot get G1 element");
-        let g1_bytes = g1.to_bytes();
-        let g1_2 =
-            G1Element::from_bytes(g1_bytes.as_ref()).expect("cannot build G1 element from bytes");
-
-        assert_eq!(g1, g1_2);
-    }
-
-    #[test]
-    fn g2_serialize_deserialize() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let scheme = AugSchemeMPL::new();
-        let sk = PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-
-        let g2 = scheme.sign(&sk, b"ayy");
-        let g2_bytes = g2.to_bytes();
-        let g2_2 =
-            G2Element::from_bytes(g2_bytes.as_ref()).expect("cannot build G2 element from bytes");
-
-        assert_eq!(g2, g2_2);
-    }
-
-    #[test]
-    fn should_generate_new_g1_element() {
-        let g1_element = G1Element::generate();
-
-        assert_eq!(g1_element.to_bytes().len(), 48);
-    }
-
-    #[test]
-    fn should_return_fingerprint() {
-        let bytes = [
-            151, 241, 211, 167, 49, 151, 215, 148, 38, 149, 99, 140, 79, 169, 172, 15, 195, 104,
-            140, 79, 151, 116, 185, 5, 161, 78, 58, 63, 23, 27, 172, 88, 108, 85, 232, 63, 249,
-            122, 26, 239, 251, 58, 240, 10, 219, 34, 198, 187,
-        ];
-
-        let g1_element =
-            G1Element::from_bytes(&bytes).expect("should create g1 element from bytes");
-
-        assert_eq!(g1_element.fingerprint(), 2093959050);
-    }
-
-    #[test]
-    fn should_be_thread_safe() {
-        let bytes = [
-            151, 241, 211, 167, 49, 151, 215, 148, 38, 149, 99, 140, 79, 169, 172, 15, 195, 104,
-            140, 79, 151, 116, 185, 5, 161, 78, 58, 63, 23, 27, 172, 88, 108, 85, 232, 63, 249,
-            122, 26, 239, 251, 58, 240, 10, 219, 34, 198, 187,
-        ];
-
-        let g1_element =
-            G1Element::from_bytes(&bytes).expect("should create g1 element from bytes");
-
-        let test_thread = thread::spawn(move|| {
-            assert_eq!(g1_element.fingerprint(), 2093959050);
-        });
-
-        test_thread.join().unwrap();
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/mod.rs b/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/mod.rs
deleted file mode 100644
index 5426eac84a79..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod private_key;
-mod public_key;
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/private_key.rs b/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/private_key.rs
deleted file mode 100644
index c818c37214b5..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/private_key.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use crate::{
-    bip32::{ExtendedPrivateKey, ExtendedPublicKey},
-    BlsError,
-};
-
-impl ExtendedPrivateKey {
-    pub fn private_child_legacy(&self, index: u32) -> Self {
-        self.private_child_with_legacy_flag(index, true)
-    }
-
-    pub fn extended_public_key_legacy(&self) -> Result<ExtendedPublicKey, BlsError> {
-        self.extended_public_key_with_legacy_flag(true)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn serialize_deserialize_legacy() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key_legacy()
-            .expect("cannot get extended public key");
-
-        let public_key_bytes = public_key.serialize_legacy();
-        let public_key_2 = ExtendedPublicKey::from_bytes_legacy(public_key_bytes.as_ref())
-            .expect("cannot deserialize extended public key");
-
-        assert_eq!(public_key, public_key_2);
-    }
-
-    #[test]
-    fn hierarchical_deterministic_keys_legacy() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key_legacy()
-            .expect("cannot get extended public key");
-
-        let private_child = private_key.private_child_legacy(1337);
-        let private_grandchild = private_child.private_child_legacy(420);
-
-        let public_child = public_key.public_child_legacy(1337);
-        let public_grandchild = public_child.public_child_legacy(420);
-
-        assert_eq!(
-            public_grandchild,
-            private_grandchild
-                .extended_public_key_legacy()
-                .expect("cannot get extended public key")
-        );
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/public_key.rs b/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/public_key.rs
deleted file mode 100644
index eb0bda851358..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/legacy/bip32/public_key.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use crate::{
-    bip32::{ExtendedPublicKey, BIP32_EXTENDED_PUBLIC_KEY_SIZE},
-    BlsError,
-};
-
-impl ExtendedPublicKey {
-    pub fn from_bytes_legacy(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, true)
-    }
-
-    pub fn public_child_legacy(&self, index: u32) -> Self {
-        self.public_child_with_legacy_flag(index, true)
-    }
-
-    pub fn serialize_legacy(&self) -> Box<[u8; BIP32_EXTENDED_PUBLIC_KEY_SIZE]> {
-        self.serialize_with_legacy_flag(true)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::bip32::ExtendedPrivateKey;
-
-    #[test]
-    fn serialize_deserialize_legacy() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let private_key =
-            ExtendedPrivateKey::from_seed(seed).expect("cannot generate extended private key");
-        let public_key = private_key
-            .extended_public_key_legacy()
-            .expect("cannot get extended public key");
-
-        let public_key_bytes = public_key.serialize_legacy();
-        let public_key_2 = ExtendedPublicKey::from_bytes_legacy(public_key_bytes.as_ref())
-            .expect("cannot deserialize extended public key");
-
-        assert_eq!(public_key, public_key_2);
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/legacy/elements.rs b/src/dashbls/rust-bindings/bls-signatures/src/legacy/elements.rs
deleted file mode 100644
index eae5bc4eda06..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/legacy/elements.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use crate::{BlsError, G1Element, G2Element, G1_ELEMENT_SIZE, G2_ELEMENT_SIZE};
-
-impl G1Element {
-    pub fn serialize_legacy(&self) -> Box<[u8; G1_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(true)
-    }
-
-    pub fn serialize(&self) -> Box<[u8; G1_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(false)
-    }
-
-    pub fn from_bytes_legacy(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, true)
-    }
-
-    pub fn fingerprint_legacy(&self) -> u32 {
-        self.fingerprint_with_legacy_flag(true)
-    }
-}
-
-impl G2Element {
-    pub fn from_bytes_legacy(bytes: &[u8]) -> Result<Self, BlsError> {
-        Self::from_bytes_with_legacy_flag(bytes, true)
-    }
-
-    pub fn serialize_legacy(&self) -> Box<[u8; G2_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(true)
-    }
-
-    pub fn serialize(&self) -> Box<[u8; G2_ELEMENT_SIZE]> {
-        self.to_bytes_with_legacy_flag(false)
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/legacy/mod.rs b/src/dashbls/rust-bindings/bls-signatures/src/legacy/mod.rs
deleted file mode 100644
index d84ab9d0259b..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/legacy/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod bip32;
-mod elements;
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/lib.rs b/src/dashbls/rust-bindings/bls-signatures/src/lib.rs
deleted file mode 100644
index fdfc6ddef347..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/lib.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-mod elements;
-mod private_key;
-mod schemes;
-mod utils;
-
-#[cfg(feature = "legacy")]
-mod legacy;
-
-#[cfg(feature = "bip32")]
-pub mod bip32;
-
-use std::{error::Error, fmt::Display};
-
-pub use elements::{G1Element, G2Element, G1_ELEMENT_SIZE, G2_ELEMENT_SIZE};
-#[cfg(feature = "dash_helpers")]
-pub use elements::{PublicKey, Signature};
-pub use private_key::{PrivateKey, PRIVATE_KEY_SIZE};
-pub use schemes::{AugSchemeMPL, BasicSchemeMPL, LegacySchemeMPL, Scheme};
-
-#[derive(Debug, PartialEq)]
-pub struct BlsError {
-    // Need to use owned version as each time BLS has an error its binding glue overwrites error
-    // message variable.
-    msg: String,
-}
-
-impl Display for BlsError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.msg)
-    }
-}
-
-impl Error for BlsError {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::schemes::{AugSchemeMPL, Scheme};
-
-    #[test]
-    fn basic_sign() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let bad_seed = b"weedseedweedseedweedseedweedseed";
-
-        let scheme = AugSchemeMPL::new();
-
-        let private_key_before =
-            PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-
-        // Also test private key serialization
-        let private_key_bytes = private_key_before.to_bytes();
-        let private_key = PrivateKey::from_bytes(private_key_bytes.as_slice(), false)
-            .expect("cannot build private key from bytes");
-        drop(private_key_bytes);
-
-        let public_key = private_key.g1_element().expect("unable to get public key");
-
-        let private_key_bad =
-            PrivateKey::key_gen(&scheme, bad_seed).expect("unable to generate private key");
-        let public_key_bad = private_key_bad
-            .g1_element()
-            .expect("unable to get public key");
-
-        let message = b"Evgeny owns 1337 dash no cap";
-
-        let signature = scheme.sign(&private_key, message);
-        let verify = scheme.verify(&public_key, message, &signature);
-        assert!(verify);
-        let verify_bad = scheme.verify(&public_key_bad, message, &signature);
-        assert!(!verify_bad);
-    }
-
-    #[test]
-    fn bad_seed() {
-        let seed = b"lol";
-        let scheme = AugSchemeMPL::new();
-        let private_key = PrivateKey::key_gen(&scheme, seed);
-
-        assert!(matches!(
-            private_key,
-            Err(BlsError { msg }) if msg == "Seed size must be at least 32 bytes"
-        ));
-    }
-
-    #[test]
-    fn hd_keys_deterministic() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let scheme = AugSchemeMPL::new();
-
-        let master_sk = PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-        let master_pk = master_sk.g1_element().expect("unable to get public key");
-
-        let child_sk_u = master_sk.derive_child_private_key_unhardened(&scheme, 22);
-        let grandchild_sk_u = child_sk_u.derive_child_private_key_unhardened(&scheme, 0);
-
-        let child_pk_u = master_pk.derive_child_public_key_unhardened(&scheme, 22);
-        let grandchild_pk_u = child_pk_u.derive_child_public_key_unhardened(&scheme, 0);
-
-        assert_eq!(
-            grandchild_pk_u,
-            grandchild_sk_u.g1_element().expect("cannot get public key")
-        );
-    }
-
-    #[test]
-    fn test_bls_public_key() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let scheme = LegacySchemeMPL::new();
-
-        let private_key = PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-        let public_key = private_key.g1_element().expect("unable to get public key");
-
-        let expected_priv_key = vec![92, 116, 13, 32, 66, 150, 74, 240, 121, 255, 94, 222, 127, 180, 19, 10, 244, 212, 173, 51, 91, 198, 162, 132, 230, 105, 134, 255, 125, 191, 198, 223];
-        let expected_pub_key = vec![129, 171, 183, 152, 50, 52, 28, 18, 241, 75, 118, 255, 58, 136, 184, 52, 247, 229, 14, 221, 40, 117, 194, 142, 2, 208, 193, 215, 131, 17, 234, 195, 229, 23, 249, 239, 139, 176, 18, 187, 102, 55, 162, 76, 48, 88, 228, 150];
-
-        assert_eq!(
-            private_key.to_bytes().as_slice(),
-            expected_priv_key
-        );
-
-        assert_eq!(
-            public_key.to_bytes().as_slice(),
-            expected_pub_key
-        );
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/private_key.rs b/src/dashbls/rust-bindings/bls-signatures/src/private_key.rs
deleted file mode 100755
index 556c968ed2a7..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/private_key.rs
+++ /dev/null
@@ -1,322 +0,0 @@
-use std::{ffi::c_void, ops::Mul};
-use std::fmt::{Debug, Formatter};
-
-use bls_dash_sys::{
-    CoreMPLDeriveChildSk, CoreMPLDeriveChildSkUnhardened, CoreMPLKeyGen, G1ElementMul,
-    PrivateKeyFree, PrivateKeyFromBytes, PrivateKeyFromSeedBIP32, PrivateKeyGetG1Element,
-    PrivateKeyIsEqual, PrivateKeySerialize, ThresholdPrivateKeyRecover,
-};
-use rand::{prelude::StdRng, Rng};
-#[cfg(feature = "use_serde")]
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-use crate::{schemes::Scheme, utils::{c_err_to_result, SecureBox}, BasicSchemeMPL, BlsError, G1Element, G2Element};
-
-pub const PRIVATE_KEY_SIZE: usize = 32; // TODO somehow extract it from bls library
-
-pub struct PrivateKey {
-    pub(crate) c_private_key: *mut c_void,
-}
-
-impl PartialEq for PrivateKey {
-    fn eq(&self, other: &Self) -> bool {
-        unsafe { PrivateKeyIsEqual(self.c_private_key, other.c_private_key) }
-    }
-}
-
-impl Eq for PrivateKey {}
-
-impl Debug for PrivateKey {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let private_key_hex = hex::encode(self.to_bytes().as_slice());
-
-        write!(f, "PrivateKey({:?})", private_key_hex)
-    }
-}
-impl Mul<G1Element> for PrivateKey {
-    type Output = Result<G1Element, BlsError>;
-
-    fn mul(self, rhs: G1Element) -> Self::Output {
-        Ok(G1Element {
-            c_element: c_err_to_result(|_| unsafe {
-                G1ElementMul(rhs.c_element, self.c_private_key)
-            })?,
-        })
-    }
-}
-
-impl Mul<PrivateKey> for G1Element {
-    type Output = Result<G1Element, BlsError>;
-
-    fn mul(self, rhs: PrivateKey) -> Self::Output {
-        rhs * self
-    }
-}
-
-impl PrivateKey {
-    pub(crate) fn as_mut_ptr(&self) -> *mut c_void {
-        self.c_private_key
-    }
-
-    // TODO Rename to from_seed
-    pub fn key_gen(scheme: &impl Scheme, seed: &[u8]) -> Result<Self, BlsError> {
-        Ok(PrivateKey {
-            c_private_key: c_err_to_result(|did_err| unsafe {
-                CoreMPLKeyGen(
-                    scheme.as_mut_ptr(),
-                    seed.as_ptr() as *const _,
-                    seed.len(),
-                    did_err,
-                )
-            })?,
-        })
-    }
-
-    #[cfg(feature = "dash_helpers")]
-    pub fn generate_dash(rng: &mut StdRng) -> Result<Self, BlsError> {
-        let seed = rng.gen::<[u8; 32]>();
-        let scheme = BasicSchemeMPL::new();
-        Ok(PrivateKey {
-            c_private_key: c_err_to_result(|did_err| unsafe {
-                CoreMPLKeyGen(
-                    scheme.as_mut_ptr(),
-                    seed.as_ptr() as *const _,
-                    seed.len(),
-                    did_err,
-                )
-            })?,
-        })
-    }
-
-    #[cfg(feature = "dash_helpers")]
-    pub fn sign(&self, message: &[u8]) -> G2Element {
-        self.sign_basic(message)
-    }
-
-    pub fn sign_basic(&self, message: &[u8]) -> G2Element {
-        let scheme = BasicSchemeMPL::new();
-        scheme.sign(self, message)
-    }
-
-    #[cfg(feature = "dash_helpers")]
-    pub fn generate_dash_many(count: usize, rng: &mut StdRng) -> Result<Vec<Self>, BlsError> {
-        (0..count)
-            .into_iter()
-            .map(|_| Self::generate_dash(rng))
-            .collect()
-    }
-
-    pub fn g1_element(&self) -> Result<G1Element, BlsError> {
-        Ok(G1Element {
-            c_element: c_err_to_result(|did_err| unsafe {
-                PrivateKeyGetG1Element(self.c_private_key, did_err)
-            })?,
-        })
-    }
-
-    pub fn to_bytes(&self) -> SecureBox {
-        // `PrivateKeySerialize` internally securely allocates memory which we have to
-        // wrap safely
-        unsafe {
-            SecureBox::from_ptr(
-                PrivateKeySerialize(self.c_private_key) as *mut u8,
-                PRIVATE_KEY_SIZE,
-            )
-        }
-    }
-
-    pub fn from_bytes(bytes: &[u8], mod_order: bool) -> Result<Self, BlsError> {
-        if bytes.len() != PRIVATE_KEY_SIZE {
-            return Err(BlsError {
-                msg: format!(
-                    "Private key size must be {}, got {}",
-                    PRIVATE_KEY_SIZE,
-                    bytes.len()
-                ),
-            });
-        }
-
-        let c_private_key = c_err_to_result(|did_err| unsafe {
-            PrivateKeyFromBytes(bytes.as_ptr() as *const c_void, bytes.len(), mod_order, did_err)
-        })?;
-
-        Ok(PrivateKey { c_private_key })
-    }
-
-    pub fn from_bip32_seed(bytes: &[u8]) -> Self {
-        let c_private_key =
-            unsafe { PrivateKeyFromSeedBIP32(bytes.as_ptr() as *const c_void, bytes.len()) };
-
-        PrivateKey { c_private_key }
-    }
-
-    pub fn derive_child_private_key(&self, scheme: &impl Scheme, index: u32) -> PrivateKey {
-        PrivateKey {
-            c_private_key: unsafe {
-                CoreMPLDeriveChildSk(scheme.as_mut_ptr(), self.c_private_key, index)
-            },
-        }
-    }
-
-    pub fn derive_child_private_key_unhardened(
-        &self,
-        scheme: &impl Scheme,
-        index: u32,
-    ) -> PrivateKey {
-        PrivateKey {
-            c_private_key: unsafe {
-                CoreMPLDeriveChildSkUnhardened(scheme.as_mut_ptr(), self.c_private_key, index)
-            },
-        }
-    }
-
-    pub fn threshold_recover(
-        bls_ids_with_private_keys: &[(Vec<u8>, PrivateKey)],
-    ) -> Result<Self, BlsError> {
-        unsafe {
-            let len = bls_ids_with_private_keys.len();
-            let (c_hashes, c_elements): (Vec<_>, Vec<_>) = bls_ids_with_private_keys
-                .iter()
-                .map(|(hash, element)| (hash.as_ptr() as *mut c_void, element.c_private_key))
-                .unzip();
-            let c_hashes_ptr = c_hashes.as_ptr() as *mut *mut c_void;
-            let c_elements_ptr = c_elements.as_ptr() as *mut *mut c_void;
-            Ok(PrivateKey {
-                c_private_key: c_err_to_result(|did_err| {
-                    ThresholdPrivateKeyRecover(c_elements_ptr, len, c_hashes_ptr, len, did_err)
-                })?,
-            })
-        }
-    }
-}
-
-impl Clone for PrivateKey {
-    fn clone(&self) -> Self {
-        // Serialize the element
-        let bytes = self.to_bytes();
-        // We can panic
-        PrivateKey::from_bytes(bytes.as_slice(), false).expect("expected bytes to be valid")
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Serialize trait for G1Element
-impl Serialize for PrivateKey {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_bytes(self.to_bytes().as_slice())
-    }
-}
-
-#[cfg(feature = "use_serde")]
-// Implement Deserialize trait for G1Element
-impl<'de> Deserialize<'de> for PrivateKey {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct PrivateKeyElementVisitor;
-
-        impl<'de> serde::de::Visitor<'de> for PrivateKeyElementVisitor {
-            type Value = PrivateKey;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str("a byte array representing a Private Key")
-            }
-
-            fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                PrivateKey::from_bytes(bytes, false).map_err(serde::de::Error::custom)
-            }
-        }
-
-        deserializer.deserialize_bytes(PrivateKeyElementVisitor)
-    }
-}
-
-impl Drop for PrivateKey {
-    fn drop(&mut self) {
-        unsafe { PrivateKeyFree(self.c_private_key) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::schemes::AugSchemeMPL;
-
-    #[test]
-    fn serialize_deserialize() {
-        let seed = b"seedweedseedweedseedweedseedweed";
-        let scheme = AugSchemeMPL::new();
-        let sk1 = PrivateKey::key_gen(&scheme, seed).expect("unable to generate private key");
-        let sk1_bytes = sk1.to_bytes();
-        let sk2 = PrivateKey::from_bytes(sk1_bytes.as_slice(), false)
-            .expect("cannot build private key from bytes");
-
-        assert_eq!(sk1, sk2);
-    }
-
-    #[test]
-    fn should_return_private_key_from_bip32_bytes() {
-        let long_seed = [
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8,
-            9, 10, 1, 2,
-        ];
-        let long_private_key_test_data = [
-            50, 67, 148, 112, 207, 6, 210, 118, 137, 125, 27, 144, 105, 189, 214, 228, 68, 83, 144,
-            205, 80, 105, 133, 222, 14, 26, 28, 136, 167, 111, 241, 118,
-        ];
-        let long_private_key = PrivateKey::from_bip32_seed(&long_seed);
-        assert_eq!(*long_private_key.to_bytes(), long_private_key_test_data);
-
-        // Previously didn't work with seed with length != 32
-        let short_seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-        let short_private_key_test_data = [
-            70, 137, 28, 44, 236, 73, 89, 60, 129, 146, 30, 71, 61, 183, 72, 0, 41, 224, 252, 30,
-            185, 51, 198, 185, 61, 129, 245, 55, 14, 177, 159, 189,
-        ];
-        let short_private_key = PrivateKey::from_bip32_seed(&short_seed);
-        assert_eq!(*short_private_key.to_bytes(), short_private_key_test_data);
-    }
-
-    #[test]
-    fn test_keys_multiplication() {
-        // 46891c2cec49593c81921e473db7480029e0fc1eb933c6b93d81f5370eb19fbd
-        let private_key_data = [
-            70, 137, 28, 44, 236, 73, 89, 60, 129, 146, 30, 71, 61, 183, 72, 0, 41, 224, 252, 30,
-            185, 51, 198, 185, 61, 129, 245, 55, 14, 177, 159, 189,
-        ];
-        // 0e2f9055c17eb13221d8b41833468ab49f7d4e874ddf4b217f5126392a608fd48ccab3510548f1da4f397c1ad4f8e01a
-        let public_key_data = [
-            14, 47, 144, 85, 193, 126, 177, 50, 33, 216, 180, 24, 51, 70, 138, 180, 159, 125, 78,
-            135, 77, 223, 75, 33, 127, 81, 38, 57, 42, 96, 143, 212, 140, 202, 179, 81, 5, 72, 241,
-            218, 79, 57, 124, 26, 212, 248, 224, 26,
-        ];
-        // 03fd387c4d4c66ec9dcdb31ef0c08ad881090dcda13d4b2c9cbc5ef264ff4dc7
-        let expected_data = [
-            3, 253, 56, 124, 77, 76, 102, 236, 157, 205, 179, 30, 240, 192, 138, 216, 129, 9, 13,
-            205, 161, 61, 75, 44, 156, 188, 94, 242, 100, 255, 77, 199,
-        ];
-        let private_key = PrivateKey::from_bytes(&private_key_data, false).unwrap();
-        let public_key = G1Element::from_bytes_legacy(&public_key_data).unwrap();
-        let result = (private_key * public_key).unwrap();
-        assert_eq!(
-            &result.serialize_legacy()[..32],
-            &expected_data,
-            "should match"
-        );
-        let private_key = PrivateKey::from_bytes(&private_key_data, false).unwrap();
-        let public_key = G1Element::from_bytes_legacy(&public_key_data).unwrap();
-        let result = (public_key * private_key).unwrap();
-        assert_eq!(
-            &result.serialize_legacy()[..32],
-            &expected_data,
-            "should match"
-        );
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/schemes.rs b/src/dashbls/rust-bindings/bls-signatures/src/schemes.rs
deleted file mode 100644
index 3019bc0b4aa6..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/schemes.rs
+++ /dev/null
@@ -1,434 +0,0 @@
-use std::ffi::c_void;
-
-use bls_dash_sys::{
-    AugSchemeMPLAggregateVerify, AugSchemeMPLFree, AugSchemeMPLSign, AugSchemeMPLVerify,
-    BasicSchemeMPLAggregateVerify, BasicSchemeMPLFree, CoreMPLAggregatePubKeys,
-    CoreMPLAggregateSigs, CoreMPLSign, CoreMPLVerify, CoreMPLVerifySecure,
-    LegacySchemeMPLAggregateVerify, LegacySchemeMPLSign, LegacySchemeMPLVerify,
-    LegacySchemeMPLVerifySecure, NewAugSchemeMPL, NewBasicSchemeMPL, NewLegacySchemeMPL,
-};
-
-// TODO Split into modules
-use crate::{private_key::PrivateKey, G1Element, G2Element};
-
-pub trait Scheme {
-    fn as_mut_ptr(&self) -> *mut c_void;
-
-    fn sign(&self, private_key: &PrivateKey, message: &[u8]) -> G2Element;
-
-    fn verify(&self, public_key: &G1Element, message: &[u8], signature: &G2Element) -> bool;
-
-    fn verify_secure<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        message: &[u8],
-        signature: &G2Element,
-    ) -> bool {
-        let mut g1_pointers = public_keys
-            .into_iter()
-            .map(|g1| g1.c_element)
-            .collect::<Vec<_>>();
-
-        unsafe {
-            CoreMPLVerifySecure(
-                self.as_mut_ptr(),
-                g1_pointers.as_mut_ptr(),
-                g1_pointers.len(),
-                signature.c_element,
-                message.as_ptr() as *const _,
-                message.len(),
-            )
-        }
-    }
-
-    fn aggregate_public_keys<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-    ) -> G1Element {
-        let mut g1_pointers = public_keys
-            .into_iter()
-            .map(|g1| g1.c_element)
-            .collect::<Vec<_>>();
-        G1Element {
-            c_element: unsafe {
-                CoreMPLAggregatePubKeys(
-                    self.as_mut_ptr(),
-                    g1_pointers.as_mut_ptr(),
-                    g1_pointers.len(),
-                )
-            },
-        }
-    }
-
-    fn aggregate_sigs<'a>(&self, sigs: impl IntoIterator<Item = &'a G2Element>) -> G2Element {
-        let mut g2_pointers = sigs.into_iter().map(|g2| g2.c_element).collect::<Vec<_>>();
-        G2Element {
-            c_element: unsafe {
-                CoreMPLAggregateSigs(
-                    self.as_mut_ptr(),
-                    g2_pointers.as_mut_ptr(),
-                    g2_pointers.len(),
-                )
-            },
-        }
-    }
-
-    fn aggregate_verify<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        messages: impl IntoIterator<Item = &'a [u8]>,
-        signature: &G2Element,
-    ) -> bool;
-}
-
-struct AggregateVerifyArgs {
-    g1_pointers: Vec<*mut c_void>,
-    messages_pointers: Vec<*const u8>,
-    messages_lengths: Vec<usize>,
-}
-
-// TODO put constructor inside struct?
-fn prepare_aggregate_verify_args<'a>(
-    public_keys: impl IntoIterator<Item = &'a G1Element>,
-    messages: impl IntoIterator<Item = &'a [u8]>,
-) -> AggregateVerifyArgs {
-    let g1_pointers = public_keys
-        .into_iter()
-        .map(|g1| g1.c_element)
-        .collect::<Vec<_>>();
-
-    let mut messages_pointers = Vec::new();
-    let mut messages_lengths = Vec::new();
-
-    for m in messages.into_iter() {
-        messages_pointers.push(m.as_ptr());
-        messages_lengths.push(m.len());
-    }
-
-    AggregateVerifyArgs {
-        g1_pointers,
-        messages_pointers,
-        messages_lengths,
-    }
-}
-
-pub struct BasicSchemeMPL {
-    scheme: *mut c_void,
-}
-
-impl BasicSchemeMPL {
-    pub fn new() -> Self {
-        BasicSchemeMPL {
-            scheme: unsafe { NewBasicSchemeMPL() },
-        }
-    }
-}
-
-impl Scheme for BasicSchemeMPL {
-    fn as_mut_ptr(&self) -> *mut c_void {
-        self.scheme
-    }
-
-    fn sign(&self, private_key: &PrivateKey, message: &[u8]) -> G2Element {
-        G2Element {
-            c_element: unsafe {
-                CoreMPLSign(
-                    self.scheme,
-                    private_key.as_mut_ptr(),
-                    message.as_ptr() as *const _,
-                    message.len(),
-                )
-            },
-        }
-    }
-
-    fn verify(&self, public_key: &G1Element, message: &[u8], signature: &G2Element) -> bool {
-        unsafe {
-            CoreMPLVerify(
-                self.scheme,
-                public_key.c_element,
-                message.as_ptr() as *const _,
-                message.len(),
-                signature.c_element,
-            )
-        }
-    }
-
-    fn aggregate_verify<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        messages: impl IntoIterator<Item = &'a [u8]>,
-        signature: &G2Element,
-    ) -> bool {
-        let AggregateVerifyArgs {
-            mut g1_pointers,
-            mut messages_pointers,
-            messages_lengths: mut messages_lengthes,
-        } = prepare_aggregate_verify_args(public_keys, messages);
-
-        unsafe {
-            BasicSchemeMPLAggregateVerify(
-                self.as_mut_ptr(),
-                g1_pointers.as_mut_ptr(),
-                g1_pointers.len(),
-                messages_pointers.as_mut_ptr() as *mut _,
-                messages_lengthes.as_mut_ptr() as *mut _,
-                messages_pointers.len(),
-                signature.c_element,
-            )
-        }
-    }
-}
-
-pub struct LegacySchemeMPL {
-    scheme: *mut c_void,
-}
-
-impl LegacySchemeMPL {
-    pub fn new() -> Self {
-        LegacySchemeMPL {
-            scheme: unsafe { NewLegacySchemeMPL() },
-        }
-    }
-}
-
-impl Scheme for LegacySchemeMPL {
-    fn as_mut_ptr(&self) -> *mut c_void {
-        self.scheme
-    }
-
-    fn sign(&self, private_key: &PrivateKey, message: &[u8]) -> G2Element {
-        G2Element {
-            c_element: unsafe {
-                LegacySchemeMPLSign(
-                    self.scheme,
-                    private_key.as_mut_ptr(),
-                    message.as_ptr() as *const _,
-                    message.len(),
-                )
-            },
-        }
-    }
-
-    fn verify(&self, public_key: &G1Element, message: &[u8], signature: &G2Element) -> bool {
-        unsafe {
-            LegacySchemeMPLVerify(
-                self.scheme,
-                public_key.c_element,
-                message.as_ptr() as *const _,
-                message.len(),
-                signature.c_element,
-            )
-        }
-    }
-
-    fn verify_secure<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        message: &[u8],
-        signature: &G2Element,
-    ) -> bool {
-        let mut g1_pointers = public_keys
-            .into_iter()
-            .map(|g1| g1.c_element)
-            .collect::<Vec<_>>();
-
-        unsafe {
-            LegacySchemeMPLVerifySecure(
-                self.as_mut_ptr(),
-                g1_pointers.as_mut_ptr(),
-                g1_pointers.len(),
-                signature.c_element,
-                message.as_ptr() as *const _,
-                message.len(),
-            )
-        }
-    }
-
-    fn aggregate_verify<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        messages: impl IntoIterator<Item = &'a [u8]>,
-        signature: &G2Element,
-    ) -> bool {
-        let AggregateVerifyArgs {
-            mut g1_pointers,
-            mut messages_pointers,
-            messages_lengths: mut messages_lengthes,
-        } = prepare_aggregate_verify_args(public_keys, messages);
-
-        unsafe {
-            LegacySchemeMPLAggregateVerify(
-                self.as_mut_ptr(),
-                g1_pointers.as_mut_ptr(),
-                g1_pointers.len(),
-                messages_pointers.as_mut_ptr() as *mut _,
-                messages_lengthes.as_mut_ptr() as *mut _,
-                messages_pointers.len(),
-                signature.c_element,
-            )
-        }
-    }
-}
-
-impl Drop for BasicSchemeMPL {
-    fn drop(&mut self) {
-        unsafe { BasicSchemeMPLFree(self.scheme) }
-    }
-}
-
-pub struct AugSchemeMPL {
-    scheme: *mut c_void,
-}
-
-impl AugSchemeMPL {
-    pub fn new() -> Self {
-        AugSchemeMPL {
-            scheme: unsafe { NewAugSchemeMPL() },
-        }
-    }
-}
-
-impl Scheme for AugSchemeMPL {
-    fn as_mut_ptr(&self) -> *mut c_void {
-        self.scheme
-    }
-
-    fn sign(&self, private_key: &PrivateKey, message: &[u8]) -> G2Element {
-        G2Element {
-            c_element: unsafe {
-                AugSchemeMPLSign(
-                    self.scheme,
-                    private_key.as_mut_ptr(),
-                    message.as_ptr() as *const _,
-                    message.len(),
-                )
-            },
-        }
-    }
-
-    fn verify(&self, public_key: &G1Element, message: &[u8], signature: &G2Element) -> bool {
-        unsafe {
-            AugSchemeMPLVerify(
-                self.scheme,
-                public_key.c_element,
-                message.as_ptr() as *const _,
-                message.len(),
-                signature.c_element,
-            )
-        }
-    }
-
-    fn aggregate_verify<'a>(
-        &self,
-        public_keys: impl IntoIterator<Item = &'a G1Element>,
-        messages: impl IntoIterator<Item = &'a [u8]>,
-        signature: &G2Element,
-    ) -> bool {
-        let AggregateVerifyArgs {
-            mut g1_pointers,
-            mut messages_pointers,
-            mut messages_lengths,
-        } = prepare_aggregate_verify_args(public_keys, messages);
-
-        unsafe {
-            AugSchemeMPLAggregateVerify(
-                self.as_mut_ptr(),
-                g1_pointers.as_mut_ptr(),
-                g1_pointers.len(),
-                messages_pointers.as_mut_ptr() as *mut _,
-                messages_lengths.as_mut_ptr() as *mut _,
-                messages_pointers.len(),
-                signature.c_element,
-            )
-        }
-    }
-}
-
-impl Drop for AugSchemeMPL {
-    fn drop(&mut self) {
-        unsafe { AugSchemeMPLFree(self.scheme) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn verify_aggregate(scheme: impl Scheme) {
-        let seed1 = b"seedweedseedweedseedweedseedweed";
-        let seed2 = b"weedseedweedseedweedseedweedseed";
-        let seed3 = b"seedseedseedseedweedweedweedweed";
-        let seed4 = b"weedweedweedweedweedweedweedweed";
-
-        let private_key_1 =
-            PrivateKey::key_gen(&scheme, seed1).expect("unable to generate private key");
-        let private_key_2 =
-            PrivateKey::key_gen(&scheme, seed2).expect("unable to generate private key");
-        let private_key_3 =
-            PrivateKey::key_gen(&scheme, seed3).expect("unable to generate private key");
-        let private_key_4 =
-            PrivateKey::key_gen(&scheme, seed4).expect("unable to generate private key");
-
-        let public_key_1 = private_key_1
-            .g1_element()
-            .expect("unable to get public key");
-        let public_key_2 = private_key_2
-            .g1_element()
-            .expect("unable to get public key");
-        let public_key_3 = private_key_3
-            .g1_element()
-            .expect("unable to get public key");
-        let public_key_4 = private_key_4
-            .g1_element()
-            .expect("unable to get public key");
-
-        let message_1 = b"ayya";
-        let message_2 = b"ayyb";
-        let message_3 = b"ayyc";
-        let message_4 = b"ayyd";
-
-        let signature_1 = scheme.sign(&private_key_1, message_1);
-        let signature_2 = scheme.sign(&private_key_2, message_2);
-        let signature_3 = scheme.sign(&private_key_3, message_3);
-        let signature_4 = scheme.sign(&private_key_4, message_4);
-
-        let signature_agg = scheme.aggregate_sigs([&signature_1, &signature_2, &signature_3]);
-
-        let verify = scheme.aggregate_verify(
-            [&public_key_1, &public_key_2, &public_key_3],
-            [message_1.as_ref(), message_2.as_ref(), message_3.as_ref()],
-            &signature_agg,
-        );
-        assert!(verify);
-
-        // Arbitrary trees of aggregates
-        let signature_agg_final = scheme.aggregate_sigs([&signature_agg, &signature_4]);
-        let verify_final = scheme.aggregate_verify(
-            [&public_key_1, &public_key_2, &public_key_3, &public_key_4],
-            [
-                message_1.as_ref(),
-                message_2.as_ref(),
-                message_3.as_ref(),
-                message_4.as_ref(),
-            ],
-            &signature_agg_final,
-        );
-        assert!(verify_final);
-    }
-
-    #[test]
-    fn verify_aggregate_aug() {
-        verify_aggregate(AugSchemeMPL::new());
-    }
-
-    #[test]
-    fn verify_aggregate_basic() {
-        verify_aggregate(BasicSchemeMPL::new());
-    }
-
-    #[test]
-    fn verify_aggregate_legacy() {
-        verify_aggregate(LegacySchemeMPL::new());
-    }
-}
diff --git a/src/dashbls/rust-bindings/bls-signatures/src/utils.rs b/src/dashbls/rust-bindings/bls-signatures/src/utils.rs
deleted file mode 100644
index 8461e25e9399..000000000000
--- a/src/dashbls/rust-bindings/bls-signatures/src/utils.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use core::slice;
-use std::{
-    ffi::{c_void, CStr},
-    ops::Deref,
-};
-
-use bls_dash_sys::{GetLastErrorMsg, SecAllocBytes, SecFree};
-
-use crate::BlsError;
-
-pub(crate) fn c_err_to_result<T, F>(f: F) -> Result<T, BlsError>
-where
-    F: FnOnce(&mut bool) -> T,
-{
-    let mut did_error = false;
-    let result = f(&mut did_error);
-
-    if did_error {
-        let error_message = unsafe { CStr::from_ptr(GetLastErrorMsg()) };
-        Err(BlsError {
-            msg: String::from_utf8_lossy(error_message.to_bytes()).into_owned(),
-        })
-    } else {
-        Ok(result)
-    }
-}
-
-pub struct SecureBox {
-    c_sec_alloc: *mut u8,
-    len: usize,
-}
-
-impl SecureBox {
-    #[allow(dead_code)]
-    pub(crate) fn new(len: usize) -> Self {
-        SecureBox {
-            c_sec_alloc: unsafe { SecAllocBytes(len) },
-            len,
-        }
-    }
-
-    pub(crate) unsafe fn from_ptr(ptr: *mut u8, len: usize) -> Self {
-        SecureBox {
-            c_sec_alloc: ptr,
-            len,
-        }
-    }
-
-    // Somewhere it returns *mut c_void
-    pub(crate) fn as_mut_ptr(&mut self) -> *mut c_void {
-        self.c_sec_alloc as *mut c_void
-    }
-
-    pub fn as_slice(&self) -> &[u8] {
-        unsafe { slice::from_raw_parts(self.c_sec_alloc, self.len) }
-    }
-}
-
-impl Deref for SecureBox {
-    type Target = [u8];
-
-    fn deref(&self) -> &Self::Target {
-        self.as_slice()
-    }
-}
-
-impl Drop for SecureBox {
-    fn drop(&mut self) {
-        unsafe { SecFree(self.as_mut_ptr()) }
-    }
-}
diff --git a/src/dashbls/rust-bindings/example/Cargo.toml b/src/dashbls/rust-bindings/example/Cargo.toml
deleted file mode 100644
index 8cbc6b7d9196..000000000000
--- a/src/dashbls/rust-bindings/example/Cargo.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "example"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bls-signatures = { path = "../bls-signatures" }
diff --git a/src/dashbls/rust-bindings/example/src/main.rs b/src/dashbls/rust-bindings/example/src/main.rs
deleted file mode 100644
index afc7c27cbb4e..000000000000
--- a/src/dashbls/rust-bindings/example/src/main.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use bls_signatures::{bip32::ExtendedPrivateKey, LegacySchemeMPL, Scheme};
-
-const SEED: &'static [u8] = b"seedweedseedweedseedweedseedweed";
-
-fn check_bip32_hd_keys() {
-    println!("Check BIP32 hierarchical deterministic keys work");
-
-    let private_key =
-        ExtendedPrivateKey::from_seed(SEED).expect("cannot generate extended private key");
-    let public_key = private_key
-        .extended_public_key()
-        .expect("cannot get extended public key");
-
-    let private_child = private_key.private_child(1337);
-    let private_grandchild = private_child.private_child(420);
-
-    let public_child = public_key.public_child(1337);
-    let public_grandchild = public_child.public_child(420);
-
-    assert_eq!(
-        public_grandchild,
-        private_grandchild
-            .extended_public_key()
-            .expect("cannot get extended public key")
-    );
-}
-
-fn check_bip32_legacy_scheme() {
-    println!("Check BIP32 signing works");
-
-    let private_key =
-        ExtendedPrivateKey::from_seed(SEED).expect("cannot generate extended private key");
-    let public_key = private_key
-        .extended_public_key()
-        .expect("cannot get extended public key");
-
-    let scheme = LegacySchemeMPL::new();
-    let message = b"dash is og";
-    let signature = scheme.sign(&private_key.private_key(), message);
-
-    assert!(scheme.verify(&public_key.public_key(), message, &signature));
-}
-
-fn main() {
-    println!("Run some checks to see if everything is linked up to original BLS library:");
-
-    check_bip32_hd_keys();
-    check_bip32_legacy_scheme();
-
-    println!("All checks passed!");
-}
diff --git a/src/dashbls/setjmp_patch.diff b/src/dashbls/setjmp_patch.diff
deleted file mode 100644
index f4a5c80f1c2c..000000000000
--- a/src/dashbls/setjmp_patch.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/include/relic_err.h b/include/relic_err.h
-index e16f71fe..a4adb107 100644
---- a/include/relic_err.h
-+++ b/include/relic_err.h
-@@ -33,7 +33,6 @@
- #define RLC_ERR_H
- 
- #include <stdint.h>
--#include <setjmp.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -43,6 +42,10 @@
- #include "relic_util.h"
- #include "relic_label.h"
- 
-+#ifdef CHECK
-+#include <setjmp.h>
-+#endif
-+
- /*============================================================================*/
- /* Constant definitions                                                       */
- /*============================================================================*/
-@@ -94,6 +97,8 @@ enum errors {
-  */
- typedef int err_t;
- 
-+#ifdef CHECK
-+
- /**
-  * Type that describes an error status, including the error code and the program
-  * location where the error occurred.
-@@ -107,6 +112,8 @@ typedef struct _sts_t {
- 	int block;
- } sts_t;
- 
-+#endif
-+
- /*============================================================================*/
- /* Macro definitions                                                          */
- /*============================================================================*/
diff --git a/src/dashbls/setup.py b/src/dashbls/setup.py
deleted file mode 100644
index 7b4c0bfbbc3c..000000000000
--- a/src/dashbls/setup.py
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/python3
-import os
-import platform
-import re
-import subprocess
-import sys
-from distutils.version import LooseVersion
-
-from setuptools import Extension, setup, setuptools
-from setuptools.command.build_ext import build_ext
-
-
-class CMakeExtension(Extension):
-    def __init__(self, name, sourcedir=""):
-        Extension.__init__(self, name, sources=["./"])
-        self.sourcedir = os.path.abspath(sourcedir)
-
-
-class CMakeBuild(build_ext):
-    def run(self):
-        try:
-            out = subprocess.check_output(["cmake", "--version"])
-        except OSError:
-            raise RuntimeError(
-                "CMake must be installed to build"
-                + " the following extensions: "
-                + ", ".join(e.name for e in self.extensions)
-            )
-
-        if platform.system() == "Windows":
-            cmake_version = LooseVersion(
-                re.search(r"version\s*([\d.]+)", out.decode()).group(1)
-            )
-            if cmake_version < "3.1.0":
-                raise RuntimeError("CMake >= 3.1.0 is required on Windows")
-
-        for ext in self.extensions:
-            self.build_extension(ext)
-
-    def build_extension(self, ext):
-        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
-        cmake_args = [
-            "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir,
-            "-DPYTHON_EXECUTABLE=" + sys.executable,
-        ]
-
-        cfg = "Debug" if self.debug else "Release"
-        build_args = ["--config", cfg]
-
-        if platform.system() == "Windows":
-            cmake_args += [
-                "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)
-            ]
-            if sys.maxsize > 2 ** 32:
-                cmake_args += ["-A", "x64"]
-            build_args += ["--", "/m"]
-        else:
-            cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg]
-            build_args += ["--", "-j", "6"]
-
-        env = os.environ.copy()
-        env["CXXFLAGS"] = '{} -DVERSION_INFO=\\"{}\\"'.format(
-            env.get("CXXFLAGS", ""), self.distribution.get_version()
-        )
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        subprocess.check_call(
-            ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env
-        )
-        subprocess.check_call(
-            ["cmake", "--build", "."] + build_args, cwd=self.build_temp
-        )
-
-
-class get_pybind_include(object):
-    """Helper class to determine the pybind11 include path
-
-    The purpose of this class is to postpone importing pybind11
-    until it is actually installed, so that the ``get_include()``
-    method can be invoked."""
-
-    def __init__(self, user=False):
-        self.user = user
-
-    def __str__(self):
-        import pybind11
-
-        return pybind11.get_include(self.user)
-
-
-ext_modules = [
-    Extension(
-        "blspy",
-        [
-            "src/elements.cpp",
-            "src/schemes.cpp",
-            "src/privatekey.cpp",
-            "src/bls.cpp",
-            "python-bindings/pythonbindings.cpp",
-        ],
-        include_dirs=[
-            # Path to pybind11 headers
-            get_pybind_include(),
-            get_pybind_include(user=True),
-            "relic_ietf_64/include",
-            "mpir_gc_x64",
-            "libsodium/include",
-        ],
-        library_dirs=[
-            "relic_ietf_64",
-            "mpir_gc_x64",
-            "libsodium/x64/Release/v142/static",
-        ],
-        libraries=["relic_s", "Advapi32", "mpir", "libsodium"],
-        language="c++",
-    ),
-]
-
-
-# As of Python 3.6, CCompiler has a `has_flag` method.
-# cf http://bugs.python.org/issue26689
-def has_flag(compiler, flagname):
-    """Return a boolean indicating whether a flag name is supported on
-    the specified compiler.
-    """
-    import tempfile
-
-    with tempfile.NamedTemporaryFile("w", suffix=".cpp") as f:
-        f.write("int main (int argc, char **argv) { return 0; }")
-        try:
-            compiler.compile([f.name], extra_postargs=[flagname])
-        except setuptools.distutils.errors.CompileError:
-            return False
-    return True
-
-
-def cpp_flag(compiler):
-    """Return the -std=c++[11/14/17] compiler flag.
-
-    The newer version is prefered over c++11 (when it is available).
-    """
-    flags = ["-std=c++17", "-std=c++14", "-std=c++11"]
-
-    for flag in flags:
-        if has_flag(compiler, flag):
-            return flag
-
-    raise RuntimeError("Unsupported compiler -- at least C++11 support " "is needed!")
-
-
-class BuildExt(build_ext):
-    """A custom build extension for adding compiler-specific options."""
-
-    c_opts = {
-        "msvc": ["/EHsc", "/std:c++17", "/DBLSALLOC_SODIUM=1", "/DSODIUM_STATIC"],
-        "unix": [],
-    }
-    l_opts = {
-        "msvc": [],
-        "unix": [],
-    }
-
-    if sys.platform == "darwin":
-        darwin_opts = ["-stdlib=libc++", "-mmacosx-version-min=10.14"]
-        c_opts["unix"] += darwin_opts
-        l_opts["unix"] += darwin_opts
-
-    def build_extensions(self):
-        ct = self.compiler.compiler_type
-        opts = self.c_opts.get(ct, [])
-        link_opts = self.l_opts.get(ct, [])
-        if ct == "unix":
-            opts.append('-DVERSION_INFO="%s"' % self.distribution.get_version())
-            opts.append(cpp_flag(self.compiler))
-            if has_flag(self.compiler, "-fvisibility=hidden"):
-                opts.append("-fvisibility=hidden")
-        elif ct == "msvc":
-            if sys.version_info < (3, 9):
-                ver_flag = '/DVERSION_INFO=\"%s\"'
-            else:
-                ver_flag = '-DVERSION_INFO="%s"'
-            opts.append(ver_flag % self.distribution.get_version())
-        for ext in self.extensions:
-            ext.extra_compile_args = opts
-            ext.extra_link_args = link_opts
-        build_ext.build_extensions(self)
-
-
-if platform.system() == "Windows":
-    setup(
-        name="blspy",
-        author="Mariano Sorgente",
-        author_email="mariano@chia.net",
-        description="BLS signatures in c++ (with python bindings)",
-        long_description=open("README.md").read(),
-        long_description_content_type="text/markdown",
-        url="https://github.com/Chia-Network/bls-signatures",
-        python_requires=">=3.7",
-        setup_requires=["pybind11>=2.10.0"],
-        install_requires=["pybind11>=2.10.0"],
-        ext_modules=ext_modules,
-        cmdclass={"build_ext": BuildExt},
-        zip_safe=False,
-    )
-else:
-    setup(
-        name="blspy",
-        author="Mariano Sorgente",
-        author_email="mariano@chia.net",
-        description="BLS signatures in c++ (python bindings)",
-        python_requires=">=3.7",
-        install_requires=["wheel"],
-        long_description=open("README.md").read(),
-        long_description_content_type="text/markdown",
-        url="https://github.com/Chia-Network/bls-signatures",
-        ext_modules=[CMakeExtension("blspy", ".")],
-        cmdclass=dict(build_ext=CMakeBuild),
-        zip_safe=False,
-    )
diff --git a/src/dashbls/src/CMakeLists.txt b/src/dashbls/src/CMakeLists.txt
deleted file mode 100644
index 5802843a61ed..000000000000
--- a/src/dashbls/src/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/dashbls/*.hpp)
-source_group("SrcHeaders" FILES ${HEADERS})
-
-add_library(dashbls
-  ${HEADERS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/privatekey.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/bls.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/chaincode.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/elements.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/extendedprivatekey.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/extendedpublickey.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/legacy.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/schemes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/threshold.cpp)
-
-target_include_directories(dashbls
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    $<$<BOOL:${GMP_FOUND}>:${GMP_INCLUDES}>
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/dashbls
-    ${CMAKE_CURRENT_SOURCE_DIR}/../depends/mimalloc/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../depends/relic/include
-    ${CMAKE_CURRENT_BINARY_DIR}/../depends/relic/include
-)
-
-target_compile_definitions(dashbls
-  PRIVATE
-    BLSALLOC_MIMALLOC=1
-)
-
-target_link_libraries(dashbls
-  PUBLIC
-    relic_s
-    mimalloc-static
-)
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../depends/relic/include/ DESTINATION include/dashbls)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../depends/relic/include/ DESTINATION include/dashbls)
-install(FILES ${HEADERS} DESTINATION include/dashbls)
-install(FILES $<TARGET_FILE:dashbls> DESTINATION lib)
-
-if(BUILD_BLS_TESTS)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/../depends/catch2/CMakeLists.txt)
-
-  add_executable(runtest test.cpp)
-  target_link_libraries(runtest
-                        PRIVATE dashbls
-                        PRIVATE catch2)
-
-  if(EMSCRIPTEN)
-    target_link_options(runtest PRIVATE "SHELL:-s MALLOC=emmalloc")
-    if(CMAKE_BUILD_TYPE MATCHES "Debug")
-      target_link_options(runtest PRIVATE "SHELL:-s ASSERTIONS=2")
-    endif()
-  endif()
-endif()
-
-if(BUILD_BLS_BENCHMARKS)
-  add_executable(runbench test-bench.cpp)
-  target_link_libraries(runbench PRIVATE dashbls)
-
-  if(EMSCRIPTEN)
-    target_link_options(runbench PRIVATE "SHELL:-s MALLOC=emmalloc")
-    if(CMAKE_BUILD_TYPE MATCHES "Debug")
-      target_link_options(runbench PRIVATE "SHELL:-s ASSERTIONS=2")
-    endif()
-  endif()
-endif()
diff --git a/src/dashbls/src/bls.cpp b/src/dashbls/src/bls.cpp
deleted file mode 100644
index e0af3a388216..000000000000
--- a/src/dashbls/src/bls.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "bls.hpp"
-
-#if BLSALLOC_MIMALLOC
-#include "mimalloc.h"
-#endif
-
-#if BLSALLOC_SODIUM
-#include "sodium.h"
-#endif
-
-namespace bls {
-
-const size_t BLS::MESSAGE_HASH_LEN;
-
-bool BLSInitResult = BLS::Init();
-
-Util::SecureAllocCallback Util::secureAllocCallback;
-Util::SecureFreeCallback Util::secureFreeCallback;
-
-static void relic_core_initializer(void* ptr)
-{
-    core_init();
-    if (err_get_code() != RLC_OK) {
-        throw std::runtime_error("core_init() failed");
-    }
-
-    const int r = ep_param_set_any_pairf();
-    if (r != RLC_OK) {
-        throw std::runtime_error("ep_param_set_any_pairf() failed");
-    }
-}
-
-bool BLS::Init()
-{
-    if (ALLOC != AUTO) {
-        throw std::runtime_error("Must have ALLOC == AUTO");
-    }
-#if BLSALLOC_MIMALLOC
-    SetSecureAllocator(mi_malloc, mi_free);
-#elif BLSALLOC_SODIUM
-    if (sodium_init() < 0) {
-        throw std::runtime_error("libsodium init failed");
-    }
-    SetSecureAllocator(sodium_malloc, sodium_free);
-#else
-    SetSecureAllocator(malloc, free);
-#endif
-
-#if MULTI != RELIC_NONE
-    core_set_thread_initializer(relic_core_initializer, nullptr);
-#else
-    relic_core_initializer(nullptr);
-#endif
-    
-    return true;
-}
-
-void BLS::SetSecureAllocator(
-    Util::SecureAllocCallback allocCb,
-    Util::SecureFreeCallback freeCb)
-{
-    Util::secureAllocCallback = allocCb;
-    Util::secureFreeCallback = freeCb;
-}
-
-
-void BLS::CheckRelicErrors(bool should_throw)
-{
-    if (!core_get()) {
-        throw std::runtime_error("Library not initialized properly. Call BLS::Init()");
-    }
-    if (core_get()->code != RLC_OK) {
-        core_get()->code = RLC_OK;
-        if (should_throw) {
-            throw std::invalid_argument("Relic library error");
-        }
-    }
-}
-
-}  // end namespace bls
diff --git a/src/dashbls/src/chaincode.cpp b/src/dashbls/src/chaincode.cpp
deleted file mode 100644
index efacdc95ae29..000000000000
--- a/src/dashbls/src/chaincode.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "bls.hpp"
-
-namespace bls {
-
-ChainCode ChainCode::FromBytes(const Bytes& bytes) {
-    if (bytes.size() != ChainCode::SIZE) {
-        throw std::invalid_argument("ChainCode::FromBytes: Invalid size");
-    }
-    ChainCode c = ChainCode();
-    bn_new(c.chainCode);
-    bn_read_bin(c.chainCode, bytes.begin(), ChainCode::SIZE);
-    return c;
-}
-
-ChainCode::ChainCode(const ChainCode &cc) {
-    uint8_t bytes[ChainCode::SIZE];
-    cc.Serialize(bytes);
-    bn_new(chainCode);
-    bn_read_bin(chainCode, bytes, ChainCode::SIZE);
-}
-
-// Comparator implementation.
-bool operator==(ChainCode const &a,  ChainCode const &b) {
-    return bn_cmp(a.chainCode, b.chainCode) == RLC_EQ;
-}
-
-bool operator!=(ChainCode const &a,  ChainCode const &b) {
-    return !(a == b);
-}
-
-std::ostream &operator<<(std::ostream &os, ChainCode const &s) {
-    uint8_t buffer[ChainCode::SIZE];
-    s.Serialize(buffer);
-    return os << Util::HexStr(buffer, ChainCode::SIZE);
-}
-
-void ChainCode::Serialize(uint8_t *buffer) const {
-    bn_write_bin(buffer, ChainCode::SIZE, chainCode);
-}
-
-std::vector<uint8_t> ChainCode::Serialize() const {
-    std::vector<uint8_t> data(SIZE);
-    Serialize(data.data());
-    return data;
-}
-} // end namespace bls
diff --git a/src/dashbls/src/elements.cpp b/src/dashbls/src/elements.cpp
deleted file mode 100644
index b0c747af823c..000000000000
--- a/src/dashbls/src/elements.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <cstring>
-
-#include "bls.hpp"
-#include "legacy.hpp"
-
-namespace bls {
-
-const size_t G1Element::SIZE;
-
-G1Element G1Element::FromBytes(Bytes const bytes, bool fLegacy) {
-    G1Element ele = G1Element::FromBytesUnchecked(bytes, fLegacy);
-    if (!fLegacy) {
-        ele.CheckValid();
-    }
-    return ele;
-}
-
-G1Element G1Element::FromBytesUnchecked(Bytes const bytes, bool fLegacy)
-{
-    if (bytes.size() != SIZE) {
-        throw std::invalid_argument("G1Element::FromBytes: Invalid size");
-    }
-
-    G1Element ele;
-
-    // convert bytes to relic form
-    uint8_t buffer[G1Element::SIZE + 1];
-    std::memcpy(buffer + 1, bytes.begin(), G1Element::SIZE);
-    buffer[0] = 0x00;
-    buffer[1] &= 0x1f;  // erase 3 msbs from given input
-
-    if ((bytes[0] & 0xc0) == 0xc0) {  // representing infinity
-        buffer[0] = 0x00;
-        buffer[1] &= 0x1f;  // erase 3 msbs from given input
-
-        bool fZerosOnly = Util::HasOnlyZeros(Bytes(buffer, G1Element::SIZE + 1));
-        // enforce that infinity must be 0xc0000..00
-        if (bytes[0] != 0xc0 || !fZerosOnly) {
-            throw std::invalid_argument("Given G1 infinity element must be canonical");
-        }
-        return ele;
-    } else {
-        if (fLegacy) {
-            if (bytes[0] & 0x80) {
-                buffer[0] = 0x03;   // Insert extra byte for Y=1
-                buffer[1] &= 0x7f;  // Remove initial Y bit
-            } else {
-                buffer[0] = 0x02;   // Insert extra byte for Y=0
-            }
-        } else {
-            buffer[0] = 0x00;
-            buffer[1] &= 0x1f;  // erase 3 msbs from given input
-
-            bool fZerosOnly = Util::HasOnlyZeros(Bytes(buffer, G1Element::SIZE + 1));
-            if ((bytes[0] & 0xc0) != 0x80) {
-                throw std::invalid_argument(
-                        "Given G1 non-infinity element must start with 0b10");
-            }
-
-            if (fZerosOnly) {
-                throw std::invalid_argument("G1 non-infinity element can't have only zeros");
-            }
-            if (bytes[0] & 0x20) {  // sign bit
-                buffer[0] = 0x03;
-            } else {
-                buffer[0] = 0x02;
-            }
-        }
-    }
-    g1_read_bin(ele.p, buffer, G1Element::SIZE + 1);
-    BLS::CheckRelicErrors(!fLegacy);
-    return ele;
-}
-
-G1Element G1Element::FromByteVector(const std::vector<uint8_t>& bytevec, bool fLegacy)
-{
-    return G1Element::FromBytes(Bytes(bytevec), fLegacy);
-}
-
-G1Element G1Element::FromNative(const g1_t element)
-{
-    G1Element ele;
-    g1_copy(ele.p, element);
-    return ele;
-}
-
-G1Element G1Element::Copy() {
-    G1Element ele;
-    g1_copy(ele.p, this->p);
-
-    return ele;
-}
-
-
-G1Element G1Element::FromMessage(const std::vector<uint8_t>& message,
-                                 const uint8_t* dst,
-                                 int dst_len)
-{
-    return FromMessage(Bytes(message), dst, dst_len);
-}
-
-G1Element G1Element::FromMessage(Bytes const message,
-                                 const uint8_t* dst,
-                                 int dst_len)
-{
-    G1Element ans;
-    ep_map_dst(ans.p, message.begin(), (int)message.size(), dst, dst_len);
-    BLS::CheckRelicErrors();
-    assert(ans.IsValid());
-    return ans;
-}
-
-G1Element G1Element::Generator()
-{
-    G1Element ele;
-    g1_get_gen(ele.p);
-    BLS::CheckRelicErrors();
-    return ele;
-}
-
-bool G1Element::IsValid() const {
-    // Infinity no longer valid in Relic
-    // https://github.com/relic-toolkit/relic/commit/f3be2babb955cf9f82743e0ae5ef265d3da6c02b
-    if (g1_is_infty((g1_st*)p) == 1)
-        return true;
-
-    return g1_is_valid((g1_st*)p);
-}
-
-void G1Element::CheckValid() const {
-    if (!IsValid())
-        throw std::invalid_argument("G1 element is invalid");
-    BLS::CheckRelicErrors();
-}
-
-void G1Element::ToNative(g1_t output) const {
-    g1_copy(output, p);
-}
-
-G1Element G1Element::Negate() const
-{
-    G1Element ans;
-    g1_neg(ans.p, p);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-GTElement G1Element::Pair(const G2Element& b) const { return (*this) & b; }
-
-uint32_t G1Element::GetFingerprint(const bool fLegacy) const
-{
-    uint8_t buffer[G1Element::SIZE];
-    uint8_t hash[32];
-    memcpy(buffer, Serialize(fLegacy).data(), G1Element::SIZE);
-    Util::Hash256(hash, buffer, G1Element::SIZE);
-    return Util::FourBytesToInt(hash);
-}
-
-std::vector<uint8_t> G1Element::Serialize(const bool fLegacy) const {
-    const auto arr = G1Element::SerializeToArray(fLegacy);
-    return std::vector<uint8_t>{arr.begin(), arr.end()};
-}
-
-std::array<uint8_t, G1Element::SIZE> G1Element::SerializeToArray(const bool fLegacy) const {
-    uint8_t buffer[G1Element::SIZE + 1];
-    g1_write_bin(buffer, G1Element::SIZE + 1, p, 1);
-
-    std::array<uint8_t, G1Element::SIZE> result{};
-    if (buffer[0] == 0x00) {  // infinity
-        result[0] = 0xc0;
-        return result;
-    }
-
-    if (buffer[0] == 0x03) {  // sign bit set
-        buffer[1] |= fLegacy ? 0x80 : 0x20;
-    }
-
-    if (!fLegacy) {
-        buffer[1] |= 0x80;  // indicate compression
-    }
-
-    std::copy_n(buffer + 1, G1Element::SIZE, result.begin());
-    return result;
-}
-
-bool operator==(const G1Element & a, const G1Element &b)
-{
-    return g1_cmp(a.p, b.p) == RLC_EQ;
-}
-
-bool operator!=(const G1Element & a, const G1Element & b) { return !(a == b); }
-
-std::ostream& operator<<(std::ostream& os, const G1Element &ele)
-{
-    return os << Util::HexStr(ele.Serialize());
-}
-
-G1Element& operator+=(G1Element& a, const G1Element& b)
-{
-    g1_add(a.p, a.p, b.p);
-    BLS::CheckRelicErrors();
-    return a;
-}
-
-G1Element operator+(const G1Element& a, const G1Element& b)
-{
-    G1Element ans;
-    g1_add(ans.p, a.p, b.p);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-G1Element operator*(const G1Element& a, const bn_t& k)
-{
-    G1Element ans;
-    g1_mul(ans.p, (g1_st*)a.p, (bn_st*)k);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-G1Element operator*(const bn_t& k, const G1Element& a) { return a * k; }
-
-
-
-// G2Element definitions below
-
-
-
-const size_t G2Element::SIZE;
-
-G2Element G2Element::FromBytes(Bytes const bytes, const bool fLegacy) {
-    G2Element ele = G2Element::FromBytesUnchecked(bytes, fLegacy);
-    if (!fLegacy) {
-        ele.CheckValid();
-    }
-    return ele;
-}
-
-G2Element G2Element::FromBytesUnchecked(Bytes const bytes, const bool fLegacy)
-{
-    if (bytes.size() != SIZE) {
-        throw std::invalid_argument("G2Element::FromBytes: Invalid size");
-    }
-
-    G2Element ele;
-    uint8_t buffer[G2Element::SIZE + 1];
-
-    if (fLegacy) {
-        std::memcpy(buffer + 1, bytes.begin(), G2Element::SIZE);
-        buffer[0] = 0x00;
-    } else {
-        std::memcpy(buffer + 1, bytes.begin() + G2Element::SIZE / 2, G2Element::SIZE / 2);
-        std::memcpy(buffer + 1 + G2Element::SIZE / 2, bytes.begin(), G2Element::SIZE / 2);
-        buffer[0] = 0x00;
-        buffer[49] &= 0x1f;  // erase 3 msbs from input
-        if ((bytes[48] & 0xe0) != 0x00) {
-            throw std::invalid_argument(
-                    "Given G2 element must always have 48th byte start with 0b000");
-        }
-    }
-    bool fZerosOnly = Util::HasOnlyZeros(Bytes(buffer, G2Element::SIZE + 1));
-    if (((bytes[0] & 0xc0) == 0xc0)) {  // infinity
-        // enforce that infinity must be 0xc0000..00
-        if (bytes[0] != 0xc0 || !fZerosOnly) {
-            throw std::invalid_argument(
-                "Given G2 infinity element must be canonical");
-        }
-        return ele;
-    }
-
-    if (fLegacy) {
-        if (bytes[0] & 0x80) {
-            buffer[0] = 0x03;   // Insert extra byte for Y=1
-            buffer[1] &= 0x7f;  // Remove initial Y bit
-        } else {
-            buffer[0] = 0x02;   // Insert extra byte for Y=0
-        }
-    } else {
-        if (((bytes[0] & 0xc0) != 0x80)) {
-            throw std::invalid_argument(
-                "G2 non-inf element must have 0th byte start with 0b10");
-        }
-
-        if (fZerosOnly) {
-            throw std::invalid_argument("G2 non-infinity element can't have only zeros");
-        }
-
-        if (bytes[0] & 0x20) {
-            buffer[0] = 0x03;
-        } else {
-            buffer[0] = 0x02;
-        }
-    }
-
-    g2_read_bin(ele.q, buffer, G2Element::SIZE + 1);
-    BLS::CheckRelicErrors(!fLegacy);
-    return ele;
-}
-
-G2Element G2Element::FromByteVector(const std::vector<uint8_t>& bytevec, bool fLegacy)
-{
-    return G2Element::FromBytes(Bytes(bytevec), fLegacy);
-}
-
-G2Element G2Element::FromNative(const g2_t element)
-{
-    G2Element ele;
-    g2_copy(ele.q, (g2_st*)element);
-    return ele;
-}
-
-G2Element G2Element::FromMessage(const std::vector<uint8_t>& message,
-                                 const uint8_t* dst,
-                                 int dst_len,
-                                 const bool fLegacy)
-{
-    return FromMessage(Bytes(message), dst, dst_len, fLegacy);
-}
-
-G2Element G2Element::FromMessage(Bytes const message,
-                                 const uint8_t* dst,
-                                 int dst_len,
-                                 const bool fLegacy)
-{
-    G2Element ans;
-    if (fLegacy) {
-        ep2_map_legacy(ans.q, message.begin(), BLS::MESSAGE_HASH_LEN);
-    } else {
-        ep2_map_dst(ans.q, message.begin(), (int)message.size(), dst, dst_len);
-    }
-    BLS::CheckRelicErrors();
-    assert(ans.IsValid());
-    return ans;
-}
-
-G2Element G2Element::Generator()
-{
-    G2Element ele;
-    g2_get_gen(ele.q);
-    BLS::CheckRelicErrors();
-    return ele;
-}
-
-bool G2Element::IsValid() const {
-    // Infinity no longer valid in Relic
-    // https://github.com/relic-toolkit/relic/commit/f3be2babb955cf9f82743e0ae5ef265d3da6c02b
-    if (g2_is_infty((g2_st*)q) == 1)
-        return true;
-
-    return g2_is_valid((g2_st*)q);
-}
-
-void G2Element::CheckValid() const {
-    if (!IsValid())
-        throw std::invalid_argument("G2 element is invalid");
-    BLS::CheckRelicErrors();
-}
-
-void G2Element::ToNative(g2_t output) const {
-    g2_copy(output, (g2_st*)q);
-}
-
-G2Element G2Element::Copy() {
-    G2Element ele;
-    g2_copy(ele.q, this->q);
-
-    return ele;
-}
-
-
-G2Element G2Element::Negate() const
-{
-    G2Element ans;
-    g2_neg(ans.q, (g2_st*)q);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-GTElement G2Element::Pair(const G1Element& a) const { return a & (*this); }
-
-std::vector<uint8_t> G2Element::Serialize(const bool fLegacy) const {
-    const auto arr = G2Element::SerializeToArray(fLegacy);
-    return std::vector<uint8_t>{arr.begin(), arr.end()};
-}
-
-std::array<uint8_t, G2Element::SIZE> G2Element::SerializeToArray(const bool fLegacy) const {
-    uint8_t buffer[G2Element::SIZE + 1];
-    g2_write_bin(buffer, G2Element::SIZE + 1, (g2_st*)q, 1);
-
-    std::array<uint8_t, G2Element::SIZE> result{};
-
-    if (buffer[0] == 0x00) {  // infinity
-        result.fill(0);
-        result[0] = 0xc0;
-        return result;
-    }
-
-    if (fLegacy) {
-        if (buffer[0] == 0x03) {  // sign bit set
-            buffer[1] |= 0x80;
-        }
-    } else {
-        // remove leading 3 bits
-        buffer[1] &= 0x1f;
-        buffer[49] &= 0x1f;
-        if (buffer[0] == 0x03) {
-            buffer[49] |= 0xa0;  // swapped later to 0
-        } else {
-            buffer[49] |= 0x80;
-        }
-    }
-
-    if (fLegacy) {
-        std::memcpy(result.data(), buffer + 1, G2Element::SIZE);
-    } else {
-        // Swap buffer, relic uses the opposite ordering for Fq2 elements
-        std::memcpy(result.data(), buffer + 1 + G2Element::SIZE / 2, G2Element::SIZE / 2);
-        std::memcpy(result.data() + G2Element::SIZE / 2, buffer + 1, G2Element::SIZE / 2);
-    }
-
-    return result;
-}
-
-bool operator==(G2Element const& a, G2Element const& b)
-{
-    return g2_cmp((g2_st*)a.q, (g2_st*)b.q) == RLC_EQ;
-}
-
-bool operator!=(G2Element const& a, G2Element const& b) { return !(a == b); }
-
-std::ostream& operator<<(std::ostream& os, const G2Element & s)
-{
-    return os << Util::HexStr(s.Serialize());
-}
-
-G2Element& operator+=(G2Element& a, const G2Element& b)
-{
-    g2_add(a.q, a.q, (g2_st*)b.q);
-    BLS::CheckRelicErrors();
-    return a;
-}
-
-G2Element operator+(const G2Element& a, const G2Element& b)
-{
-    G2Element ans;
-    g2_add(ans.q, (g2_st*)a.q, (g2_st*)b.q);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-G2Element operator*(const G2Element& a, const bn_t& k)
-{
-    G2Element ans;
-    g2_mul(ans.q, (g2_st*)a.q, (bn_st*)k);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-G2Element operator*(const bn_t& k, const G2Element& a) { return a * k; }
-
-
-
-// GTElement
-
-const size_t GTElement::SIZE;
-
-GTElement GTElement::FromBytes(Bytes const bytes)
-{
-    GTElement ele = GTElement::FromBytesUnchecked(bytes);
-    if (gt_is_valid(*(gt_t*)&ele) == 0)
-        throw std::invalid_argument("GTElement is invalid");
-    return ele;
-}
-
-GTElement GTElement::FromBytesUnchecked(Bytes const bytes)
-{
-    if (bytes.size() != SIZE) {
-        throw std::invalid_argument("GTElement::FromBytes: Invalid size");
-    }
-    GTElement ele = GTElement();
-    gt_read_bin(ele.r, bytes.begin(), GTElement::SIZE);
-    BLS::CheckRelicErrors();
-    return ele;
-}
-
-GTElement GTElement::FromByteVector(const std::vector<uint8_t>& bytevec)
-{
-    return GTElement::FromBytes(Bytes(bytevec));
-}
-
-GTElement GTElement::FromNative(const gt_t* element)
-{
-    GTElement ele = GTElement();
-    gt_copy(ele.r, *(gt_t*)element);
-    return ele;
-}
-
-GTElement GTElement::Unity() {
-    GTElement ele = GTElement();
-    gt_set_unity(ele.r);
-    return ele;
-}
-
-
-bool operator==(GTElement const& a, GTElement const& b)
-{
-    return gt_cmp(*(gt_t*)(a.r), *(gt_t*)(b.r)) == RLC_EQ;
-}
-
-bool operator!=(GTElement const& a, GTElement const& b) { return !(a == b); }
-
-std::ostream& operator<<(std::ostream& os, GTElement const& ele)
-{
-    return os << Util::HexStr(ele.Serialize());
-}
-
-GTElement operator&(const G1Element& a, const G2Element& b)
-{
-    G1Element nonConstA(a);
-    gt_t ans;
-    gt_new(ans);
-    g2_t tmp;
-    g2_null(tmp);
-    g2_new(tmp);
-    b.ToNative(tmp);
-    pp_map_oatep_k12(ans, nonConstA.p, tmp);
-    GTElement ret = GTElement::FromNative(&ans);
-    gt_free(ans);
-    g2_free(tmp);
-    return ret;
-}
-
-GTElement operator*(GTElement& a, GTElement& b)
-{
-    GTElement ans;
-    fp12_mul(ans.r, a.r, b.r);
-    BLS::CheckRelicErrors();
-    return ans;
-}
-
-void GTElement::Serialize(uint8_t* buffer) const
-{
-    gt_write_bin(buffer, GTElement::SIZE, *(gt_t*)&r, 1);
-}
-
-std::vector<uint8_t> GTElement::Serialize() const
-{
-    std::vector<uint8_t> data(GTElement::SIZE);
-    Serialize(data.data());
-    return data;
-}
-
-std::array<uint8_t, GTElement::SIZE> GTElement::SerializeToArray() const
-{
-    std::array<uint8_t, GTElement::SIZE> data{};
-    Serialize(data.data());
-    return data;
-}
-
-}  // end namespace bls
diff --git a/src/dashbls/src/extendedprivatekey.cpp b/src/dashbls/src/extendedprivatekey.cpp
deleted file mode 100644
index d5fe746ee690..000000000000
--- a/src/dashbls/src/extendedprivatekey.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <cstring>
-#include "bls.hpp"
-
-namespace bls {
-
-ExtendedPrivateKey ExtendedPrivateKey::FromSeed(const Bytes& bytes) {
-    // "BLS HD seed" in ascii
-    const uint8_t prefix[] = {66, 76, 83, 32, 72, 68, 32, 115, 101, 101, 100};
-
-    uint8_t* hashInput = Util::SecAlloc<uint8_t>(bytes.size() + 1);
-    std::memcpy(hashInput, bytes.begin(), bytes.size());
-
-    // 32 bytes for secret key, and 32 bytes for chaincode
-    uint8_t* ILeft = Util::SecAlloc<uint8_t>(
-            PrivateKey::PRIVATE_KEY_SIZE);
-    uint8_t IRight[ChainCode::SIZE];
-
-    // Hash the seed into 64 bytes, half will be sk, half will be cc
-    hashInput[bytes.size()] = 0;
-    md_hmac(ILeft, hashInput, bytes.size() + 1, prefix, sizeof(prefix));
-
-    hashInput[bytes.size()] = 1;
-    md_hmac(IRight, hashInput, bytes.size() + 1, prefix, sizeof(prefix));
-
-    // Make sure private key is less than the curve order
-    bn_t* skBn = Util::SecAlloc<bn_t>(1);
-    bn_t order;
-    bn_new(order);
-    g1_get_ord(order);
-
-    bn_new(*skBn);
-    bn_read_bin(*skBn, ILeft, PrivateKey::PRIVATE_KEY_SIZE);
-    bn_mod_basic(*skBn, *skBn, order);
-    bn_write_bin(ILeft, PrivateKey::PRIVATE_KEY_SIZE, *skBn);
-
-    ExtendedPrivateKey esk(ExtendedPublicKey::REVISION, 0, 0, 0,
-                           ChainCode::FromBytes(Bytes(IRight, ChainCode::SIZE)),
-                           PrivateKey::FromBytes(Bytes(ILeft, PrivateKey::PRIVATE_KEY_SIZE)));
-
-    Util::SecFree(skBn);
-    Util::SecFree(ILeft);
-    Util::SecFree(hashInput);
-    return esk;
-}
-
-ExtendedPrivateKey ExtendedPrivateKey::FromBytes(const Bytes& bytes) {
-    uint32_t version = Util::FourBytesToInt(bytes.begin());
-    uint32_t depth = bytes[4];
-    uint32_t parentFingerprint = Util::FourBytesToInt(bytes.begin() + 5);
-    uint32_t childNumber = Util::FourBytesToInt(bytes.begin() + 9);
-    const uint8_t* ccPointer = bytes.begin() + 13;
-    const uint8_t* skPointer = ccPointer + ChainCode::SIZE;
-
-    ExtendedPrivateKey esk(version, depth, parentFingerprint, childNumber,
-                          ChainCode::FromBytes(Bytes(ccPointer, ChainCode::SIZE)),
-                          PrivateKey::FromBytes(Bytes(skPointer, PrivateKey::PRIVATE_KEY_SIZE)));
-    return esk;
-}
-
-ExtendedPrivateKey ExtendedPrivateKey::PrivateChild(uint32_t i, const bool fLegacy) const {
-    if (depth >= 255) {
-        throw std::logic_error("Cannot go further than 255 levels");
-    }
-    // Hardened keys have i >= 2^31. Non-hardened have i < 2^31
-    uint32_t cmp = (1 << 31);
-    bool hardened = i >= cmp;
-
-    uint8_t* ILeft = Util::SecAlloc<uint8_t>(PrivateKey::PRIVATE_KEY_SIZE);
-    uint8_t IRight[ChainCode::SIZE];
-
-    // Chain code is used as hmac key
-    uint8_t hmacKey[ChainCode::SIZE];
-    chainCode.Serialize(hmacKey);
-
-    size_t inputLen = hardened ? PrivateKey::PRIVATE_KEY_SIZE + 4 + 1
-                                : G1Element::SIZE + 4 + 1;
-    // Hmac input includes sk or pk, int i, and byte with 0 or 1
-    uint8_t* hmacInput = Util::SecAlloc<uint8_t>(inputLen);
-
-    // Fill the input with the required data
-    if (hardened) {
-        sk.Serialize(hmacInput);
-        Util::IntToFourBytes(hmacInput + PrivateKey::PRIVATE_KEY_SIZE, i);
-    } else {
-        memcpy(hmacInput, sk.GetG1Element().Serialize(fLegacy).data(), G1Element::SIZE);
-        Util::IntToFourBytes(hmacInput + G1Element::SIZE, i);
-    }
-    hmacInput[inputLen - 1] = 0;
-
-    md_hmac(ILeft, hmacInput, inputLen,
-                    hmacKey, ChainCode::SIZE);
-
-    // Change 1 byte to generate a different sequence for chaincode
-    hmacInput[inputLen - 1] = 1;
-
-    md_hmac(IRight, hmacInput, inputLen,
-                    hmacKey, ChainCode::SIZE);
-
-    PrivateKey newSk = PrivateKey::FromBytes(Bytes(ILeft, PrivateKey::PRIVATE_KEY_SIZE), true);
-    newSk = PrivateKey::Aggregate({sk, newSk});
-
-    ExtendedPrivateKey esk(version, depth + 1,
-                           sk.GetG1Element().GetFingerprint(), i,
-                           ChainCode::FromBytes(Bytes(IRight, ChainCode::SIZE)),
-                           newSk);
-
-    Util::SecFree(ILeft);
-    Util::SecFree(hmacInput);
-
-    return esk;
-}
-
-uint32_t ExtendedPrivateKey::GetVersion() const {
-    return version;
-}
-
-uint8_t ExtendedPrivateKey::GetDepth() const {
-    return depth;
-}
-
-uint32_t ExtendedPrivateKey::GetParentFingerprint() const {
-    return parentFingerprint;
-}
-
-uint32_t ExtendedPrivateKey::GetChildNumber() const {
-    return childNumber;
-}
-
-ExtendedPublicKey ExtendedPrivateKey::PublicChild(uint32_t i) const {
-    return PrivateChild(i).GetExtendedPublicKey();
-}
-
-PrivateKey ExtendedPrivateKey::GetPrivateKey() const {
-    return sk;
-}
-
-G1Element ExtendedPrivateKey::GetPublicKey() const {
-    return sk.GetG1Element();
-}
-
-ChainCode ExtendedPrivateKey::GetChainCode() const {
-    return chainCode;
-}
-
-ExtendedPublicKey ExtendedPrivateKey::GetExtendedPublicKey(const bool fLegacy) const {
-    std::vector<uint8_t> buffer(ExtendedPublicKey::SIZE);
-    Util::IntToFourBytes(buffer.data(), version);
-    buffer[4] = depth;
-    Util::IntToFourBytes(buffer.data() + 5, parentFingerprint);
-    Util::IntToFourBytes(buffer.data() + 9, childNumber);
-
-    chainCode.Serialize(buffer.data() + 13);
-    auto vecG1 = sk.GetG1Element().Serialize(fLegacy);
-    buffer.insert(buffer.begin() + 13 + ChainCode::SIZE, vecG1.begin(), vecG1.end());
-
-    return ExtendedPublicKey::FromBytes(Bytes(buffer), fLegacy);
-}
-
-// Comparator implementation.
-bool operator==(ExtendedPrivateKey const &a,  ExtendedPrivateKey const &b) {
-    return (a.GetPrivateKey() == b.GetPrivateKey() &&
-            a.GetChainCode() == b.GetChainCode());
-}
-
-bool operator!=(ExtendedPrivateKey const&a,  ExtendedPrivateKey const&b) {
-    return !(a == b);
-}
-
-void ExtendedPrivateKey::Serialize(uint8_t *buffer) const {
-    Util::IntToFourBytes(buffer, version);
-    buffer[4] = depth;
-    Util::IntToFourBytes(buffer + 5, parentFingerprint);
-    Util::IntToFourBytes(buffer + 9, childNumber);
-    chainCode.Serialize(buffer + 13);
-    sk.Serialize(buffer + 13 + ChainCode::SIZE);
-}
-
-std::vector<uint8_t> ExtendedPrivateKey::Serialize() const {
-    std::vector<uint8_t> data(SIZE);
-    Serialize(data.data());
-    return data;
-}
-
-// Destructors in PrivateKey and ChainCode handle cleaning of memory
-ExtendedPrivateKey::~ExtendedPrivateKey() {}
-} // end namespace bls
diff --git a/src/dashbls/src/extendedpublickey.cpp b/src/dashbls/src/extendedpublickey.cpp
deleted file mode 100644
index a484dea64621..000000000000
--- a/src/dashbls/src/extendedpublickey.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2018 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "bls.hpp"
-
-namespace bls {
-
-ExtendedPublicKey ExtendedPublicKey::FromBytes(const Bytes& bytes, const bool fLegacy) {
-    uint32_t version = Util::FourBytesToInt(bytes.begin());
-    uint32_t depth = bytes[4];
-    uint32_t parentFingerprint = Util::FourBytesToInt(bytes.begin() + 5);
-    uint32_t childNumber = Util::FourBytesToInt(bytes.begin() + 9);
-    const uint8_t* ccPointer = bytes.begin() + 13;
-    const uint8_t* pkPointer = ccPointer + ChainCode::SIZE;
-
-    ExtendedPublicKey epk(version, depth, parentFingerprint, childNumber,
-                          ChainCode::FromBytes(Bytes(ccPointer, ChainCode::SIZE)),
-                          G1Element::FromBytes(Bytes(pkPointer, G1Element::SIZE), fLegacy));
-    return epk;
-}
-
-ExtendedPublicKey ExtendedPublicKey::PublicChild(uint32_t i, const bool fLegacy) const {
-    // Hardened children have i >= 2^31. Non-hardened have i < 2^31
-    uint32_t cmp = (1 << 31);
-    if (i >= cmp) {
-        throw std::invalid_argument("Cannot derive hardened children from public key");
-    }
-    if (depth >= 255) {
-        throw std::logic_error("Cannot go further than 255 levels");
-    }
-    uint8_t ILeft[PrivateKey::PRIVATE_KEY_SIZE];
-    uint8_t IRight[ChainCode::SIZE];
-
-    // Chain code is used as hmac key
-    uint8_t hmacKey[ChainCode::SIZE];
-    chainCode.Serialize(hmacKey);
-
-    // Public key serialization, i serialization, and one 0 or 1 byte
-    size_t inputLen = G1Element::SIZE + 4 + 1;
-
-    // Hmac input includes sk or pk, int i, and byte with 0 or 1
-    uint8_t hmacInput[G1Element::SIZE + 4 + 1];
-
-    // Fill the input with the required data
-    auto vecG1 = pk.Serialize(fLegacy);
-    memcpy(hmacInput, vecG1.data(), vecG1.size());
-
-    hmacInput[inputLen - 1] = 0;
-    Util::IntToFourBytes(hmacInput + G1Element::SIZE, i);
-
-    md_hmac(ILeft, hmacInput, inputLen,
-                    hmacKey, ChainCode::SIZE);
-
-    // Change 1 byte to generate a different sequence for chaincode
-    hmacInput[inputLen - 1] = 1;
-
-    md_hmac(IRight, hmacInput, inputLen,
-                    hmacKey, ChainCode::SIZE);
-
-    PrivateKey leftSk = PrivateKey::FromBytes(Bytes(ILeft, PrivateKey::PRIVATE_KEY_SIZE), true);
-    G1Element newPk = pk + leftSk.GetG1Element();
-
-    ExtendedPublicKey epk(version, depth + 1,
-                          GetPublicKey().GetFingerprint(), i,
-                          ChainCode::FromBytes(Bytes(IRight, ChainCode::SIZE)),
-                          newPk);
-
-    return epk;
-}
-
-uint32_t ExtendedPublicKey::GetVersion() const {
-    return version;
-}
-
-uint8_t ExtendedPublicKey::GetDepth() const {
-    return depth;
-}
-
-uint32_t ExtendedPublicKey::GetParentFingerprint() const {
-    return parentFingerprint;
-}
-
-uint32_t ExtendedPublicKey::GetChildNumber() const {
-    return childNumber;
-}
-
-ChainCode ExtendedPublicKey::GetChainCode() const {
-    return chainCode;
-}
-
-G1Element ExtendedPublicKey::GetPublicKey() const {
-    return pk;
-}
-
-// Comparator implementation.
-bool operator==(ExtendedPublicKey const &a,  ExtendedPublicKey const &b) {
-    return (a.GetPublicKey() == b.GetPublicKey() &&
-            a.GetChainCode() == b.GetChainCode());
-}
-
-bool operator!=(ExtendedPublicKey const&a,  ExtendedPublicKey const&b) {
-    return !(a == b);
-}
-
-std::ostream &operator<<(std::ostream &os, ExtendedPublicKey const &a) {
-    return os << a.GetPublicKey() << a.GetChainCode();
-}
-
-void ExtendedPublicKey::Serialize(uint8_t *buffer, const bool fLegacy) const {
-    Util::IntToFourBytes(buffer, version);
-    buffer[4] = depth;
-    Util::IntToFourBytes(buffer + 5, parentFingerprint);
-    Util::IntToFourBytes(buffer + 9, childNumber);
-    chainCode.Serialize(buffer + 13);
-    auto vecG1 = pk.Serialize(fLegacy);
-    memcpy(buffer + 13 + ChainCode::SIZE, vecG1.data(), vecG1.size());
-}
-
-std::vector<uint8_t> ExtendedPublicKey::Serialize(const bool fLegacy) const {
-    std::vector<uint8_t> data(SIZE);
-    Serialize(data.data(), fLegacy);
-    return data;
-}
-
-} // end namespace bls
diff --git a/src/dashbls/src/legacy.cpp b/src/dashbls/src/legacy.cpp
deleted file mode 100644
index 7a28b92c66b6..000000000000
--- a/src/dashbls/src/legacy.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "legacy.hpp"
-
-#define B12_P381_S3 "BE32CE5FBEED9CA374D38C0ED41EEFD5BB675277CDF12D11BC2FB026C41400045C03FFFFFFFDFFFD"
-#define B12_P381_S32 "5F19672FDF76CE51BA69C6076A0F77EADDB3A93BE6F89688DE17D813620A00022E01FFFFFFFEFFFE"
-
-/**
- * Returns the (sqrt(-3) - 1) / 2 mod q in the curve, where q is the prime.
- *
- * @param[out] h			- the returned cofactor.
- */
-static void ep2_curve_get_s32(bn_t s32In) {
-    static bool fInitialized{false};
-    static bn_t s32;
-    if (!fInitialized) {
-        bn_new(s32);
-        bn_read_str(s32, B12_P381_S32, sizeof(B12_P381_S32), 16);
-        fInitialized = true;
-    }
-    bn_copy(s32In, s32);
-}
-
-/**
- * Returns the sqrt(-3) mod q in the curve, where q is the prime.
- *
- * @param[out] h			- the returned cofactor.
- */
-static void ep2_curve_get_s3(bn_t s3In) {
-    static bool fInitialized{false};
-    static bn_t s3;
-    if (!fInitialized) {
-        bn_new(s3);
-        bn_read_str(s3, B12_P381_S3, sizeof(B12_P381_S3), 16);
-        fInitialized = true;
-    }
-    bn_copy(s3In, s3);
-}
-
-/**
- * Returns the 'b' coefficient of the currently configured elliptic curve.
- *
- * @param[out] b			- the 'b' coefficient of the elliptic curve.
- */
-static void ep2_curve_get_b(fp2_t b) {
-    ctx_t *ctx = core_get();
-    fp_copy(b[0], ctx->ep2_b[0]);
-    fp_copy(b[1], ctx->ep2_b[1]);
-}
-
-/**
- * Returns the variable used to parameterize the given prime modulus.
- *
- * @param[out] x			- the integer parameter.
- */
-static void fp_param_get_var(bn_t x) {
-    bn_t a;
-
-    bn_null(a);
-
-    RLC_TRY {
-            bn_new(a);
-            /* x = -(2^63 + 2^62 + 2^60 + 2^57 + 2^48 + 2^16). */
-            bn_set_2b(x, 63);
-            bn_set_2b(a, 62);
-            bn_add(x, x, a);
-            bn_set_2b(a, 60);
-            bn_add(x, x, a);
-            bn_set_2b(a, 57);
-            bn_add(x, x, a);
-            bn_set_2b(a, 48);
-            bn_add(x, x, a);
-            bn_set_2b(a, 16);
-            bn_add(x, x, a);
-            bn_neg(x, x);
-    }
-    RLC_CATCH_ANY {
-            RLC_THROW(ERR_CAUGHT);
-    }
-    RLC_FINALLY {
-            bn_free(a);
-    }
-}
-
-/**
- * Multiplies a point by the cofactor in a Barreto-Lynn-Soctt.
- *
- * @param[out] r			- the result.
- * @param[in] p				- the point to multiply.
- */
-static void ep2_mul_cof_b12(ep2_t r, ep2_t p) {
-    bn_t x;
-    ep2_t t0, t1, t2, t3;
-
-    ep2_null(t0);
-    ep2_null(t1);
-    ep2_null(t2);
-    ep2_null(t3);
-    bn_null(x);
-
-    RLC_TRY {
-            ep2_new(t0);
-            ep2_new(t1);
-            ep2_new(t2);
-            ep2_new(t3);
-            bn_new(x);
-
-            fp_param_get_var(x);
-
-            /* Compute t0 = xP. */
-            ep2_mul_basic(t0, p, x);
-            /* Compute t1 = [x^2]P. */
-            ep2_mul_basic(t1, t0, x);
-
-            /* t2 = (x^2 - x - 1)P = x^2P - x*P - P. */
-            ep2_sub(t2, t1, t0);
-            ep2_sub(t2, t2, p);
-            /* t3 = \psi(x - 1)P. */
-            ep2_sub(t3, t0, p);
-            ep2_norm(t3, t3);
-            ep2_frb(t3, t3, 1);
-            ep2_add(t2, t2, t3);
-            /* t3 = \psi^2(2P). */
-            ep2_dbl(t3, p);
-            ep2_norm(t3, t3);
-            ep2_frb(t3, t3, 2);
-            ep2_add(t2, t2, t3);
-            ep2_norm(r, t2);
-    }
-    RLC_CATCH_ANY {
-            RLC_THROW(ERR_CAUGHT);
-    }
-    RLC_FINALLY {
-            ep2_free(t0);
-            ep2_free(t1);
-            ep2_free(t2);
-            ep2_free(t3);
-            bn_free(x);
-    }
-}
-
-/**
- * Based on the rust implementation of pairings, zkcrypto/pairing.
- * The algorithm is Shallue–van de Woestijne encoding from
- * Section 3 of "Indifferentiable Hashing to Barreto–Naehrig Curves"
- * from Fouque-Tibouchi: <https://www.di.ens.fr/~fouque/pub/latincrypt12.pdf>
- */
-static void ep2_sw_encode(ep2_t p, fp2_t t) {
-    if (fp2_is_zero(t)) {
-        // Maps t=0 to the point at infinity.
-        ep2_set_infty(p);
-        return;
-    }
-    fp2_t nt; // Negative t
-    fp2_t w;
-    fp2_t b;
-    bn_t s_n3;
-    bn_t s_n3m1o2;
-    fp2_t x1;
-    fp2_t x2;
-    fp2_t x3;
-    fp2_t rhs;
-
-    fp2_new(nt);
-    fp2_new(w);
-    fp2_new(b);
-    bn_new(s_n3);
-    bn_new(s_n3m1o2);
-    fp2_new(x1);
-    fp2_new(x2);
-    fp2_new(x3);
-    fp2_new(rhs);
-
-    // nt = -t
-    fp2_neg(nt, t);
-
-    uint8_t buf0[RLC_FP_BYTES];  // t[1]
-    uint8_t buf1[RLC_FP_BYTES];  // -t[1]
-    fp_write_bin(buf0, RLC_FP_BYTES, t[1]);
-    fp_write_bin(buf1, RLC_FP_BYTES, nt[1]);
-
-    // Compare bytes since fp_cmp compares montgomery representation
-    int parity = memcmp(buf0, buf1, RLC_FP_BYTES) > 0;
-
-    // w = t^2 + b + 1
-    fp2_mul(w, t, t);
-    ep2_curve_get_b(b);
-    fp2_add(w, w, b);
-    fp_add_dig(w[0], w[0], 1);
-
-    if (fp2_is_zero(w)) {
-        ep2_curve_get_gen(p);
-        if (parity) {
-            ep2_neg(p, p);
-        }
-        fp2_free(nt);
-        fp2_free(w);
-        fp2_free(b);
-        bn_free(s_n3);
-        bn_free(s_n3m1o2);
-        fp2_free(x1);
-        fp2_free(x2);
-        fp2_free(x3);
-        fp2_free(rhs);
-        return;
-    }
-
-    // sqrt(-3)
-    ep2_curve_get_s3(s_n3);
-    fp2_t s_n3p;
-    fp2_null(s_n3p);
-    fp2_new(s_n3p);
-    fp2_t s_n3m1o2p;
-    fp2_null(s_n3m1o2p);
-    fp2_new(s_n3m1o2p);
-
-    fp2_zero(s_n3p);
-    fp2_zero(s_n3m1o2p);
-    fp_prime_conv(s_n3p[0], s_n3);
-
-    // (sqrt(-3) - 1) / 2
-    ep2_curve_get_s32(s_n3m1o2);
-    fp_prime_conv(s_n3m1o2p[0], s_n3m1o2);
-
-    fp2_inv(w, w);
-    fp2_mul(w, w, s_n3p);
-    fp2_mul(w, w, t);
-
-    // x1 = -wt + sqrt(-3)
-    fp2_neg(x1, w);
-    fp2_mul(x1, x1, t);
-    fp2_add(x1, x1, s_n3m1o2p);
-
-    // x2 = -x1 - 1
-    fp2_neg(x2, x1);
-    fp_sub_dig(x2[0], x2[0], 1);
-
-    // x3 = 1/w^2 + 1
-    fp2_mul(x3, w, w);
-    fp2_inv(x3, x3);
-    fp_add_dig(x3[0], x3[0], 1);
-
-    fp2_zero(p->y);
-    fp2_set_dig(p->z, 1);
-
-    // if x1 has no y, try x2. if x2 has no y, try x3
-    fp2_copy(p->x, x1);
-
-    ep2_rhs(rhs, p);
-    int Xx1 = fp2_srt(p->y, rhs) ? 1 : -1;
-    fp2_copy(p->x, x2);
-    ep2_rhs(rhs, p);
-    int Xx2 = fp2_srt(p->y, rhs) ? 1 : -1;
-
-    // This formula computes which index to use, in constant time
-    // without conditional branches. It's taken from the paper. 3 is
-    // added, because the % operator in c can be negative.
-    int index = ((((Xx1 - 1) * Xx2) % 3) + 3) % 3;
-
-    if (index == 0) {
-        fp2_copy(p->x, x1);
-        ep2_rhs(rhs, p);
-        fp2_srt(p->y, rhs);
-    } else if (index == 1) {
-        fp2_copy(p->x, x2);
-        ep2_rhs(rhs, p);
-        fp2_srt(p->y, rhs);
-    } else if (index == 2) {
-        fp2_copy(p->x, x3);
-        ep2_rhs(rhs, p);
-        fp2_srt(p->y, rhs);
-    }
-
-    p->coord = 1;
-
-    // Check for lexicografically greater than the negation
-    fp2_t ny;
-    fp2_null(ny);
-    fp2_new(ny);
-    fp2_neg(ny, p->y);
-    fp_write_bin(buf0, RLC_FP_BYTES, p->y[1]);
-    fp_write_bin(buf1, RLC_FP_BYTES, ny[1]);
-
-    // Compare bytes since fp_cmp compares montgomery representation
-    if ((memcmp(buf0, buf1, RLC_FP_BYTES) > 0) != parity) {
-        ep2_neg(p, p);
-    }
-
-    fp2_free(nt);
-    fp2_free(w);
-    fp2_free(b);
-    bn_free(s_n3);
-    bn_free(s_n3m1o2);
-    fp2_free(x1);
-    fp2_free(x2);
-    fp2_free(x3);
-    fp2_free(rhs);
-
-    fp2_free(s_n3p);
-    fp2_free(s_n3m1o2p);
-    fp2_free(ny);
-}
-
-void ep2_map_legacy(ep2_t p, const uint8_t *msg, int len) {
-    bn_t t00;
-    bn_t t01;
-    bn_t t10;
-    bn_t t11;
-    fp_t t00p;
-    fp_t t01p;
-    fp_t t10p;
-    fp_t t11p;
-    fp2_t t0p;
-    fp2_t t1p;
-    ep2_t p0;
-    ep2_t p1;
-
-    bn_null(t00);
-    bn_null(t01);
-    bn_null(t10);
-    bn_null(t11);
-    fp_null(t00p);
-    fp_null(t01p);
-    fp_null(t10p);
-    fp_null(t11p);
-    fp2_null(t0p);
-    fp2_null(t1p);
-    ep2_null(p1);
-    ep2_null(p0);
-
-    RLC_TRY {
-            uint8_t input[RLC_MD_LEN + 8];
-            if (len != RLC_MD_LEN) {
-                RLC_THROW(ERR_CAUGHT);
-            }
-            memcpy(input, msg, len);
-            // b"G2_0_c0"
-            input[RLC_MD_LEN + 0] = 0x47; // G
-            input[RLC_MD_LEN + 1] = 0x32; // 2
-            input[RLC_MD_LEN + 2] = 0x5f; // _
-            input[RLC_MD_LEN + 3] = 0x30; // 0
-            input[RLC_MD_LEN + 4] = 0x5f; // _
-            input[RLC_MD_LEN + 5] = 0x63; // c
-            input[RLC_MD_LEN + 6] = 0x30; // 0
-
-            bn_new(t00);
-            bn_new(t01);
-            bn_new(t10);
-            bn_new(t11);
-            fp_new(t00p);
-            fp_new(t01p);
-            fp_new(t10p);
-            fp_new(t11p);
-            fp2_new(t0p);
-            fp2_new(t1p);
-            ep2_new(p1);
-            ep2_new(p0);
-
-            uint8_t t00Bytes[RLC_MD_LEN * 2];
-            uint8_t t01Bytes[RLC_MD_LEN * 2];
-            uint8_t t10Bytes[RLC_MD_LEN * 2];
-            uint8_t t11Bytes[RLC_MD_LEN * 2];
-
-            // b"G2_0_c0"
-            input[RLC_MD_LEN + 7] = 0x00; // 0
-            md_map(t00Bytes, input, RLC_MD_LEN + 8);
-            input[RLC_MD_LEN + 7] = 1;    // 1
-            md_map(t00Bytes + RLC_MD_LEN, input, RLC_MD_LEN + 8);
-
-            // b"G2_0_c1"
-            input[RLC_MD_LEN + 6] = 0x31; // b"1"
-            input[RLC_MD_LEN + 7] = 0;    // 0
-
-            md_map(t01Bytes, input, RLC_MD_LEN + 8);
-            input[RLC_MD_LEN + 7] = 1;    // 1
-            md_map(t01Bytes + RLC_MD_LEN, input, RLC_MD_LEN + 8);
-
-            // b"G2_1_c0"
-            input[RLC_MD_LEN + 3] = 0x31;  // b"1"
-            input[RLC_MD_LEN + 6] = 0x30;  // b"0"
-            input[RLC_MD_LEN + 7] = 0;     // 0
-            md_map(t10Bytes, input, RLC_MD_LEN + 8);
-            input[RLC_MD_LEN + 7] = 1;     // 1
-            md_map(t10Bytes + RLC_MD_LEN, input, RLC_MD_LEN + 8);
-
-            // b"G2_1_c1"
-            input[RLC_MD_LEN + 6] = 0x31;     // b"1"
-            input[RLC_MD_LEN + 7] = 0;     // 0
-            md_map(t11Bytes, input, RLC_MD_LEN + 8);
-            input[RLC_MD_LEN + 7] = 1;     // 1
-            md_map(t11Bytes + RLC_MD_LEN, input, RLC_MD_LEN + 8);
-
-            bn_read_bin(t00, t00Bytes, RLC_MD_LEN * 2);
-            bn_read_bin(t01, t01Bytes, RLC_MD_LEN * 2);
-            bn_read_bin(t10, t10Bytes, RLC_MD_LEN * 2);
-            bn_read_bin(t11, t11Bytes, RLC_MD_LEN * 2);
-
-            fp_prime_conv(t00p, t00);
-            fp_prime_conv(t01p, t01);
-            fp_prime_conv(t10p, t10);
-            fp_prime_conv(t11p, t11);
-
-            fp_copy(t0p[0], t00p);
-            fp_copy(t0p[1], t01p);
-            fp_copy(t1p[0], t10p);
-            fp_copy(t1p[1], t11p);
-
-            ep2_sw_encode(p0, t0p);
-            ep2_sw_encode(p1, t1p);
-            ep2_add(p0, p0, p1);
-            /* Now, multiply by cofactor to get the correct group. */
-            ep2_mul_cof_b12(p, p0);
-    }
-    RLC_CATCH_ANY {
-            RLC_THROW(ERR_CAUGHT);
-    }
-    RLC_FINALLY {
-            fp2_free(t0p);
-            fp2_free(t1p);
-            fp_free(t00p);
-            fp_free(t01p);
-            fp_free(t10p);
-            fp_free(t11p);
-            bn_free(t00);
-            bn_free(t01);
-            bn_free(t10);
-            bn_free(t11);
-            ep2_free(p0);
-            ep2_free(p1);
-    }
-}
diff --git a/src/dashbls/src/privatekey.cpp b/src/dashbls/src/privatekey.cpp
deleted file mode 100644
index d07246d8575e..000000000000
--- a/src/dashbls/src/privatekey.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "bls.hpp"
-#include "legacy.hpp"
-
-namespace bls {
-
-const size_t PrivateKey::PRIVATE_KEY_SIZE;
-
-PrivateKey PrivateKey::FromSeedBIP32(const Bytes& seed) {
-    // "BLS private key seed" in ascii
-    const uint8_t hmacKey[] = {66, 76, 83, 32, 112, 114, 105, 118, 97, 116, 101,
-                               32, 107, 101, 121, 32, 115, 101, 101, 100};
-
-    auto* hash = Util::SecAlloc<uint8_t>(
-        PrivateKey::PRIVATE_KEY_SIZE);
-
-    // Hash the seed into sk
-    md_hmac(hash, seed.begin(), (int)seed.size(), hmacKey, sizeof(hmacKey));
-
-    bn_t order;
-    bn_new(order);
-    g1_get_ord(order);
-
-    // Make sure private key is less than the curve order
-    bn_t* skBn = Util::SecAlloc<bn_t>(1);
-    bn_new(*skBn);
-    bn_read_bin(*skBn, hash, PrivateKey::PRIVATE_KEY_SIZE);
-    bn_mod_basic(*skBn, *skBn, order);
-
-    PrivateKey k;
-    bn_copy(k.keydata, *skBn);
-
-    Util::SecFree(skBn);
-    Util::SecFree(hash);
-    return k;
-}
-
-// Construct a private key from a bytearray.
-PrivateKey PrivateKey::FromBytes(const Bytes& bytes, bool modOrder)
-{
-    if (bytes.size() != PRIVATE_KEY_SIZE) {
-        throw std::invalid_argument("PrivateKey::FromBytes: Invalid size");
-    }
-
-    PrivateKey k;
-    bn_read_bin(k.keydata, bytes.begin(), PrivateKey::PRIVATE_KEY_SIZE);
-    bn_t ord;
-    bn_new(ord);
-    g1_get_ord(ord);
-    if (modOrder) {
-        bn_mod_basic(k.keydata, k.keydata, ord);
-    } else {
-        if (bn_cmp(k.keydata, ord) > 0) {
-            throw std::invalid_argument(
-                "PrivateKey byte data must be less than the group order");
-        }
-    }
-    return k;
-}
-
-// Construct a private key from a bytearray.
-PrivateKey PrivateKey::FromByteVector(const std::vector<uint8_t> bytes, bool modOrder)
-{
-    return PrivateKey::FromBytes(Bytes(bytes), modOrder);
-}
-
-// Construct a private key from a bytearray.
-PrivateKey PrivateKey::RandomPrivateKey()
-{
-    bn_t *r = Util::SecAlloc<bn_t>(1);
-    bn_new(*r);
-    bn_rand(*r, RLC_POS, 256);
-    PrivateKey k;
-    bn_copy(k.keydata, *r);
-    bn_t ord;
-    bn_new(ord);
-    g1_get_ord(ord);
-    bn_mod_basic(k.keydata, k.keydata, ord);
-    Util::SecFree(r);
-    return k;
-}
-
-PrivateKey::PrivateKey() {
-    AllocateKeyData();
-};
-
-// Construct a private key from another private key.
-PrivateKey::PrivateKey(const PrivateKey &privateKey)
-{
-    privateKey.CheckKeyData();
-    AllocateKeyData();
-    bn_copy(keydata, privateKey.keydata);
-}
-
-PrivateKey::PrivateKey(PrivateKey &&k)
-    : keydata(std::exchange(k.keydata, nullptr))
-{
-    k.InvalidateCaches();
-}
-
-PrivateKey::~PrivateKey()
-{
-    DeallocateKeyData();
-}
-
-void PrivateKey::DeallocateKeyData()
-{
-    if(keydata != nullptr) {
-        Util::SecFree(keydata);
-        keydata = nullptr;
-    }
-    InvalidateCaches();
-}
-
-void PrivateKey::InvalidateCaches()
-{
-    fG1CacheValid = false;
-    fG2CacheValid = false;
-}
-
-PrivateKey& PrivateKey::operator=(const PrivateKey& other)
-{
-    CheckKeyData();
-    other.CheckKeyData();
-    InvalidateCaches();
-    bn_copy(keydata, other.keydata);
-    return *this;
-}
-
-PrivateKey& PrivateKey::operator=(PrivateKey&& other)
-{
-    DeallocateKeyData();
-    keydata = std::exchange(other.keydata, nullptr);
-    other.InvalidateCaches();
-    return *this;
-}
-
-const G1Element& PrivateKey::GetG1Element() const
-{
-    if (!fG1CacheValid) {
-        CheckKeyData();
-        g1_st *p = Util::SecAlloc<g1_st>(1);
-        g1_mul_gen(p, keydata);
-
-        g1Cache = G1Element::FromNative(p);
-        Util::SecFree(p);
-        fG1CacheValid = true;
-    }
-    return g1Cache;
-}
-
-const G2Element& PrivateKey::GetG2Element() const
-{
-    if (!fG2CacheValid) {
-        CheckKeyData();
-        g2_st *q = Util::SecAlloc<g2_st>(1);
-        g2_mul_gen(q, keydata);
-
-        g2Cache = G2Element::FromNative(q);
-        Util::SecFree(q);
-        fG2CacheValid = true;
-    }
-    return g2Cache;
-}
-
-bool PrivateKey::HasKeyData() const
-{
-    return (keydata != nullptr);
-}
-
-G1Element operator*(const G1Element &a, const PrivateKey &k)
-{
-    k.CheckKeyData();
-    g1_st* ans = Util::SecAlloc<g1_st>(1);
-    a.ToNative(ans);
-    g1_mul(ans, ans, k.keydata);
-    G1Element ret = G1Element::FromNative(ans);
-    Util::SecFree(ans);
-    return ret;
-}
-
-G1Element operator*(const PrivateKey &k, const G1Element &a) { return a * k; }
-
-G2Element operator*(const G2Element &a, const PrivateKey &k)
-{
-    k.CheckKeyData();
-    g2_st* ans = Util::SecAlloc<g2_st>(1);
-    a.ToNative(ans);
-    g2_mul(ans, ans, k.keydata);
-    G2Element ret = G2Element::FromNative(ans);
-    Util::SecFree(ans);
-    return ret;
-}
-
-G2Element operator*(const PrivateKey &k, const G2Element &a) { return a * k; }
-
-PrivateKey operator*(const PrivateKey& k, const bn_t& a)
-{
-    k.CheckKeyData();
-    bn_t order;
-    bn_new(order);
-    g2_get_ord(order);
-
-    PrivateKey ret;
-    bn_mul_comba(ret.keydata, k.keydata, a);
-    bn_mod_basic(ret.keydata, ret.keydata, order);
-    return ret;
-}
-
-PrivateKey operator*(const bn_t& a, const PrivateKey& k) { return a * k; }
-
-G2Element PrivateKey::GetG2Power(const G2Element& element) const
-{
-    CheckKeyData();
-    g2_st* q = Util::SecAlloc<g2_st>(1);
-    element.ToNative(q);
-    g2_mul(q, q, keydata);
-
-    const G2Element ret = G2Element::FromNative(q);
-    Util::SecFree(q);
-    return ret;
-}
-
-PrivateKey PrivateKey::Aggregate(std::vector<PrivateKey> const &privateKeys)
-{
-    if (privateKeys.empty()) {
-        throw std::length_error("Number of private keys must be at least 1");
-    }
-
-    bn_t order;
-    bn_new(order);
-    g1_get_ord(order);
-
-    PrivateKey ret;
-    assert(ret.IsZero());
-    for (size_t i = 0; i < privateKeys.size(); i++) {
-        privateKeys[i].CheckKeyData();
-        bn_add(ret.keydata, ret.keydata, privateKeys[i].keydata);
-        bn_mod_basic(ret.keydata, ret.keydata, order);
-    }
-    return ret;
-}
-
-bool PrivateKey::IsZero() const {
-    CheckKeyData();
-    return bn_is_zero(keydata);
-}
-
-bool operator==(const PrivateKey &a, const PrivateKey &b)
-{
-    a.CheckKeyData();
-    b.CheckKeyData();
-    return bn_cmp(a.keydata, b.keydata) == RLC_EQ;
-}
-
-bool operator!=(const PrivateKey &a, const PrivateKey &b) { return !(a == b); }
-
-void PrivateKey::Serialize(uint8_t *buffer) const
-{
-    if (buffer == nullptr) {
-        throw std::runtime_error("PrivateKey::Serialize buffer invalid");
-    }
-    CheckKeyData();
-    bn_write_bin(buffer, PrivateKey::PRIVATE_KEY_SIZE, keydata);
-}
-
-std::vector<uint8_t> PrivateKey::Serialize(const bool fLegacy) const
-{
-    std::vector<uint8_t> data(PRIVATE_KEY_SIZE);
-    Serialize(data.data());
-    return data;
-}
-
-std::array<uint8_t, PrivateKey::PRIVATE_KEY_SIZE> PrivateKey::SerializeToArray(bool fLegacy) const
-{
-    std::array<uint8_t, PRIVATE_KEY_SIZE> data{};
-    Serialize(data.data());
-    return data;
-}
-
-G2Element PrivateKey::SignG2(
-    const uint8_t *msg,
-    size_t len,
-    const uint8_t *dst,
-    size_t dst_len,
-    const bool fLegacy) const
-{
-    CheckKeyData();
-
-    g2_t pt;
-    g2_null(pt);
-    g2_new(pt);
-
-    if (fLegacy) {
-        ep2_map_legacy(pt, msg, BLS::MESSAGE_HASH_LEN);
-    } else {
-        ep2_map_dst(pt, msg, len, dst, dst_len);
-    }
-    
-    g2_mul(pt, pt, keydata);
-    G2Element ret = G2Element::FromNative(pt);
-    g2_free(pt);
-    return ret;
-}
-
-void PrivateKey::AllocateKeyData()
-{
-    assert(!keydata);
-    keydata = Util::SecAlloc<bn_st>(1);
-    keydata->alloc = RLC_BN_SIZE;
-    bn_zero(keydata);
-}
-
-void PrivateKey::CheckKeyData() const
-{
-    if (keydata == nullptr) {
-        throw std::runtime_error("PrivateKey::CheckKeyData keydata not initialized");
-    }
-}
-
-}  // end namespace bls
diff --git a/src/dashbls/src/schemes.cpp b/src/dashbls/src/schemes.cpp
deleted file mode 100644
index c0d7ad294c64..000000000000
--- a/src/dashbls/src/schemes.cpp
+++ /dev/null
@@ -1,719 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <set>
-
-#include "bls.hpp"
-#include "elements.hpp"
-#include "schemes.hpp"
-#include "hdkeys.hpp"
-
-using std::string;
-using std::vector;
-
-namespace bls {
-
-template <typename GetBytesFn>
-static void HashPubKeys(bn_t* computedTs, size_t nPubKeys, GetBytesFn getBytes)
-{
-    bn_t order;
-    bn_new(order);
-    g2_get_ord(order);
-
-    std::vector<uint8_t> vecBuffer(nPubKeys * G1Element::SIZE);
-
-    for (size_t i = 0; i < nPubKeys; i++) {
-        const uint8_t* pkBytes = getBytes(i);
-        memcpy(vecBuffer.data() + i * G1Element::SIZE, pkBytes, G1Element::SIZE);
-    }
-
-    uint8_t pkHash[32];
-    Util::Hash256(pkHash, vecBuffer.data(), nPubKeys * G1Element::SIZE);
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        uint8_t hash[32];
-        uint8_t buffer[4 + 32];
-        memset(buffer, 0, 4);
-        // Set first 4 bytes to index, to generate different ts
-        Util::IntToFourBytes(buffer, i);
-        // Set next 32 bytes as the hash of all the public keys
-        std::memcpy(buffer + 4, pkHash, 32);
-        Util::Hash256(hash, buffer, 4 + 32);
-
-        bn_read_bin(computedTs[i], hash, 32);
-        bn_mod_basic(computedTs[i], computedTs[i], order);
-    }
-    bn_free(order);
-}
-
-enum InvariantResult { BAD=false, GOOD=true, CONTINUE };
-
-// Enforce argument invariants for Agg Sig Verification
-InvariantResult VerifyAggregateSignatureArguments(
-    const size_t nPubKeys,
-    const size_t nMessages,
-    const G2Element &signature)
-{
-    if (nPubKeys == 0) {
-        return (nMessages == 0 && signature == G2Element() ? GOOD : BAD);
-    }
-    if (nPubKeys != nMessages) {
-        return BAD;
-    }
-    return CONTINUE;
-}
-
-/* These are all for the min-pubkey-size variant.
-   TODO : analogs for min-signature-size
-*/
-const std::string BasicSchemeMPL::CIPHERSUITE_ID = "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_";
-const std::string AugSchemeMPL::CIPHERSUITE_ID = "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_AUG_";
-const std::string PopSchemeMPL::CIPHERSUITE_ID = "BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";
-const std::string PopSchemeMPL::POP_CIPHERSUITE_ID = "BLS_POP_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";
-
-PrivateKey CoreMPL::KeyGen(const vector<uint8_t>& seed) {
-    return HDKeys::KeyGen(seed);
-}
-
-PrivateKey CoreMPL::KeyGen(const Bytes& seed) {
-    return HDKeys::KeyGen(seed);
-}
-
-vector<uint8_t> CoreMPL::SkToPk(const PrivateKey &seckey)
-{
-    return seckey.GetG1Element().Serialize();
-}
-
-G1Element CoreMPL::SkToG1(const PrivateKey &seckey)
-{
-    return seckey.GetG1Element();
-}
-
-G2Element CoreMPL::Sign(const PrivateKey &seckey, const vector<uint8_t> &message)
-{
-    return CoreMPL::Sign(seckey, Bytes(message));
-}
-
-G2Element CoreMPL::Sign(const PrivateKey& seckey, const Bytes& message)
-{
-    return seckey.SignG2(message.begin(), message.size(), (const uint8_t*)strCiphersuiteId.c_str(), strCiphersuiteId.length());
-}
-
-bool CoreMPL::Verify(const vector<uint8_t> &pubkey,
-                     const vector<uint8_t> &message,  // unhashed
-                     const vector<uint8_t> &signature)
-{
-    return CoreMPL::Verify(G1Element::FromBytes(Bytes(pubkey)),
-                           Bytes(message),
-                           G2Element::FromBytes(Bytes(signature)));
-}
-
-bool CoreMPL::Verify(const Bytes& pubkey, const Bytes& message, const Bytes& signature)
-{
-    return CoreMPL::Verify(G1Element::FromBytes(pubkey), message, G2Element::FromBytes(signature));
-}
-
-bool CoreMPL::Verify(const G1Element &pubkey,
-                     const vector<uint8_t> &message,  // unhashed
-                     const G2Element &signature)
-{
-    return CoreMPL::Verify(pubkey, Bytes(message), signature);
-}
-
-bool CoreMPL::Verify(const G1Element& pubkey, const Bytes& message, const G2Element& signature)
-{
-    const G2Element hashedPoint = G2Element::FromMessage(message, (const uint8_t*)strCiphersuiteId.c_str(), strCiphersuiteId.length());
-
-    std::array<g1_t, 2> g1s;
-    std::array<g2_t, 2> g2s;
-
-    G1Element::Generator().Negate().ToNative(g1s[0]);
-    if (!pubkey.IsValid()) {
-        return false;
-    }
-    if (!signature.IsValid()) {
-        return false;
-    }
-    pubkey.ToNative(g1s[1]);
-    signature.ToNative(g2s[0]);
-    hashedPoint.ToNative(g2s[1]);
-
-    return CoreMPL::NativeVerify(g1s.data(), g2s.data(), 2);
-}
-
-std::array<uint8_t, G2Element::SIZE> CoreMPL::Aggregate(const vector<vector<uint8_t>> &signatures)
-{
-    vector<G2Element> elements;
-    elements.reserve(signatures.size());
-    for (const vector<uint8_t>& signature : signatures) {
-        elements.push_back(G2Element::FromByteVector(signature));
-    }
-    return CoreMPL::Aggregate(elements).SerializeToArray();
-}
-
-std::array<uint8_t, G2Element::SIZE> CoreMPL::Aggregate(const vector<Bytes>& signatures)
-{
-    vector<G2Element> elements;
-    elements.reserve(signatures.size());
-    for (const Bytes& signature : signatures) {
-        elements.push_back(G2Element::FromBytes(signature));
-    }
-    return CoreMPL::Aggregate(elements).SerializeToArray();
-}
-
-G2Element CoreMPL::Aggregate(const vector<G2Element> &signatures)
-{
-    G2Element aggregated;
-    for (const G2Element& signature : signatures) {
-        aggregated += signature;
-    }
-    return aggregated;
-}
-
-G1Element CoreMPL::Aggregate(const vector<G1Element> &publicKeys)
-{
-    G1Element aggregated;
-    for (const G1Element& publicKey : publicKeys) {
-        aggregated += publicKey;
-    }
-    return aggregated;
-}
-
-G2Element CoreMPL::AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
-                                   std::vector<G2Element> const &vecSignatures,
-                                   const Bytes& message,
-                                   const bool fLegacy) {
-    if (vecSignatures.size() != vecPublicKeys.size()) {
-        throw std::invalid_argument("LegacySchemeMPL::AggregateSigs sigs.size() != pubKeys.size()");
-    }
-
-    bn_t* computedTs = new bn_t[vecPublicKeys.size()];
-    std::vector<std::pair<std::array<uint8_t, G1Element::SIZE>, const G2Element*>> vecSorted(vecPublicKeys.size());
-    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
-        bn_new(computedTs[i]);
-        vecSorted[i] = std::make_pair(vecPublicKeys[i].SerializeToArray(fLegacy), &vecSignatures[i]);
-    }
-    std::sort(vecSorted.begin(), vecSorted.end(), [](const auto& a, const auto& b) {
-        return std::memcmp(a.first.data(), b.first.data(), G1Element::SIZE) < 0;
-    });
-
-    HashPubKeys(computedTs, vecSorted.size(),
-                [&](size_t i) { return vecSorted[i].first.data(); });
-
-    // Raise all signatures to power of the corresponding t's and aggregate the results into aggSig
-    // Also accumulates aggregation info for each signature
-    std::vector<G2Element> expSigs;
-    expSigs.reserve(vecSorted.size());
-    for (size_t i = 0; i < vecSorted.size(); i++) {
-        expSigs.emplace_back(*vecSorted[i].second * computedTs[i]);
-    }
-
-    G2Element aggSig = CoreMPL::Aggregate(expSigs);
-
-    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
-        bn_free(computedTs[i]);
-    }
-    delete[] computedTs;
-
-    return aggSig;
-}
-
-G2Element CoreMPL::AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
-                                   std::vector<G2Element> const &vecSignatures,
-                                   const Bytes& message) {
-    return CoreMPL::AggregateSecure(vecPublicKeys, vecSignatures, message, false);
-}
-
-bool CoreMPL::VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                           const G2Element& signature,
-                           const Bytes& message,
-                           const bool fLegacy) {
-    bn_t* computedTs = new bn_t[vecPublicKeys.size()];
-    std::vector<std::array<uint8_t, G1Element::SIZE>> vecSorted(vecPublicKeys.size());
-    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
-        bn_new(computedTs[i]);
-        vecSorted[i] = vecPublicKeys[i].SerializeToArray(fLegacy);
-    }
-    std::sort(vecSorted.begin(), vecSorted.end(), [](const auto& a, const auto& b) -> bool {
-        return std::memcmp(a.data(), b.data(), G1Element::SIZE) < 0;
-    });
-
-    HashPubKeys(computedTs, vecSorted.size(),
-                [&](size_t i) { return vecSorted[i].data(); });
-
-    G1Element publicKey;
-    for (size_t i = 0; i < vecSorted.size(); ++i) {
-        G1Element g1 = G1Element::FromBytes(Bytes(vecSorted[i]), fLegacy);
-        publicKey += g1 * computedTs[i];
-    }
-
-    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
-        bn_free(computedTs[i]);
-    }
-    delete[] computedTs;
-
-    return AggregateVerify({publicKey}, {message}, {signature});
-}
-
-bool CoreMPL::VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                           const G2Element& signature,
-                           const Bytes& message) {
-    return CoreMPL::VerifySecure(vecPublicKeys, signature, message, false);
-}
-
-bool CoreMPL::AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                              const vector<vector<uint8_t>> &messages,  // unhashed
-                              const vector<uint8_t> &signature)
-{
-    const std::vector<Bytes> vecPubKeyBytes(pubkeys.begin(), pubkeys.end());
-    const std::vector<Bytes> vecMessagesBytes(messages.begin(), messages.end());
-    return CoreMPL::AggregateVerify(vecPubKeyBytes, vecMessagesBytes, Bytes(signature));
-}
-
-bool CoreMPL::AggregateVerify(const vector<Bytes>& pubkeys,
-                              const vector<Bytes>& messages,  // unhashed
-                              const Bytes& signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const G2Element signatureElement = G2Element::FromBytes(signature);
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signatureElement);
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    vector<G1Element> pubkeyElements;
-    pubkeyElements.reserve(nPubKeys);
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        pubkeyElements.push_back(G1Element::FromBytes(pubkeys[i]));
-    }
-    return CoreMPL::AggregateVerify(pubkeyElements, messages, signatureElement);
-}
-
-bool CoreMPL::AggregateVerify(const vector<G1Element> &pubkeys,
-                              const vector<vector<uint8_t>> &messages,
-                              const G2Element &signature)
-{
-    return CoreMPL::AggregateVerify(pubkeys, std::vector<Bytes>(messages.begin(), messages.end()), signature);
-}
-
-bool CoreMPL::AggregateVerify(const vector<G1Element>& pubkeys,
-                              const vector<Bytes> &messages,
-                              const G2Element& signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signature);
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    std::vector<g1_st> vecG1(nPubKeys + 1);
-    std::vector<g2_st> vecG2(nPubKeys + 1);
-    G1Element::Generator().Negate().ToNative(&vecG1[0]);
-    if (!signature.IsValid()) {
-        return false;
-    }
-    signature.ToNative(&vecG2[0]);
-
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        if (!pubkeys[i].IsValid()) {
-            return false;
-        }
-        pubkeys[i].ToNative(&vecG1[i + 1]);
-        G2Element::FromMessage(messages[i], (const uint8_t*)strCiphersuiteId.c_str(), strCiphersuiteId.length()).ToNative(&vecG2[i + 1]);
-    }
-
-    return CoreMPL::NativeVerify((g1_t*)vecG1.data(), (g2_t*)vecG2.data(), nPubKeys + 1);
-}
-
-bool CoreMPL::NativeVerify(g1_t *pubkeys, g2_t *mappedHashes, size_t length)
-{
-    gt_t target, candidate, tmpPairing;
-    fp12_zero(target);
-    fp_set_dig(target[0][0][0], 1);
-    fp12_zero(candidate);
-    fp_set_dig(candidate[0][0][0], 1);
-
-    // prod e(pubkey[i], hash[i]) * e(-g1, aggSig)
-    // Performs pubKeys.size() pairings, 250 at a time
-
-    for (size_t i = 0; i < length; i += 250) {
-        size_t numPairings = std::min((length - i), (size_t)250);
-        pc_map_sim(tmpPairing, pubkeys + i, mappedHashes + i, numPairings);
-        fp12_mul(candidate, candidate, tmpPairing);
-    }
-
-    // 1 =? prod e(pubkey[i], hash[i]) * e(-g1, aggSig)
-    if (gt_cmp(target, candidate) != RLC_EQ || core_get()->code != RLC_OK) {
-        core_get()->code = RLC_OK;
-        return false;
-    }
-    BLS::CheckRelicErrors();
-    return true;
-}
-
-PrivateKey CoreMPL::DeriveChildSk(const PrivateKey& sk, uint32_t index) {
-    return HDKeys::DeriveChildSk(sk, index);
-}
-
-PrivateKey CoreMPL::DeriveChildSkUnhardened(const PrivateKey& sk, uint32_t index) {
-    return HDKeys::DeriveChildSkUnhardened(sk, index);
-}
-
-G1Element CoreMPL::DeriveChildPkUnhardened(const G1Element& pk, uint32_t index) {
-    return HDKeys::DeriveChildG1Unhardened(pk, index);
-}
-
-bool BasicSchemeMPL::AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                                     const vector<vector<uint8_t>> &messages,
-                                     const vector<uint8_t> &signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), G2Element::FromByteVector(signature));
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    const std::set<vector<uint8_t>> setMessages(messages.begin(), messages.end());
-    if (setMessages.size() != nPubKeys) {
-        return false;
-    }
-    return CoreMPL::AggregateVerify(pubkeys, messages, signature);
-}
-
-bool BasicSchemeMPL::AggregateVerify(const vector<Bytes>& pubkeys,
-                                     const vector<Bytes>& messages,
-                                     const Bytes& signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), G2Element::FromBytes(signature));
-    if (arg_check != CONTINUE) return arg_check;
-
-    std::set<vector<uint8_t>> setMessages;
-    for (const auto& message : messages) {
-        setMessages.insert({message.begin(), message.end()});
-    }
-    if (setMessages.size() != nPubKeys) {
-        return false;
-    }
-    return CoreMPL::AggregateVerify(pubkeys, messages, signature);
-}
-
-bool BasicSchemeMPL::AggregateVerify(const vector<G1Element> &pubkeys,
-                                     const vector<vector<uint8_t>> &messages,
-                                     const G2Element &signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signature);
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    const std::set<vector<uint8_t>> setMessages(messages.begin(), messages.end());
-    if (setMessages.size() != nPubKeys) {
-        return false;
-    }
-    return CoreMPL::AggregateVerify(pubkeys, messages, signature);
-}
-
-bool BasicSchemeMPL::AggregateVerify(const vector<G1Element>& pubkeys,
-                                     const vector<Bytes> &messages,
-                                     const G2Element& signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signature);
-    if (arg_check != CONTINUE) return arg_check;
-
-    std::set<vector<uint8_t>> setMessages;
-    for (const auto& message : messages) {
-        setMessages.insert({message.begin(), message.end()});
-    }
-    if (setMessages.size() != nPubKeys) {
-        return false;
-    }
-    return CoreMPL::AggregateVerify(pubkeys, messages, signature);
-}
-
-G2Element AugSchemeMPL::Sign(const PrivateKey &seckey, const vector<uint8_t> &message)
-{
-    return AugSchemeMPL::Sign(seckey, message, seckey.GetG1Element());
-}
-
-G2Element AugSchemeMPL::Sign(const PrivateKey& seckey, const Bytes& message)
-{
-    return AugSchemeMPL::Sign(seckey, message, seckey.GetG1Element());
-}
-
-// Used for prepending different augMessage
-G2Element AugSchemeMPL::Sign(const PrivateKey &seckey,
-                             const vector<uint8_t> &message,
-                             const G1Element &prepend_pk)
-{
-    return AugSchemeMPL::Sign(seckey, Bytes(message), prepend_pk);
-}
-
-// Used for prepending different augMessage
-G2Element AugSchemeMPL::Sign(const PrivateKey& seckey,
-                             const Bytes& message,
-                             const G1Element& prepend_pk)
-{
-    vector<uint8_t> augMessage = prepend_pk.Serialize();
-    augMessage.reserve(augMessage.size() + message.size());
-    augMessage.insert(augMessage.end(), message.begin(), message.end());
-    return CoreMPL::Sign(seckey, augMessage);
-}
-
-bool AugSchemeMPL::Verify(const vector<uint8_t> &pubkey,
-                          const vector<uint8_t> &message,
-                          const vector<uint8_t> &signature)
-{
-    vector<uint8_t> augMessage(pubkey);
-    augMessage.reserve(augMessage.size() + message.size());
-    augMessage.insert(augMessage.end(), message.begin(), message.end());
-    return CoreMPL::Verify(pubkey, augMessage, signature);
-}
-
-bool AugSchemeMPL::Verify(const Bytes& pubkey,
-                          const Bytes& message,
-                          const Bytes& signature)
-{
-    vector<uint8_t> augMessage(pubkey.begin(), pubkey.end());
-    augMessage.reserve(augMessage.size() + message.size());
-    augMessage.insert(augMessage.end(), message.begin(), message.end());
-    return CoreMPL::Verify(pubkey, Bytes(augMessage), Bytes(signature));
-}
-
-bool AugSchemeMPL::Verify(const G1Element &pubkey,
-                          const vector<uint8_t> &message,
-                          const G2Element &signature)
-{
-    return AugSchemeMPL::Verify(pubkey, Bytes(message), signature);
-}
-
-bool AugSchemeMPL::Verify(const G1Element& pubkey,
-                          const Bytes& message,
-                          const G2Element& signature)
-{
-    vector<uint8_t> augMessage = pubkey.Serialize();
-    augMessage.reserve(augMessage.size() + message.size());
-    augMessage.insert(augMessage.end(), message.begin(), message.end());
-    return CoreMPL::Verify(pubkey, augMessage, signature);
-}
-
-bool AugSchemeMPL::AggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                                   const vector<vector<uint8_t>> &messages,
-                                   const vector<uint8_t> &signature)
-{
-    std::vector<Bytes> vecPubKeyBytes(pubkeys.begin(), pubkeys.end());
-    std::vector<Bytes> vecMessagesBytes(messages.begin(), messages.end());
-    return AugSchemeMPL::AggregateVerify(vecPubKeyBytes, vecMessagesBytes, Bytes(signature));
-}
-
-bool AugSchemeMPL::AggregateVerify(const vector<Bytes>& pubkeys,
-                                   const vector<Bytes>& messages,
-                                   const Bytes& signature)
-{
-    size_t nPubKeys = pubkeys.size();
-    auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), G2Element::FromBytes(signature));
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    vector<vector<uint8_t>> augMessages(nPubKeys);
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        vector<uint8_t>& aug = augMessages[i];
-        aug.reserve(pubkeys[i].size() + messages[i].size());
-        aug.insert(aug.end(), pubkeys[i].begin(), pubkeys[i].end());
-        aug.insert(aug.end(), messages[i].begin(), messages[i].end());
-    }
-
-    std::vector<Bytes> vecAugMessageBytes(augMessages.begin(), augMessages.end());
-    return CoreMPL::AggregateVerify(pubkeys, vecAugMessageBytes, signature);
-}
-
-bool AugSchemeMPL::AggregateVerify(const vector<G1Element>& pubkeys,
-                                   const vector<vector<uint8_t>>& messages,
-                                   const G2Element& signature)
-{
-    std::vector<Bytes> vecMessagesBytes(messages.begin(), messages.end());
-    return AugSchemeMPL::AggregateVerify(pubkeys, vecMessagesBytes, signature);
-}
-
-bool AugSchemeMPL::AggregateVerify(const vector<G1Element>& pubkeys,
-                                   const vector<Bytes>& messages,
-                                   const G2Element& signature)
-{
-    size_t nPubKeys = pubkeys.size();
-    auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signature);
-    if (arg_check != CONTINUE) {
-        return arg_check;
-    }
-
-    vector<vector<uint8_t>> augMessages(nPubKeys);
-    for (int i = 0; i < nPubKeys; ++i) {
-        vector<uint8_t>& aug = augMessages[i];
-        vector<uint8_t>&& pubkey = pubkeys[i].Serialize();
-        aug.reserve(pubkey.size() + messages[i].size());
-        aug.insert(aug.end(), pubkey.begin(), pubkey.end());
-        aug.insert(aug.end(), messages[i].begin(), messages[i].end());
-    }
-
-    return CoreMPL::AggregateVerify(pubkeys, augMessages, signature);
-}
-
-G2Element PopSchemeMPL::PopProve(const PrivateKey &seckey)
-{
-    const G1Element& pk = seckey.GetG1Element();
-    const G2Element hashedKey = G2Element::FromMessage(pk.SerializeToArray(), (const uint8_t *)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
-    return seckey.GetG2Power(hashedKey);
-}
-
-
-bool PopSchemeMPL::PopVerify(const G1Element &pubkey, const G2Element &signature_proof)
-{
-    const G2Element hashedPoint = G2Element::FromMessage(pubkey.SerializeToArray(), (const uint8_t*)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
-
-    g1_t g1s[2];
-    g2_t g2s[2];
-
-    if (!pubkey.IsValid()) {
-        return false;
-    }
-    if (!signature_proof.IsValid()) {
-        return false;
-    }
-    G1Element::Generator().Negate().ToNative(g1s[0]);
-    pubkey.ToNative(g1s[1]);
-    signature_proof.ToNative(g2s[0]);
-    hashedPoint.ToNative(g2s[1]);
-
-    return CoreMPL::NativeVerify(g1s, g2s, 2);
-}
-
-bool PopSchemeMPL::PopVerify(const vector<uint8_t> &pubkey, const vector<uint8_t> &proof)
-{
-    return PopSchemeMPL::PopVerify(Bytes(pubkey), Bytes(proof));
-}
-
-bool PopSchemeMPL::PopVerify(const Bytes& pubkey, const Bytes& proof)
-{
-    const G2Element hashedPoint = G2Element::FromMessage(pubkey, (const uint8_t*)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
-
-    g1_t g1s[2];
-    g2_t g2s[2];
-
-    G1Element::Generator().Negate().ToNative(g1s[0]);
-    G1Element::FromBytes(pubkey).ToNative(g1s[1]);
-    G2Element::FromBytes(proof).ToNative(g2s[0]);
-    hashedPoint.ToNative(g2s[1]);
-
-    return CoreMPL::NativeVerify(g1s, g2s, 2);
-}
-
-bool PopSchemeMPL::FastAggregateVerify(const vector<G1Element> &pubkeys,
-                                       const vector<uint8_t> &message,
-                                       const G2Element &signature)
-{
-    return PopSchemeMPL::FastAggregateVerify(pubkeys, Bytes(message), signature);
-}
-
-bool PopSchemeMPL::FastAggregateVerify(const vector<G1Element>& pubkeys,
-                                       const Bytes& message,
-                                       const G2Element& signature)
-{
-    if (pubkeys.size() == 0) {
-        return false;
-    }
-    // No VerifyAggregateSignatureArguments checks required here as we have exactly one pubkey and one message.
-    return CoreMPL::Verify(CoreMPL::Aggregate(pubkeys), message, signature);
-}
-
-bool PopSchemeMPL::FastAggregateVerify(const vector<vector<uint8_t>> &pubkeys,
-                                       const vector<uint8_t> &message,
-                                       const vector<uint8_t> &signature)
-{
-    const std::vector<Bytes> vecPubKeyBytes(pubkeys.begin(), pubkeys.end());
-    return PopSchemeMPL::FastAggregateVerify(vecPubKeyBytes, Bytes(message), Bytes(signature));
-}
-
-bool PopSchemeMPL::FastAggregateVerify(const vector<Bytes>& pubkeys,
-                                       const Bytes& message,
-                                       const Bytes& signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    if (nPubKeys == 0) {
-        return false;
-    }
-
-    vector<G1Element> pkelements;
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        pkelements.push_back(G1Element::FromBytes(pubkeys[i]));
-    }
-
-    return PopSchemeMPL::FastAggregateVerify(pkelements, message, G2Element::FromBytes(signature));
-}
-
-G2Element LegacySchemeMPL::Sign(const PrivateKey& seckey, const Bytes& message)
-{
-    return seckey.SignG2(message.begin(), message.size(), nullptr, 0, true);
-}
-
-bool LegacySchemeMPL::Verify(const G1Element &pubkey, const Bytes& message, const G2Element &signature)
-{
-    g1_t g1s[2];
-    g2_t g2s[2];
-
-    G1Element::Generator().Negate().ToNative(g1s[0]);
-    pubkey.ToNative(g1s[1]);
-    signature.ToNative(g2s[0]);
-    G2Element::FromMessage(message, nullptr, 0, true).ToNative(g2s[1]);
-
-    return CoreMPL::NativeVerify(g1s, g2s, 2);
-}
-
-G2Element LegacySchemeMPL::AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
-                                          std::vector<G2Element> const &vecSignatures,
-                                          const Bytes& message) {
-    return CoreMPL::AggregateSecure(vecPublicKeys, vecSignatures, message, true);
-}
-
-bool LegacySchemeMPL::VerifySecure(const std::vector<G1Element>& vecPublicKeys,
-                                   const G2Element& signature,
-                                   const Bytes& message) {
-    return CoreMPL::VerifySecure(vecPublicKeys, signature, message, true);
-}
-
-bool LegacySchemeMPL::AggregateVerify(const vector<G1Element> &pubkeys,
-                                      const vector<Bytes> &messages,
-                                      const G2Element &signature)
-{
-    const size_t nPubKeys = pubkeys.size();
-    const auto arg_check = VerifyAggregateSignatureArguments(nPubKeys, messages.size(), signature);
-    if (arg_check != CONTINUE) return arg_check;
-
-    std::vector<g1_st> vecG1(nPubKeys + 1);
-    std::vector<g2_st> vecG2(nPubKeys + 1);
-    G1Element::Generator().Negate().ToNative(&vecG1[0]);
-    signature.ToNative(&vecG2[0]);
-
-    for (size_t i = 0; i < nPubKeys; ++i) {
-        pubkeys[i].ToNative(&vecG1[i + 1]);
-        G2Element::FromMessage(messages[i], nullptr, 0, true).ToNative(&vecG2[i + 1]);
-    }
-
-    return CoreMPL::NativeVerify((g1_t*)vecG1.data(), (g2_t*)vecG2.data(), nPubKeys + 1);
-}
-
-}  // end namespace bls
diff --git a/src/dashbls/src/test-bench.cpp b/src/dashbls/src/test-bench.cpp
deleted file mode 100644
index 20bbbb443952..000000000000
--- a/src/dashbls/src/test-bench.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <chrono>
-#include "bls.hpp"
-#include "test-utils.hpp"
-
-extern "C" {
-#include "relic.h"
-}
-
-using std::string;
-using std::vector;
-using std::cout;
-using std::endl;
-
-using namespace bls;
-
-
-void benchSigs() {
-    string testName = "Signing";
-    const int numIters = 5000;
-    PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-    vector<uint8_t> message1 = sk.GetG1Element().Serialize();
-
-    auto start = startStopwatch();
-
-    for (int i = 0; i < numIters; i++) {
-        BasicSchemeMPL().Sign(sk, message1);
-    }
-    endStopwatch(testName, start, numIters);
-}
-
-void benchVerification() {
-    string testName = "Verification";
-    const int numIters = 1000;
-    PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-    G1Element pk = sk.GetG1Element();
-
-    std::vector<G2Element> sigs;
-
-    for (int i = 0; i < numIters; i++) {
-        uint8_t message[4];
-        Util::IntToFourBytes(message, i);
-        vector<uint8_t> messageBytes(message, message + 4);
-        sigs.push_back(BasicSchemeMPL().Sign(sk, messageBytes));
-    }
-
-    auto start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        uint8_t message[4];
-        Util::IntToFourBytes(message, i);
-        vector<uint8_t> messageBytes(message, message + 4);
-        bool ok = BasicSchemeMPL().Verify(pk, messageBytes, sigs[i]);
-        ASSERT(ok);
-    }
-    endStopwatch(testName, start, numIters);
-}
-
-void benchBatchVerification() {
-    const int numIters = 10000;
-
-    vector<vector<uint8_t>> sig_bytes;
-    vector<vector<uint8_t>> pk_bytes;
-    vector<vector<uint8_t>> ms;
-
-    auto start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        uint8_t message[4];
-        Util::IntToFourBytes(message, i);
-        vector<uint8_t> messageBytes(message, message + 4);
-        PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-        G1Element pk = sk.GetG1Element();
-        sig_bytes.push_back(BasicSchemeMPL().Sign(sk, messageBytes).Serialize());
-        pk_bytes.push_back(pk.Serialize());
-        ms.push_back(messageBytes);
-    }
-    endStopwatch("Batch verification preparation", start, numIters);
-
-    vector<G1Element> pks;
-    pks.reserve(numIters);
-
-    start = startStopwatch();
-    for (auto const& pk : pk_bytes) {
-        pks.emplace_back(G1Element::FromBytes(Bytes(pk)));
-    }
-    endStopwatch("Public key validation", start, numIters);
-
-    vector<G2Element> sigs;
-    sigs.reserve(numIters);
-
-    start = startStopwatch();
-    for (auto const& sig : sig_bytes) {
-        sigs.emplace_back(G2Element::FromBytes(Bytes(sig)));
-    }
-    endStopwatch("Signature validation", start, numIters);
-
-    start = startStopwatch();
-    G2Element aggSig = BasicSchemeMPL().Aggregate(sigs);
-    endStopwatch("Aggregation", start, numIters);
-
-    start = startStopwatch();
-    bool ok = BasicSchemeMPL().AggregateVerify(pks, ms, aggSig);
-    ASSERT(ok);
-    endStopwatch("Batch verification", start, numIters);
-}
-
-void benchSerialize() {
-    const int numIters = 5000000;
-    PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-    G1Element pk = sk.GetG1Element();
-    vector<uint8_t> message = sk.GetG1Element().Serialize();
-    G2Element sig = BasicSchemeMPL().Sign(sk, message);
-
-    auto start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        sk.Serialize();
-    }
-    endStopwatch("Serialize PrivateKey", start, numIters);
-
-    start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        pk.Serialize();
-    }
-    endStopwatch("Serialize G1Element", start, numIters);
-
-    start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        sig.Serialize();
-    }
-    endStopwatch("Serialize G2Element", start, numIters);
-}
-
-void benchSerializeToArray() {
-    const int numIters = 5000000;
-    PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-    G1Element pk = sk.GetG1Element();
-    vector<uint8_t> message = sk.GetG1Element().Serialize();
-    G2Element sig = BasicSchemeMPL().Sign(sk, message);
-
-    auto start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        sk.SerializeToArray();
-    }
-    endStopwatch("SerializeToArray PrivateKey", start, numIters);
-
-    start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        pk.SerializeToArray();
-    }
-    endStopwatch("SerializeToArray G1Element", start, numIters);
-
-    start = startStopwatch();
-    for (int i = 0; i < numIters; i++) {
-        sig.SerializeToArray();
-    }
-    endStopwatch("SerializeToArray G2Element", start, numIters);
-}
-
-int main(int argc, char* argv[]) {
-    benchSigs();
-    benchVerification();
-    benchBatchVerification();
-    benchSerialize();
-    benchSerializeToArray();
-}
diff --git a/src/dashbls/src/test.cpp b/src/dashbls/src/test.cpp
deleted file mode 100644
index 7e9d5280b3b5..000000000000
--- a/src/dashbls/src/test.cpp
+++ /dev/null
@@ -1,1571 +0,0 @@
-
-// Copyright 2020 Chia Network Inc
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//    http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#define CATCH_CONFIG_RUNNER
-#include <thread>
-
-#include "bls.hpp"
-#include <catch2/catch.hpp>
-
-extern "C" {
-#include "relic.h"
-}
-#include "test-utils.hpp"
-using std::cout;
-using std::endl;
-using std::string;
-using std::vector;
-
-using namespace bls;
-
-void TestHKDF(string ikm_hex, string salt_hex, string info_hex, string prk_expected_hex, string okm_expected_hex, int L) {
-    vector<uint8_t> ikm = Util::HexToBytes(ikm_hex);
-    vector<uint8_t> salt = Util::HexToBytes(salt_hex);
-    vector<uint8_t> info = Util::HexToBytes(info_hex);
-    vector<uint8_t> prk_expected = Util::HexToBytes(prk_expected_hex);
-    vector<uint8_t> okm_expected = Util::HexToBytes(okm_expected_hex);
-    uint8_t prk[32];
-    HKDF256::Extract(prk, salt.data(), salt.size(), ikm.data(), ikm.size());
-    uint8_t* okm = new uint8_t[L];
-    HKDF256::Expand(okm, L, prk, info.data(), info.size());
-
-    REQUIRE(32 == prk_expected.size());
-    REQUIRE(L == okm_expected.size());
-
-    for (size_t i=0; i < 32; i++) {
-        REQUIRE(prk[i] == prk_expected[i]);
-    }
-    for (size_t i=0; i < L; i++) {
-        REQUIRE(okm[i] == okm_expected[i]);
-    }
-
-    delete[] okm;
-}
-
-TEST_CASE("class PrivateKey") {
-    uint8_t buffer[PrivateKey::PRIVATE_KEY_SIZE];
-    memcpy(buffer, getRandomSeed().data(), PrivateKey::PRIVATE_KEY_SIZE);
-    SECTION("Copy {constructor|assignment operator}") {
-        PrivateKey pk1 = PrivateKey::RandomPrivateKey();
-        PrivateKey pk2 = PrivateKey::RandomPrivateKey();
-        PrivateKey pk3 = PrivateKey(pk2);
-        REQUIRE(!pk1.IsZero());
-        REQUIRE(!pk2.IsZero());
-        REQUIRE(!pk3.IsZero());
-        REQUIRE(pk1 != pk2);
-        REQUIRE(pk3 == pk2);
-        REQUIRE(pk2.GetG1Element().IsValid()); // cache previous g1
-        REQUIRE(pk2.GetG2Element().IsValid()); // cache previous g2
-        pk2 = pk1;
-        REQUIRE(pk1 == pk2);
-        REQUIRE(pk1.GetG1Element() == pk2.GetG1Element());
-        REQUIRE(pk1.GetG2Element() == pk2.GetG2Element());
-        REQUIRE(pk3 != pk2);
-    }
-    SECTION("Move {constructor|assignment operator}") {
-        PrivateKey pk1 = PrivateKey::RandomPrivateKey();
-        std::vector<uint8_t> vec1 = pk1.Serialize();
-        PrivateKey pk2 = PrivateKey::RandomPrivateKey();
-        std::vector<uint8_t> vec2 = pk2.Serialize();
-        PrivateKey pk3 = PrivateKey(std::move(pk2));
-        REQUIRE(!pk1.IsZero());
-        REQUIRE_THROWS(pk2.IsZero());
-        REQUIRE(!pk3.IsZero());
-        REQUIRE(vec2 == pk3.Serialize());
-        pk3 = std::move(pk1);
-        REQUIRE_THROWS(pk1.IsZero());
-        REQUIRE_THROWS(pk2.IsZero());
-        REQUIRE(!pk3.IsZero());
-        REQUIRE(vec1 == pk3.Serialize());
-        pk3 = std::move(pk1);
-        REQUIRE_THROWS(pk1.IsZero());
-        REQUIRE_THROWS(pk2.IsZero());
-        REQUIRE_THROWS(pk3.IsZero());
-    }
-    SECTION("Equality operators") {
-        PrivateKey pk1 = PrivateKey::RandomPrivateKey();
-        PrivateKey pk2 = PrivateKey::RandomPrivateKey();
-        PrivateKey pk3 = pk2;
-        REQUIRE(pk1 != pk2);
-        REQUIRE(pk1 != pk3);
-        REQUIRE(pk2 == pk3);
-    }
-    SECTION("(De)Serialization") {
-        PrivateKey pk1 = PrivateKey::RandomPrivateKey();
-        pk1.Serialize(buffer);
-        REQUIRE(memcmp(buffer, pk1.Serialize().data(), PrivateKey::PRIVATE_KEY_SIZE) == 0);
-        PrivateKey pk2 = PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), true);
-        REQUIRE(pk1 == pk2);
-        REQUIRE_THROWS(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE - 1), true));
-        REQUIRE_THROWS(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE + 1), true));
-        REQUIRE_NOTHROW(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), true));
-        bn_t order;
-        bn_new(order);
-        g1_get_ord(order);
-        bn_write_bin(buffer, PrivateKey::PRIVATE_KEY_SIZE, order);
-        REQUIRE_NOTHROW(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), false));
-        REQUIRE_NOTHROW(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), true));
-        bn_add(order, order, order);
-        bn_write_bin(buffer, PrivateKey::PRIVATE_KEY_SIZE, order);
-        REQUIRE_THROWS(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), false));
-        REQUIRE_NOTHROW(PrivateKey::FromBytes(Bytes(buffer, PrivateKey::PRIVATE_KEY_SIZE), true));
-    }
-    SECTION("BIP32 Seed") {
-        uint8_t aliceSeed[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        PrivateKey pk1 = PrivateKey::FromSeedBIP32(Bytes(aliceSeed, 10));
-        REQUIRE(pk1.HasKeyData());
-        vector<uint8_t> privateKey = pk1.Serialize(true);
-        vector<uint8_t> knownPrivateKey = Util::HexToBytes("46891c2cec49593c81921e473db7480029e0fc1eb933c6b93d81f5370eb19fbd");
-        REQUIRE(privateKey == knownPrivateKey);
-        G1Element pubKey1 = pk1.GetG1Element();
-        vector<uint8_t> pubKey1Bytes = pubKey1.Serialize(true);
-        vector<uint8_t> knownPublicKey = Util::HexToBytes("1790635de8740e9a6a6b15fb6b72f3a16afa0973d971979b6ba54761d6e2502c50db76f4d26143f05459a42cfd520d44");
-        REQUIRE(pubKey1Bytes == knownPublicKey);
-    }
-    SECTION("keydata checks") {
-        PrivateKey pk1 = PrivateKey::RandomPrivateKey();
-        G1Element g1 = pk1.GetG1Element();
-        G2Element g2 = pk1.GetG2Element();
-        PrivateKey pk2 = std::move(pk1);
-        REQUIRE_THROWS(PrivateKey(pk1));
-        REQUIRE_THROWS(pk1 = pk2);
-        REQUIRE_THROWS(pk1.GetG1Element());
-        REQUIRE_THROWS(pk1.GetG2Element());
-        REQUIRE_THROWS(g1 * pk1);
-        REQUIRE_THROWS(pk1 * g1);
-        REQUIRE_THROWS(g2 * pk1);
-        REQUIRE_THROWS(pk1 * g2);
-        REQUIRE_THROWS(pk1.GetG2Power(g2));
-        REQUIRE_THROWS(PrivateKey::Aggregate({pk1, pk2}));
-        REQUIRE_THROWS(pk1.IsZero());
-        REQUIRE_THROWS(pk1 == pk2);
-        REQUIRE_THROWS(pk1 != pk2);
-        REQUIRE_THROWS(pk1.Serialize(buffer));
-        REQUIRE_THROWS(pk1.Serialize());
-        REQUIRE_THROWS(pk1.SignG2(buffer, sizeof(buffer), buffer, sizeof(buffer)));
-    }
-}
-
-TEST_CASE("HKDF") {
-    // https://tools.ietf.org/html/rfc5869 test vectors
-    SECTION("Test case 2") {
-        TestHKDF("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-                 "000102030405060708090a0b0c",
-                 "f0f1f2f3f4f5f6f7f8f9",
-                 "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5",
-                 "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865",
-                 42
-        );
-    }
-    SECTION("Test case 2") {
-        TestHKDF("000102030405060708090a0b0c0d0e0f"
-                 "101112131415161718191a1b1c1d1e1f"
-                 "202122232425262728292a2b2c2d2e2f"
-                 "303132333435363738393a3b3c3d3e3f"
-                 "404142434445464748494a4b4c4d4e4f", // 80 octets
-                 "0x606162636465666768696a6b6c6d6e6f"
-                 "707172737475767778797a7b7c7d7e7f"
-                 "808182838485868788898a8b8c8d8e8f"
-                 "909192939495969798999a9b9c9d9e9f"
-                 "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf", // 80 octets
-                 "0xb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-                 "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-                 "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-                 "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-                 "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", // 80 octets
-                 "0x06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244", // 32 octets
-                 "0xb11e398dc80327a1c8e7f78c596a4934"
-                 "4f012eda2d4efad8a050cc4c19afa97c"
-                 "59045a99cac7827271cb41c65e590e09"
-                 "da3275600c2f09b8367793a9aca3db71"
-                 "cc30c58179ec3e87c14c01d5c1f3434f"
-                 "1d87", // 82 octets
-                 82
-        );
-    }
-    SECTION("Test case 3") {
-        TestHKDF("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-                 "",
-                 "",
-                 "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04",
-                 "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8",
-                 42
-        );
-    }
-    SECTION("Works with multiple of 32") {
-        // This generates exactly 64 bytes. Uses a 32 byte key and 4 byte salt as in EIP2333.
-        TestHKDF("8704f9ac024139fe62511375cf9bc534c0507dcf00c41603ac935cd5943ce0b4b88599390de14e743ca2f56a73a04eae13aa3f3b969b39d8701e0d69a6f8d42f",
-                 "53d8e19b",
-                 "",
-                 "eb01c9cd916653df76ffa61b6ab8a74e254ebfd9bfc43e624cc12a72b0373dee",
-                 "8faabea85fc0c64e7ca86217cdc6dcdc88551c3244d56719e630a3521063082c46455c2fd5483811f9520a748f0099c1dfcfa52c54e1c22b5cdf70efb0f3c676",
-                 64
-        );
-    }
-}
-
-void TestEIP2333(string seedHex, string masterSkHex, string childSkHex, uint32_t childIndex) {
-    auto masterSk = Util::HexToBytes(masterSkHex);
-    auto childSk = Util::HexToBytes(childSkHex);
-
-    PrivateKey master = BasicSchemeMPL().KeyGen(Util::HexToBytes(seedHex));
-    PrivateKey child = HDKeys::DeriveChildSk(master, childIndex);
-
-    uint8_t master_arr[32];
-    master.Serialize(master_arr);
-    auto calculatedMaster = master.Serialize();
-    auto calculatedChild = child.Serialize();
-
-    REQUIRE(calculatedMaster.size() == 32);
-    REQUIRE(calculatedChild.size() == 32);
-    for (int i=0; i<32; i++) {
-        REQUIRE(calculatedMaster[i] == masterSk[i]);
-    }
-    for (int i=0; i<32; i++) {
-        REQUIRE(calculatedChild[i] == childSk[i]);
-    }
-}
-
-TEST_CASE("EIP-2333 hardened HD keys") {
-    // The comments in the test cases correspond to  integers that are converted to
-    // bytes using python int.to_bytes(32, "big").hex(), since the EIP spec provides ints, but c++
-    // does not support bigint by default
-    SECTION("EIP-2333 Test case 1"){
-        TestEIP2333("3141592653589793238462643383279502884197169399375105820974944592",
-                    // 36167147331491996618072159372207345412841461318189449162487002442599770291484
-                    "4ff5e145590ed7b71e577bb04032396d1619ff41cb4e350053ed2dce8d1efd1c",
-                    // 41787458189896526028601807066547832426569899195138584349427756863968330588237
-                    "5c62dcf9654481292aafa3348f1d1b0017bbfb44d6881d26d2b17836b38f204d",
-                    3141592653
-        );
-    }
-    SECTION("EIP-2333 Test case 2"){
-        TestEIP2333("0x0099FF991111002299DD7744EE3355BBDD8844115566CC55663355668888CC00",
-                    // 13904094584487173309420026178174172335998687531503061311232927109397516192843
-                    "1ebd704b86732c3f05f30563dee6189838e73998ebc9c209ccff422adee10c4b",
-                    // 12482522899285304316694838079579801944734479969002030150864436005368716366140
-                    "1b98db8b24296038eae3f64c25d693a269ef1e4d7ae0f691c572a46cf3c0913c",
-                    4294967295
-        );
-    }
-    SECTION("EIP-2333 Test case 3"){
-        TestEIP2333("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
-                    // 44010626067374404458092393860968061149521094673473131545188652121635313364506
-                    "614d21b10c0e4996ac0608e0e7452d5720d95d20fe03c59a3321000a42432e1a",
-                    // 4011524214304750350566588165922015929937602165683407445189263506512578573606
-                    "08de7136e4afc56ae3ec03b20517d9c1232705a747f588fd17832f36ae337526",
-                    42
-        );
-    }
-    SECTION("EIP-2333 Test vector with intermediate values"){
-        TestEIP2333("c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04",
-                    // 5399117110774477986698372024995405256382522670366369834617409486544348441851
-                    "0x0befcabff4a664461cc8f190cdd51c05621eb2837c71a1362df5b465a674ecfb",
-                    // 11812940737387919040225825939013910852517748782307378293770044673328955938106
-                    "1a1de3346883401f1e3b2281be5774080edb8e5ebe6f776b0f7af9fea942553a",
-                    0
-        );
-    }
-}
-
-TEST_CASE("Unhardened HD keys") {
-    SECTION("Should match derivation through private and public keys"){
-        const vector<uint8_t> seed = {1, 50, 6, 244, 24, 199, 1, 25, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29};
-
-        PrivateKey sk = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk = sk.GetG1Element();
-
-        PrivateKey childSk = BasicSchemeMPL().DeriveChildSkUnhardened(sk, 42);
-        G1Element childPk = BasicSchemeMPL().DeriveChildPkUnhardened(pk, 42);
-
-        REQUIRE(childSk.GetG1Element() == childPk);
-
-        PrivateKey grandchildSk = BasicSchemeMPL().DeriveChildSkUnhardened(childSk, 12142);
-        G1Element grandcihldPk = BasicSchemeMPL().DeriveChildPkUnhardened(childPk, 12142);
-
-        REQUIRE(grandchildSk.GetG1Element() == grandcihldPk);
-    }
-
-    SECTION("Should derive public child from parent") {
-        const vector<uint8_t> seed = {2, 50, 6, 244, 24, 199, 1, 25, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29};
-
-        PrivateKey sk = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk = sk.GetG1Element();
-
-        PrivateKey childSk = BasicSchemeMPL().DeriveChildSkUnhardened(sk, 42);
-        G1Element childPk = BasicSchemeMPL().DeriveChildPkUnhardened(pk, 42);
-
-        PrivateKey childSkHardened = BasicSchemeMPL().DeriveChildSk(sk, 42);
-        REQUIRE(childSk.GetG1Element() == childPk);
-        REQUIRE(childSkHardened != childSk);
-        REQUIRE(childSkHardened.GetG1Element() != childPk);
-    }
-}
-
-TEST_CASE("IETF test vectors") {
-    SECTION ("Pyecc vector") {
-        string sig1BasicHex = "96ba34fac33c7f129d602a0bc8a3d43f9abc014eceaab7359146b4b150e57b808645738f35671e9e10e0d862a30cab70074eb5831d13e6a5b162d01eebe687d0164adbd0a864370a7c222a2768d7704da254f1bf1823665bc2361f9dd8c00e99";
-        string sk = "0x0101010101010101010101010101010101010101010101010101010101010101";
-        vector<uint8_t> msg = {3, 1, 4, 1, 5, 9};
-        auto skobj = PrivateKey::FromBytes(Bytes(Util::HexToBytes(sk)));
-        G2Element sig = BasicSchemeMPL().Sign(skobj, msg);
-        vector<uint8_t> sig1;
-        for (const uint8_t byte : Util::HexToBytes(sig1BasicHex)) {
-            sig1.push_back(byte);
-        }
-        REQUIRE(sig == G2Element::FromByteVector(sig1));
-    }
-}
-
-
-TEST_CASE("Chia test vectors") {
-    SECTION("Chia test vectors 1 (Basic)") {
-        vector<uint8_t> seed1(32, 0x00);  // All 0s
-        vector<uint8_t> seed2(32, 0x01);  // All 1s
-        vector<uint8_t> message1 = {7, 8, 9};
-        vector<uint8_t> message2 = {10, 11, 12};
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed1);
-        G1Element pk1 = sk1.GetG1Element();
-        G2Element sig1 = BasicSchemeMPL().Sign(sk1, message1);
-
-
-        PrivateKey sk2 = BasicSchemeMPL().KeyGen(seed2);
-        G1Element pk2 = sk2.GetG1Element();
-        G2Element sig2 = BasicSchemeMPL().Sign(sk2, message2);
-
-        REQUIRE(pk1.GetFingerprint() == 0xb40dd58a);
-        REQUIRE(pk2.GetFingerprint() == 0xb839add1);
-
-        REQUIRE(
-            Util::HexStr(sig1.Serialize()) ==
-            "b8faa6d6a3881c9fdbad803b170d70ca5cbf1e6ba5a586262df368c75acd1d1f"
-            "fa3ab6ee21c71f844494659878f5eb230c958dd576b08b8564aad2ee0992e85a"
-            "1e565f299cd53a285de729937f70dc176a1f01432129bb2b94d3d5031f8065a1");
-        REQUIRE(
-            Util::HexStr(sk1.Serialize()) ==
-            "4a353be3dac091a0a7e640620372f5e1e2e4401717c1e79cac6ffba8f6905604");
-        REQUIRE(
-            Util::HexStr(pk1.Serialize()) ==
-            "85695fcbc06cc4c4c9451f4dce21cbf8de3e5a13bf48f44cdbb18e2038ba7b8bb1632d7911e"
-            "f1e2e08749bddbf165352");
-
-        REQUIRE(
-            Util::HexStr(sig2.Serialize()) ==
-            "a9c4d3e689b82c7ec7e838dac2380cb014f9a08f6cd6ba044c263746e39a8f7a60ffee4afb7"
-            "8f146c2e421360784d58f0029491e3bd8ab84f0011d258471ba4e87059de295d9aba845c044e"
-            "e83f6cf2411efd379ef38bf4cf41d5f3c0ae1205d");
-
-        G2Element aggSig1 = BasicSchemeMPL().Aggregate({sig1, sig2});
-
-        REQUIRE(
-            Util::HexStr(aggSig1.Serialize()) ==
-            "aee003c8cdaf3531b6b0ca354031b0819f7586b5846796615aee8108fec75ef838d181f9d24"
-            "4a94d195d7b0231d4afcf06f27f0cc4d3c72162545c240de7d5034a7ef3a2a03c0159de982fb"
-            "c2e7790aeb455e27beae91d64e077c70b5506dea3");
-
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message1, message2}, aggSig1));
-        REQUIRE(!BasicSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message1, message2}, sig1));
-        REQUIRE(!BasicSchemeMPL().Verify(pk1, message1, sig2));
-        REQUIRE(!BasicSchemeMPL().Verify(pk1, message2, sig1));
-
-        vector<uint8_t> message3 = {1, 2, 3};
-        vector<uint8_t> message4 = {1, 2, 3, 4};
-        vector<uint8_t> message5 = {1, 2};
-
-        G2Element sig3 = BasicSchemeMPL().Sign(sk1, message3);
-        G2Element sig4 = BasicSchemeMPL().Sign(sk1, message4);
-        G2Element sig5 = BasicSchemeMPL().Sign(sk2, message5);
-
-        G2Element aggSig2 = BasicSchemeMPL().Aggregate({sig3, sig4, sig5});
-
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk1, pk2}, vector<vector<uint8_t>>{message3, message4, message5}, aggSig2));
-        REQUIRE(
-            Util::HexStr(aggSig2.Serialize()) ==
-            "a0b1378d518bea4d1100adbc7bdbc4ff64f2c219ed6395cd36fe5d2aa44a4b8e710b607afd9"
-            "65e505a5ac3283291b75413d09478ab4b5cfbafbeea366de2d0c0bcf61deddaa521f6020460f"
-            "d547ab37659ae207968b545727beba0a3c5572b9c");
-    }
-
-    SECTION("Chia test vector 2 (Augmented, aggregate of aggregates)") {
-        vector<uint8_t> message1 = {1, 2, 3, 40};
-        vector<uint8_t> message2 = {5, 6, 70, 201};
-        vector<uint8_t> message3 = {9, 10, 11, 12, 13};
-        vector<uint8_t> message4 = {15, 63, 244, 92, 0, 1};
-
-        vector<uint8_t> seed1(32, 0x02);  // All 2s
-        vector<uint8_t> seed2(32, 0x03);  // All 3s
-
-        PrivateKey sk1 = AugSchemeMPL().KeyGen(seed1);
-        PrivateKey sk2 = AugSchemeMPL().KeyGen(seed2);
-
-        G1Element pk1 = sk1.GetG1Element();
-        G1Element pk2 = sk2.GetG1Element();
-
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, message1);
-        G2Element sig2 = AugSchemeMPL().Sign(sk2, message2);
-        G2Element sig3 = AugSchemeMPL().Sign(sk2, message1);
-        G2Element sig4 = AugSchemeMPL().Sign(sk1, message3);
-        G2Element sig5 = AugSchemeMPL().Sign(sk1, message1);
-        G2Element sig6 = AugSchemeMPL().Sign(sk1, message4);
-
-
-        G2Element aggSigL = AugSchemeMPL().Aggregate({sig1, sig2});
-        G2Element aggSigR = AugSchemeMPL().Aggregate({sig3, sig4, sig5});
-        G2Element aggSig = AugSchemeMPL().Aggregate({aggSigL, aggSigR, sig6});
-
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2, pk2, pk1, pk1, pk1}, vector<vector<uint8_t>>{message1, message2, message1, message3, message1, message4}, aggSig));
-
-        REQUIRE(
-            Util::HexStr(aggSig.Serialize()) ==
-            "a1d5360dcb418d33b29b90b912b4accde535cf0e52caf467a005dc632d9f7af44b6c4e9acd4"
-            "6eac218b28cdb07a3e3bc087df1cd1e3213aa4e11322a3ff3847bbba0b2fd19ddc25ca964871"
-            "997b9bceeab37a4c2565876da19382ea32a962200");
-    }
-    SECTION("Chia test vector 3 (PoP)") {
-        vector<uint8_t> message1 = {1, 2, 3, 40, 50};
-
-        vector<uint8_t> seed1(32, 0x04);  // All 4s
-
-        PrivateKey sk1 = PopSchemeMPL().KeyGen(seed1);
-
-        G2Element pop = PopSchemeMPL().PopProve(sk1);
-        REQUIRE(PopSchemeMPL().PopVerify(sk1.GetG1Element(), pop));
-
-        REQUIRE(Util::HexStr(pop.Serialize()) == "84f709159435f0dc73b3e8bf6c78d85282d19231555a8ee3b6e2573aaf66872d9203fefa1ef"
-                                                 "700e34e7c3f3fb28210100558c6871c53f1ef6055b9f06b0d1abe22ad584ad3b957f3018a8f5"
-                                                 "8227c6c716b1e15791459850f2289168fa0cf9115");
-    }
-}
-
-
-TEST_CASE("Key generation")
-{
-    SECTION("Should generate a keypair from a seed")
-    {
-        vector<uint8_t> seed1(31, 0x08);
-        vector<uint8_t> seed2(32, 0x08);
-
-        REQUIRE_THROWS(BasicSchemeMPL().KeyGen(seed1));
-        PrivateKey sk = BasicSchemeMPL().KeyGen(seed2);
-        G1Element pk = sk.GetG1Element();
-        REQUIRE(core_get()->code == RLC_OK);
-        REQUIRE(pk.GetFingerprint() == 0x8ee7ba56);
-    }
-}
-
-
-TEST_CASE("Error handling")
-{
-    SECTION("Should throw on a bad private key")
-    {
-        vector<uint8_t> seed(32, 0x10);
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        uint8_t* skData = Util::SecAlloc<uint8_t>(G2Element::SIZE);
-        sk1.Serialize(skData);
-        skData[0] = 255;
-        REQUIRE_THROWS(PrivateKey::FromBytes(Bytes(skData, PrivateKey::PRIVATE_KEY_SIZE)));
-        Util::SecFree(skData);
-    }
-
-    SECTION("Should throw on a bad public key")
-    {
-        vector<uint8_t> buf(G1Element::SIZE, 0);
-        for (int i = 0; i < 0xFF; i++) {
-            buf[0] = (uint8_t)i;
-            if (i == 0xc0) { // Infinity prefix shouldn't throw here as we have only zero values
-                REQUIRE_NOTHROW(G1Element::FromByteVector(buf));
-            } else {
-                REQUIRE_THROWS(G1Element::FromByteVector(buf));
-            }
-        }
-    }
-
-    SECTION("Should throw on a bad G2Element")
-    {
-        vector<uint8_t> buf(G2Element::SIZE, 0);
-        for (int i = 0; i < 0xFF; i++) {
-            buf[0] = (uint8_t)i;
-            if (i == 0xc0) { // Infinity prefix shouldn't throw here as we have only zero values
-                REQUIRE_NOTHROW(G2Element::FromByteVector(buf));
-            } else {
-                REQUIRE_THROWS(G2Element::FromByteVector(buf));
-            }
-        }
-        // Trigger "G2 element must always have 48th byte start with 0b000" error case
-        buf[48] = 0xFF;
-        REQUIRE_THROWS(G2Element::FromByteVector(buf));
-    }
-
-    SECTION("Error handling should be thread safe")
-    {
-        core_get()->code = 10;
-        REQUIRE(core_get()->code == 10);
-
-        ctx_t* ctx1 = core_get();
-
-        // spawn a thread and make sure it uses a different/same context depending on relic's multithreading setup
-        std::thread([&]() {
-#if MULTI != RELIC_NONE
-            REQUIRE(ctx1 != core_get());
-            REQUIRE(core_get()->code == RLC_OK);
-#else
-            REQUIRE(ctx1 == core_get());
-            REQUIRE(core_get()->code != RLC_OK);
-#endif
-            core_get()->code = 1;
-        }).join();
-
-#if MULTI != RELIC_NONE
-        REQUIRE(core_get()->code == 10);
-#else
-        REQUIRE(core_get()->code == 1);
-#endif
-        // reset so that future test cases don't fail
-        core_get()->code = RLC_OK;
-    }
-}
-
-
-TEST_CASE("Util tests")
-{
-    SECTION("Should convert an int to four bytes")
-    {
-        uint32_t x = 1024;
-        uint8_t expected[4] = {0x00, 0x00, 0x04, 0x00};
-        uint8_t result[4];
-        Util::IntToFourBytes(result, x);
-        REQUIRE(result[0] == expected[0]);
-        REQUIRE(result[1] == expected[1]);
-        REQUIRE(result[2] == expected[2]);
-        REQUIRE(result[3] == expected[3]);
-        uint32_t again = Util::FourBytesToInt(result);
-        REQUIRE(again == x);
-    }
-}
-
-
-TEST_CASE("Signature tests")
-{
-    SECTION("Should use copy constructor")
-    {
-        vector<uint8_t> message1 = {1, 65, 254, 88, 90, 45, 22};
-
-        vector<uint8_t> seed(32, 0x30);
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk1 = sk1.GetG1Element();
-        PrivateKey sk2 = PrivateKey(sk1);
-
-        uint8_t skBytes[PrivateKey::PRIVATE_KEY_SIZE];
-        sk2.Serialize(skBytes);
-        PrivateKey sk4 = PrivateKey::FromBytes(Bytes(skBytes, PrivateKey::PRIVATE_KEY_SIZE));
-
-        G1Element pk2 = G1Element(pk1);
-        G2Element sig1 = BasicSchemeMPL().Sign(sk4, message1);
-        G2Element sig2 = G2Element(sig1);
-
-        REQUIRE(BasicSchemeMPL().Verify(pk2, message1, sig2));
-    }
-
-    SECTION("Should sign with the zero key") {
-        vector<uint8_t> sk0(32, 0);
-        PrivateKey sk = PrivateKey::FromByteVector(sk0);
-        REQUIRE(sk.GetG1Element() == G1Element());  // Infinity
-        REQUIRE(sk.GetG2Element() == G2Element());  // Infinity
-        REQUIRE(BasicSchemeMPL().Sign(sk, {1, 2, 3}) == G2Element());
-        REQUIRE(AugSchemeMPL().Sign(sk, {1, 2, 3}) == G2Element());
-        REQUIRE(PopSchemeMPL().Sign(sk, {1, 2, 3}) == G2Element());
-    }
-
-    SECTION("Should use equality operators")
-    {
-        vector<uint8_t> message1 = {1, 65, 254, 88, 90, 45, 22};
-        vector<uint8_t> seed(32, 0x40);
-        vector<uint8_t> seed3(32, 0x50);
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        PrivateKey sk2 = PrivateKey(sk1);
-        PrivateKey sk3 = BasicSchemeMPL().KeyGen(seed3);
-        G1Element pk1 = sk1.GetG1Element();
-        G1Element pk2 = sk2.GetG1Element();
-        G1Element pk3 = G1Element(pk2);
-        G1Element pk4 = sk3.GetG1Element();
-        G2Element sig1 = BasicSchemeMPL().Sign(sk1, message1);
-        G2Element sig2 = BasicSchemeMPL().Sign(sk1, message1);
-        G2Element sig3 = BasicSchemeMPL().Sign(sk2, message1);
-        G2Element sig4 = BasicSchemeMPL().Sign(sk3, message1);
-
-        REQUIRE(sk1 == sk2);
-        REQUIRE(sk1 != sk3);
-        REQUIRE(pk1 == pk2);
-        REQUIRE(pk2 == pk3);
-        REQUIRE(pk1 != pk4);
-        REQUIRE(sig1 == sig2);
-        REQUIRE(sig2 == sig3);
-        REQUIRE(sig3 != sig4);
-
-        REQUIRE(pk1.Serialize() == pk2.Serialize());
-        REQUIRE(sig1.Serialize() == sig2.Serialize());
-    }
-
-    SECTION("Should serialize and deserialize")
-    {
-        vector<uint8_t> message1 = {1, 65, 254, 88, 90, 45, 22};
-
-        vector<uint8_t> seed(32, 0x40);
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk1 = sk1.GetG1Element();
-
-        uint8_t* skData = Util::SecAlloc<uint8_t>(G2Element::SIZE);
-        sk1.Serialize(skData);
-        PrivateKey sk2 = PrivateKey::FromBytes(Bytes(skData, PrivateKey::PRIVATE_KEY_SIZE));
-        REQUIRE(sk1 == sk2);
-
-        auto pkData = pk1.Serialize();
-
-        G1Element pk2 = G1Element::FromBytes(Bytes(pkData));
-        REQUIRE(pk1 == pk2);
-
-        G2Element sig1 = BasicSchemeMPL().Sign(sk1, message1);
-
-        auto sigData = sig1.Serialize();
-
-        G2Element sig2 = G2Element::FromBytes(Bytes(sigData));
-        REQUIRE(sig1 == sig2);
-
-        REQUIRE(BasicSchemeMPL().Verify(pk2, message1, sig2));
-        Util::SecFree(skData);
-    }
-
-    SECTION("Should not verify aggregate with same message under BasicScheme")
-    {
-        vector<uint8_t> message = {100, 2, 254, 88, 90, 45, 23};
-        uint8_t hash[BLS::MESSAGE_HASH_LEN];
-
-        vector<uint8_t> seed(32, 0x50);
-        vector<uint8_t> seed2(32, 0x70);
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        PrivateKey sk2 = BasicSchemeMPL().KeyGen(seed2);
-
-        G1Element pk1 = sk1.GetG1Element();
-        G1Element pk2 = sk2.GetG1Element();
-
-        G2Element sig1 = BasicSchemeMPL().Sign(sk1, message);
-        G2Element sig2 = BasicSchemeMPL().Sign(sk2, message);
-
-        G2Element aggSig = BasicSchemeMPL().Aggregate({sig1, sig2});
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message}, aggSig) == false);
-    }
-
-    SECTION("Should verify aggregate with same message under AugScheme/PopScheme")
-    {
-        vector<uint8_t> message = {100, 2, 254, 88, 90, 45, 23};
-        uint8_t hash[BLS::MESSAGE_HASH_LEN];
-
-        vector<uint8_t> seed(32, 0x50);
-        vector<uint8_t> seed2(32, 0x70);
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        PrivateKey sk2 = BasicSchemeMPL().KeyGen(seed2);
-
-        G1Element pk1 = sk1.GetG1Element();
-        G1Element pk2 = sk2.GetG1Element();
-
-        G2Element sig1Aug = AugSchemeMPL().Sign(sk1, message);
-        G2Element sig2Aug = AugSchemeMPL().Sign(sk2, message);
-        G2Element aggSigAug = AugSchemeMPL().Aggregate({sig1Aug, sig2Aug});
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message}, aggSigAug));
-
-        G2Element sig1Pop = PopSchemeMPL().Sign(sk1, message);
-        G2Element sig2Pop = PopSchemeMPL().Sign(sk2, message);
-        G2Element aggSigPop = PopSchemeMPL().Aggregate({sig1Pop, sig2Pop});
-        REQUIRE(PopSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message}, aggSigPop));
-    }
-
-    SECTION("Should Aug aggregate many G2Elements, diff message")
-    {
-        vector<G1Element> pks;
-        vector<G2Element> sigs;
-        vector<vector<uint8_t> > ms;
-
-        for (uint8_t i = 0; i < 80; i++) {
-            vector<uint8_t> message = {0, 100, 2, 45, 64, 12, 12, 63, i};
-            PrivateKey sk = BasicSchemeMPL().KeyGen(getRandomSeed());
-            pks.push_back(sk.GetG1Element());
-            auto sig = AugSchemeMPL().Sign(sk, message);
-            sigs.push_back(sig);
-            ms.push_back(message);
-        }
-
-        G2Element aggSig = AugSchemeMPL().Aggregate(sigs);
-
-        REQUIRE(AugSchemeMPL().AggregateVerify(pks, ms, aggSig));
-    }
-
-    SECTION("Aggregate Verification of zero items with infinity should pass")
-    {
-        vector<G1Element> pks_as_g1;
-        vector<vector<uint8_t> > pks_as_bytes;
-        vector<vector<uint8_t> > msgs;
-        vector<G2Element> sigs;
-
-        sigs.push_back(G2Element());
-        G2Element aggSig = AugSchemeMPL().Aggregate(sigs);
-
-        REQUIRE(aggSig.Serialize().size() != 0);
-        REQUIRE(aggSig == G2Element());
-
-        REQUIRE(AugSchemeMPL().AggregateVerify(pks_as_g1, msgs, aggSig));
-        REQUIRE(AugSchemeMPL().AggregateVerify(pks_as_bytes, msgs, aggSig.Serialize()));
-
-        REQUIRE(BasicSchemeMPL().AggregateVerify(pks_as_g1, msgs, aggSig));
-        REQUIRE(BasicSchemeMPL().AggregateVerify(pks_as_bytes, msgs, aggSig.Serialize()));
-
-	// FastAggregateVerify takes one message, and requires at least one key
-        vector<uint8_t> msg;
-        REQUIRE(pks_as_g1.size() == 0);
-        REQUIRE(PopSchemeMPL().FastAggregateVerify(pks_as_g1, msg, aggSig) == false);
-        REQUIRE(pks_as_bytes.size() == 0);
-        REQUIRE(PopSchemeMPL().FastAggregateVerify(pks_as_bytes, msg, aggSig.Serialize()) == false);
-
-    }
-}
-
-TEST_CASE("Agg sks") {
-    SECTION("Should create aggregates with agg sk (basic scheme)")
-    {
-        const vector<uint8_t> message = {100, 2, 254, 88, 90, 45, 23};
-        const vector<uint8_t> seed(32, 0x07);
-        const vector<uint8_t> seed2(32, 0x08);
-
-        const PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        const G1Element pk1 = sk1.GetG1Element();
-
-        const PrivateKey sk2 = BasicSchemeMPL().KeyGen(seed2);
-        const G1Element pk2 = sk2.GetG1Element();
-
-        const PrivateKey aggSk = PrivateKey::Aggregate({sk1, sk2});
-        const PrivateKey aggSkAlt = PrivateKey::Aggregate({sk2, sk1});
-        REQUIRE(aggSk == aggSkAlt);
-
-        const G1Element aggPubKey = pk1 + pk2;
-        REQUIRE(aggPubKey == aggSk.GetG1Element());
-
-        const G2Element sig1 = BasicSchemeMPL().Sign(sk1, message);
-        const G2Element sig2 = BasicSchemeMPL().Sign(sk2, message);
-
-        const G2Element aggSig2 = BasicSchemeMPL().Sign(aggSk, message);
-
-
-        const G2Element aggSig = BasicSchemeMPL().Aggregate({sig1, sig2});
-        REQUIRE(aggSig == aggSig2);
-
-        // Verify as a single G2Element
-        REQUIRE(BasicSchemeMPL().Verify(aggPubKey, message, aggSig));
-        REQUIRE(BasicSchemeMPL().Verify(aggPubKey, message, aggSig2));
-
-        // Verify aggregate with both keys (Fails since not distinct)
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message}, aggSig) == false);
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message}, aggSig2) == false);
-
-        // Try the same with distinct message, and same sk
-        vector<uint8_t> message2 = {200, 29, 54, 8, 9, 29, 155, 55};
-        G2Element sig3 = BasicSchemeMPL().Sign(sk2, message2);
-        G2Element aggSigFinal = BasicSchemeMPL().Aggregate({aggSig, sig3});
-        G2Element aggSigAlt = BasicSchemeMPL().Aggregate({sig1, sig2, sig3});
-        G2Element aggSigAlt2 = BasicSchemeMPL().Aggregate({sig1, sig3, sig2});
-        REQUIRE(aggSigFinal == aggSigAlt);
-        REQUIRE(aggSigFinal == aggSigAlt2);
-
-        PrivateKey skFinal = PrivateKey::Aggregate({aggSk, sk2});
-        PrivateKey skFinalAlt = PrivateKey::Aggregate({sk2, sk1, sk2});
-        REQUIRE(skFinal == skFinalAlt);
-        REQUIRE(skFinal != aggSk);
-
-        G1Element pkFinal = aggPubKey + pk2;
-        G1Element pkFinalAlt = pk2 + pk1 + pk2;
-        REQUIRE(pkFinal == pkFinalAlt);
-        REQUIRE(pkFinal != aggPubKey);
-
-        // Cannot verify with aggPubKey (since we have multiple messages)
-        REQUIRE(BasicSchemeMPL().AggregateVerify({aggPubKey, pk2}, vector<vector<uint8_t>>{message, message2}, aggSigFinal));
-    }
-}
-
-TEST_CASE("Advanced") {
-    SECTION("Should aggregate with multiple levels, degenerate") {
-        vector<uint8_t> message1 = {100, 2, 254, 88, 90, 45, 23};
-        PrivateKey sk1 = AugSchemeMPL().KeyGen(getRandomSeed());
-        G1Element pk1 = sk1.GetG1Element();
-        G2Element aggSig = AugSchemeMPL().Sign(sk1, message1);
-        vector<G1Element> pks = {pk1};
-        vector<vector<uint8_t>> ms = {message1};
-
-        for (size_t i = 0; i < 10; i++) {
-            PrivateKey sk = AugSchemeMPL().KeyGen(getRandomSeed());
-            G1Element pk = sk.GetG1Element();
-            pks.push_back(pk);
-            ms.push_back(message1);
-            G2Element sig = AugSchemeMPL().Sign(sk, message1);
-            aggSig = AugSchemeMPL().Aggregate({aggSig, sig});
-        }
-        REQUIRE(AugSchemeMPL().AggregateVerify(pks, ms, aggSig));
-    }
-
-    SECTION("Should aggregate with multiple levels, different messages") {
-        vector<uint8_t> message1 = {100, 2, 254, 88, 90, 45, 23};
-        vector<uint8_t> message2 = {192, 29, 2, 0, 0, 45, 23};
-        vector<uint8_t> message3 = {52, 29, 2, 0, 0, 45, 102};
-        vector<uint8_t> message4 = {99, 29, 2, 0, 0, 45, 222};
-
-        PrivateKey sk1 = AugSchemeMPL().KeyGen(getRandomSeed());
-        PrivateKey sk2 = AugSchemeMPL().KeyGen(getRandomSeed());
-
-        G1Element pk1 = sk1.GetG1Element();
-        G1Element pk2 = sk2.GetG1Element();
-
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, message1);
-        G2Element sig2 = AugSchemeMPL().Sign(sk2, message2);
-        G2Element sig3 = AugSchemeMPL().Sign(sk2, message3);
-        G2Element sig4 = AugSchemeMPL().Sign(sk1, message4);
-
-        vector<G2Element> const sigsL = {sig1, sig2};
-        vector<G1Element> const pksL = {pk1, pk2};
-        vector<vector<uint8_t>> messagesL = {message1, message2};
-        const G2Element aggSigL = AugSchemeMPL().Aggregate(sigsL);
-
-        vector<G2Element> const sigsR = {sig3, sig4};
-        vector<G1Element> const pksR = {pk2, pk1};
-        const G2Element aggSigR = AugSchemeMPL().Aggregate(sigsR);
-
-        vector<G2Element> sigs = {aggSigL, aggSigR};
-        const G2Element aggSig = AugSchemeMPL().Aggregate(sigs);
-
-        vector<G1Element> allPks = {pk1, pk2, pk2, pk1};
-        vector<vector<uint8_t>> allMessages = {
-            message1, message2, message3, message4};
-        REQUIRE(AugSchemeMPL().AggregateVerify(allPks, allMessages, aggSig));
-    }
-
-    SECTION("README")
-    {
-        // Example seed, used to generate private key. Always use
-        // a secure RNG with sufficient entropy to generate a seed (at least 32 bytes).
-        vector<uint8_t> seed = {0,  50, 6,  244, 24,  199, 1,  25,  52,  88,  192,
-                                19, 18, 12, 89,  6,   220, 18, 102, 58,  209, 82,
-                                12, 62, 89, 110, 182, 9,   44, 20,  254, 22};
-
-        PrivateKey sk = AugSchemeMPL().KeyGen(seed);
-        G1Element pk = sk.GetG1Element();
-
-        vector<uint8_t> message = {1, 2, 3, 4, 5};  // Message is passed in as a byte vector
-        G2Element signature = AugSchemeMPL().Sign(sk, message);
-
-        vector<uint8_t> skBytes = sk.Serialize();
-        vector<uint8_t> pkBytes = pk.Serialize();
-        vector<uint8_t> signatureBytes = signature.Serialize();
-
-        cout << Util::HexStr(skBytes) << endl;    // 32 bytes
-        cout << Util::HexStr(pkBytes) << endl;    // 48 bytes
-        cout << Util::HexStr(signatureBytes) << endl;  // 96 bytes
-
-        // Takes array of 32 bytes
-        PrivateKey skc = PrivateKey::FromByteVector(skBytes);
-
-        // Takes array of 48 bytes
-        pk = G1Element::FromByteVector(pkBytes);
-
-        // Takes array of 96 bytes
-        signature = G2Element::FromByteVector(signatureBytes);
-
-        REQUIRE(AugSchemeMPL().Verify(pk, message, signature));
-
-        // Generate some more private keys
-        seed[0] = 1;
-        PrivateKey sk1 = AugSchemeMPL().KeyGen(seed);
-        seed[0] = 2;
-        PrivateKey sk2 = AugSchemeMPL().KeyGen(seed);
-        vector<uint8_t> message2 = {1, 2, 3, 4, 5, 6, 7};
-
-        // Generate first sig
-        G1Element pk1 = sk1.GetG1Element();
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, message);
-
-        // Generate second sig
-        G1Element pk2 = sk2.GetG1Element();
-        G2Element sig2 = AugSchemeMPL().Sign(sk2, message2);
-
-        // Signatures can be noninteractively combined by anyone
-        G2Element aggSig = AugSchemeMPL().Aggregate({sig1, sig2});
-
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2}, vector<vector<uint8_t>>{message, message2}, aggSig));
-
-        seed[0] = 3;
-        PrivateKey sk3 = AugSchemeMPL().KeyGen(seed);
-        G1Element pk3 = sk3.GetG1Element();
-        vector<uint8_t> message3 = {100, 2, 254, 88, 90, 45, 23};
-        G2Element sig3 = AugSchemeMPL().Sign(sk3, message3);
-
-
-        // Arbitrary trees of aggregates
-        G2Element aggSigFinal = AugSchemeMPL().Aggregate({aggSig, sig3});
-
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2, pk3}, vector<vector<uint8_t>>{message, message2, message3}, aggSigFinal));
-
-        // If the same message is signed, you can use Proof of Posession (PopScheme) for efficiency
-        // A proof of possession MUST be passed around with the PK to ensure security.
-
-        G2Element popSig1 = PopSchemeMPL().Sign(sk1, message);
-        G2Element popSig2 = PopSchemeMPL().Sign(sk2, message);
-        G2Element popSig3 = PopSchemeMPL().Sign(sk3, message);
-        G2Element pop1 = PopSchemeMPL().PopProve(sk1);
-        G2Element pop2 = PopSchemeMPL().PopProve(sk2);
-        G2Element pop3 = PopSchemeMPL().PopProve(sk3);
-
-        REQUIRE(PopSchemeMPL().PopVerify(pk1, pop1));
-        REQUIRE(PopSchemeMPL().PopVerify(pk2, pop2));
-        REQUIRE(PopSchemeMPL().PopVerify(pk3, pop3));
-        G2Element popSigAgg = PopSchemeMPL().Aggregate({popSig1, popSig2, popSig3});
-
-        REQUIRE(PopSchemeMPL().FastAggregateVerify({pk1, pk2, pk3}, message, popSigAgg));
-
-        // Aggregate public key, indistinguishable from a single public key
-        G1Element popAggPk = pk1 + pk2 + pk3;
-        REQUIRE(PopSchemeMPL().Verify(popAggPk, message, popSigAgg));
-
-        // Aggregate private keys
-        PrivateKey aggSk = PrivateKey::Aggregate({sk1, sk2, sk3});
-        REQUIRE(PopSchemeMPL().Sign(aggSk, message) == popSigAgg);
-
-
-        PrivateKey masterSk = AugSchemeMPL().KeyGen(seed);
-        PrivateKey child = AugSchemeMPL().DeriveChildSk(masterSk, 152);
-        PrivateKey grandchild = AugSchemeMPL().DeriveChildSk(child, 952);
-
-        G1Element masterPk = masterSk.GetG1Element();
-        PrivateKey childU = AugSchemeMPL().DeriveChildSkUnhardened(masterSk, 22);
-        PrivateKey grandchildU = AugSchemeMPL().DeriveChildSkUnhardened(childU, 0);
-
-        G1Element childUPk = AugSchemeMPL().DeriveChildPkUnhardened(masterPk, 22);
-        G1Element grandchildUPk = AugSchemeMPL().DeriveChildPkUnhardened(childUPk, 0);
-
-        REQUIRE(grandchildUPk == grandchildU.GetG1Element());
-    }
-
-    SECTION("Bytes overloads")
-    {
-        std::vector<uint8_t> vecHash = getRandomSeed();
-        PrivateKey pk1 = BasicSchemeMPL().KeyGen(Bytes(getRandomSeed()));
-        PrivateKey pk2 = AugSchemeMPL().KeyGen(Bytes(getRandomSeed()));
-        PrivateKey pk3 = PopSchemeMPL().KeyGen(Bytes(getRandomSeed()));
-
-        std::vector<uint8_t> vecG1Element = pk1.GetG1Element().Serialize();
-        G1Element g1Vector = G1Element::FromByteVector(vecG1Element);
-        G1Element g1Bytes = G1Element::FromBytes(Bytes(vecG1Element));
-        REQUIRE(g1Vector == g1Bytes);
-
-        std::vector<uint8_t> vecG2Element = pk1.GetG2Element().Serialize();
-        G2Element g2Vector = G2Element::FromByteVector(vecG2Element);
-        G2Element g2Bytes = G2Element::FromBytes(Bytes(vecG2Element));
-        REQUIRE(g2Vector == g2Bytes);
-
-        G1Element g1MessageVector = G1Element::FromMessage(vecHash, vecHash.data(), vecHash.size());
-        G1Element g1MessageBytes = G1Element::FromMessage(Bytes(vecHash), vecHash.data(), vecHash.size());
-        REQUIRE(g1MessageVector == g1MessageBytes);
-
-        G2Element g2MessageVector = G2Element::FromMessage(vecHash, vecHash.data(), vecHash.size());
-        G2Element g2MessageBytes = G2Element::FromMessage(Bytes(vecHash), vecHash.data(), vecHash.size());
-        REQUIRE(g2MessageVector == g2MessageBytes);
-
-        G1Element g1_1 = pk1.GetG1Element();
-        G1Element g1_2 = pk2.GetG1Element();
-        G1Element g1_3 = pk3.GetG1Element();
-
-        G2Element g2BasicSignVector1 = BasicSchemeMPL().Sign(pk1, vecHash);
-        G2Element g2BasicSignBytes1 = BasicSchemeMPL().Sign(pk1, Bytes(vecHash));
-        REQUIRE(g2BasicSignVector1 == g2BasicSignBytes1);
-        G2Element g2BasicSign2 = BasicSchemeMPL().Sign(pk2, Bytes(vecHash));
-        G2Element g2BasicSign3 = BasicSchemeMPL().Sign(pk3, Bytes(vecG2Element));
-        REQUIRE(g2BasicSignVector1 != g2BasicSign2);
-
-        REQUIRE(BasicSchemeMPL().Verify(Bytes(g1_1.Serialize()), Bytes(vecHash), Bytes(g2BasicSignVector1.Serialize())));
-        REQUIRE(BasicSchemeMPL().Verify(g1_1, Bytes(vecHash), g2BasicSignVector1));
-
-        vector<vector<uint8_t>> vecG1Vector = {g1_1.Serialize(), g1_3.Serialize()};
-        vector<vector<uint8_t>> vecG2Vector = {g2BasicSignVector1.Serialize(), g2BasicSign3.Serialize()};
-        vector<vector<uint8_t>> vecHashes = {vecHash, vecG2Element};
-
-        auto aggVector = BasicSchemeMPL().Aggregate(vecG2Vector);
-        auto aggBytes = BasicSchemeMPL().Aggregate(vector<Bytes>{vecG2Vector.begin(), vecG2Vector.end()});
-        REQUIRE(aggVector == aggBytes);
-
-        REQUIRE(BasicSchemeMPL().AggregateVerify(vector<Bytes>{vecG1Vector.begin(), vecG1Vector.end()},
-                                                 vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 Bytes(aggVector)));
-        REQUIRE(BasicSchemeMPL().AggregateVerify({g1_1, g1_3},
-                                                 vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 G2Element::FromBytes(aggVector)));
-
-        G2Element g2AugSignVector1 = AugSchemeMPL().Sign(pk1, vecHash);
-        G2Element g2AugSignBytes1 = AugSchemeMPL().Sign(pk1, Bytes(vecHash));
-        G2Element g2AugSign2 = AugSchemeMPL().Sign(pk2, vecG2Element);
-        REQUIRE(g2AugSignVector1 == g2AugSignBytes1);
-        REQUIRE(g2AugSignVector1 != g2AugSign2);
-
-        REQUIRE(AugSchemeMPL().Verify(Bytes(g1_1.Serialize()), Bytes(vecHash), Bytes(g2AugSignVector1.Serialize())));
-        REQUIRE(AugSchemeMPL().Verify(g1_1, Bytes(vecHash), g2AugSignVector1));
-
-        vector<vector<uint8_t>> vecG1AugVector = {g1_1.Serialize(), g1_2.Serialize()};
-        vector<vector<uint8_t>> vecG2AugVector = {g2AugSignVector1.Serialize(), g2AugSign2.Serialize()};
-
-        auto aggAugVector = AugSchemeMPL().Aggregate(vecG2AugVector);
-        auto aggAugBytes = AugSchemeMPL().Aggregate(vector<Bytes>{vecG2AugVector.begin(), vecG2AugVector.end()});
-        REQUIRE(aggAugVector == aggAugBytes);
-
-        REQUIRE(AugSchemeMPL().AggregateVerify(vector<Bytes>{vecG1AugVector.begin(), vecG1AugVector.end()},
-                                                 vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 Bytes(aggAugVector)));
-        REQUIRE(AugSchemeMPL().AggregateVerify({g1_1, g1_2},
-                                                 vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 G2Element::FromBytes(aggAugVector)));
-
-        G2Element proof = PopSchemeMPL().PopProve(pk1);
-        REQUIRE(PopSchemeMPL().PopVerify(g1_1, proof));
-        REQUIRE(PopSchemeMPL().PopVerify(Bytes(g1_1.Serialize()), Bytes(proof.Serialize())));
-
-        G2Element g2Pop1 = PopSchemeMPL().Sign(pk1, vecHash);
-        G2Element g2Pop2 = PopSchemeMPL().Sign(pk2, vecHash);
-        G2Element g2PopAgg = PopSchemeMPL().Aggregate({g2Pop1, g2Pop2});
-        vecG1Vector = {g1_1.Serialize(), g1_2.Serialize()};
-        REQUIRE(PopSchemeMPL().FastAggregateVerify({g1_1, g1_2}, Bytes(vecHash), g2PopAgg));
-        REQUIRE(PopSchemeMPL().FastAggregateVerify(vector<Bytes>{vecG1Vector.begin(), vecG1Vector.end()},
-                                                   Bytes(vecHash), Bytes(g2PopAgg.Serialize())));
-    }
-}
-
-
-TEST_CASE("Schemes") {
-    SECTION("Basic Scheme") {
-        vector<uint8_t> seed1(32, 0x04);
-        vector<uint8_t> seed2(32, 0x05);
-        std::array<uint8_t, 3> msg1 = {7, 8, 9};
-        std::array<uint8_t, 3> msg2 = {10, 11, 12};
-        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed1);
-        G1Element pk1 = BasicSchemeMPL().SkToG1(sk1);
-        vector<uint8_t> pk1v = BasicSchemeMPL().SkToPk(sk1);
-        G2Element sig1 = BasicSchemeMPL().Sign(sk1, msg1);
-        vector<uint8_t> sig1v = BasicSchemeMPL().Sign(sk1, msg1).Serialize();
-
-
-        REQUIRE(BasicSchemeMPL().Verify(pk1v, msg1, sig1v));
-
-        PrivateKey sk2 = BasicSchemeMPL().KeyGen(seed2);
-        G1Element pk2 = BasicSchemeMPL().SkToG1(sk2);
-        vector<uint8_t> pk2v = BasicSchemeMPL().SkToPk(sk2);
-        G2Element sig2 = BasicSchemeMPL().Sign(sk2, msg2);
-        vector<uint8_t> sig2v = BasicSchemeMPL().Sign(sk2, msg2).Serialize();
-
-        // Wrong G2Element
-        REQUIRE(BasicSchemeMPL().Verify(pk1, msg1, sig2) == false);
-        REQUIRE(BasicSchemeMPL().Verify(pk1v, msg1, sig2v) == false);
-        // Wrong msg
-        REQUIRE(BasicSchemeMPL().Verify(pk1, msg2, sig1) == false);
-        REQUIRE(BasicSchemeMPL().Verify(pk1v, msg2, sig1v) == false);
-        // Wrong pk
-        REQUIRE(BasicSchemeMPL().Verify(pk2, msg1, sig1) == false);
-        REQUIRE(BasicSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
-
-        G2Element aggsig = BasicSchemeMPL().Aggregate({sig1, sig2});
-        auto aggsigv = BasicSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
-        REQUIRE(BasicSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, aggsigv));
-    }
-
-    SECTION("Aug Scheme")
-    {
-        vector<uint8_t> seed1(32, 0x04);
-        vector<uint8_t> seed2(32, 0x05);
-        std::array<uint8_t, 3> msg1 = {7, 8, 9};
-        std::array<uint8_t, 3> msg2 = {10, 11, 12};
-        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
-
-        PrivateKey sk1 = AugSchemeMPL().KeyGen(seed1);
-        G1Element pk1 = AugSchemeMPL().SkToG1(sk1);
-        vector<uint8_t> pk1v = AugSchemeMPL().SkToPk(sk1);
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, msg1);
-        vector<uint8_t> sig1v = AugSchemeMPL().Sign(sk1, msg1).Serialize();
-
-        REQUIRE(AugSchemeMPL().Verify(pk1, msg1, sig1));
-        REQUIRE(AugSchemeMPL().Verify(pk1v, msg1, sig1v));
-
-        PrivateKey sk2 = AugSchemeMPL().KeyGen(seed2);
-        G1Element pk2 = AugSchemeMPL().SkToG1(sk2);
-        vector<uint8_t> pk2v = AugSchemeMPL().SkToPk(sk2);
-        G2Element sig2 = AugSchemeMPL().Sign(sk2, msg2);
-        vector<uint8_t> sig2v = AugSchemeMPL().Sign(sk2, msg2).Serialize();
-
-        // Wrong G2Element
-        REQUIRE(AugSchemeMPL().Verify(pk1, msg1, sig2) == false);
-        REQUIRE(AugSchemeMPL().Verify(pk1v, msg1, sig2v) == false);
-        // Wrong msg
-        REQUIRE(AugSchemeMPL().Verify(pk1, msg2, sig1) == false);
-        REQUIRE(AugSchemeMPL().Verify(pk1v, msg2, sig1v) == false);
-        // Wrong pk
-        REQUIRE(AugSchemeMPL().Verify(pk2, msg1, sig1) == false);
-        REQUIRE(AugSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
-
-        G2Element aggsig = AugSchemeMPL().Aggregate({sig1, sig2});
-        auto aggsigv = AugSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, Bytes(aggsigv.data(), aggsigv.size())));
-    }
-
-    SECTION("Pop Scheme")
-    {
-        vector<uint8_t> seed1(32, 0x06);
-        vector<uint8_t> seed2(32, 0x07);
-        std::array<uint8_t, 3> msg1 = {7, 8, 9};
-        std::array<uint8_t, 3> msg2 = {10, 11, 12};
-        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
-
-        PrivateKey sk1 = PopSchemeMPL().KeyGen(seed1);
-        G1Element pk1 = PopSchemeMPL().SkToG1(sk1);
-        vector<uint8_t> pk1v = PopSchemeMPL().SkToPk(sk1);
-        G2Element sig1 = PopSchemeMPL().Sign(sk1, msg1);
-        vector<uint8_t> sig1v = PopSchemeMPL().Sign(sk1, msg1).Serialize();
-
-        REQUIRE(PopSchemeMPL().Verify(pk1, msg1, sig1));
-        REQUIRE(PopSchemeMPL().Verify(pk1v, msg1, sig1v));
-
-        PrivateKey sk2 = PopSchemeMPL().KeyGen(seed2);
-        G1Element pk2 = PopSchemeMPL().SkToG1(sk2);
-        vector<uint8_t> pk2v = PopSchemeMPL().SkToPk(sk2);
-        G2Element sig2 = PopSchemeMPL().Sign(sk2, msg2);
-        vector<uint8_t> sig2v = PopSchemeMPL().Sign(sk2, msg2).Serialize();
-
-        // Wrong G2Element
-        REQUIRE(PopSchemeMPL().Verify(pk1, msg1, sig2) == false);
-        REQUIRE(PopSchemeMPL().Verify(pk1v, msg1, sig2v) == false);
-        // Wrong msg
-        REQUIRE(PopSchemeMPL().Verify(pk1, msg2, sig1) == false);
-        REQUIRE(PopSchemeMPL().Verify(pk1v, msg2, sig1v) == false);
-        // Wrong pk
-        REQUIRE(PopSchemeMPL().Verify(pk2, msg1, sig1) == false);
-        REQUIRE(PopSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
-
-        G2Element aggsig = PopSchemeMPL().Aggregate({sig1, sig2});
-        auto aggsigv = PopSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
-        REQUIRE(PopSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
-        REQUIRE(PopSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, Bytes(aggsigv.data(), aggsigv.size())));
-
-        // PopVerify
-        G2Element proof1 = PopSchemeMPL().PopProve(sk1);
-        vector<uint8_t> proof1v = PopSchemeMPL().PopProve(sk1).Serialize();
-        REQUIRE(PopSchemeMPL().PopVerify(pk1, proof1));
-        REQUIRE(PopSchemeMPL().PopVerify(pk1v, proof1v));
-
-        // FastAggregateVerify
-        // We want sk2 to sign the same message
-        G2Element sig2_same = PopSchemeMPL().Sign(sk2, msg1);
-        vector<uint8_t> sig2v_same = PopSchemeMPL().Sign(sk2, msg1).Serialize();
-        G2Element aggsig_same = PopSchemeMPL().Aggregate({sig1, sig2_same});
-        auto aggsigv_same =
-            PopSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v_same});
-        REQUIRE(
-            PopSchemeMPL().FastAggregateVerify({pk1, pk2}, msg1, aggsig_same));
-        REQUIRE(PopSchemeMPL().FastAggregateVerify(
-            {pk1v, pk2v}, msg1, aggsigv_same));
-    }
-
-    SECTION("Legacy scheme") {
-        // Test legacy example data defined in https://gist.github.com/xdustinface/318c2c08c36ab12a2b1963caf1f7815c
-        std::string strSignHash{"b6d8ee31bbd375dfd55d5fb4b02cfccc68709e64f4c5ffcd3895ceb46540311d"};
-        std::string strThresholdPublicKey{"97a12b918eac73718d55b7fca60435ec0b442d7e24b45cbd80f5cf2ea2e14c4164333fffdb00d27e309abbafacaa9c34"};
-        std::string strThresholdSignature{"031c536960c9c44efefa4a3334d2d1b808f46abe121cd14a1d0b6ee6b6dca85fd3087d86fe5b1327e6792be53f4ed4df19c3af3aac79c0bb9dc36fc2a30ba566de6a82cd3e4af2d6654cbe02bb52769a06c1644a4c63b3c3a6fd16e5e68e5c0b"};
-        std::vector<std::string> vecSecretKeySharesHex{
-            "43dd263542a8d10bc9f843b46f15c86cd87e00c8f45fe5339b30c08e3233d8e3",
-            "5e7247ef1a0e671b8349e7be3f50ec88f1eafde90345f34520010e4aa9f18731",
-            "34bcc40dea17bb03ec085ac46a0ea9614b3ffc4bae8b0b292f3d7c54662b00a6",
-            "139f967b6f4af5dfe2bebf8085b6332efe31c2dc348d02e6b4745a0e7e56a469",
-            "08442e959054d87b5de3553ef8cfd9da923241664c35c6548b5e3271a86b4a18",
-            "2698613947a156639b423ad1a9fbe45863d58540d8ebd08612504bf9cf4743ea",
-            "1871c9270c8344028946eee64e79d09e4915dd3b717ffc1c9aa86faff88c0475",
-            "68409938427df3567e8948c1fff8610b5cf94872eb959c90a714b7ff0f339e88",
-            "70d3e3ad7d22bd30e4e2ca108a3fa47f4873bda28f3b000a218339b09db6f58a",
-            "39ea630e894b71d9f28fefb551611824f16d4b16d29fdea8bb3dbd857a6bc317",
-        };
-        std::vector<std::string> vecSigSharesHex{
-                "0888879c99852460912fd28c7a9138926c1e87fd6609fd2d3d307764e49feb85702fd8f9b3b836bc11f7ce151b769dc70b760879d26f8c33a29e24f69297f45ef028f0794e63ddb0610db7de1a608b6d6a2129ada62b845004a408f651fd44a5",
-                "16efc39fa5aa979245a82334856a97ebf3027bc6be7d35df117267a3c9b1618e32477fe1b8f4a23bdba346bf2b2b35ad0b395227de76827fd32eb9952e0d97b7dba275040101131a7fc38ea381a3099c2b3205177866ee4ab3119593bb58d092",
-                "8407afd2776ab9d3f9293f1519ace1a9ce8aaf07d0a6a9785ec7ae4ae47e42102c09cfb3c8655dba014d53933af6a0b41244df006575e85e333271c90fcad80410cab4962bf4bba1570770775b1282f142b526d521a38fbc14336f22dc44a683",
-                "027061a8c2d631e40882ce6919d3e5f45c4c74ac32a3bce94e5661d06cdecf2d492dfab99e9a9dd8a29a90fe8f816be30178bf9277a3751882e49bb9f08437f5f2cd9dbc12c2fdcccaf7578838e87273fd2ba87f20cf00ca5fec56822f845769",
-                "178ece91967145b1dfc02de703dbd8049b05d626f18a71303ea0c23ee3b60a52bd61cc30fea3e4a562b20c20e0439a2f108b4e6b8a646f647afb64e3b355eba382380ef2c634f3a56de066b7a764249aba1c42c49d76d65e094e890cbbf005a3",
-                "193da45d31d728acc92165173253fd8689301b448c81039350ae6916a72f157b00da469a7ab6d2b5db2dac216f47073d089afdcdffce25b6aac991f4745c803f164d7426b8da7d19bf699f5e5489f715ac32e539db90610d7df47121556c1a20",
-                "938ce6cc265fa15fe67314ac4773f18ff0b49c01eac626814abc2f836814068aeba8582d619a3e0c08dc4bafecda84a818b6a7abd350637e72a47356e5919e3a72be66316417c598338e4ab85f8d25535bd6c4a5fb16767ac470902e0cf19df0",
-                "985039d55a92f6fb3b324b0b9f1c7ddcd5f443d6d1ce72549f043b967ded7d56dc4320dc8569a1c41c6cfb4c150d8c61095d3b325e3308a321ceb43369fe56807fba67b6b313f072ab2cdbaa872b52a9a2e75bf396f1b2007152067f756946b7",
-                "922717d8c170862662d08a4c29943cc26bb05daff0f07b0b7c352651ec64ee5a1d032bad24dfb42243e9afe044ed25680694b183b657948a91533e9a73b6bf359ff907d5088503137edc8e271ac3d2003a4daf8d36f3f847cc87afc6f9007c72",
-                "02bc8e3ea8409418949fb4106e00893b49983495035b47026a1747eb6f89b05d4c1b8e357e89ddfa7c9f8145b78e0c480177842f20b98b1f7ca2ed26cfb9895380e4d86aeb60c2326bc43753a0633167a7c4ae7a526ce927ade1388a6cdc11d1",
-        };
-        std::vector<std::string> vecIdsHex{
-                "4393e2a243c3db776dcdbe2535493440d29cb65006a1e6f0f8d3f1e1488cbf1a",
-                "8b2d776ac75cfca1559b5616ade4eb376a6478556135276e4b3210fe170b9f59",
-                "f2015bdbc0daa70c41a25d2450b96f433ac7d568126505e9997794bb357cf3af",
-                "5818a68f2f34e5ff7d1d43beca5ff103739dd918efda4bac7fd4ede6c53dc6af",
-                "965437bdf51278f716078477a2eae595a9d2b0aa3fe69a387b30936c13c7d68e",
-                "fd14695a48a35fe6a1f9894accfa83349508e350b3f743d494074fe204b17166",
-                "7e3c28e59ff54bf097b2f3ada4a30f5613227951116675127fc97c98405f2067",
-                "5e427dba092e3d81d057c0277a9a465e036c8336c59a18f27d7c21bc51910904",
-                "90976dbe492de3eda7623c7ad6523ed9f63f83c3200c383fccd9f22408e18e1b",
-                "cd474447afd5df18a0c10c9e2d5216eace9c624119974280236a043cb4b7f8ae",
-        };
-        size_t nSize = 10;
-        REQUIRE(vecSecretKeySharesHex.size() == nSize);
-        REQUIRE(vecSigSharesHex.size() == nSize);
-        REQUIRE(vecIdsHex.size() == nSize);
-
-        std::vector<uint8_t> vecSignHash = Util::HexToBytes(strSignHash);
-        std::reverse(vecSignHash.begin(), vecSignHash.end());
-        G1Element thresholdPublicKey = G1Element::FromByteVector(Util::HexToBytes(strThresholdPublicKey), true);
-        G2Element thresholdSignatureExpected = G2Element::FromByteVector(Util::HexToBytes(strThresholdSignature), true);
-
-        std::vector<G2Element> vecSignatureShares;
-        std::vector<std::vector<uint8_t>> vecIds;
-
-        for (size_t i = 0; i < nSize; ++i) {
-            vecIds.push_back(Util::HexToBytes(vecIdsHex[i]));
-            std::reverse(vecIds.back().begin(), vecIds.back().end());
-
-            PrivateKey skShare = PrivateKey::FromByteVector(Util::HexToBytes(vecSecretKeySharesHex[i]));
-            std::vector<uint8_t> vecSigShareBytes = Util::HexToBytes(vecSigSharesHex[i]);
-            vecSignatureShares.push_back(G2Element::FromByteVector(vecSigShareBytes, true));
-            G2Element sigShare = LegacySchemeMPL().Sign(skShare, Bytes(vecSignHash));
-            REQUIRE(sigShare == vecSignatureShares.back());
-            REQUIRE(sigShare.Serialize(true) == vecSigShareBytes);
-        }
-
-        G2Element thresholdSignature = Threshold::SignatureRecover(vecSignatureShares, {vecIds.begin(), vecIds.end()});
-        REQUIRE(thresholdSignature == thresholdSignatureExpected);
-        REQUIRE(LegacySchemeMPL().Verify(thresholdPublicKey, Bytes{vecSignHash}, thresholdSignature));
-    }
-}
-
-TEST_CASE("Legacy HD keys") {
-    SECTION("Should create an extended private key from seed") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 24, 199, 1, 25};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-
-        ExtendedPrivateKey esk77 = esk.PrivateChild(77 + (1 << 31));
-        ExtendedPrivateKey esk77copy = esk.PrivateChild(77 + (1 << 31));
-
-        REQUIRE(esk77 == esk77copy);
-
-        ExtendedPrivateKey esk77nh = esk.PrivateChild(77);
-
-        auto eskLong = esk.PrivateChild((1 << 31) + 5)
-                .PrivateChild(0)
-                .PrivateChild(0)
-                .PrivateChild((1 << 31) + 56)
-                .PrivateChild(70)
-                .PrivateChild(4);
-        uint8_t chainCode[32];
-        eskLong.GetChainCode().Serialize(chainCode);
-    }
-
-
-    SECTION("Should match derivation through private and public keys") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 24, 199, 1, 25};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-        ExtendedPublicKey epk = esk.GetExtendedPublicKey();
-
-        G1Element pk1 = esk.PrivateChild(238757).GetPublicKey();
-        G1Element pk2 = epk.PublicChild(238757).GetPublicKey();
-
-        REQUIRE(pk1 == pk2);
-
-        PrivateKey sk3 = esk.PrivateChild(0)
-                .PrivateChild(3)
-                .PrivateChild(8)
-                .PrivateChild(1)
-                .GetPrivateKey();
-
-        G1Element pk4 = epk.PublicChild(0)
-                .PublicChild(3)
-                .PublicChild(8)
-                .PublicChild(1)
-                .GetPublicKey();
-        REQUIRE(sk3.GetG1Element() == pk4);
-
-        G2Element sig = LegacySchemeMPL().Sign(sk3, Bytes(seed));
-
-        REQUIRE(LegacySchemeMPL().Verify(sk3.GetG1Element(), Bytes(seed), sig));
-    }
-
-    SECTION("Should prevent hardened pk derivation") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 24, 199, 1, 25};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-        ExtendedPublicKey epk = esk.GetExtendedPublicKey();
-
-        ExtendedPrivateKey sk = esk.PrivateChild((1 << 31) + 3);
-        REQUIRE_THROWS(epk.PublicChild((1 << 31) + 3));
-    }
-
-    SECTION("Should derive public child from parent") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 24, 199, 1, 0, 0, 0};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-        ExtendedPublicKey epk = esk.GetExtendedPublicKey();
-
-        ExtendedPublicKey pk1 = esk.PublicChild(13);
-        ExtendedPublicKey pk2 = epk.PublicChild(13);
-
-        REQUIRE(pk1 == pk2);
-    }
-
-    SECTION("Should cout structures") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 24, 199, 1, 0, 0, 0};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-        ExtendedPublicKey epk = esk.GetExtendedPublicKey();
-
-        cout << epk << endl;
-        cout << epk.GetPublicKey() << endl;
-        cout << epk.GetChainCode() << endl;
-
-        G2Element sig1 = LegacySchemeMPL().Sign(esk.GetPrivateKey(), Bytes(seed));
-        cout << sig1 << endl;
-    }
-
-    SECTION("Should serialize extended keys") {
-        std::vector<uint8_t> seed{1, 50, 6, 244, 25, 199, 1, 25};
-        ExtendedPrivateKey esk = ExtendedPrivateKey::FromSeed(Bytes(seed));
-        ExtendedPublicKey epk = esk.GetExtendedPublicKey();
-
-        G1Element pk1 = esk.PrivateChild(238757).GetPublicKey();
-        G1Element pk2 = epk.PublicChild(238757).GetPublicKey();
-
-        REQUIRE(pk1 == pk2);
-
-        ExtendedPrivateKey sk3 = esk.PrivateChild(0)
-                .PrivateChild(3)
-                .PrivateChild(8)
-                .PrivateChild(1);
-
-        ExtendedPublicKey pk4 = epk.PublicChild(0)
-                .PublicChild(3)
-                .PublicChild(8)
-                .PublicChild(1);
-        uint8_t buffer1[ExtendedPrivateKey::SIZE];
-        uint8_t buffer2[ExtendedPublicKey::SIZE];
-        uint8_t buffer3[ExtendedPublicKey::SIZE];
-
-        sk3.Serialize(buffer1);
-        sk3.GetExtendedPublicKey().Serialize(buffer2);
-        pk4.Serialize(buffer3);
-        REQUIRE(std::memcmp(buffer2, buffer3, ExtendedPublicKey::SIZE) == 0);
-    }
-}
-
-TEST_CASE("Threshold Signatures") {
-    SECTION("Secret Key Shares") {
-        size_t m = 3;
-        size_t n = 5;
-
-        std::vector<PrivateKey> sks;
-        std::vector<G1Element> pks;
-        std::vector<G2Element> sigs;
-        std::vector<std::vector<uint8_t>> idHashes(n);
-        std::vector<Bytes> ids;
-        std::vector<PrivateKey> skShares;
-        std::vector<G1Element> pkShares;
-        std::vector<G2Element> sigShares;
-
-        std::vector<uint8_t> vecHash = getRandomSeed();
-
-        for (size_t i = 0; i < n; i++) {
-            idHashes[i] = getRandomSeed();
-        }
-        ids = std::vector<Bytes>(idHashes.begin(), idHashes.end());
-
-        for (size_t i = 0; i < m; i++) {
-            std::vector<uint8_t> buf = getRandomSeed();
-
-            PrivateKey sk = PrivateKey::FromByteVector(buf, true);
-            sks.push_back(sk);
-            pks.push_back(sk.GetG1Element());
-            sigs.push_back(bls::Threshold::Sign(sk, Bytes(vecHash)));
-            ASSERT(bls::Threshold::Verify(sk.GetG1Element(), Bytes(vecHash), sigs.back()));
-        }
-
-        G2Element sig = bls::Threshold::Sign(sks[0], Bytes(vecHash));
-
-        REQUIRE(bls::Threshold::Verify({pks[0]}, Bytes{vecHash}, {sig}));
-
-        for (size_t i = 0; i < n; i++) {
-            PrivateKey skShare = bls::Threshold::PrivateKeyShare(sks, ids[i]);
-            G1Element pkShare = bls::Threshold::PublicKeyShare(pks, ids[i]);
-            G2Element sigShare1 = bls::Threshold::SignatureShare(sigs, ids[i]);
-            REQUIRE(skShare.GetG1Element() == pkShare);
-
-            G2Element sigShare2 = bls::Threshold::Sign(skShare, Bytes(vecHash));
-            REQUIRE(sigShare1 == sigShare2);
-            REQUIRE(bls::Threshold::Verify({pkShare}, Bytes(vecHash), {sigShare1}));
-
-            skShares.push_back(skShare);
-            pkShares.push_back(pkShare);
-            sigShares.push_back(sigShare1);
-        }
-
-        std::vector<PrivateKey> rsks;
-        std::vector<G1Element> rpks;
-        std::vector<G2Element> rsigs;
-        std::vector<Bytes> rids;
-        for (size_t i = 0; i < 2; i++) {
-            rsks.push_back(skShares[i]);
-            rpks.push_back(pkShares[i]);
-            rsigs.push_back(sigShares[i]);
-            rids.push_back(ids[i]);
-        }
-        PrivateKey recSk = bls::Threshold::PrivateKeyRecover(rsks, rids);
-        G1Element recPk = bls::Threshold::PublicKeyRecover(rpks, rids);
-        G2Element recSig = bls::Threshold::SignatureRecover(rsigs, rids);
-        REQUIRE(recSk != sks[0]);
-        REQUIRE(recPk != pks[0]);
-        REQUIRE(recSig != sig);
-
-        rsks.push_back(skShares[2]);
-        rpks.push_back(pkShares[2]);
-        rsigs.push_back(sigShares[2]);
-        rids.push_back(ids[2]);
-        recSk = bls::Threshold::PrivateKeyRecover(rsks, rids);
-        recPk = bls::Threshold::PublicKeyRecover(rpks, rids);
-        recSig = bls::Threshold::SignatureRecover(rsigs, rids);
-        REQUIRE(recSk == sks[0]);
-        REQUIRE(recPk == pks[0]);
-        REQUIRE(recSig == sig);
-    }
-}
-
-TEST_CASE("CheckValid")
-{
-    SECTION("Valid points should succeed") {
-        vector<uint8_t> seed(32, 0x05);
-        vector<uint8_t> msg1 = {10, 11, 12};
-
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk1 = BasicSchemeMPL().SkToG1(sk1);
-        pk1.CheckValid();
-
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, msg1);
-        sig1.CheckValid();
-    }
-
-    SECTION("Invalid G1 points should not succeed")
-    {
-        string badPointHex =
-            "8d5d0fb73b9c92df4eab4216e48c3e358578b4cc30f82c268bd6fef3bd34b558628daf1afef798d4c3b0fcd8b28c8973";
-
-        // FromBytes throws
-        REQUIRE_THROWS(
-            G1Element::FromBytes(Bytes(Util::HexToBytes(badPointHex))));
-
-        // FromBytesUnchecked does not throw
-        G1Element pk =
-            G1Element::FromBytesUnchecked(Bytes(Util::HexToBytes(badPointHex)));
-        REQUIRE(pk.IsValid() == false);
-        REQUIRE_THROWS(pk.CheckValid());
-
-        vector<uint8_t> seed(32, 0x05);
-        vector<uint8_t> msg1 = {10, 11, 12};
-        PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed);
-        G1Element pk1 = BasicSchemeMPL().SkToG1(sk1);
-        G2Element sig1 = AugSchemeMPL().Sign(sk1, msg1);
-        REQUIRE(AugSchemeMPL().Verify(pk, msg1, sig1) == false);
-    }
-
-    SECTION("Invalid G2 points should not succeed") {
-        g2_t point_native;
-        g2_set_infty(point_native);
-        fp2_rand(point_native->x);
-        fp2_rand(point_native->y);
-        fp2_rand(point_native->z);
-
-        G2Element point = G2Element::FromNative(point_native);
-        REQUIRE(point.IsValid() == false);
-        REQUIRE_THROWS(point.CheckValid());
-
-        auto badSer = point.Serialize();
-        std::cout <<Util::HexStr(badSer) << std::endl;
-
-        REQUIRE_THROWS(G2Element::FromByteVector(badSer));
-    }
-}
-
-TEST_CASE("CheckValid for Legacy")
-{
-    SECTION("Invalid G1 points should throw in CheckValid but not in FromBytes")
-    {
-        std::map<std::string, bool> vecPointsHex{
-            {"11df3a748b713460f9b21083315c0dca1742b7962ca98685be4094d302e84b0884a04c1a55beb0ed921dae1dd66c0111", true},
-            {"11df3a748b713460f9b21083315c0dca1742b7962ca98685be4094d302e84b0884a04c1a55beb0ed921dae1dd66c0a11", false},
-        };
-
-        for (const auto& pair : vecPointsHex) {
-            const auto& strPointHex = pair.first;
-            const auto& valid = pair.second;
-
-            // FromBytes does not throw
-            G1Element::FromBytes(Bytes(Util::HexToBytes(strPointHex)), true);
-            // FromBytesUnchecked does not throw
-            G1Element pk = G1Element::FromBytesUnchecked(Bytes(Util::HexToBytes(strPointHex)), true);
-
-            REQUIRE(pk.IsValid() == valid);
-            if (!valid) {
-                REQUIRE_THROWS(pk.CheckValid());
-            }
-        }
-    }
-
-    SECTION("Invalid G2 points should throw in CheckValid but not in FromBytes")
-    {
-        std::map<std::string, bool> vecPointsHex{
-            {"0888879c99852460912fd28c7a9138926c1e87fd6609fd2d3d307764e49feb85702fd8f9b3b836bc11f7ce151b769dc70b760879d26f8c33a29e24f69297f45ef028f0794e63ddb0610db7de1a608b6d6a2129ada62b845004a408f651fd44a5", true},
-            {"0888879c99852460912fd28c7a9138926c1e87fd6609fd2d3d307764e49feb85702fd8f9b3b836bc11f7ce151b769dc70b760879d26f8c33a29e24f69297f45ef028f0794e63ddb0610db7de1a608b6d6a2129ada62b845004a408f651fd44a6", false},
-        };
-
-        for (const auto& pair : vecPointsHex) {
-            const auto& strPointHex = pair.first;
-            const auto& valid = pair.second;
-
-            // FromBytes does not throw
-            G2Element::FromBytes(Bytes(Util::HexToBytes(strPointHex)), true);
-            // FromBytesUnchecked does not throw
-            G2Element sig = G2Element::FromBytesUnchecked(Bytes(Util::HexToBytes(strPointHex)), true);
-
-            REQUIRE(sig.IsValid() == valid);
-            if (!valid) {
-                REQUIRE_THROWS(sig.CheckValid());
-            }
-        }
-    }
-}
-
-int main(int argc, char* argv[])
-{
-    int result = Catch::Session().run(argc, argv);
-    return result;
-}
diff --git a/src/dashbls/src/threshold.cpp b/src/dashbls/src/threshold.cpp
deleted file mode 100644
index 73a3023b28da..000000000000
--- a/src/dashbls/src/threshold.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) 2021 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <memory>
-
-#include "threshold.hpp"
-
-#include "schemes.hpp"
-
-#include <memory>
-
-static std::unique_ptr<bls::CoreMPL> pThresholdScheme(new bls::LegacySchemeMPL);
-
-/**
- * Inverts a prime field element using the Euclidean Extended Algorithm,
- * using bns and a custom prime modulus.
- *
- * @param[out] c			- the result.
- * @param[in] a				- the prime field element to invert.
- * @param[in] p				- the custom prime modulus.
- */
-static void fp_inv_exgcd_bn(bn_t c, const bn_t u_in, const bn_t p) {
-    bn_t u, v, g1, g2, q, r;
-
-    bn_null(u);
-    bn_null(v);
-    bn_null(g1);
-    bn_null(g2);
-    bn_null(q);
-    bn_null(r);
-
-    RLC_TRY {
-        bn_new(u);
-        bn_new(v);
-        bn_new(g1);
-        bn_new(g2);
-        bn_new(q);
-        bn_new(r);
-
-        /* u = a, v = p, g1 = 1, g2 = 0. */
-        bn_copy(u, u_in);
-        bn_copy(v, p);
-        bn_set_dig(g1, 1);
-        bn_zero(g2);
-
-        /* While (u != 1. */
-        while (bn_cmp_dig(u, 1) != RLC_EQ) {
-            /* q = [v/u], r = v mod u. */
-            bn_div_rem(q, r, v, u);
-            /* v = u, u = r. */
-            bn_copy(v, u);
-            bn_copy(u, r);
-            /* r = g2 - q * g1. */
-            bn_mul(r, q, g1);
-            bn_sub(r, g2, r);
-            /* g2 = g1, g1 = r. */
-            bn_copy(g2, g1);
-            bn_copy(g1, r);
-        }
-
-        if (bn_sign(g1) == RLC_NEG) {
-            bn_add(g1, g1, p);
-        }
-        bn_copy(c, g1);
-    }
-    RLC_CATCH_ANY {
-        RLC_THROW(ERR_CAUGHT);
-    }
-    RLC_FINALLY {
-        bn_free(u);
-        bn_free(v);
-        bn_free(g1);
-        bn_free(g2);
-        bn_free(q);
-        bn_free(r);
-    };
-}
-
-namespace bls {
-
-    namespace Poly {
-
-        static const int nIdSize{32};
-
-        template <typename BLSType>
-        BLSType Evaluate(const std::vector<BLSType>& vecIn, const Bytes& id);
-
-        template <typename BLSType>
-        BLSType LagrangeInterpolate(const std::vector<BLSType>& vec, const std::vector<Bytes>& ids);
-    } // end namespace Poly
-
-    struct PolyOpsBase {
-        bn_t order;
-        bn_t iv;
-
-        PolyOpsBase() {
-            bn_new(order);
-            gt_get_ord(order);
-            bn_new(iv);
-        }
-
-        ~PolyOpsBase() {
-            bn_free(iv);
-            bn_free(order);
-        }
-
-        void MulFP(bn_t& r, const bn_t& a, const bn_t& b) {
-            bn_mul(r, a, b);
-            ModOrder(r);
-        }
-
-        void AddFP(bn_t& r, const bn_t& a, const bn_t& b) {
-            bn_add(r, a, b);
-            ModOrder(r);
-        }
-
-        void SubFP(bn_t& r, const bn_t& a, const bn_t& b) {
-            bn_sub(r, a, b);
-            ModOrder(r);
-        }
-
-        void DivFP(bn_t& r, const bn_t& a, const bn_t& b) {
-            fp_inv_exgcd_bn(iv, b, order);
-            bn_mul(r, a, iv);
-            ModOrder(r);
-        }
-
-        void ModOrder(bn_t& r) {
-            bn_mod(r, r, order);
-        }
-    };
-
-    template<typename G>
-    struct PolyOps;
-
-    template<>
-    struct PolyOps<PrivateKey> : PolyOpsBase {
-        PrivateKey Add(const PrivateKey& a, const PrivateKey& b) {
-            return PrivateKey::Aggregate({a, b});
-        }
-
-        PrivateKey Mul(const PrivateKey& a, const bn_t& b) {
-            return a * b;
-        }
-    };
-
-    template<>
-    struct PolyOps<G1Element> : PolyOpsBase {
-        G1Element Add(const G1Element& a, const G1Element& b) {
-            return a + b;
-        }
-
-        G1Element Mul(const G1Element& a, const bn_t& b) {
-            return a * b;
-        }
-    };
-
-    template<>
-    struct PolyOps<G2Element> : PolyOpsBase {
-        G2Element Add(const G2Element& a, const G2Element& b) {
-            return a + b;
-        }
-
-        G2Element Mul(const G2Element& a, bn_t& b) {
-            return a * b;
-        }
-    };
-
-    template<typename BLSType>
-    BLSType Poly::Evaluate(const std::vector<BLSType>& vecIn, const Bytes& id) {
-        typedef PolyOps<BLSType> Ops;
-        Ops ops;
-        if (vecIn.size() < 2) {
-            throw std::length_error("At least 2 coefficients required");
-        }
-
-        bn_t x;
-        bn_new(x);
-        bn_read_bin(x, id.begin(), Poly::nIdSize);
-        ops.ModOrder(x);
-
-        BLSType y = vecIn.back();
-        for (int i = (int) vecIn.size() - 2; i >= 0; i--) {
-            y = ops.Mul(y, x);
-            y = ops.Add(y, vecIn[i]);
-        }
-
-        bn_free(x);
-
-        return y;
-    }
-
-    template<typename BLSType>
-    BLSType Poly::LagrangeInterpolate(const std::vector<BLSType>& vec, const std::vector<Bytes>& ids) {
-        typedef PolyOps<BLSType> Ops;
-        Ops ops;
-
-        if (vec.size() < 2) {
-            throw std::length_error("At least 2 shares required");
-        }
-        if (vec.size() != ids.size()) {
-            throw std::length_error("Numbers of shares and ids must be equal");
-        }
-
-        /*
-            delta_{i,S}(0) = prod_{j != i} S[j] / (S[j] - S[i]) = a / b
-            where a = prod S[j], b = S[i] * prod_{j != i} (S[j] - S[i])
-        */
-        const size_t k = vec.size();
-
-        bn_t *delta = new bn_t[k];
-        bn_t *ids2 = new bn_t[k];
-
-        for (size_t i = 0; i < k; i++) {
-            bn_new(delta[i]);
-            bn_new(ids2[i]);
-            bn_read_bin(ids2[i], ids[i].begin(), Poly::nIdSize);
-            ops.ModOrder(ids2[i]);
-        }
-
-        bn_t a, b, v;
-        bn_new(a);
-        bn_new(b);
-        bn_new(v);
-
-        auto cleanup = [&](){
-            bn_free(a);
-            bn_free(b);
-            bn_free(v);
-            for (size_t i = 0; i < k; i++) {
-                bn_free(delta[i]);
-                bn_free(ids2[i]);
-            }
-            delete[] delta;
-            delete[] ids2;
-        };
-
-        bn_copy(a, ids2[0]);
-        for (size_t i = 1; i < k; i++) {
-            ops.MulFP(a, a, ids2[i]);
-        }
-        if (bn_is_zero(a)) {
-            cleanup();
-            throw std::invalid_argument("Zero id");
-        }
-        for (size_t i = 0; i < k; i++) {
-            bn_copy(b, ids2[i]);
-            for (size_t j = 0; j < k; j++) {
-                if (j != i) {
-                    ops.SubFP(v, ids2[j], ids2[i]);
-                    if (bn_is_zero(v)) {
-                        cleanup();
-                        throw std::invalid_argument("Duplicate id");
-                    }
-                    ops.MulFP(b, b, v);
-                }
-            }
-            ops.DivFP(delta[i], a, b);
-        }
-
-        /*
-            f(0) = sum_i f(S[i]) delta_{i,S}(0)
-        */
-        BLSType r;
-        for (size_t i = 0; i < k; i++) {
-            r = ops.Add(r, ops.Mul(vec[i], delta[i]));
-        }
-
-        cleanup();
-
-        return r;
-    }
-
-    PrivateKey Threshold::PrivateKeyShare(const std::vector<PrivateKey>& sks, const Bytes& id) {
-        return Poly::Evaluate(sks, id);
-    }
-
-    PrivateKey Threshold::PrivateKeyRecover(const std::vector<PrivateKey>& sks, const std::vector<Bytes>& ids) {
-        return Poly::LagrangeInterpolate(sks, ids);
-    }
-
-    G1Element Threshold::PublicKeyShare(const std::vector<G1Element>& pks, const Bytes& id) {
-        return Poly::Evaluate(pks, id);
-    }
-
-    G1Element Threshold::PublicKeyRecover(const std::vector<G1Element>& sks, const std::vector<Bytes>& ids) {
-        return Poly::LagrangeInterpolate(sks, ids);
-    }
-
-    G2Element Threshold::SignatureShare(const std::vector<G2Element>& sigs, const Bytes& id) {
-        return Poly::Evaluate(sigs, id);
-    }
-
-    G2Element Threshold::SignatureRecover(const std::vector<G2Element>& sigs, const std::vector<Bytes>& ids) {
-        return Poly::LagrangeInterpolate(sigs, ids);
-    }
-    
-    G2Element Threshold::Sign(const PrivateKey& privateKey, const Bytes& vecMessage) {
-        return pThresholdScheme->Sign(privateKey, vecMessage);
-    }
-
-    bool Threshold::Verify(const G1Element& pubKey, const Bytes& vecMessage, const G2Element& signature) {
-        return pThresholdScheme->Verify(pubKey, vecMessage, signature);
-    }
-}
diff --git a/src/dashbls/depends/mimalloc/.gitattributes b/src/mimalloc/.gitattributes
similarity index 100%
rename from src/dashbls/depends/mimalloc/.gitattributes
rename to src/mimalloc/.gitattributes
diff --git a/src/dashbls/depends/mimalloc/.gitignore b/src/mimalloc/.gitignore
similarity index 100%
rename from src/dashbls/depends/mimalloc/.gitignore
rename to src/mimalloc/.gitignore
diff --git a/src/dashbls/depends/mimalloc/CMakeLists.txt b/src/mimalloc/CMakeLists.txt
similarity index 100%
rename from src/dashbls/depends/mimalloc/CMakeLists.txt
rename to src/mimalloc/CMakeLists.txt
diff --git a/src/dashbls/depends/mimalloc/LICENSE b/src/mimalloc/LICENSE
similarity index 100%
rename from src/dashbls/depends/mimalloc/LICENSE
rename to src/mimalloc/LICENSE
diff --git a/src/dashbls/depends/mimalloc/SECURITY.md b/src/mimalloc/SECURITY.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/SECURITY.md
rename to src/mimalloc/SECURITY.md
diff --git a/src/dashbls/depends/mimalloc/azure-pipelines.yml b/src/mimalloc/azure-pipelines.yml
similarity index 100%
rename from src/dashbls/depends/mimalloc/azure-pipelines.yml
rename to src/mimalloc/azure-pipelines.yml
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64.dll b/src/mimalloc/bin/mimalloc-redirect-arm64.dll
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64.dll
rename to src/mimalloc/bin/mimalloc-redirect-arm64.dll
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64.lib b/src/mimalloc/bin/mimalloc-redirect-arm64.lib
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64.lib
rename to src/mimalloc/bin/mimalloc-redirect-arm64.lib
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64ec.dll b/src/mimalloc/bin/mimalloc-redirect-arm64ec.dll
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64ec.dll
rename to src/mimalloc/bin/mimalloc-redirect-arm64ec.dll
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64ec.lib b/src/mimalloc/bin/mimalloc-redirect-arm64ec.lib
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect-arm64ec.lib
rename to src/mimalloc/bin/mimalloc-redirect-arm64ec.lib
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect.dll b/src/mimalloc/bin/mimalloc-redirect.dll
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect.dll
rename to src/mimalloc/bin/mimalloc-redirect.dll
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect.lib b/src/mimalloc/bin/mimalloc-redirect.lib
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect.lib
rename to src/mimalloc/bin/mimalloc-redirect.lib
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect32.dll b/src/mimalloc/bin/mimalloc-redirect32.dll
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect32.dll
rename to src/mimalloc/bin/mimalloc-redirect32.dll
diff --git a/src/dashbls/depends/mimalloc/bin/mimalloc-redirect32.lib b/src/mimalloc/bin/mimalloc-redirect32.lib
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/mimalloc-redirect32.lib
rename to src/mimalloc/bin/mimalloc-redirect32.lib
diff --git a/src/dashbls/depends/mimalloc/bin/minject-arm64.exe b/src/mimalloc/bin/minject-arm64.exe
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/minject-arm64.exe
rename to src/mimalloc/bin/minject-arm64.exe
diff --git a/src/dashbls/depends/mimalloc/bin/minject.exe b/src/mimalloc/bin/minject.exe
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/minject.exe
rename to src/mimalloc/bin/minject.exe
diff --git a/src/dashbls/depends/mimalloc/bin/minject32.exe b/src/mimalloc/bin/minject32.exe
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/minject32.exe
rename to src/mimalloc/bin/minject32.exe
diff --git a/src/dashbls/depends/mimalloc/bin/readme.md b/src/mimalloc/bin/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/bin/readme.md
rename to src/mimalloc/bin/readme.md
diff --git a/src/dashbls/depends/mimalloc/cmake/JoinPaths.cmake b/src/mimalloc/cmake/JoinPaths.cmake
similarity index 100%
rename from src/dashbls/depends/mimalloc/cmake/JoinPaths.cmake
rename to src/mimalloc/cmake/JoinPaths.cmake
diff --git a/src/dashbls/depends/mimalloc/cmake/mimalloc-config-version.cmake b/src/mimalloc/cmake/mimalloc-config-version.cmake
similarity index 100%
rename from src/dashbls/depends/mimalloc/cmake/mimalloc-config-version.cmake
rename to src/mimalloc/cmake/mimalloc-config-version.cmake
diff --git a/src/dashbls/depends/mimalloc/cmake/mimalloc-config.cmake b/src/mimalloc/cmake/mimalloc-config.cmake
similarity index 100%
rename from src/dashbls/depends/mimalloc/cmake/mimalloc-config.cmake
rename to src/mimalloc/cmake/mimalloc-config.cmake
diff --git a/src/dashbls/depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile b/src/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
rename to src/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
diff --git a/src/dashbls/depends/mimalloc/contrib/docker/alpine-x86/Dockerfile b/src/mimalloc/contrib/docker/alpine-x86/Dockerfile
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/docker/alpine-x86/Dockerfile
rename to src/mimalloc/contrib/docker/alpine-x86/Dockerfile
diff --git a/src/dashbls/depends/mimalloc/contrib/docker/alpine/Dockerfile b/src/mimalloc/contrib/docker/alpine/Dockerfile
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/docker/alpine/Dockerfile
rename to src/mimalloc/contrib/docker/alpine/Dockerfile
diff --git a/src/dashbls/depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile b/src/mimalloc/contrib/docker/manylinux-x64/Dockerfile
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile
rename to src/mimalloc/contrib/docker/manylinux-x64/Dockerfile
diff --git a/src/dashbls/depends/mimalloc/contrib/docker/readme.md b/src/mimalloc/contrib/docker/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/docker/readme.md
rename to src/mimalloc/contrib/docker/readme.md
diff --git a/src/dashbls/depends/mimalloc/contrib/vcpkg/portfile.cmake b/src/mimalloc/contrib/vcpkg/portfile.cmake
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/vcpkg/portfile.cmake
rename to src/mimalloc/contrib/vcpkg/portfile.cmake
diff --git a/src/dashbls/depends/mimalloc/contrib/vcpkg/readme.md b/src/mimalloc/contrib/vcpkg/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/vcpkg/readme.md
rename to src/mimalloc/contrib/vcpkg/readme.md
diff --git a/src/dashbls/depends/mimalloc/contrib/vcpkg/usage b/src/mimalloc/contrib/vcpkg/usage
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/vcpkg/usage
rename to src/mimalloc/contrib/vcpkg/usage
diff --git a/src/dashbls/depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake b/src/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
rename to src/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
diff --git a/src/dashbls/depends/mimalloc/contrib/vcpkg/vcpkg.json b/src/mimalloc/contrib/vcpkg/vcpkg.json
similarity index 100%
rename from src/dashbls/depends/mimalloc/contrib/vcpkg/vcpkg.json
rename to src/mimalloc/contrib/vcpkg/vcpkg.json
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-a.svg b/src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-a.svg
rename to src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-b.svg b/src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-b.svg
rename to src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-a.svg b/src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-a.svg
rename to src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-b.svg b/src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-b.svg
rename to src/mimalloc/doc/bench-2020/bench-c5-18xlarge-2020-01-20-rss-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-1.svg b/src/mimalloc/doc/bench-2020/bench-r5a-1.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-1.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-1.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-a.svg b/src/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-a.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-b.svg b/src/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-b.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-12xlarge-2020-01-16-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-2.svg b/src/mimalloc/doc/bench-2020/bench-r5a-2.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-2.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-2.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-rss-1.svg b/src/mimalloc/doc/bench-2020/bench-r5a-rss-1.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-rss-1.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-rss-1.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-rss-2.svg b/src/mimalloc/doc/bench-2020/bench-r5a-rss-2.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-r5a-rss-2.svg
rename to src/mimalloc/doc/bench-2020/bench-r5a-rss-2.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-spec-rss.svg b/src/mimalloc/doc/bench-2020/bench-spec-rss.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-spec-rss.svg
rename to src/mimalloc/doc/bench-2020/bench-spec-rss.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-spec.svg b/src/mimalloc/doc/bench-2020/bench-spec.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-spec.svg
rename to src/mimalloc/doc/bench-2020/bench-spec.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-1.svg b/src/mimalloc/doc/bench-2020/bench-z4-1.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-1.svg
rename to src/mimalloc/doc/bench-2020/bench-z4-1.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-2.svg b/src/mimalloc/doc/bench-2020/bench-z4-2.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-2.svg
rename to src/mimalloc/doc/bench-2020/bench-z4-2.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-rss-1.svg b/src/mimalloc/doc/bench-2020/bench-z4-rss-1.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-rss-1.svg
rename to src/mimalloc/doc/bench-2020/bench-z4-rss-1.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-rss-2.svg b/src/mimalloc/doc/bench-2020/bench-z4-rss-2.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2020/bench-z4-rss-2.svg
rename to src/mimalloc/doc/bench-2020/bench-z4-rss-2.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-a.svg b/src/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-a.svg
rename to src/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-b.svg b/src/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-b.svg
rename to src/mimalloc/doc/bench-2021/bench-amd5950x-2021-01-30-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-a.svg b/src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-a.svg
rename to src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-b.svg b/src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-b.svg
rename to src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-a.svg b/src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-a.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-a.svg
rename to src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-a.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-b.svg b/src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-b.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-b.svg
rename to src/mimalloc/doc/bench-2021/bench-c5-18xlarge-2021-01-30-rss-b.svg
diff --git a/src/dashbls/depends/mimalloc/doc/bench-2021/bench-macmini-2021-01-30.svg b/src/mimalloc/doc/bench-2021/bench-macmini-2021-01-30.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/bench-2021/bench-macmini-2021-01-30.svg
rename to src/mimalloc/doc/bench-2021/bench-macmini-2021-01-30.svg
diff --git a/src/dashbls/depends/mimalloc/doc/doxyfile b/src/mimalloc/doc/doxyfile
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/doxyfile
rename to src/mimalloc/doc/doxyfile
diff --git a/src/dashbls/depends/mimalloc/doc/ds-logo.jpg b/src/mimalloc/doc/ds-logo.jpg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/ds-logo.jpg
rename to src/mimalloc/doc/ds-logo.jpg
diff --git a/src/dashbls/depends/mimalloc/doc/ds-logo.png b/src/mimalloc/doc/ds-logo.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/ds-logo.png
rename to src/mimalloc/doc/ds-logo.png
diff --git a/src/dashbls/depends/mimalloc/doc/mimalloc-doc.h b/src/mimalloc/doc/mimalloc-doc.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/mimalloc-doc.h
rename to src/mimalloc/doc/mimalloc-doc.h
diff --git a/src/dashbls/depends/mimalloc/doc/mimalloc-doxygen.css b/src/mimalloc/doc/mimalloc-doxygen.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/mimalloc-doxygen.css
rename to src/mimalloc/doc/mimalloc-doxygen.css
diff --git a/src/dashbls/depends/mimalloc/doc/mimalloc-logo-100.png b/src/mimalloc/doc/mimalloc-logo-100.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/mimalloc-logo-100.png
rename to src/mimalloc/doc/mimalloc-logo-100.png
diff --git a/src/dashbls/depends/mimalloc/doc/mimalloc-logo.png b/src/mimalloc/doc/mimalloc-logo.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/mimalloc-logo.png
rename to src/mimalloc/doc/mimalloc-logo.png
diff --git a/src/dashbls/depends/mimalloc/doc/mimalloc-logo.svg b/src/mimalloc/doc/mimalloc-logo.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/mimalloc-logo.svg
rename to src/mimalloc/doc/mimalloc-logo.svg
diff --git a/src/dashbls/depends/mimalloc/doc/spades-logo.png b/src/mimalloc/doc/spades-logo.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/spades-logo.png
rename to src/mimalloc/doc/spades-logo.png
diff --git a/src/dashbls/depends/mimalloc/doc/unreal-logo.svg b/src/mimalloc/doc/unreal-logo.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/doc/unreal-logo.svg
rename to src/mimalloc/doc/unreal-logo.svg
diff --git a/src/dashbls/depends/mimalloc/docs/annotated.html b/src/mimalloc/docs/annotated.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/annotated.html
rename to src/mimalloc/docs/annotated.html
diff --git a/src/dashbls/depends/mimalloc/docs/annotated_dup.js b/src/mimalloc/docs/annotated_dup.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/annotated_dup.js
rename to src/mimalloc/docs/annotated_dup.js
diff --git a/src/dashbls/depends/mimalloc/docs/bc_s.png b/src/mimalloc/docs/bc_s.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/bc_s.png
rename to src/mimalloc/docs/bc_s.png
diff --git a/src/dashbls/depends/mimalloc/docs/bdwn.png b/src/mimalloc/docs/bdwn.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/bdwn.png
rename to src/mimalloc/docs/bdwn.png
diff --git a/src/dashbls/depends/mimalloc/docs/bench.html b/src/mimalloc/docs/bench.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/bench.html
rename to src/mimalloc/docs/bench.html
diff --git a/src/dashbls/depends/mimalloc/docs/build.html b/src/mimalloc/docs/build.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/build.html
rename to src/mimalloc/docs/build.html
diff --git a/src/dashbls/depends/mimalloc/docs/classes.html b/src/mimalloc/docs/classes.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/classes.html
rename to src/mimalloc/docs/classes.html
diff --git a/src/dashbls/depends/mimalloc/docs/clipboard.js b/src/mimalloc/docs/clipboard.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/clipboard.js
rename to src/mimalloc/docs/clipboard.js
diff --git a/src/dashbls/depends/mimalloc/docs/closed.png b/src/mimalloc/docs/closed.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/closed.png
rename to src/mimalloc/docs/closed.png
diff --git a/src/dashbls/depends/mimalloc/docs/cookie.js b/src/mimalloc/docs/cookie.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/cookie.js
rename to src/mimalloc/docs/cookie.js
diff --git a/src/dashbls/depends/mimalloc/docs/doc.png b/src/mimalloc/docs/doc.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/doc.png
rename to src/mimalloc/docs/doc.png
diff --git a/src/dashbls/depends/mimalloc/docs/doxygen.css b/src/mimalloc/docs/doxygen.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/doxygen.css
rename to src/mimalloc/docs/doxygen.css
diff --git a/src/dashbls/depends/mimalloc/docs/doxygen.png b/src/mimalloc/docs/doxygen.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/doxygen.png
rename to src/mimalloc/docs/doxygen.png
diff --git a/src/dashbls/depends/mimalloc/docs/doxygen.svg b/src/mimalloc/docs/doxygen.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/doxygen.svg
rename to src/mimalloc/docs/doxygen.svg
diff --git a/src/dashbls/depends/mimalloc/docs/dynsections.js b/src/mimalloc/docs/dynsections.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/dynsections.js
rename to src/mimalloc/docs/dynsections.js
diff --git a/src/dashbls/depends/mimalloc/docs/environment.html b/src/mimalloc/docs/environment.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/environment.html
rename to src/mimalloc/docs/environment.html
diff --git a/src/dashbls/depends/mimalloc/docs/folderclosed.png b/src/mimalloc/docs/folderclosed.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/folderclosed.png
rename to src/mimalloc/docs/folderclosed.png
diff --git a/src/dashbls/depends/mimalloc/docs/folderopen.png b/src/mimalloc/docs/folderopen.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/folderopen.png
rename to src/mimalloc/docs/folderopen.png
diff --git a/src/dashbls/depends/mimalloc/docs/functions.html b/src/mimalloc/docs/functions.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/functions.html
rename to src/mimalloc/docs/functions.html
diff --git a/src/dashbls/depends/mimalloc/docs/functions_vars.html b/src/mimalloc/docs/functions_vars.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/functions_vars.html
rename to src/mimalloc/docs/functions_vars.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__aligned.html b/src/mimalloc/docs/group__aligned.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__aligned.html
rename to src/mimalloc/docs/group__aligned.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__aligned.js b/src/mimalloc/docs/group__aligned.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__aligned.js
rename to src/mimalloc/docs/group__aligned.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__analysis.html b/src/mimalloc/docs/group__analysis.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__analysis.html
rename to src/mimalloc/docs/group__analysis.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__analysis.js b/src/mimalloc/docs/group__analysis.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__analysis.js
rename to src/mimalloc/docs/group__analysis.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js b/src/mimalloc/docs/group__analysis_structmi__heap__area__t.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js
rename to src/mimalloc/docs/group__analysis_structmi__heap__area__t.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__cpp.html b/src/mimalloc/docs/group__cpp.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__cpp.html
rename to src/mimalloc/docs/group__cpp.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__cpp.js b/src/mimalloc/docs/group__cpp.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__cpp.js
rename to src/mimalloc/docs/group__cpp.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__extended.html b/src/mimalloc/docs/group__extended.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__extended.html
rename to src/mimalloc/docs/group__extended.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__extended.js b/src/mimalloc/docs/group__extended.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__extended.js
rename to src/mimalloc/docs/group__extended.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__heap.html b/src/mimalloc/docs/group__heap.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__heap.html
rename to src/mimalloc/docs/group__heap.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__heap.js b/src/mimalloc/docs/group__heap.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__heap.js
rename to src/mimalloc/docs/group__heap.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__malloc.html b/src/mimalloc/docs/group__malloc.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__malloc.html
rename to src/mimalloc/docs/group__malloc.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__malloc.js b/src/mimalloc/docs/group__malloc.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__malloc.js
rename to src/mimalloc/docs/group__malloc.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__options.html b/src/mimalloc/docs/group__options.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__options.html
rename to src/mimalloc/docs/group__options.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__options.js b/src/mimalloc/docs/group__options.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__options.js
rename to src/mimalloc/docs/group__options.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__posix.html b/src/mimalloc/docs/group__posix.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__posix.html
rename to src/mimalloc/docs/group__posix.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__posix.js b/src/mimalloc/docs/group__posix.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__posix.js
rename to src/mimalloc/docs/group__posix.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__typed.html b/src/mimalloc/docs/group__typed.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__typed.html
rename to src/mimalloc/docs/group__typed.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__typed.js b/src/mimalloc/docs/group__typed.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__typed.js
rename to src/mimalloc/docs/group__typed.js
diff --git a/src/dashbls/depends/mimalloc/docs/group__zeroinit.html b/src/mimalloc/docs/group__zeroinit.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__zeroinit.html
rename to src/mimalloc/docs/group__zeroinit.html
diff --git a/src/dashbls/depends/mimalloc/docs/group__zeroinit.js b/src/mimalloc/docs/group__zeroinit.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/group__zeroinit.js
rename to src/mimalloc/docs/group__zeroinit.js
diff --git a/src/dashbls/depends/mimalloc/docs/index.html b/src/mimalloc/docs/index.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/index.html
rename to src/mimalloc/docs/index.html
diff --git a/src/dashbls/depends/mimalloc/docs/jquery.js b/src/mimalloc/docs/jquery.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/jquery.js
rename to src/mimalloc/docs/jquery.js
diff --git a/src/dashbls/depends/mimalloc/docs/mimalloc-doc_8h_source.html b/src/mimalloc/docs/mimalloc-doc_8h_source.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/mimalloc-doc_8h_source.html
rename to src/mimalloc/docs/mimalloc-doc_8h_source.html
diff --git a/src/dashbls/depends/mimalloc/docs/mimalloc-doxygen.css b/src/mimalloc/docs/mimalloc-doxygen.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/mimalloc-doxygen.css
rename to src/mimalloc/docs/mimalloc-doxygen.css
diff --git a/src/dashbls/depends/mimalloc/docs/mimalloc-logo.svg b/src/mimalloc/docs/mimalloc-logo.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/mimalloc-logo.svg
rename to src/mimalloc/docs/mimalloc-logo.svg
diff --git a/src/dashbls/depends/mimalloc/docs/modules.html b/src/mimalloc/docs/modules.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/modules.html
rename to src/mimalloc/docs/modules.html
diff --git a/src/dashbls/depends/mimalloc/docs/modules.js b/src/mimalloc/docs/modules.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/modules.js
rename to src/mimalloc/docs/modules.js
diff --git a/src/dashbls/depends/mimalloc/docs/nav_f.png b/src/mimalloc/docs/nav_f.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/nav_f.png
rename to src/mimalloc/docs/nav_f.png
diff --git a/src/dashbls/depends/mimalloc/docs/nav_g.png b/src/mimalloc/docs/nav_g.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/nav_g.png
rename to src/mimalloc/docs/nav_g.png
diff --git a/src/dashbls/depends/mimalloc/docs/nav_h.png b/src/mimalloc/docs/nav_h.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/nav_h.png
rename to src/mimalloc/docs/nav_h.png
diff --git a/src/dashbls/depends/mimalloc/docs/navtree.css b/src/mimalloc/docs/navtree.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/navtree.css
rename to src/mimalloc/docs/navtree.css
diff --git a/src/dashbls/depends/mimalloc/docs/navtree.js b/src/mimalloc/docs/navtree.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/navtree.js
rename to src/mimalloc/docs/navtree.js
diff --git a/src/dashbls/depends/mimalloc/docs/navtreedata.js b/src/mimalloc/docs/navtreedata.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/navtreedata.js
rename to src/mimalloc/docs/navtreedata.js
diff --git a/src/dashbls/depends/mimalloc/docs/navtreeindex0.js b/src/mimalloc/docs/navtreeindex0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/navtreeindex0.js
rename to src/mimalloc/docs/navtreeindex0.js
diff --git a/src/dashbls/depends/mimalloc/docs/open.png b/src/mimalloc/docs/open.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/open.png
rename to src/mimalloc/docs/open.png
diff --git a/src/dashbls/depends/mimalloc/docs/overrides.html b/src/mimalloc/docs/overrides.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/overrides.html
rename to src/mimalloc/docs/overrides.html
diff --git a/src/dashbls/depends/mimalloc/docs/pages.html b/src/mimalloc/docs/pages.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/pages.html
rename to src/mimalloc/docs/pages.html
diff --git a/src/dashbls/depends/mimalloc/docs/resize.js b/src/mimalloc/docs/resize.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/resize.js
rename to src/mimalloc/docs/resize.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_0.html b/src/mimalloc/docs/search/all_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_0.html
rename to src/mimalloc/docs/search/all_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_0.js b/src/mimalloc/docs/search/all_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_0.js
rename to src/mimalloc/docs/search/all_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_1.html b/src/mimalloc/docs/search/all_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_1.html
rename to src/mimalloc/docs/search/all_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_1.js b/src/mimalloc/docs/search/all_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_1.js
rename to src/mimalloc/docs/search/all_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_10.js b/src/mimalloc/docs/search/all_10.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_10.js
rename to src/mimalloc/docs/search/all_10.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_2.html b/src/mimalloc/docs/search/all_2.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_2.html
rename to src/mimalloc/docs/search/all_2.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_2.js b/src/mimalloc/docs/search/all_2.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_2.js
rename to src/mimalloc/docs/search/all_2.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_3.html b/src/mimalloc/docs/search/all_3.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_3.html
rename to src/mimalloc/docs/search/all_3.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_3.js b/src/mimalloc/docs/search/all_3.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_3.js
rename to src/mimalloc/docs/search/all_3.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_4.html b/src/mimalloc/docs/search/all_4.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_4.html
rename to src/mimalloc/docs/search/all_4.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_4.js b/src/mimalloc/docs/search/all_4.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_4.js
rename to src/mimalloc/docs/search/all_4.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_5.html b/src/mimalloc/docs/search/all_5.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_5.html
rename to src/mimalloc/docs/search/all_5.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_5.js b/src/mimalloc/docs/search/all_5.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_5.js
rename to src/mimalloc/docs/search/all_5.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_6.html b/src/mimalloc/docs/search/all_6.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_6.html
rename to src/mimalloc/docs/search/all_6.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_6.js b/src/mimalloc/docs/search/all_6.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_6.js
rename to src/mimalloc/docs/search/all_6.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_7.html b/src/mimalloc/docs/search/all_7.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_7.html
rename to src/mimalloc/docs/search/all_7.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_7.js b/src/mimalloc/docs/search/all_7.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_7.js
rename to src/mimalloc/docs/search/all_7.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_8.html b/src/mimalloc/docs/search/all_8.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_8.html
rename to src/mimalloc/docs/search/all_8.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_8.js b/src/mimalloc/docs/search/all_8.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_8.js
rename to src/mimalloc/docs/search/all_8.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_9.html b/src/mimalloc/docs/search/all_9.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_9.html
rename to src/mimalloc/docs/search/all_9.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_9.js b/src/mimalloc/docs/search/all_9.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_9.js
rename to src/mimalloc/docs/search/all_9.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_a.html b/src/mimalloc/docs/search/all_a.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_a.html
rename to src/mimalloc/docs/search/all_a.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_a.js b/src/mimalloc/docs/search/all_a.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_a.js
rename to src/mimalloc/docs/search/all_a.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_b.html b/src/mimalloc/docs/search/all_b.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_b.html
rename to src/mimalloc/docs/search/all_b.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_b.js b/src/mimalloc/docs/search/all_b.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_b.js
rename to src/mimalloc/docs/search/all_b.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_c.html b/src/mimalloc/docs/search/all_c.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_c.html
rename to src/mimalloc/docs/search/all_c.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_c.js b/src/mimalloc/docs/search/all_c.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_c.js
rename to src/mimalloc/docs/search/all_c.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_d.html b/src/mimalloc/docs/search/all_d.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_d.html
rename to src/mimalloc/docs/search/all_d.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_d.js b/src/mimalloc/docs/search/all_d.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_d.js
rename to src/mimalloc/docs/search/all_d.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_e.js b/src/mimalloc/docs/search/all_e.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_e.js
rename to src/mimalloc/docs/search/all_e.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/all_f.js b/src/mimalloc/docs/search/all_f.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/all_f.js
rename to src/mimalloc/docs/search/all_f.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/classes_0.html b/src/mimalloc/docs/search/classes_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/classes_0.html
rename to src/mimalloc/docs/search/classes_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/classes_0.js b/src/mimalloc/docs/search/classes_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/classes_0.js
rename to src/mimalloc/docs/search/classes_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/close.png b/src/mimalloc/docs/search/close.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/close.png
rename to src/mimalloc/docs/search/close.png
diff --git a/src/dashbls/depends/mimalloc/docs/search/close.svg b/src/mimalloc/docs/search/close.svg
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/close.svg
rename to src/mimalloc/docs/search/close.svg
diff --git a/src/dashbls/depends/mimalloc/docs/search/enums_0.html b/src/mimalloc/docs/search/enums_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enums_0.html
rename to src/mimalloc/docs/search/enums_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/enums_0.js b/src/mimalloc/docs/search/enums_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enums_0.js
rename to src/mimalloc/docs/search/enums_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/enumvalues_0.html b/src/mimalloc/docs/search/enumvalues_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enumvalues_0.html
rename to src/mimalloc/docs/search/enumvalues_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/enumvalues_0.js b/src/mimalloc/docs/search/enumvalues_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enumvalues_0.js
rename to src/mimalloc/docs/search/enumvalues_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/enumvalues_1.html b/src/mimalloc/docs/search/enumvalues_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enumvalues_1.html
rename to src/mimalloc/docs/search/enumvalues_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/enumvalues_1.js b/src/mimalloc/docs/search/enumvalues_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/enumvalues_1.js
rename to src/mimalloc/docs/search/enumvalues_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/functions_0.html b/src/mimalloc/docs/search/functions_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/functions_0.html
rename to src/mimalloc/docs/search/functions_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/functions_0.js b/src/mimalloc/docs/search/functions_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/functions_0.js
rename to src/mimalloc/docs/search/functions_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/functions_1.html b/src/mimalloc/docs/search/functions_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/functions_1.html
rename to src/mimalloc/docs/search/functions_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/functions_1.js b/src/mimalloc/docs/search/functions_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/functions_1.js
rename to src/mimalloc/docs/search/functions_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_0.html b/src/mimalloc/docs/search/groups_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_0.html
rename to src/mimalloc/docs/search/groups_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_0.js b/src/mimalloc/docs/search/groups_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_0.js
rename to src/mimalloc/docs/search/groups_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_1.html b/src/mimalloc/docs/search/groups_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_1.html
rename to src/mimalloc/docs/search/groups_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_1.js b/src/mimalloc/docs/search/groups_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_1.js
rename to src/mimalloc/docs/search/groups_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_2.html b/src/mimalloc/docs/search/groups_2.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_2.html
rename to src/mimalloc/docs/search/groups_2.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_2.js b/src/mimalloc/docs/search/groups_2.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_2.js
rename to src/mimalloc/docs/search/groups_2.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_3.html b/src/mimalloc/docs/search/groups_3.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_3.html
rename to src/mimalloc/docs/search/groups_3.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_3.js b/src/mimalloc/docs/search/groups_3.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_3.js
rename to src/mimalloc/docs/search/groups_3.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_4.html b/src/mimalloc/docs/search/groups_4.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_4.html
rename to src/mimalloc/docs/search/groups_4.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_4.js b/src/mimalloc/docs/search/groups_4.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_4.js
rename to src/mimalloc/docs/search/groups_4.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_5.html b/src/mimalloc/docs/search/groups_5.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_5.html
rename to src/mimalloc/docs/search/groups_5.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_5.js b/src/mimalloc/docs/search/groups_5.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_5.js
rename to src/mimalloc/docs/search/groups_5.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_6.html b/src/mimalloc/docs/search/groups_6.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_6.html
rename to src/mimalloc/docs/search/groups_6.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_6.js b/src/mimalloc/docs/search/groups_6.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_6.js
rename to src/mimalloc/docs/search/groups_6.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_7.html b/src/mimalloc/docs/search/groups_7.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_7.html
rename to src/mimalloc/docs/search/groups_7.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_7.js b/src/mimalloc/docs/search/groups_7.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_7.js
rename to src/mimalloc/docs/search/groups_7.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_8.html b/src/mimalloc/docs/search/groups_8.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_8.html
rename to src/mimalloc/docs/search/groups_8.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_8.js b/src/mimalloc/docs/search/groups_8.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_8.js
rename to src/mimalloc/docs/search/groups_8.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_9.js b/src/mimalloc/docs/search/groups_9.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_9.js
rename to src/mimalloc/docs/search/groups_9.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_a.js b/src/mimalloc/docs/search/groups_a.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_a.js
rename to src/mimalloc/docs/search/groups_a.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_b.js b/src/mimalloc/docs/search/groups_b.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_b.js
rename to src/mimalloc/docs/search/groups_b.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_c.js b/src/mimalloc/docs/search/groups_c.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_c.js
rename to src/mimalloc/docs/search/groups_c.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/groups_d.js b/src/mimalloc/docs/search/groups_d.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/groups_d.js
rename to src/mimalloc/docs/search/groups_d.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/mag_sel.png b/src/mimalloc/docs/search/mag_sel.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/mag_sel.png
rename to src/mimalloc/docs/search/mag_sel.png
diff --git a/src/dashbls/depends/mimalloc/docs/search/nomatches.html b/src/mimalloc/docs/search/nomatches.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/nomatches.html
rename to src/mimalloc/docs/search/nomatches.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_0.html b/src/mimalloc/docs/search/pages_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_0.html
rename to src/mimalloc/docs/search/pages_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_0.js b/src/mimalloc/docs/search/pages_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_0.js
rename to src/mimalloc/docs/search/pages_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_1.html b/src/mimalloc/docs/search/pages_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_1.html
rename to src/mimalloc/docs/search/pages_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_1.js b/src/mimalloc/docs/search/pages_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_1.js
rename to src/mimalloc/docs/search/pages_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_2.html b/src/mimalloc/docs/search/pages_2.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_2.html
rename to src/mimalloc/docs/search/pages_2.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_2.js b/src/mimalloc/docs/search/pages_2.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_2.js
rename to src/mimalloc/docs/search/pages_2.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_3.html b/src/mimalloc/docs/search/pages_3.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_3.html
rename to src/mimalloc/docs/search/pages_3.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_3.js b/src/mimalloc/docs/search/pages_3.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_3.js
rename to src/mimalloc/docs/search/pages_3.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_4.html b/src/mimalloc/docs/search/pages_4.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_4.html
rename to src/mimalloc/docs/search/pages_4.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_4.js b/src/mimalloc/docs/search/pages_4.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_4.js
rename to src/mimalloc/docs/search/pages_4.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_5.js b/src/mimalloc/docs/search/pages_5.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_5.js
rename to src/mimalloc/docs/search/pages_5.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_6.js b/src/mimalloc/docs/search/pages_6.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_6.js
rename to src/mimalloc/docs/search/pages_6.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/pages_7.js b/src/mimalloc/docs/search/pages_7.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/pages_7.js
rename to src/mimalloc/docs/search/pages_7.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/search.css b/src/mimalloc/docs/search/search.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/search.css
rename to src/mimalloc/docs/search/search.css
diff --git a/src/dashbls/depends/mimalloc/docs/search/search.js b/src/mimalloc/docs/search/search.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/search.js
rename to src/mimalloc/docs/search/search.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/search_l.png b/src/mimalloc/docs/search/search_l.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/search_l.png
rename to src/mimalloc/docs/search/search_l.png
diff --git a/src/dashbls/depends/mimalloc/docs/search/search_m.png b/src/mimalloc/docs/search/search_m.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/search_m.png
rename to src/mimalloc/docs/search/search_m.png
diff --git a/src/dashbls/depends/mimalloc/docs/search/search_r.png b/src/mimalloc/docs/search/search_r.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/search_r.png
rename to src/mimalloc/docs/search/search_r.png
diff --git a/src/dashbls/depends/mimalloc/docs/search/searchdata.js b/src/mimalloc/docs/search/searchdata.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/searchdata.js
rename to src/mimalloc/docs/search/searchdata.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_0.html b/src/mimalloc/docs/search/typedefs_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_0.html
rename to src/mimalloc/docs/search/typedefs_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_0.js b/src/mimalloc/docs/search/typedefs_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_0.js
rename to src/mimalloc/docs/search/typedefs_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_1.html b/src/mimalloc/docs/search/typedefs_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_1.html
rename to src/mimalloc/docs/search/typedefs_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_1.js b/src/mimalloc/docs/search/typedefs_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_1.js
rename to src/mimalloc/docs/search/typedefs_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_2.html b/src/mimalloc/docs/search/typedefs_2.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_2.html
rename to src/mimalloc/docs/search/typedefs_2.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/typedefs_2.js b/src/mimalloc/docs/search/typedefs_2.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/typedefs_2.js
rename to src/mimalloc/docs/search/typedefs_2.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_0.html b/src/mimalloc/docs/search/variables_0.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_0.html
rename to src/mimalloc/docs/search/variables_0.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_0.js b/src/mimalloc/docs/search/variables_0.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_0.js
rename to src/mimalloc/docs/search/variables_0.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_1.html b/src/mimalloc/docs/search/variables_1.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_1.html
rename to src/mimalloc/docs/search/variables_1.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_1.js b/src/mimalloc/docs/search/variables_1.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_1.js
rename to src/mimalloc/docs/search/variables_1.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_2.html b/src/mimalloc/docs/search/variables_2.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_2.html
rename to src/mimalloc/docs/search/variables_2.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_2.js b/src/mimalloc/docs/search/variables_2.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_2.js
rename to src/mimalloc/docs/search/variables_2.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_3.html b/src/mimalloc/docs/search/variables_3.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_3.html
rename to src/mimalloc/docs/search/variables_3.html
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_3.js b/src/mimalloc/docs/search/variables_3.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_3.js
rename to src/mimalloc/docs/search/variables_3.js
diff --git a/src/dashbls/depends/mimalloc/docs/search/variables_4.js b/src/mimalloc/docs/search/variables_4.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/search/variables_4.js
rename to src/mimalloc/docs/search/variables_4.js
diff --git a/src/dashbls/depends/mimalloc/docs/splitbar.png b/src/mimalloc/docs/splitbar.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/splitbar.png
rename to src/mimalloc/docs/splitbar.png
diff --git a/src/dashbls/depends/mimalloc/docs/sync_off.png b/src/mimalloc/docs/sync_off.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/sync_off.png
rename to src/mimalloc/docs/sync_off.png
diff --git a/src/dashbls/depends/mimalloc/docs/sync_on.png b/src/mimalloc/docs/sync_on.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/sync_on.png
rename to src/mimalloc/docs/sync_on.png
diff --git a/src/dashbls/depends/mimalloc/docs/tab_a.png b/src/mimalloc/docs/tab_a.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/tab_a.png
rename to src/mimalloc/docs/tab_a.png
diff --git a/src/dashbls/depends/mimalloc/docs/tab_b.png b/src/mimalloc/docs/tab_b.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/tab_b.png
rename to src/mimalloc/docs/tab_b.png
diff --git a/src/dashbls/depends/mimalloc/docs/tab_h.png b/src/mimalloc/docs/tab_h.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/tab_h.png
rename to src/mimalloc/docs/tab_h.png
diff --git a/src/dashbls/depends/mimalloc/docs/tab_s.png b/src/mimalloc/docs/tab_s.png
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/tab_s.png
rename to src/mimalloc/docs/tab_s.png
diff --git a/src/dashbls/depends/mimalloc/docs/tabs.css b/src/mimalloc/docs/tabs.css
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/tabs.css
rename to src/mimalloc/docs/tabs.css
diff --git a/src/dashbls/depends/mimalloc/docs/topics.js b/src/mimalloc/docs/topics.js
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/topics.js
rename to src/mimalloc/docs/topics.js
diff --git a/src/dashbls/depends/mimalloc/docs/using.html b/src/mimalloc/docs/using.html
similarity index 100%
rename from src/dashbls/depends/mimalloc/docs/using.html
rename to src/mimalloc/docs/using.html
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters b/src/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
rename to src/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters b/src/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
rename to src/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj b/src/mimalloc/ide/vs2022/mimalloc-test.vcxproj
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj
rename to src/mimalloc/ide/vs2022/mimalloc-test.vcxproj
diff --git a/src/dashbls/depends/mimalloc/ide/vs2022/mimalloc.sln b/src/mimalloc/ide/vs2022/mimalloc.sln
similarity index 100%
rename from src/dashbls/depends/mimalloc/ide/vs2022/mimalloc.sln
rename to src/mimalloc/ide/vs2022/mimalloc.sln
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc-new-delete.h b/src/mimalloc/include/mimalloc-new-delete.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc-new-delete.h
rename to src/mimalloc/include/mimalloc-new-delete.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc-override.h b/src/mimalloc/include/mimalloc-override.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc-override.h
rename to src/mimalloc/include/mimalloc-override.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc-stats.h b/src/mimalloc/include/mimalloc-stats.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc-stats.h
rename to src/mimalloc/include/mimalloc-stats.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc.h b/src/mimalloc/include/mimalloc.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc.h
rename to src/mimalloc/include/mimalloc.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/atomic.h b/src/mimalloc/include/mimalloc/atomic.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/atomic.h
rename to src/mimalloc/include/mimalloc/atomic.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/bits.h b/src/mimalloc/include/mimalloc/bits.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/bits.h
rename to src/mimalloc/include/mimalloc/bits.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/internal.h b/src/mimalloc/include/mimalloc/internal.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/internal.h
rename to src/mimalloc/include/mimalloc/internal.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/prim.h b/src/mimalloc/include/mimalloc/prim.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/prim.h
rename to src/mimalloc/include/mimalloc/prim.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/track.h b/src/mimalloc/include/mimalloc/track.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/track.h
rename to src/mimalloc/include/mimalloc/track.h
diff --git a/src/dashbls/depends/mimalloc/include/mimalloc/types.h b/src/mimalloc/include/mimalloc/types.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/include/mimalloc/types.h
rename to src/mimalloc/include/mimalloc/types.h
diff --git a/src/dashbls/depends/mimalloc/mimalloc.pc.in b/src/mimalloc/mimalloc.pc.in
similarity index 100%
rename from src/dashbls/depends/mimalloc/mimalloc.pc.in
rename to src/mimalloc/mimalloc.pc.in
diff --git a/src/dashbls/depends/mimalloc/readme.md b/src/mimalloc/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/readme.md
rename to src/mimalloc/readme.md
diff --git a/src/dashbls/depends/mimalloc/src/alloc-aligned.c b/src/mimalloc/src/alloc-aligned.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/alloc-aligned.c
rename to src/mimalloc/src/alloc-aligned.c
diff --git a/src/dashbls/depends/mimalloc/src/alloc-override.c b/src/mimalloc/src/alloc-override.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/alloc-override.c
rename to src/mimalloc/src/alloc-override.c
diff --git a/src/dashbls/depends/mimalloc/src/alloc-posix.c b/src/mimalloc/src/alloc-posix.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/alloc-posix.c
rename to src/mimalloc/src/alloc-posix.c
diff --git a/src/dashbls/depends/mimalloc/src/alloc.c b/src/mimalloc/src/alloc.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/alloc.c
rename to src/mimalloc/src/alloc.c
diff --git a/src/dashbls/depends/mimalloc/src/arena-meta.c b/src/mimalloc/src/arena-meta.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/arena-meta.c
rename to src/mimalloc/src/arena-meta.c
diff --git a/src/dashbls/depends/mimalloc/src/arena.c b/src/mimalloc/src/arena.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/arena.c
rename to src/mimalloc/src/arena.c
diff --git a/src/dashbls/depends/mimalloc/src/bitmap.c b/src/mimalloc/src/bitmap.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/bitmap.c
rename to src/mimalloc/src/bitmap.c
diff --git a/src/dashbls/depends/mimalloc/src/bitmap.h b/src/mimalloc/src/bitmap.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/bitmap.h
rename to src/mimalloc/src/bitmap.h
diff --git a/src/dashbls/depends/mimalloc/src/free.c b/src/mimalloc/src/free.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/free.c
rename to src/mimalloc/src/free.c
diff --git a/src/dashbls/depends/mimalloc/src/heap.c b/src/mimalloc/src/heap.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/heap.c
rename to src/mimalloc/src/heap.c
diff --git a/src/dashbls/depends/mimalloc/src/init.c b/src/mimalloc/src/init.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/init.c
rename to src/mimalloc/src/init.c
diff --git a/src/dashbls/depends/mimalloc/src/libc.c b/src/mimalloc/src/libc.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/libc.c
rename to src/mimalloc/src/libc.c
diff --git a/src/dashbls/depends/mimalloc/src/options.c b/src/mimalloc/src/options.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/options.c
rename to src/mimalloc/src/options.c
diff --git a/src/dashbls/depends/mimalloc/src/os.c b/src/mimalloc/src/os.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/os.c
rename to src/mimalloc/src/os.c
diff --git a/src/dashbls/depends/mimalloc/src/page-map.c b/src/mimalloc/src/page-map.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/page-map.c
rename to src/mimalloc/src/page-map.c
diff --git a/src/dashbls/depends/mimalloc/src/page-queue.c b/src/mimalloc/src/page-queue.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/page-queue.c
rename to src/mimalloc/src/page-queue.c
diff --git a/src/dashbls/depends/mimalloc/src/page.c b/src/mimalloc/src/page.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/page.c
rename to src/mimalloc/src/page.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/emscripten/prim.c b/src/mimalloc/src/prim/emscripten/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/emscripten/prim.c
rename to src/mimalloc/src/prim/emscripten/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/osx/alloc-override-zone.c b/src/mimalloc/src/prim/osx/alloc-override-zone.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/osx/alloc-override-zone.c
rename to src/mimalloc/src/prim/osx/alloc-override-zone.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/osx/prim.c b/src/mimalloc/src/prim/osx/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/osx/prim.c
rename to src/mimalloc/src/prim/osx/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/prim.c b/src/mimalloc/src/prim/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/prim.c
rename to src/mimalloc/src/prim/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/readme.md b/src/mimalloc/src/prim/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/readme.md
rename to src/mimalloc/src/prim/readme.md
diff --git a/src/dashbls/depends/mimalloc/src/prim/unix/prim.c b/src/mimalloc/src/prim/unix/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/unix/prim.c
rename to src/mimalloc/src/prim/unix/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/wasi/prim.c b/src/mimalloc/src/prim/wasi/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/wasi/prim.c
rename to src/mimalloc/src/prim/wasi/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/windows/etw-mimalloc.wprp b/src/mimalloc/src/prim/windows/etw-mimalloc.wprp
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/windows/etw-mimalloc.wprp
rename to src/mimalloc/src/prim/windows/etw-mimalloc.wprp
diff --git a/src/dashbls/depends/mimalloc/src/prim/windows/etw.h b/src/mimalloc/src/prim/windows/etw.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/windows/etw.h
rename to src/mimalloc/src/prim/windows/etw.h
diff --git a/src/dashbls/depends/mimalloc/src/prim/windows/etw.man b/src/mimalloc/src/prim/windows/etw.man
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/windows/etw.man
rename to src/mimalloc/src/prim/windows/etw.man
diff --git a/src/dashbls/depends/mimalloc/src/prim/windows/prim.c b/src/mimalloc/src/prim/windows/prim.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/windows/prim.c
rename to src/mimalloc/src/prim/windows/prim.c
diff --git a/src/dashbls/depends/mimalloc/src/prim/windows/readme.md b/src/mimalloc/src/prim/windows/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/prim/windows/readme.md
rename to src/mimalloc/src/prim/windows/readme.md
diff --git a/src/dashbls/depends/mimalloc/src/random.c b/src/mimalloc/src/random.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/random.c
rename to src/mimalloc/src/random.c
diff --git a/src/dashbls/depends/mimalloc/src/static.c b/src/mimalloc/src/static.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/static.c
rename to src/mimalloc/src/static.c
diff --git a/src/dashbls/depends/mimalloc/src/stats.c b/src/mimalloc/src/stats.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/src/stats.c
rename to src/mimalloc/src/stats.c
diff --git a/src/dashbls/depends/mimalloc/test/CMakeLists.txt b/src/mimalloc/test/CMakeLists.txt
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/CMakeLists.txt
rename to src/mimalloc/test/CMakeLists.txt
diff --git a/src/dashbls/depends/mimalloc/test/main-override-dep.cpp b/src/mimalloc/test/main-override-dep.cpp
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main-override-dep.cpp
rename to src/mimalloc/test/main-override-dep.cpp
diff --git a/src/dashbls/depends/mimalloc/test/main-override-dep.h b/src/mimalloc/test/main-override-dep.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main-override-dep.h
rename to src/mimalloc/test/main-override-dep.h
diff --git a/src/dashbls/depends/mimalloc/test/main-override-static.c b/src/mimalloc/test/main-override-static.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main-override-static.c
rename to src/mimalloc/test/main-override-static.c
diff --git a/src/dashbls/depends/mimalloc/test/main-override.c b/src/mimalloc/test/main-override.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main-override.c
rename to src/mimalloc/test/main-override.c
diff --git a/src/dashbls/depends/mimalloc/test/main-override.cpp b/src/mimalloc/test/main-override.cpp
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main-override.cpp
rename to src/mimalloc/test/main-override.cpp
diff --git a/src/dashbls/depends/mimalloc/test/main.c b/src/mimalloc/test/main.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/main.c
rename to src/mimalloc/test/main.c
diff --git a/src/dashbls/depends/mimalloc/test/readme.md b/src/mimalloc/test/readme.md
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/readme.md
rename to src/mimalloc/test/readme.md
diff --git a/src/dashbls/depends/mimalloc/test/test-api-fill.c b/src/mimalloc/test/test-api-fill.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/test-api-fill.c
rename to src/mimalloc/test/test-api-fill.c
diff --git a/src/dashbls/depends/mimalloc/test/test-api.c b/src/mimalloc/test/test-api.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/test-api.c
rename to src/mimalloc/test/test-api.c
diff --git a/src/dashbls/depends/mimalloc/test/test-stress.c b/src/mimalloc/test/test-stress.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/test-stress.c
rename to src/mimalloc/test/test-stress.c
diff --git a/src/dashbls/depends/mimalloc/test/test-wrong.c b/src/mimalloc/test/test-wrong.c
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/test-wrong.c
rename to src/mimalloc/test/test-wrong.c
diff --git a/src/dashbls/depends/mimalloc/test/testhelper.h b/src/mimalloc/test/testhelper.h
similarity index 100%
rename from src/dashbls/depends/mimalloc/test/testhelper.h
rename to src/mimalloc/test/testhelper.h
diff --git a/src/test/bls_reference_vectors_tests.cpp b/src/test/bls_reference_vectors_tests.cpp
new file mode 100644
index 000000000000..63eca7f300fa
--- /dev/null
+++ b/src/test/bls_reference_vectors_tests.cpp
@@ -0,0 +1,936 @@
+// Copyright (c) 2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+// Reference vectors for the CBLS* wrapper layer.
+//
+// GenerateReferenceVectors() exercises the public API of bls/bls.h (both the
+// legacy and the basic scheme, explicit flags as well as the global
+// bls::bls_legacy_scheme switch) with fixed inputs and records every result as
+// a "key=value" line. The recorded lines live in
+// test/data/bls_reference_vectors.json and pin the behaviour of the wrapper
+// layer, including the consensus-visible quirks of the legacy codec, across
+// changes of the underlying implementation.
+//
+// To regenerate the file after an intentional behaviour change, run the
+// test with BLS_REFERENCE_VECTORS_DUMP set to the path of the JSON file:
+//   BLS_REFERENCE_VECTORS_DUMP=src/test/data/bls_reference_vectors.json src/test/test_dash -t bls_reference_vectors_tests
+
+#include <bls/bls.h>
+#include <bls/bls_batchverifier.h>
+#include <bls/bls_ies.h>
+#include <clientversion.h>
+#include <crypto/sha256.h>
+#include <hash.h>
+#include <streams.h>
+#include <test/data/bls_reference_vectors.json.h>
+#include <test/util/json.h>
+#include <uint256.h>
+#include <univalue.h>
+#include <util/strencodings.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <cstdlib>
+#include <fstream>
+#include <string>
+#include <vector>
+
+namespace {
+
+// BLS12-381 group order r, base field modulus p (big-endian).
+constexpr const char* ORDER_HEX = "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001";
+constexpr const char* ORDER_M1_HEX = "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000";
+constexpr const char* ORDER_P1_HEX = "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002";
+constexpr const char* ORDER_X2_HEX = "e7db4ea6533afa906673b0101343b00aa77b4805fffcb7fdfffffffe00000002";
+constexpr const char* P_HEX = "1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab";
+constexpr const char* P_P1_HEX = "1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaac";
+
+using Bytes = std::vector<uint8_t>;
+
+Bytes DeterministicBytes(const std::string& tag, uint32_t i, size_t n)
+{
+    Bytes out;
+    for (uint32_t counter = 0; out.size() < n; counter++) {
+        const uint8_t suffix[8] = {
+            uint8_t(i >> 24), uint8_t(i >> 16), uint8_t(i >> 8), uint8_t(i),
+            uint8_t(counter >> 24), uint8_t(counter >> 16), uint8_t(counter >> 8), uint8_t(counter)};
+        uint8_t digest[CSHA256::OUTPUT_SIZE];
+        CSHA256().Write(reinterpret_cast<const uint8_t*>(tag.data()), tag.size()).Write(suffix, sizeof(suffix)).Finalize(digest);
+        const size_t take = std::min<size_t>(sizeof(digest), n - out.size());
+        out.insert(out.end(), digest, digest + take);
+    }
+    return out;
+}
+
+CBLSSecretKey Sk(uint32_t i)
+{
+    Bytes b = DeterministicBytes("dashbls-ref-sk", i, 32);
+    b[0] &= 0x3f; // always below the group order
+    CBLSSecretKey sk;
+    sk.SetBytes(b, false);
+    assert(sk.IsValid());
+    return sk;
+}
+
+uint256 Msg(uint32_t i) { return uint256(DeterministicBytes("dashbls-ref-msg", i, 32)); }
+uint256 IdHash(uint32_t i) { return uint256(DeterministicBytes("dashbls-ref-id", i, 32)); }
+
+struct GlobalScheme {
+    const bool prev;
+    explicit GlobalScheme(bool legacy) : prev(bls::bls_legacy_scheme.load()) { bls::bls_legacy_scheme.store(legacy); }
+    ~GlobalScheme() { bls::bls_legacy_scheme.store(prev); }
+};
+
+const char* G(bool legacy) { return legacy ? "L" : "B"; }
+std::string F(bool flag) { return flag ? "1" : "0"; }
+
+struct Emitter {
+    std::vector<std::string> lines;
+
+    void Raw(std::string l) { lines.push_back(std::move(l)); }
+    void Str(const std::string& k, const std::string& v) { Raw(k + "=" + v); }
+    void Bool(const std::string& k, bool v) { Str(k, v ? "1" : "0"); }
+    void Hash(const std::string& k, const uint256& h) { Str(k, h.ToString()); }
+    void Hex(const std::string& k, const Bytes& b) { Str(k, HexStr(b)); }
+    // Both encodings of a wrapper object, or INVALID
+    template <typename T>
+    void Obj(const std::string& k, const T& o)
+    {
+        Str(k, o.IsValid() ? o.ToString(true) + ":" + o.ToString(false) : "INVALID");
+    }
+};
+
+// Outcome of stream deserialization: "throw", "invalid" or the object
+template <typename T>
+void UnserializeProbe(Emitter& e, const std::string& k, const Bytes& bytes)
+{
+    CDataStream ss(bytes, SER_NETWORK, PROTOCOL_VERSION);
+    T obj;
+    try {
+        ss >> obj;
+    } catch (const std::ios_base::failure&) {
+        e.Str(k, "throw");
+        return;
+    }
+    e.Obj(k, obj);
+}
+
+template <typename T>
+Bytes Ser(const T& obj)
+{
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << obj;
+    return Bytes(UCharCast(ss.data()), UCharCast(ss.data() + ss.size()));
+}
+
+// ---------------------------------------------------------------------------
+// A. Keys
+void SectionKeys(Emitter& e)
+{
+    for (uint32_t i = 0; i < 4; i++) {
+        const std::string t = "A." + ToString(i);
+        CBLSSecretKey sk = Sk(i);
+        e.Obj(t + ".sk", sk);
+        e.Obj(t + ".pk", sk.GetPublicKey());
+        for (bool g : {true, false}) {
+            GlobalScheme gs(g);
+            CBLSSecretKey sk2 = Sk(i);
+            CBLSPublicKey pk2 = sk2.GetPublicKey();
+            e.Hash(t + ".sk.hash.g" + G(g), sk2.GetHash());
+            e.Hash(t + ".pk.hash.g" + G(g), pk2.GetHash());
+            e.Hex(t + ".pk.ser.g" + G(g), Ser(pk2));
+        }
+        // The cached hash is not invalidated by a change of the global scheme
+        CBLSPublicKey pk3 = sk.GetPublicKey();
+        uint256 h1, h2;
+        {
+            GlobalScheme gs(true);
+            h1 = pk3.GetHash();
+        }
+        {
+            GlobalScheme gs(false);
+            h2 = pk3.GetHash();
+        }
+        e.Bool(t + ".pk.hash.stable", h1 == h2);
+    }
+    e.Obj("A.invalid.sk", CBLSSecretKey());
+    e.Obj("A.invalid.pk", CBLSSecretKey().GetPublicKey());
+    e.Obj("A.invalid.sig", CBLSSecretKey().Sign(Msg(0), true));
+    e.Obj("A.id.zero", CBLSId(uint256{}));
+    e.Obj("A.id.h0", CBLSId(IdHash(0)));
+}
+
+// ---------------------------------------------------------------------------
+// B. Secret key codec
+void SectionSecretKeyCodec(Emitter& e)
+{
+    const std::vector<std::pair<std::string, Bytes>> probes{
+        {"rm1", ParseHex(ORDER_M1_HEX)},
+        {"r", ParseHex(ORDER_HEX)},
+        {"rp1", ParseHex(ORDER_P1_HEX)},
+        {"2r", ParseHex(ORDER_X2_HEX)},
+        {"ff", Bytes(32, 0xff)},
+        {"zero", Bytes(32, 0x00)},
+        {"one", [] { Bytes b(32, 0); b[31] = 1; return b; }()},
+        {"sk0", Sk(0).ToByteVector(false)},
+    };
+    for (const auto& [name, bytes] : probes) {
+        const std::string t = "B." + name;
+        for (bool f : {false, true}) {
+            CBLSSecretKey sk;
+            sk.SetBytes(bytes, f);
+            e.Obj(t + ".f" + F(f), sk);
+            if (sk.IsValid()) {
+                e.Obj(t + ".f" + F(f) + ".pk", sk.GetPublicKey());
+                e.Obj(t + ".f" + F(f) + ".sig", sk.Sign(Msg(0), true));
+            }
+        }
+        for (bool g : {true, false}) {
+            GlobalScheme gs(g);
+            UnserializeProbe<CBLSSecretKey>(e, t + ".unser.g" + G(g), bytes);
+        }
+        CBLSSecretKey ctorKey(bytes);
+        e.Obj(t + ".ctor", ctorKey);
+    }
+    CBLSSecretKey sk;
+    e.Bool("B.hex.nonhex", sk.SetHexStr("zz" + HexStr(Bytes(31, 1)), false));
+    e.Obj("B.hex.nonhex.obj", sk);
+    e.Bool("B.hex.short", sk.SetHexStr(HexStr(Bytes(31, 1)), false));
+    e.Bool("B.hex.long", sk.SetHexStr(HexStr(Bytes(33, 1)), false));
+    e.Bool("B.hex.ok", sk.SetHexStr(Sk(1).ToString(false), false));
+    e.Obj("B.hex.ok.obj", sk);
+    e.Bool("B.hex.r.f0", sk.SetHexStr(ORDER_HEX, false));
+    e.Bool("B.hex.r.f1", sk.SetHexStr(ORDER_HEX, true));
+    e.Bool("B.hex.rp1.f1", sk.SetHexStr(ORDER_P1_HEX, true));
+    e.Obj("B.hex.rp1.f1.obj", sk);
+    e.Bool("B.len31", [] { CBLSSecretKey k; k.SetBytes(Bytes(31, 1), false); return k.IsValid(); }());
+    e.Bool("B.len33", [] { CBLSSecretKey k; k.SetBytes(Bytes(33, 1), false); return k.IsValid(); }());
+}
+
+// ---------------------------------------------------------------------------
+// C. G1 codec probes
+Bytes WithByte(Bytes b, size_t idx, uint8_t v) { b[idx] = v; return b; }
+Bytes OrByte(Bytes b, size_t idx, uint8_t v) { b[idx] |= v; return b; }
+Bytes XorByte(Bytes b, size_t idx, uint8_t v) { b[idx] ^= v; return b; }
+Bytes AndByte(Bytes b, size_t idx, uint8_t v) { b[idx] &= v; return b; }
+Bytes Concat(Bytes a, const Bytes& b) { a.insert(a.end(), b.begin(), b.end()); return a; }
+
+void ProbeG1(Emitter& e, const std::string& t, const Bytes& bytes)
+{
+    const CBLSSecretKey sk1 = Sk(1);
+    const CBLSPublicKey pk1 = sk1.GetPublicKey();
+    for (bool f : {true, false}) {
+        const std::string k = t + ".f" + F(f);
+        CBLSPublicKey pk;
+        pk.SetBytes(bytes, f);
+        e.Obj(k, pk);
+        if (!pk.IsValid()) continue;
+        CBLSPublicKey dh;
+        e.Bool(k + ".dh", dh.DHKeyExchange(sk1, pk));
+        e.Obj(k + ".dh.obj", dh);
+        for (bool s : {true, false}) {
+            const CBLSSignature sig = Sk(0).Sign(Msg(0), s);
+            e.Bool(k + ".ver" + G(s), sig.VerifyInsecure(pk, Msg(0), s));
+        }
+        for (bool g : {true, false}) {
+            GlobalScheme gs(g);
+            CBLSPublicKey pkg;
+            pkg.SetBytes(bytes, f);
+            e.Hash(k + ".hash.g" + G(g), pkg.GetHash());
+            std::vector<CBLSPublicKey> pks{pkg, pk1};
+            std::vector<CBLSSignature> sigs{Sk(0).Sign(Msg(0), g), sk1.Sign(Msg(0), g)};
+            CBLSSignature agg = CBLSSignature::AggregateSecure(sigs, pks, Msg(0));
+            e.Obj(k + ".aggsec.g" + G(g), agg);
+            e.Bool(k + ".versec.g" + G(g), agg.VerifySecureAggregated(pks, Msg(0)));
+            CBLSPublicKey aggpk = CBLSPublicKey::AggregateInsecure(pks);
+            e.Obj(k + ".aggpk.g" + G(g), aggpk);
+        }
+    }
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        UnserializeProbe<CBLSPublicKey>(e, t + ".unser.g" + G(g), bytes);
+    }
+}
+
+void SectionG1(Emitter& e)
+{
+    const CBLSPublicKey pk0 = Sk(0).GetPublicKey();
+    const Bytes L = pk0.ToByteVector(true);
+    const Bytes B = pk0.ToByteVector(false);
+    const Bytes p = ParseHex(P_HEX);
+    const Bytes pp1 = ParseHex(P_P1_HEX);
+    Bytes inf(48, 0);
+    inf[0] = 0xc0;
+    const std::vector<std::pair<std::string, Bytes>> probes{
+        {"pkL", L},
+        {"pkB", B},
+        {"zeros", Bytes(48, 0)},
+        {"inf", inf},
+        {"badinf", WithByte(inf, 47, 0x01)},
+        {"badinf.mid", WithByte(inf, 20, 0x10)},
+        {"ff", Bytes(48, 0xff)},
+        {"fflow", WithByte(Bytes(48, 0xff), 0, 0x1f)},
+        {"L.or40", OrByte(L, 0, 0x40)},
+        {"L.or20", OrByte(L, 0, 0x20)},
+        {"L.orE0", OrByte(L, 0, 0xe0)},
+        {"L.xor80", XorByte(L, 0, 0x80)},
+        {"L.and1f", AndByte(L, 0, 0x1f)},
+        {"B.xor20", XorByte(B, 0, 0x20)},
+        {"B.and7f", AndByte(B, 0, 0x7f)},
+        {"B.or40", OrByte(B, 0, 0x40)},
+        {"B.tail", XorByte(B, 47, 0x01)},
+        {"x0.80", WithByte(Bytes(48, 0), 0, 0x80)},
+        {"x0.a0", WithByte(Bytes(48, 0), 0, 0xa0)},
+        {"x1.00", WithByte(Bytes(48, 0), 47, 0x01)},
+        {"x1.80", WithByte(WithByte(Bytes(48, 0), 47, 0x01), 0, 0x80)},
+        {"x1.a0", WithByte(WithByte(Bytes(48, 0), 47, 0x01), 0, 0xa0)},
+        {"x2.80", WithByte(WithByte(Bytes(48, 0), 47, 0x02), 0, 0x80)},
+        {"x3.80", WithByte(WithByte(Bytes(48, 0), 47, 0x03), 0, 0x80)},
+        {"x3.00", WithByte(Bytes(48, 0), 47, 0x03)},
+        {"x5.80", WithByte(WithByte(Bytes(48, 0), 47, 0x05), 0, 0x80)},
+        {"p.00", p},
+        {"p.80", OrByte(p, 0, 0x80)},
+        {"p.a0", OrByte(p, 0, 0xa0)},
+        {"pp1.80", OrByte(pp1, 0, 0x80)},
+        {"max1f", WithByte(Bytes(48, 0xff), 0, 0x1f)},
+        {"max9f", WithByte(Bytes(48, 0xff), 0, 0x9f)},
+    };
+    for (const auto& [name, bytes] : probes) {
+        ProbeG1(e, "C." + name, bytes);
+    }
+    for (size_t len : {47, 49, 0}) {
+        CBLSPublicKey pk;
+        pk.SetBytes(Bytes(len, 0x80), false);
+        e.Bool("C.len" + ToString(len), pk.IsValid());
+    }
+}
+
+// ---------------------------------------------------------------------------
+// D. G2 codec probes
+void ProbeG2(Emitter& e, const std::string& t, const Bytes& bytes)
+{
+    const CBLSPublicKey pk0 = Sk(0).GetPublicKey();
+    for (bool f : {true, false}) {
+        const std::string k = t + ".f" + F(f);
+        CBLSSignature sig;
+        sig.SetBytes(bytes, f);
+        e.Obj(k, sig);
+        if (!sig.IsValid()) continue;
+        for (bool s : {true, false}) {
+            e.Bool(k + ".ver" + G(s), sig.VerifyInsecure(pk0, Msg(0), s));
+        }
+        for (bool g : {true, false}) {
+            GlobalScheme gs(g);
+            CBLSSignature sigg;
+            sigg.SetBytes(bytes, f);
+            e.Hash(k + ".hash.g" + G(g), sigg.GetHash());
+            e.Bool(k + ".ver2.g" + G(g), sigg.VerifyInsecure(pk0, Msg(0)));
+            CBLSSignature agg = sigg;
+            agg.AggregateInsecure(Sk(1).Sign(Msg(0), g));
+            e.Obj(k + ".agg.g" + G(g), agg);
+        }
+    }
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        UnserializeProbe<CBLSSignature>(e, t + ".unser.g" + G(g), bytes);
+    }
+}
+
+void SectionG2(Emitter& e)
+{
+    const CBLSSecretKey sk0 = Sk(0);
+    const Bytes L = sk0.Sign(Msg(0), true).ToByteVector(true);
+    const Bytes B = sk0.Sign(Msg(0), false).ToByteVector(false);
+    const Bytes p = ParseHex(P_HEX);
+    Bytes inf(96, 0);
+    inf[0] = 0xc0;
+    const Bytes zeros48(48, 0);
+    const std::vector<std::pair<std::string, Bytes>> probes{
+        {"sigL", L},
+        {"sigB", B},
+        {"sigL.asB", sk0.Sign(Msg(0), true).ToByteVector(false)},
+        {"sigB.asL", sk0.Sign(Msg(0), false).ToByteVector(true)},
+        {"zeros", Bytes(96, 0)},
+        {"inf", inf},
+        {"badinf", WithByte(inf, 95, 0x01)},
+        {"badinf.mid", WithByte(inf, 50, 0x10)},
+        {"ff", Bytes(96, 0xff)},
+        {"ff.low", WithByte(WithByte(Bytes(96, 0xff), 0, 0x1f), 48, 0x1f)},
+        {"L.or40", OrByte(L, 0, 0x40)},
+        {"L.or20", OrByte(L, 0, 0x20)},
+        {"L.orE0", OrByte(L, 0, 0xe0)},
+        {"L.xor80", XorByte(L, 0, 0x80)},
+        {"L.b48or80", OrByte(L, 48, 0x80)},
+        {"L.b48or40", OrByte(L, 48, 0x40)},
+        {"L.tail", XorByte(L, 95, 0x01)},
+        {"B.xor20", XorByte(B, 0, 0x20)},
+        {"B.and7f", AndByte(B, 0, 0x7f)},
+        {"B.or40", OrByte(B, 0, 0x40)},
+        {"B.b48or80", OrByte(B, 48, 0x80)},
+        {"B.b48or40", OrByte(B, 48, 0x40)},
+        {"B.b48or20", OrByte(B, 48, 0x20)},
+        {"B.tail", XorByte(B, 95, 0x01)},
+        {"x0.80", WithByte(Bytes(96, 0), 0, 0x80)},
+        {"x0.a0", WithByte(Bytes(96, 0), 0, 0xa0)},
+        {"c0.1", WithByte(WithByte(Bytes(96, 0), 47, 0x01), 0, 0x80)},
+        {"c1.1", WithByte(WithByte(Bytes(96, 0), 95, 0x01), 0, 0x80)},
+        {"c0.1.a0", WithByte(WithByte(Bytes(96, 0), 47, 0x01), 0, 0xa0)},
+        {"c0.p", OrByte(Concat(p, zeros48), 0, 0x80)},
+        {"c1.p", OrByte(Concat(zeros48, p), 0, 0x80)},
+        {"c0.p.00", Concat(p, zeros48)},
+        {"c1.p.00", Concat(zeros48, p)},
+        {"pp", OrByte(Concat(p, p), 0, 0x80)},
+        {"max", WithByte(Bytes(96, 0xff), 0, 0x1f)},
+    };
+    for (const auto& [name, bytes] : probes) {
+        ProbeG2(e, "D." + name, bytes);
+    }
+    for (size_t len : {95, 97, 0}) {
+        CBLSSignature sig;
+        sig.SetBytes(Bytes(len, 0x80), false);
+        e.Bool("D.len" + ToString(len), sig.IsValid());
+    }
+}
+
+// ---------------------------------------------------------------------------
+// E. Sign / verify
+void SectionSignVerify(Emitter& e)
+{
+    for (uint32_t i = 0; i < 3; i++) {
+        for (uint32_t j = 0; j < 2; j++) {
+            for (bool f : {true, false}) {
+                e.Obj("E.sig." + ToString(i) + "." + ToString(j) + ".f" + F(f), Sk(i).Sign(Msg(j), f));
+            }
+        }
+    }
+    const CBLSPublicKey pk0 = Sk(0).GetPublicKey();
+    const CBLSPublicKey pk1 = Sk(1).GetPublicKey();
+    for (bool f : {true, false}) {
+        const CBLSSignature sig = Sk(0).Sign(Msg(0), f);
+        const std::string t = std::string("E.ver.f") + F(f);
+        e.Bool(t + ".ok", sig.VerifyInsecure(pk0, Msg(0), f));
+        e.Bool(t + ".wrongmsg", sig.VerifyInsecure(pk0, Msg(1), f));
+        e.Bool(t + ".wrongpk", sig.VerifyInsecure(pk1, Msg(0), f));
+        e.Bool(t + ".cross", sig.VerifyInsecure(pk0, Msg(0), !f));
+        e.Bool(t + ".invalidpk", sig.VerifyInsecure(CBLSPublicKey(), Msg(0), f));
+        e.Bool(t + ".invalidsig", CBLSSignature().VerifyInsecure(pk0, Msg(0), f));
+        for (bool g : {true, false}) {
+            GlobalScheme gs(g);
+            e.Bool(t + ".global.g" + G(g), sig.VerifyInsecure(pk0, Msg(0)));
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// F. Aggregation
+void SectionAggregation(Emitter& e)
+{
+    std::vector<CBLSSecretKey> sks;
+    std::vector<CBLSPublicKey> pks;
+    for (uint32_t i = 0; i < 4; i++) {
+        sks.push_back(Sk(i));
+        pks.push_back(sks.back().GetPublicKey());
+    }
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        const std::string t = std::string("F.g") + G(g);
+        std::vector<CBLSSignature> sigs;
+        for (uint32_t i = 0; i < 4; i++) sigs.push_back(sks[i].Sign(Msg(0), g));
+
+        // Insecure aggregation, incremental and static
+        CBLSSecretKey skAgg = sks[0];
+        CBLSPublicKey pkAgg = pks[0];
+        CBLSSignature sigAgg = sigs[0];
+        for (size_t n = 2; n <= 4; n++) {
+            skAgg.AggregateInsecure(sks[n - 1]);
+            pkAgg.AggregateInsecure(pks[n - 1]);
+            sigAgg.AggregateInsecure(sigs[n - 1]);
+            const std::string k = t + ".agg" + ToString(n);
+            e.Obj(k + ".sk", skAgg);
+            e.Obj(k + ".pk", pkAgg);
+            e.Obj(k + ".sig", sigAgg);
+            e.Bool(k + ".sk.static", CBLSSecretKey::AggregateInsecure(Span{sks}.first(n)) == skAgg);
+            e.Bool(k + ".pk.static", CBLSPublicKey::AggregateInsecure(Span{pks}.first(n)) == pkAgg);
+            e.Bool(k + ".sig.static", CBLSSignature::AggregateInsecure(Span{sigs}.first(n)) == sigAgg);
+            e.Bool(k + ".pk.fromsk", skAgg.GetPublicKey() == pkAgg);
+            e.Bool(k + ".ver", sigAgg.VerifyInsecure(pkAgg, Msg(0)));
+        }
+        e.Obj(t + ".agg0.sk", CBLSSecretKey::AggregateInsecure(Span{sks}.first(0)));
+        e.Obj(t + ".agg0.pk", CBLSPublicKey::AggregateInsecure(Span{pks}.first(0)));
+        e.Obj(t + ".agg0.sig", CBLSSignature::AggregateInsecure(Span{sigs}.first(0)));
+        e.Obj(t + ".agg1.sk", CBLSSecretKey::AggregateInsecure(Span{sks}.first(1)));
+
+        // Subtraction and objects at infinity
+        CBLSSignature sub = sigAgg;
+        sub.SubInsecure(sigs[0]);
+        e.Obj(t + ".sub", sub);
+        e.Bool(t + ".sub.ver", sub.VerifyInsecure(CBLSPublicKey::AggregateInsecure(Span{pks}.subspan(1)), Msg(0)));
+        CBLSSignature infSig = sigs[0];
+        infSig.SubInsecure(sigs[0]);
+        e.Obj(t + ".infsig", infSig);
+        e.Hash(t + ".infsig.hash", infSig.GetHash());
+        CBLSSecretKey skRm1;
+        skRm1.SetBytes(ParseHex(ORDER_M1_HEX), false);
+        CBLSPublicKey neg;
+        e.Bool(t + ".neg.dh", neg.DHKeyExchange(skRm1, pks[0]));
+        e.Obj(t + ".neg", neg);
+        CBLSPublicKey infPk = pks[0];
+        infPk.AggregateInsecure(neg);
+        e.Obj(t + ".infpk", infPk);
+        e.Hash(t + ".infpk.hash", infPk.GetHash());
+        for (bool f : {true, false}) {
+            e.Bool(t + ".inf.ver.f" + F(f), infSig.VerifyInsecure(infPk, Msg(0), f));
+            e.Bool(t + ".inf.ver.pk0.f" + F(f), infSig.VerifyInsecure(pks[0], Msg(0), f));
+            e.Bool(t + ".inf.ver.sig0.f" + F(f), sigs[0].VerifyInsecure(infPk, Msg(0), f));
+        }
+        e.Bool(t + ".inf.eq.default", infSig == CBLSSignature());
+        CBLSSignature infAgg = sigAgg;
+        infAgg.AggregateInsecure(infSig);
+        e.Bool(t + ".inf.agg.neutral", infAgg == sigAgg);
+
+        // Aggregated verification with distinct / duplicate messages
+        {
+            std::vector<CBLSSignature> dsigs;
+            std::vector<uint256> msgs;
+            for (uint32_t i = 0; i < 4; i++) {
+                msgs.push_back(Msg(i));
+                dsigs.push_back(sks[i].Sign(Msg(i), g));
+            }
+            CBLSSignature dagg = CBLSSignature::AggregateInsecure(dsigs);
+            e.Obj(t + ".vagg.distinct", dagg);
+            e.Bool(t + ".vagg.distinct.ver", dagg.VerifyInsecureAggregated(pks, msgs));
+            std::vector<uint256> wrong = msgs;
+            wrong[2] = Msg(9);
+            e.Bool(t + ".vagg.distinct.wrongmsg", dagg.VerifyInsecureAggregated(pks, wrong));
+            std::vector<uint256> dup(4, Msg(0));
+            e.Bool(t + ".vagg.dup.ver", sigAgg.VerifyInsecureAggregated(pks, dup));
+            std::vector<uint256> two{Msg(0), Msg(0)};
+            std::vector<CBLSPublicKey> twoPks{pks[0], pks[1]};
+            CBLSSignature twoSig = CBLSSignature::AggregateInsecure(Span{sigs}.first(2));
+            e.Bool(t + ".vagg.dup2.ver", twoSig.VerifyInsecureAggregated(twoPks, two));
+            e.Bool(t + ".vagg.single.ver", sigs[0].VerifyInsecureAggregated(Span{pks}.first(1), Span{msgs}.first(1)));
+            std::vector<CBLSPublicKey> swapped{pks[1], pks[0], pks[2], pks[3]};
+            e.Bool(t + ".vagg.wrongpk", dagg.VerifyInsecureAggregated(swapped, msgs));
+        }
+
+        // Secure aggregation
+        {
+            CBLSSignature agg = CBLSSignature::AggregateSecure(sigs, pks, Msg(0));
+            e.Obj(t + ".sec.agg", agg);
+            e.Bool(t + ".sec.ver", agg.VerifySecureAggregated(pks, Msg(0)));
+            std::vector<CBLSPublicKey> shuffled{pks[2], pks[0], pks[3], pks[1]};
+            e.Bool(t + ".sec.ver.shuffled", agg.VerifySecureAggregated(shuffled, Msg(0)));
+            std::vector<CBLSSignature> shuffledSigs{sigs[2], sigs[0], sigs[3], sigs[1]};
+            e.Bool(t + ".sec.agg.shuffled", CBLSSignature::AggregateSecure(shuffledSigs, shuffled, Msg(0)) == agg);
+            e.Bool(t + ".sec.ver.wrongmsg", agg.VerifySecureAggregated(pks, Msg(1)));
+            std::vector<CBLSPublicKey> wrongSet{pks[0], pks[1], pks[2]};
+            e.Bool(t + ".sec.ver.subset", agg.VerifySecureAggregated(wrongSet, Msg(0)));
+            e.Bool(t + ".sec.ver.insecureagg", sigAgg.VerifySecureAggregated(pks, Msg(0)));
+            std::vector<CBLSSignature> dupSigs{sigs[0], sigs[0], sigs[1]};
+            std::vector<CBLSPublicKey> dupPks{pks[0], pks[0], pks[1]};
+            CBLSSignature dupAgg = CBLSSignature::AggregateSecure(dupSigs, dupPks, Msg(0));
+            e.Obj(t + ".sec.dup.agg", dupAgg);
+            e.Bool(t + ".sec.dup.ver", dupAgg.VerifySecureAggregated(dupPks, Msg(0)));
+            CBLSSignature single = CBLSSignature::AggregateSecure(Span{sigs}.first(1), Span{pks}.first(1), Msg(0));
+            e.Obj(t + ".sec.single.agg", single);
+            e.Bool(t + ".sec.single.ver", single.VerifySecureAggregated(Span{pks}.first(1), Msg(0)));
+            e.Bool(t + ".sec.single.eq", single == sigs[0]);
+            e.Obj(t + ".sec.empty", CBLSSignature::AggregateSecure(Span{sigs}.first(0), Span{pks}.first(0), Msg(0)));
+            e.Obj(t + ".sec.mismatch", CBLSSignature::AggregateSecure(Span{sigs}.first(2), Span{pks}.first(3), Msg(0)));
+            e.Bool(t + ".sec.ver.empty", agg.VerifySecureAggregated(Span{pks}.first(0), Msg(0)));
+            e.Bool(t + ".sec.ver.invalidsig", CBLSSignature().VerifySecureAggregated(pks, Msg(0)));
+            {
+                GlobalScheme other(!g);
+                e.Bool(t + ".sec.ver.otherscheme", agg.VerifySecureAggregated(pks, Msg(0)));
+            }
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// G. Threshold
+void SectionThreshold(Emitter& e)
+{
+    std::vector<CBLSSecretKey> msk{Sk(10), Sk(11), Sk(12)};
+    std::vector<CBLSPublicKey> mpk;
+    for (const auto& sk : msk) mpk.push_back(sk.GetPublicKey());
+    std::vector<CBLSId> ids;
+    for (uint32_t i = 0; i < 5; i++) ids.emplace_back(IdHash(i));
+
+    std::vector<CBLSSecretKey> shares(5);
+    std::vector<CBLSPublicKey> pkShares(5);
+    for (size_t i = 0; i < 5; i++) {
+        const std::string t = "G.share" + ToString(i);
+        e.Bool(t + ".sk.ok", shares[i].SecretKeyShare(msk, ids[i]));
+        e.Obj(t + ".sk", shares[i]);
+        e.Bool(t + ".pk.ok", pkShares[i].PublicKeyShare(mpk, ids[i]));
+        e.Obj(t + ".pk", pkShares[i]);
+        e.Bool(t + ".pk.consistent", pkShares[i] == shares[i].GetPublicKey());
+    }
+    for (bool f : {true, false}) {
+        const std::string t = std::string("G.f") + F(f);
+        const CBLSSignature master = msk[0].Sign(Msg(1), f);
+        std::vector<CBLSSignature> sigShares;
+        for (size_t i = 0; i < 5; i++) {
+            sigShares.push_back(shares[i].Sign(Msg(1), f));
+            e.Obj(t + ".sigshare" + ToString(i), sigShares.back());
+            e.Bool(t + ".sigshare" + ToString(i) + ".ver", sigShares.back().VerifyInsecure(pkShares[i], Msg(1), f));
+        }
+        auto recover = [&](const std::string& k, std::vector<size_t> idx) {
+            std::vector<CBLSSignature> s;
+            std::vector<CBLSId> d;
+            for (size_t i : idx) {
+                s.push_back(sigShares[i]);
+                d.push_back(ids[i]);
+            }
+            CBLSSignature rec;
+            e.Bool(k + ".ok", rec.Recover(s, d));
+            e.Obj(k, rec);
+            e.Bool(k + ".master", rec == master);
+        };
+        recover(t + ".rec012", {0, 1, 2});
+        recover(t + ".rec123", {1, 2, 3});
+        recover(t + ".rec420", {4, 2, 0});
+        recover(t + ".rec01", {0, 1});
+        recover(t + ".rec0", {0});
+        recover(t + ".rec0123", {0, 1, 2, 3});
+        recover(t + ".rec001", {0, 0, 1});
+        recover(t + ".rec01234", {0, 1, 2, 3, 4});
+        // size mismatch and invalid inputs
+        {
+            CBLSSignature rec;
+            std::vector<CBLSSignature> s{sigShares[0], sigShares[1], sigShares[2]};
+            std::vector<CBLSId> d{ids[0], ids[1]};
+            e.Bool(t + ".rec.mismatch", rec.Recover(s, d));
+            std::vector<CBLSId> dz{ids[0], CBLSId(uint256{}), ids[2]};
+            e.Bool(t + ".rec.zeroid", rec.Recover(s, dz));
+            std::vector<CBLSId> dinv{ids[0], CBLSId(), ids[2]};
+            e.Bool(t + ".rec.invalidid", rec.Recover(s, dinv));
+            std::vector<CBLSSignature> sinv{sigShares[0], CBLSSignature(), sigShares[2]};
+            e.Bool(t + ".rec.invalidsig", rec.Recover(sinv, d));
+            std::vector<CBLSId> dr{ids[0], CBLSId(uint256(ParseHex(ORDER_HEX))), ids[2]};
+            e.Bool(t + ".rec.orderid", rec.Recover(s, dr));
+        }
+    }
+    // Special ids
+    const std::vector<std::pair<std::string, uint256>> specialIds{
+        {"zero", uint256{}},
+        {"one", uint256::ONE},
+        {"five", [] { Bytes b(32, 0); b[31] = 5; return uint256(b); }()},
+        {"rp5", [] { Bytes b = ParseHex(ORDER_HEX); b[31] += 5; return uint256(b); }()}, // r + 5, congruent to 5
+        {"r", uint256(ParseHex(ORDER_HEX))},
+        {"rm1", uint256(ParseHex(ORDER_M1_HEX))},
+        {"ff", uint256(Bytes(32, 0xff))},
+    };
+    std::map<std::string, CBLSSecretKey> specialShares;
+    for (const auto& [name, id] : specialIds) {
+        const std::string t = "G.id." + name;
+        CBLSId cid(id);
+        CBLSSecretKey s;
+        CBLSPublicKey p;
+        e.Bool(t + ".sk.ok", s.SecretKeyShare(msk, cid));
+        e.Obj(t + ".sk", s);
+        e.Bool(t + ".pk.ok", p.PublicKeyShare(mpk, cid));
+        e.Obj(t + ".pk", p);
+        specialShares[name] = s;
+    }
+    e.Bool("G.id.congruent", specialShares["five"] == specialShares["rp5"]);
+    {
+        std::vector<CBLSSignature> s{specialShares["five"].Sign(Msg(1), true), specialShares["rp5"].Sign(Msg(1), true), specialShares["one"].Sign(Msg(1), true)};
+        std::vector<CBLSId> d{CBLSId(specialIds[2].second), CBLSId(specialIds[3].second), CBLSId(specialIds[1].second)};
+        CBLSSignature rec;
+        e.Bool("G.id.congruent.rec", rec.Recover(s, d));
+    }
+    {
+        CBLSSecretKey s;
+        CBLSPublicKey p;
+        std::vector<CBLSSecretKey> msk1{msk[0]};
+        std::vector<CBLSPublicKey> mpk1{mpk[0]};
+        e.Bool("G.msk1.sk.ok", s.SecretKeyShare(msk1, ids[0]));
+        e.Obj("G.msk1.sk", s);
+        e.Bool("G.msk1.pk.ok", p.PublicKeyShare(mpk1, ids[0]));
+        e.Obj("G.msk1.pk", p);
+        std::vector<CBLSSecretKey> mskInv{msk[0], CBLSSecretKey(), msk[2]};
+        e.Bool("G.mskinv.sk.ok", s.SecretKeyShare(mskInv, ids[0]));
+        e.Bool("G.mskinv.sk.valid", s.IsValid());
+        std::vector<CBLSPublicKey> mpkInv{mpk[0], CBLSPublicKey(), mpk[2]};
+        e.Bool("G.mpkinv.pk.ok", p.PublicKeyShare(mpkInv, ids[0]));
+        e.Bool("G.idinv.sk.ok", s.SecretKeyShare(msk, CBLSId()));
+        e.Bool("G.idinv.pk.ok", p.PublicKeyShare(mpk, CBLSId()));
+        std::vector<CBLSSecretKey> msk0;
+        e.Bool("G.msk0.sk.ok", s.SecretKeyShare(msk0, ids[0]));
+    }
+}
+
+// ---------------------------------------------------------------------------
+// H. Diffie-Hellman
+void SectionDH(Emitter& e)
+{
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0; j < 3; j++) {
+            CBLSPublicKey a, b;
+            const std::string t = "H." + ToString(i) + "." + ToString(j);
+            e.Bool(t + ".ok", a.DHKeyExchange(Sk(i), Sk(j).GetPublicKey()));
+            e.Obj(t, a);
+            b.DHKeyExchange(Sk(j), Sk(i).GetPublicKey());
+            e.Bool(t + ".sym", a == b);
+        }
+    }
+    CBLSPublicKey x;
+    e.Bool("H.invalidsk", x.DHKeyExchange(CBLSSecretKey(), Sk(0).GetPublicKey()));
+    e.Bool("H.invalidpk", x.DHKeyExchange(Sk(0), CBLSPublicKey()));
+    CBLSSecretKey one;
+    one.SetBytes([] { Bytes b(32, 0); b[31] = 1; return b; }(), false);
+    e.Bool("H.one", x.DHKeyExchange(one, Sk(0).GetPublicKey()));
+    e.Bool("H.one.eq", x == Sk(0).GetPublicKey());
+}
+
+// ---------------------------------------------------------------------------
+// I. Stream serialization, version wrappers, lazy wrappers
+void SectionSerialization(Emitter& e)
+{
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        const std::string t = std::string("I.g") + G(g);
+        CBLSSecretKey sk = Sk(2);
+        CBLSPublicKey pk = sk.GetPublicKey();
+        CBLSSignature sig = sk.Sign(Msg(2), g);
+        CBLSId id(IdHash(2));
+
+        e.Hex(t + ".sk.ser", Ser(sk));
+        e.Hex(t + ".pk.ser", Ser(pk));
+        e.Hex(t + ".sig.ser", Ser(sig));
+        e.Hex(t + ".id.ser", Ser(id));
+        UnserializeProbe<CBLSSecretKey>(e, t + ".sk.rt", Ser(sk));
+        UnserializeProbe<CBLSPublicKey>(e, t + ".pk.rt", Ser(pk));
+        UnserializeProbe<CBLSSignature>(e, t + ".sig.rt", Ser(sig));
+        // opposite scheme bytes, garbage, zeros
+        UnserializeProbe<CBLSPublicKey>(e, t + ".pk.opposite", pk.ToByteVector(!g));
+        UnserializeProbe<CBLSSignature>(e, t + ".sig.opposite", sig.ToByteVector(!g));
+        UnserializeProbe<CBLSPublicKey>(e, t + ".pk.garbage", Bytes(48, 0xff));
+        UnserializeProbe<CBLSSignature>(e, t + ".sig.garbage", Bytes(96, 0xff));
+        UnserializeProbe<CBLSPublicKey>(e, t + ".pk.zeros", Bytes(48, 0x00));
+        UnserializeProbe<CBLSSignature>(e, t + ".sig.zeros", Bytes(96, 0x00));
+        UnserializeProbe<CBLSSecretKey>(e, t + ".sk.zeros", Bytes(32, 0x00));
+        UnserializeProbe<CBLSPublicKey>(e, t + ".pk.short", Bytes(47, 0x80));
+        // version wrappers
+        for (bool w : {true, false}) {
+            CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+            ss << CBLSPublicKeyVersionWrapper(pk, w) << CBLSSignatureVersionWrapper(sig, w);
+            e.Hex(t + ".vw.f" + F(w), Bytes(UCharCast(ss.data()), UCharCast(ss.data() + ss.size())));
+            CBLSPublicKey pk2;
+            CBLSSignature sig2;
+            try {
+                ss >> CBLSPublicKeyVersionWrapper(pk2, w) >> CBLSSignatureVersionWrapper(sig2, w);
+                e.Bool(t + ".vw.f" + F(w) + ".rt", pk2 == pk && sig2 == sig);
+            } catch (const std::ios_base::failure&) {
+                e.Str(t + ".vw.f" + F(w) + ".rt", "throw");
+            }
+            CDataStream ss2(pk.ToByteVector(!w), SER_NETWORK, PROTOCOL_VERSION);
+            try {
+                ss2 >> CBLSPublicKeyVersionWrapper(pk2, w);
+                e.Obj(t + ".vw.f" + F(w) + ".opposite", pk2);
+            } catch (const std::ios_base::failure&) {
+                e.Str(t + ".vw.f" + F(w) + ".opposite", "throw");
+            }
+        }
+        // lazy wrappers
+        for (bool l : {true, false}) {
+            const std::string k = t + ".lazy.f" + F(l);
+            CBLSLazyPublicKey lz;
+            e.Bool(k + ".default.legacy", lz.IsLegacy());
+            e.Hex(k + ".default.ser", Ser(lz));
+            e.Obj(k + ".default.get", lz.Get());
+            lz.Set(pk, l);
+            e.Bool(k + ".legacy", lz.IsLegacy());
+            e.Hex(k + ".ser", Ser(lz));
+            e.Hash(k + ".hash", lz.GetHash());
+            e.Str(k + ".str", lz.ToString());
+            {
+                CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+                lz.Serialize(ss, !l);
+                e.Hex(k + ".ser.other", Bytes(UCharCast(ss.data()), UCharCast(ss.data() + ss.size())));
+                e.Bool(k + ".legacy.after", lz.IsLegacy());
+                e.Hash(k + ".hash.after", lz.GetHash());
+            }
+            CBLSLazyPublicKey lz2;
+            lz2.Set(pk, !l);
+            e.Bool(k + ".eq.otherscheme", lz == lz2);
+            e.Bool(k + ".hash.eq.otherscheme", lz.GetHash() == lz2.GetHash());
+            CBLSLazyPublicKey lz3;
+            lz3.Set(pk, l);
+            e.Bool(k + ".eq.same", lz == lz3);
+            // deserialize bytes of the other scheme and materialize
+            CBLSLazyPublicKey lz4;
+            {
+                CDataStream ss(pk.ToByteVector(!l), SER_NETWORK, PROTOCOL_VERSION);
+                lz4.Unserialize(ss, l);
+            }
+            e.Obj(k + ".unser.opposite.get", lz4.Get());
+            e.Hex(k + ".unser.opposite.ser", Ser(lz4));
+            CBLSLazyPublicKey lz5;
+            {
+                CDataStream ss(pk.ToByteVector(l), SER_NETWORK, PROTOCOL_VERSION);
+                lz5.Unserialize(ss, l);
+            }
+            e.Obj(k + ".unser.get", lz5.Get());
+            e.Bool(k + ".unser.eq", lz5 == lz3);
+            e.Hash(k + ".unser.hash", lz5.GetHash());
+            CBLSLazyPublicKey lz6;
+            {
+                CDataStream ss(Bytes(48, 0xff), SER_NETWORK, PROTOCOL_VERSION);
+                lz6.Unserialize(ss, l);
+            }
+            e.Obj(k + ".unser.garbage.get", lz6.Get());
+            e.Hex(k + ".unser.garbage.ser", Ser(lz6));
+            CBLSLazyPublicKey lz7;
+            {
+                CDataStream ss(Bytes(48, 0x00), SER_NETWORK, PROTOCOL_VERSION);
+                lz7.Unserialize(ss, l);
+            }
+            e.Obj(k + ".unser.zeros.get", lz7.Get());
+            e.Bool(k + ".unser.zeros.eq.default", lz7 == CBLSLazyPublicKey());
+            CBLSLazySignature ls;
+            ls.Set(sig, l);
+            e.Hex(k + ".sig.ser", Ser(ls));
+            e.Hash(k + ".sig.hash", ls.GetHash());
+            CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+            ss << CBLSLazyPublicKeyVersionWrapper(lz, !l);
+            e.Hex(k + ".lazyvw", Bytes(UCharCast(ss.data()), UCharCast(ss.data() + ss.size())));
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// J. IES
+void SectionIES(Emitter& e)
+{
+    const CBLSSecretKey recipient = Sk(0);
+    const CBLSSecretKey ephemeral = Sk(20);
+    const Bytes plaintext = DeterministicBytes("dashbls-ref-ies", 0, 64);
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        const std::string t = std::string("J.g") + G(g);
+        CBLSIESMultiRecipientBlobs blobs;
+        blobs.InitEncrypt(2);
+        blobs.ephemeralSecretKey = ephemeral;
+        blobs.ephemeralPubKey = ephemeral.GetPublicKey();
+        blobs.ivSeed = Msg(7);
+        blobs.ivVector[0] = blobs.ivSeed;
+        blobs.ivVector[1] = ::SerializeHash(blobs.ivVector[0]);
+        e.Bool(t + ".enc0", blobs.Encrypt(0, recipient.GetPublicKey(), plaintext));
+        e.Bool(t + ".enc1", blobs.Encrypt(1, Sk(1).GetPublicKey(), plaintext));
+        e.Hex(t + ".blob0", blobs.blobs[0]);
+        e.Hex(t + ".blob1", blobs.blobs[1]);
+        e.Hex(t + ".ser", Ser(blobs));
+        CBLSIESMultiRecipientBlobs::Blob dec;
+        e.Bool(t + ".dec0", blobs.Decrypt(0, recipient, dec));
+        e.Bool(t + ".dec0.eq", dec == plaintext);
+        e.Bool(t + ".dec1", blobs.Decrypt(1, Sk(1), dec));
+        e.Bool(t + ".dec1.eq", dec == plaintext);
+        e.Bool(t + ".dec0.wrongkey", blobs.Decrypt(0, Sk(1), dec));
+        e.Hex(t + ".dec0.wrongkey.data", dec);
+        e.Bool(t + ".dec.invalidkey", blobs.Decrypt(0, CBLSSecretKey(), dec));
+        e.Bool(t + ".dec.oob", blobs.Decrypt(2, recipient, dec));
+        CBLSIESEncryptedBlob single{blobs.ephemeralPubKey, blobs.ivSeed, blobs.blobs[1]};
+        e.Hex(t + ".single.ser", Ser(single));
+        e.Bool(t + ".single.valid", single.IsValid());
+        CDataStream out(SER_NETWORK, PROTOCOL_VERSION);
+        e.Bool(t + ".single.dec", single.Decrypt(1, Sk(1), out));
+        e.Bool(t + ".single.dec.eq", Bytes(UCharCast(out.data()), UCharCast(out.data() + out.size())) == plaintext);
+        // deserialize the multi-recipient blobs again and decrypt
+        CBLSIESMultiRecipientBlobs rt;
+        {
+            CDataStream ss(Ser(blobs), SER_NETWORK, PROTOCOL_VERSION);
+            ss >> rt;
+        }
+        e.Bool(t + ".rt.dec0", rt.Decrypt(0, recipient, dec) && dec == plaintext);
+    }
+}
+
+// ---------------------------------------------------------------------------
+// K. Batch verifier
+void SectionBatchVerifier(Emitter& e)
+{
+    for (bool g : {true, false}) {
+        GlobalScheme gs(g);
+        for (bool secure : {false, true}) {
+            for (bool fallback : {false, true}) {
+                const std::string t = std::string("K.g") + G(g) + ".s" + F(secure) + ".f" + F(fallback);
+                CBLSBatchVerifier<int, int> verifier(secure, fallback);
+                // source 1: two valid messages; source 2: one bad; source 3: one good, one bad;
+                // source 4: same message hash as source 1 signed by another key
+                auto push = [&](int source, int msgId, uint32_t signer, uint32_t claimed, uint32_t msg) {
+                    verifier.PushMessage(source, msgId, Msg(msg), Sk(signer).Sign(Msg(msg), g), Sk(claimed).GetPublicKey());
+                };
+                push(1, 10, 1, 1, 0);
+                push(1, 11, 1, 1, 1);
+                push(2, 20, 2, 3, 2);
+                push(3, 30, 3, 3, 3);
+                push(3, 31, 3, 4, 4);
+                push(4, 40, 4, 4, 0);
+                verifier.Verify();
+                std::string bad;
+                for (int s : verifier.badSources) bad += ToString(s) + ",";
+                e.Str(t + ".badsources", bad);
+                bad.clear();
+                for (int m : verifier.badMessages) bad += ToString(m) + ",";
+                e.Str(t + ".badmessages", bad);
+                // all valid
+                CBLSBatchVerifier<int, int> ok(secure, fallback);
+                for (int i = 0; i < 4; i++) {
+                    ok.PushMessage(i, i, Msg(i), Sk(i).Sign(Msg(i), g), Sk(i).GetPublicKey());
+                }
+                ok.Verify();
+                e.Bool(t + ".allvalid", ok.badSources.empty() && ok.badMessages.empty());
+            }
+        }
+    }
+}
+
+std::vector<std::string> GenerateReferenceVectors()
+{
+    Emitter e;
+    SectionKeys(e);
+    SectionSecretKeyCodec(e);
+    SectionG1(e);
+    SectionG2(e);
+    SectionSignVerify(e);
+    SectionAggregation(e);
+    SectionThreshold(e);
+    SectionDH(e);
+    SectionSerialization(e);
+    SectionIES(e);
+    SectionBatchVerifier(e);
+    return e.lines;
+}
+
+} // namespace
+
+BOOST_AUTO_TEST_SUITE(bls_reference_vectors_tests)
+
+BOOST_AUTO_TEST_CASE(bls_reference_vectors)
+{
+    const bool prevScheme = bls::bls_legacy_scheme.load();
+    const std::vector<std::string> actual = GenerateReferenceVectors();
+    bls::bls_legacy_scheme.store(prevScheme);
+
+    if (const char* dump = std::getenv("BLS_REFERENCE_VECTORS_DUMP")) {
+        std::ofstream out(dump);
+        out << "[\n";
+        for (size_t i = 0; i < actual.size(); i++) {
+            out << "  \"" << actual[i] << "\"" << (i + 1 < actual.size() ? "," : "") << "\n";
+        }
+        out << "]\n";
+    }
+
+    const UniValue expected = read_json(std::string(json_tests::bls_reference_vectors, json_tests::bls_reference_vectors + sizeof(json_tests::bls_reference_vectors)));
+    BOOST_CHECK_EQUAL(actual.size(), expected.size());
+    const size_t n = std::min<size_t>(actual.size(), expected.size());
+    for (size_t i = 0; i < n; i++) {
+        BOOST_CHECK_MESSAGE(actual[i] == expected[i].get_str(), "vector " << i << " differs: got '" << actual[i] << "', expected '" << expected[i].get_str() << "'");
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/data/bls_reference_vectors.json b/src/test/data/bls_reference_vectors.json
new file mode 100644
index 000000000000..04443082e204
--- /dev/null
+++ b/src/test/data/bls_reference_vectors.json
@@ -0,0 +1,1502 @@
+[
+  "A.0.sk=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "A.0.pk=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "A.0.sk.hash.gL=c36aed0557cfa677176ad5357dfaa565d9010ea87e2279b2a06df03974451bea",
+  "A.0.pk.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "A.0.pk.ser.gL=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "A.0.sk.hash.gB=c36aed0557cfa677176ad5357dfaa565d9010ea87e2279b2a06df03974451bea",
+  "A.0.pk.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "A.0.pk.ser.gB=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "A.0.pk.hash.stable=1",
+  "A.1.sk=15cb1009d8181b04e235dca23da22037a9e5b864b12a796bd5555dcc9041bfc4:15cb1009d8181b04e235dca23da22037a9e5b864b12a796bd5555dcc9041bfc4",
+  "A.1.pk=8e5df95da78c1091dfc377d03a4b1d2d086a8bf96bbda3e4ea1ee4959047abec35162f003e64723ff8035990d5194431:ae5df95da78c1091dfc377d03a4b1d2d086a8bf96bbda3e4ea1ee4959047abec35162f003e64723ff8035990d5194431",
+  "A.1.sk.hash.gL=5f75d2b544a14f7125e1f954efc7d7b491bb7160d5798ba342aa75dc94a05b67",
+  "A.1.pk.hash.gL=9976ae6d6a7932eb4391702a1c7c8009b63c3706d074589344b649ad61e5e028",
+  "A.1.pk.ser.gL=8e5df95da78c1091dfc377d03a4b1d2d086a8bf96bbda3e4ea1ee4959047abec35162f003e64723ff8035990d5194431",
+  "A.1.sk.hash.gB=5f75d2b544a14f7125e1f954efc7d7b491bb7160d5798ba342aa75dc94a05b67",
+  "A.1.pk.hash.gB=743c3e99950113c0fc020bc898991acbd77f06962cd7758b62db96f87d2e293d",
+  "A.1.pk.ser.gB=ae5df95da78c1091dfc377d03a4b1d2d086a8bf96bbda3e4ea1ee4959047abec35162f003e64723ff8035990d5194431",
+  "A.1.pk.hash.stable=1",
+  "A.2.sk=3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59:3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59",
+  "A.2.pk=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "A.2.sk.hash.gL=153439be387f296557f08430f6d83b4a00c7f8c452ef4e6c6d89a0fb56414c5a",
+  "A.2.pk.hash.gL=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "A.2.pk.ser.gL=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "A.2.sk.hash.gB=153439be387f296557f08430f6d83b4a00c7f8c452ef4e6c6d89a0fb56414c5a",
+  "A.2.pk.hash.gB=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "A.2.pk.ser.gB=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "A.2.pk.hash.stable=1",
+  "A.3.sk=25e1b1371a97f20920f42538944483ae8d500eb8ee0e2777c9937c098b2389e8:25e1b1371a97f20920f42538944483ae8d500eb8ee0e2777c9937c098b2389e8",
+  "A.3.pk=90184e3696db634565f7b6ca9358e54dd3324eb0c58234d9a0cb3c17e2dd6b9e641c6711de86a98c9be58c445e7a7a07:b0184e3696db634565f7b6ca9358e54dd3324eb0c58234d9a0cb3c17e2dd6b9e641c6711de86a98c9be58c445e7a7a07",
+  "A.3.sk.hash.gL=0dacf8d521d75b33bc91a157eb9d6a691a954b1bb12f67b8899a48a3a690624d",
+  "A.3.pk.hash.gL=de1e33d34b4cd0908d1390d8908c754835b796b2f1aa70217f67765fc746f8b4",
+  "A.3.pk.ser.gL=90184e3696db634565f7b6ca9358e54dd3324eb0c58234d9a0cb3c17e2dd6b9e641c6711de86a98c9be58c445e7a7a07",
+  "A.3.sk.hash.gB=0dacf8d521d75b33bc91a157eb9d6a691a954b1bb12f67b8899a48a3a690624d",
+  "A.3.pk.hash.gB=3ffad86e4ebfccca8bc785a041d0ce887077a2a62d20e9d307e8d80967016d07",
+  "A.3.pk.ser.gB=b0184e3696db634565f7b6ca9358e54dd3324eb0c58234d9a0cb3c17e2dd6b9e641c6711de86a98c9be58c445e7a7a07",
+  "A.3.pk.hash.stable=1",
+  "A.invalid.sk=INVALID",
+  "A.invalid.pk=INVALID",
+  "A.invalid.sig=INVALID",
+  "A.id.zero=0000000000000000000000000000000000000000000000000000000000000000:0000000000000000000000000000000000000000000000000000000000000000",
+  "A.id.h0=9025f583975b3980874099c5be032b1a914a65432e22935202a92c3e15338f35:9025f583975b3980874099c5be032b1a914a65432e22935202a92c3e15338f35",
+  "B.rm1.f0=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000",
+  "B.rm1.f0.pk=97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb:b7f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+  "B.rm1.f0.sig=804d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed0030f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859:af192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed003",
+  "B.rm1.f1=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000",
+  "B.rm1.f1.pk=97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb:b7f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+  "B.rm1.f1.sig=804d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed0030f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859:af192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed003",
+  "B.rm1.unser.gL=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000",
+  "B.rm1.unser.gB=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000",
+  "B.rm1.ctor=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000",
+  "B.r.f0=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+  "B.r.f0.pk=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "B.r.f0.sig=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "B.r.f1=INVALID",
+  "B.r.unser.gL=INVALID",
+  "B.r.unser.gB=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+  "B.r.ctor=73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001:73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+  "B.rp1.f0=INVALID",
+  "B.rp1.f1=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.rp1.f1.pk=17f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb:97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+  "B.rp1.f1.sig=004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed0030f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859:8f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed003",
+  "B.rp1.unser.gL=throw",
+  "B.rp1.unser.gB=throw",
+  "B.rp1.ctor=INVALID",
+  "B.2r.f0=INVALID",
+  "B.2r.f1=INVALID",
+  "B.2r.unser.gL=throw",
+  "B.2r.unser.gB=throw",
+  "B.2r.ctor=INVALID",
+  "B.ff.f0=INVALID",
+  "B.ff.f1=1824b159acc5056f998c4fefecbc4ff55884b7fa0003480200000001fffffffd:1824b159acc5056f998c4fefecbc4ff55884b7fa0003480200000001fffffffd",
+  "B.ff.f1.pk=16ea601ca88f7d3489479129b258960b4c1df37194d30803627c30c34252679a0ada1a51bc7a4006a4f0564050d31746:96ea601ca88f7d3489479129b258960b4c1df37194d30803627c30c34252679a0ada1a51bc7a4006a4f0564050d31746",
+  "B.ff.f1.sig=83a2bc3ec98c4ada33537beb4c3c19787b82a2109fccd799f41fd3ef5a9a459215f1a0e326aae4159152f8bb5dafdbd405a330dbc571c4a6b60024d03858300daa95dced77243c520bdd2c35483633f04bccc141a24074813a25250a469e045e:a5a330dbc571c4a6b60024d03858300daa95dced77243c520bdd2c35483633f04bccc141a24074813a25250a469e045e03a2bc3ec98c4ada33537beb4c3c19787b82a2109fccd799f41fd3ef5a9a459215f1a0e326aae4159152f8bb5dafdbd4",
+  "B.ff.unser.gL=throw",
+  "B.ff.unser.gB=throw",
+  "B.ff.ctor=INVALID",
+  "B.zero.f0=INVALID",
+  "B.zero.f1=INVALID",
+  "B.zero.unser.gL=INVALID",
+  "B.zero.unser.gB=INVALID",
+  "B.zero.ctor=INVALID",
+  "B.one.f0=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.one.f0.pk=17f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb:97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+  "B.one.f0.sig=004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed0030f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859:8f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed003",
+  "B.one.f1=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.one.f1.pk=17f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb:97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+  "B.one.f1.sig=004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed0030f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859:8f192a3932bcfc2ca1301b4b0ca179b71f813a5683cfec0e6daf37bcf45db9af030ba0967fc7040f5d726b615347d859004d778e40de9c05641bc1512b9838c978c6c495ca099d24e3f4dbd18f312ce7a5ce5ae73d8f82ab0774626204fed003",
+  "B.one.unser.gL=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.one.unser.gB=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.one.ctor=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.sk0.f0=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "B.sk0.f0.pk=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "B.sk0.f0.sig=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "B.sk0.f1=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "B.sk0.f1.pk=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "B.sk0.f1.sig=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "B.sk0.unser.gL=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "B.sk0.unser.gB=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "B.sk0.ctor=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "B.hex.nonhex=0",
+  "B.hex.nonhex.obj=INVALID",
+  "B.hex.short=0",
+  "B.hex.long=0",
+  "B.hex.ok=1",
+  "B.hex.ok.obj=15cb1009d8181b04e235dca23da22037a9e5b864b12a796bd5555dcc9041bfc4:15cb1009d8181b04e235dca23da22037a9e5b864b12a796bd5555dcc9041bfc4",
+  "B.hex.r.f0=1",
+  "B.hex.r.f1=0",
+  "B.hex.rp1.f1=1",
+  "B.hex.rp1.f1.obj=0000000000000000000000000000000000000000000000000000000000000001:0000000000000000000000000000000000000000000000000000000000000001",
+  "B.len31=0",
+  "B.len33=0",
+  "C.pkL.f1=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.pkL.f1.dh=1",
+  "C.pkL.f1.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.pkL.f1.verL=1",
+  "C.pkL.f1.verB=1",
+  "C.pkL.f1.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.pkL.f1.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.pkL.f1.versec.gL=1",
+  "C.pkL.f1.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.pkL.f1.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.pkL.f1.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.pkL.f1.versec.gB=1",
+  "C.pkL.f1.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.pkL.f0=INVALID",
+  "C.pkL.unser.gL=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.pkL.unser.gB=INVALID",
+  "C.pkB.f1=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.pkB.f1.dh=1",
+  "C.pkB.f1.dh.obj=8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:ab38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.pkB.f1.verL=0",
+  "C.pkB.f1.verB=0",
+  "C.pkB.f1.hash.gL=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.pkB.f1.aggsec.gL=9690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d35508ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d6839:a8ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d68391690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d355",
+  "C.pkB.f1.versec.gL=0",
+  "C.pkB.f1.aggpk.gL=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.pkB.f1.hash.gB=288e5632e86c25c5b09663e0738ec2bcbaaa6d699dcdba76c3b2b7c45f78c283",
+  "C.pkB.f1.aggsec.gB=01531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a0c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f9:8c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f901531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a",
+  "C.pkB.f1.versec.gB=0",
+  "C.pkB.f1.aggpk.gB=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.pkB.f0=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.pkB.f0.dh=1",
+  "C.pkB.f0.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.pkB.f0.verL=1",
+  "C.pkB.f0.verB=1",
+  "C.pkB.f0.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.pkB.f0.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.pkB.f0.versec.gL=1",
+  "C.pkB.f0.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.pkB.f0.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.pkB.f0.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.pkB.f0.versec.gB=1",
+  "C.pkB.f0.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.pkB.unser.gL=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.pkB.unser.gB=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.zeros.f1=INVALID",
+  "C.zeros.f0=INVALID",
+  "C.zeros.unser.gL=INVALID",
+  "C.zeros.unser.gB=INVALID",
+  "C.inf.f1=INVALID",
+  "C.inf.f0=INVALID",
+  "C.inf.unser.gL=throw",
+  "C.inf.unser.gB=throw",
+  "C.badinf.f1=INVALID",
+  "C.badinf.f0=INVALID",
+  "C.badinf.unser.gL=throw",
+  "C.badinf.unser.gB=throw",
+  "C.badinf.mid.f1=INVALID",
+  "C.badinf.mid.f0=INVALID",
+  "C.badinf.mid.unser.gL=throw",
+  "C.badinf.mid.unser.gB=throw",
+  "C.ff.f1=INVALID",
+  "C.ff.f0=INVALID",
+  "C.ff.unser.gL=throw",
+  "C.ff.unser.gB=throw",
+  "C.fflow.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.fflow.f1.dh=1",
+  "C.fflow.f1.dh.obj=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.fflow.f1.verL=0",
+  "C.fflow.f1.verB=0",
+  "C.fflow.f1.hash.gL=b913674b62d3df1d3ab4f1abccc434a00f239bda9e98d26b86ddd6e79d692631",
+  "C.fflow.f1.aggsec.gL=85a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4116e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f46:b16e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f4605a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4",
+  "C.fflow.f1.versec.gL=0",
+  "C.fflow.f1.aggpk.gL=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.fflow.f1.hash.gB=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.fflow.f1.aggsec.gB=938197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e07b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e:a7b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e138197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e",
+  "C.fflow.f1.versec.gB=0",
+  "C.fflow.f1.aggpk.gB=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.fflow.f0=INVALID",
+  "C.fflow.unser.gL=throw",
+  "C.fflow.unser.gB=throw",
+  "C.L.or40.f1=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.or40.f1.dh=1",
+  "C.L.or40.f1.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.L.or40.f1.verL=1",
+  "C.L.or40.f1.verB=1",
+  "C.L.or40.f1.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.L.or40.f1.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.L.or40.f1.versec.gL=1",
+  "C.L.or40.f1.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.or40.f1.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.L.or40.f1.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.L.or40.f1.versec.gB=1",
+  "C.L.or40.f1.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.or40.f0=INVALID",
+  "C.L.or40.unser.gL=throw",
+  "C.L.or40.unser.gB=throw",
+  "C.L.or20.f1=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.or20.f1.dh=1",
+  "C.L.or20.f1.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.L.or20.f1.verL=1",
+  "C.L.or20.f1.verB=1",
+  "C.L.or20.f1.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.L.or20.f1.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.L.or20.f1.versec.gL=1",
+  "C.L.or20.f1.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.or20.f1.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.L.or20.f1.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.L.or20.f1.versec.gB=1",
+  "C.L.or20.f1.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.or20.f0=INVALID",
+  "C.L.or20.unser.gL=throw",
+  "C.L.or20.unser.gB=throw",
+  "C.L.orE0.f1=INVALID",
+  "C.L.orE0.f0=INVALID",
+  "C.L.orE0.unser.gL=throw",
+  "C.L.orE0.unser.gB=throw",
+  "C.L.xor80.f1=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.xor80.f1.dh=1",
+  "C.L.xor80.f1.dh.obj=8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:ab38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.L.xor80.f1.verL=0",
+  "C.L.xor80.f1.verB=0",
+  "C.L.xor80.f1.hash.gL=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.L.xor80.f1.aggsec.gL=9690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d35508ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d6839:a8ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d68391690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d355",
+  "C.L.xor80.f1.versec.gL=0",
+  "C.L.xor80.f1.aggpk.gL=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.L.xor80.f1.hash.gB=288e5632e86c25c5b09663e0738ec2bcbaaa6d699dcdba76c3b2b7c45f78c283",
+  "C.L.xor80.f1.aggsec.gB=01531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a0c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f9:8c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f901531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a",
+  "C.L.xor80.f1.versec.gB=0",
+  "C.L.xor80.f1.aggpk.gB=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.L.xor80.f0=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.xor80.f0.dh=1",
+  "C.L.xor80.f0.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.L.xor80.f0.verL=1",
+  "C.L.xor80.f0.verB=1",
+  "C.L.xor80.f0.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.L.xor80.f0.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.L.xor80.f0.versec.gL=1",
+  "C.L.xor80.f0.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.xor80.f0.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.L.xor80.f0.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.L.xor80.f0.versec.gB=1",
+  "C.L.xor80.f0.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.xor80.unser.gL=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.xor80.unser.gB=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.and1f.f1=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.and1f.f1.dh=1",
+  "C.L.and1f.f1.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.L.and1f.f1.verL=1",
+  "C.L.and1f.f1.verB=1",
+  "C.L.and1f.f1.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.L.and1f.f1.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.L.and1f.f1.versec.gL=1",
+  "C.L.and1f.f1.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.and1f.f1.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.L.and1f.f1.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.L.and1f.f1.versec.gB=1",
+  "C.L.and1f.f1.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.L.and1f.f0=INVALID",
+  "C.L.and1f.unser.gL=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.L.and1f.unser.gB=INVALID",
+  "C.B.xor20.f1=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.B.xor20.f1.dh=1",
+  "C.B.xor20.f1.dh.obj=8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:ab38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.B.xor20.f1.verL=0",
+  "C.B.xor20.f1.verB=0",
+  "C.B.xor20.f1.hash.gL=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.B.xor20.f1.aggsec.gL=9690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d35508ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d6839:a8ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d68391690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d355",
+  "C.B.xor20.f1.versec.gL=0",
+  "C.B.xor20.f1.aggpk.gL=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.B.xor20.f1.hash.gB=288e5632e86c25c5b09663e0738ec2bcbaaa6d699dcdba76c3b2b7c45f78c283",
+  "C.B.xor20.f1.aggsec.gB=01531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a0c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f9:8c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f901531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a",
+  "C.B.xor20.f1.versec.gB=0",
+  "C.B.xor20.f1.aggpk.gB=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.B.xor20.f0=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.B.xor20.f0.dh=1",
+  "C.B.xor20.f0.dh.obj=8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:ab38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.B.xor20.f0.verL=0",
+  "C.B.xor20.f0.verB=0",
+  "C.B.xor20.f0.hash.gL=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.B.xor20.f0.aggsec.gL=9690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d35508ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d6839:a8ffbc5c345ad06ec5c6463c98921ddd69fb8aa9cb0a36107ef95c35eac4c4e75aa6456cb73c3cdc34a6a282551d68391690d29d2a0ec8d8c4b34e23d56f37c37a6c73c0ee500c1a334f759071ad90ec294613e77c9593f37d68362b3335d355",
+  "C.B.xor20.f0.versec.gL=0",
+  "C.B.xor20.f0.aggpk.gL=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.B.xor20.f0.hash.gB=288e5632e86c25c5b09663e0738ec2bcbaaa6d699dcdba76c3b2b7c45f78c283",
+  "C.B.xor20.f0.aggsec.gB=01531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a0c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f9:8c5bb9cf80cbc8d42c7d47d6c325a948b78fe15a943cbc30c9668a36e47be809a58c83f295012377d17d7c30949e15f901531c4c556ea23d445d1178308242a33884461689c5be8f6e8dae0f536286a6f8dbd9fcab0371f91b5d5426e676da2a",
+  "C.B.xor20.f0.versec.gB=0",
+  "C.B.xor20.f0.aggpk.gB=98aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2:b8aa0e3ae83bc24237acb1eb790b43709fa9e375314f9e43f9dbe3a855aefa6c165cf9f6c5a6eeba5ad3313638e3fac2",
+  "C.B.xor20.unser.gL=INVALID",
+  "C.B.xor20.unser.gB=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.B.and7f.f1=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.B.and7f.f1.dh=1",
+  "C.B.and7f.f1.dh.obj=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "C.B.and7f.f1.verL=1",
+  "C.B.and7f.f1.verB=1",
+  "C.B.and7f.f1.hash.gL=0a008f599e0516009225f280b3c41f2dcff06e512959433703466270b7683d14",
+  "C.B.and7f.f1.aggsec.gL=8c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a0c1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa781:ac1ce3f568a7a112d0f047d34b3208f029c4c9736d17ba80241505255f3ad23623ee9113aa6cded3535a6c248b8fa7810c0fb4c3c04e2252705f12d503d000d5f6594affcffea96b50ee7e0ebbd76f34c73531db9c2d436fe3cbcc5a5e162f6a",
+  "C.B.and7f.f1.versec.gL=1",
+  "C.B.and7f.f1.aggpk.gL=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.B.and7f.f1.hash.gB=f83ac60aeb7724d7d0096f7f27922d1a85c073f32216a3a7d836c30c66c58ef5",
+  "C.B.and7f.f1.aggsec.gB=8a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513177364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a951:b77364ddff651a6cf7d7fd75d80265c43f2e7aab0d85dd6148ec4f98bb3103d202feaae0c0d695757e5338be6389a9510a4d6493fdcf82953f5bdb5409914f31cef5e84092ea115a6ca2b09126479833ae7e2d5e79d3c2ad74ad91930bdfe513",
+  "C.B.and7f.f1.versec.gB=1",
+  "C.B.and7f.f1.aggpk.gB=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "C.B.and7f.f0=INVALID",
+  "C.B.and7f.unser.gL=114ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "C.B.and7f.unser.gB=INVALID",
+  "C.B.or40.f1=INVALID",
+  "C.B.or40.f0=INVALID",
+  "C.B.or40.unser.gL=throw",
+  "C.B.or40.unser.gB=throw",
+  "C.B.tail.f1=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a1:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a1",
+  "C.B.tail.f1.dh=1",
+  "C.B.tail.f1.dh.obj=8fb7b256d3114c17437f48364e60440d7f3b046acce6dc9966dbecac389a8f883fd122a2d507e39cfb89d0d57e2387cd:afb7b256d3114c17437f48364e60440d7f3b046acce6dc9966dbecac389a8f883fd122a2d507e39cfb89d0d57e2387cd",
+  "C.B.tail.f1.verL=0",
+  "C.B.tail.f1.verB=0",
+  "C.B.tail.f1.hash.gL=8f278734cdf5ca9e2e2826d1af4dd6c77a033c4ee357842bb149f3d212f32a0c",
+  "C.B.tail.f1.aggsec.gL=8ab63df928aeb9d3c9000e8420599c2fb62eb6eba482390f070e650ef1f4fb37b0d8dba6fffa28e08ee89a6d6495a68f17fbabf524db63bdfba87dfcf37b1dbf526844581c22894d5d90684856c574e9b14261f2a746b1f40c626b4b8d7b3adf:b7fbabf524db63bdfba87dfcf37b1dbf526844581c22894d5d90684856c574e9b14261f2a746b1f40c626b4b8d7b3adf0ab63df928aeb9d3c9000e8420599c2fb62eb6eba482390f070e650ef1f4fb37b0d8dba6fffa28e08ee89a6d6495a68f",
+  "C.B.tail.f1.versec.gL=0",
+  "C.B.tail.f1.aggpk.gL=02f85f3abcde2244a49b554402497268723c7fc7a2fa2770d052e5ff65c8266905c9e627b229d1f6ffcbd740837c7903:82f85f3abcde2244a49b554402497268723c7fc7a2fa2770d052e5ff65c8266905c9e627b229d1f6ffcbd740837c7903",
+  "C.B.tail.f1.hash.gB=0965d530f5c43080378d940e9238b4d0feff620089f0579cd5ccd7a90bd03b66",
+  "C.B.tail.f1.aggsec.gB=0a162cc940789fcb1795d63cefe9c90bb94a45e4d3dc4c9ef01c1d600c865356d32d62a51c4c95c336e0d9dc72fc41a419e097a1b21a09e7ebe570732be7e9c2b7fe2f048897340df8cfe71aa7846ad96dcb232edb9566281915681d245828b3:99e097a1b21a09e7ebe570732be7e9c2b7fe2f048897340df8cfe71aa7846ad96dcb232edb9566281915681d245828b30a162cc940789fcb1795d63cefe9c90bb94a45e4d3dc4c9ef01c1d600c865356d32d62a51c4c95c336e0d9dc72fc41a4",
+  "C.B.tail.f1.versec.gB=0",
+  "C.B.tail.f1.aggpk.gB=02f85f3abcde2244a49b554402497268723c7fc7a2fa2770d052e5ff65c8266905c9e627b229d1f6ffcbd740837c7903:82f85f3abcde2244a49b554402497268723c7fc7a2fa2770d052e5ff65c8266905c9e627b229d1f6ffcbd740837c7903",
+  "C.B.tail.f0=INVALID",
+  "C.B.tail.unser.gL=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a1:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a1",
+  "C.B.tail.unser.gB=INVALID",
+  "C.x0.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x0.80.f1.dh=1",
+  "C.x0.80.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x0.80.f1.verL=0",
+  "C.x0.80.f1.verB=0",
+  "C.x0.80.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.x0.80.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.x0.80.f1.versec.gL=0",
+  "C.x0.80.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.x0.80.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.x0.80.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.x0.80.f1.versec.gB=0",
+  "C.x0.80.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.x0.80.f0=INVALID",
+  "C.x0.80.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x0.80.unser.gB=INVALID",
+  "C.x0.a0.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x0.a0.f1.dh=1",
+  "C.x0.a0.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x0.a0.f1.verL=0",
+  "C.x0.a0.f1.verB=0",
+  "C.x0.a0.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.x0.a0.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.x0.a0.f1.versec.gL=0",
+  "C.x0.a0.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.x0.a0.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.x0.a0.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.x0.a0.f1.versec.gB=0",
+  "C.x0.a0.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.x0.a0.f0=INVALID",
+  "C.x0.a0.unser.gL=throw",
+  "C.x0.a0.unser.gB=throw",
+  "C.x1.00.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "C.x1.00.f1.dh=1",
+  "C.x1.00.f1.dh.obj=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x1.00.f1.verL=0",
+  "C.x1.00.f1.verB=0",
+  "C.x1.00.f1.hash.gL=db6c33861dcfcd76999826fc15d92b06743fa923b3cfc1758bb4b8fe6e97b49d",
+  "C.x1.00.f1.aggsec.gL=10a2014e9e0101e274db647620bc66dd1e19826b758b587e13ebbc05fe04b99254b12031689f135e44ea1845506c86ea083a9742d5bdbcb33be8d01d82e884c6340db68071d439cf079458d844b37e0c40d396128fbc85e1dfd2d7e362319379:883a9742d5bdbcb33be8d01d82e884c6340db68071d439cf079458d844b37e0c40d396128fbc85e1dfd2d7e36231937910a2014e9e0101e274db647620bc66dd1e19826b758b587e13ebbc05fe04b99254b12031689f135e44ea1845506c86ea",
+  "C.x1.00.f1.versec.gL=0",
+  "C.x1.00.f1.aggpk.gL=19686569afb1923a67e83605f5f9acfb5a1355348fd82ee7fa76c454ef79afad9f82137ce08b284da0aa76fbd9d49332:99686569afb1923a67e83605f5f9acfb5a1355348fd82ee7fa76c454ef79afad9f82137ce08b284da0aa76fbd9d49332",
+  "C.x1.00.f1.hash.gB=6d36c7b985a96b44c7396b6b7b2224e1550126cd09ed6848d53ba19481626379",
+  "C.x1.00.f1.aggsec.gB=0e510fae5852908ed48911fc4973bcf48824fd055d0faa388263b9c5c78d13bf08ba615aba06c7cece687fae0c9390380ea252d3ff1e5877ae35b253eaf06cb64e980fb2637faddbe6f036e68e698fd18513efadc7091b10d3459af31dca91d0:8ea252d3ff1e5877ae35b253eaf06cb64e980fb2637faddbe6f036e68e698fd18513efadc7091b10d3459af31dca91d00e510fae5852908ed48911fc4973bcf48824fd055d0faa388263b9c5c78d13bf08ba615aba06c7cece687fae0c939038",
+  "C.x1.00.f1.versec.gB=0",
+  "C.x1.00.f1.aggpk.gB=19686569afb1923a67e83605f5f9acfb5a1355348fd82ee7fa76c454ef79afad9f82137ce08b284da0aa76fbd9d49332:99686569afb1923a67e83605f5f9acfb5a1355348fd82ee7fa76c454ef79afad9f82137ce08b284da0aa76fbd9d49332",
+  "C.x1.00.f0=INVALID",
+  "C.x1.00.unser.gL=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "C.x1.00.unser.gB=INVALID",
+  "C.x1.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "C.x1.80.f1.dh=1",
+  "C.x1.80.f1.dh.obj=038e8e584988f89f61bbb14046c653c855332025623647c3c18f8bb1080e871ccb7cfd2beda9faf8e3d7ec19e9f8a3bb:838e8e584988f89f61bbb14046c653c855332025623647c3c18f8bb1080e871ccb7cfd2beda9faf8e3d7ec19e9f8a3bb",
+  "C.x1.80.f1.verL=0",
+  "C.x1.80.f1.verB=0",
+  "C.x1.80.f1.hash.gL=6d36c7b985a96b44c7396b6b7b2224e1550126cd09ed6848d53ba19481626379",
+  "C.x1.80.f1.aggsec.gL=063448ed43683931ffb23e5e7660493fdf2b93d0dea1288b324d7b0942245c43a3b34ede5f69883e16423df6af596fde03d2d77fc3eb2b16c474ef318e965477312b878e78765e55daf796c45dc07c8b6e236c660c0cdbcf3a1aa11e8283d195:83d2d77fc3eb2b16c474ef318e965477312b878e78765e55daf796c45dc07c8b6e236c660c0cdbcf3a1aa11e8283d195063448ed43683931ffb23e5e7660493fdf2b93d0dea1288b324d7b0942245c43a3b34ede5f69883e16423df6af596fde",
+  "C.x1.80.f1.versec.gL=0",
+  "C.x1.80.f1.aggpk.gL=90d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081:b0d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081",
+  "C.x1.80.f1.hash.gB=59ba24482f29673f3ff6e77d4cfe91b6ab9cd41b236d2ae388e7b39ace011df4",
+  "C.x1.80.f1.aggsec.gB=85451273a0fead852ab8d556dea13f71fd7527a44b584b2d660dd74201e3ed08aa15498e9efc0a0a3bdbdac594e5264b0b1b23791c650974288ff95feef2733a38ddb991c22a0b0cabcd16a7fca05824f74fe1665754accb7639852b8aa18cf9:ab1b23791c650974288ff95feef2733a38ddb991c22a0b0cabcd16a7fca05824f74fe1665754accb7639852b8aa18cf905451273a0fead852ab8d556dea13f71fd7527a44b584b2d660dd74201e3ed08aa15498e9efc0a0a3bdbdac594e5264b",
+  "C.x1.80.f1.versec.gB=0",
+  "C.x1.80.f1.aggpk.gB=90d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081:b0d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081",
+  "C.x1.80.f0=INVALID",
+  "C.x1.80.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "C.x1.80.unser.gB=INVALID",
+  "C.x1.a0.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "C.x1.a0.f1.dh=1",
+  "C.x1.a0.f1.dh.obj=038e8e584988f89f61bbb14046c653c855332025623647c3c18f8bb1080e871ccb7cfd2beda9faf8e3d7ec19e9f8a3bb:838e8e584988f89f61bbb14046c653c855332025623647c3c18f8bb1080e871ccb7cfd2beda9faf8e3d7ec19e9f8a3bb",
+  "C.x1.a0.f1.verL=0",
+  "C.x1.a0.f1.verB=0",
+  "C.x1.a0.f1.hash.gL=6d36c7b985a96b44c7396b6b7b2224e1550126cd09ed6848d53ba19481626379",
+  "C.x1.a0.f1.aggsec.gL=063448ed43683931ffb23e5e7660493fdf2b93d0dea1288b324d7b0942245c43a3b34ede5f69883e16423df6af596fde03d2d77fc3eb2b16c474ef318e965477312b878e78765e55daf796c45dc07c8b6e236c660c0cdbcf3a1aa11e8283d195:83d2d77fc3eb2b16c474ef318e965477312b878e78765e55daf796c45dc07c8b6e236c660c0cdbcf3a1aa11e8283d195063448ed43683931ffb23e5e7660493fdf2b93d0dea1288b324d7b0942245c43a3b34ede5f69883e16423df6af596fde",
+  "C.x1.a0.f1.versec.gL=0",
+  "C.x1.a0.f1.aggpk.gL=90d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081:b0d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081",
+  "C.x1.a0.f1.hash.gB=59ba24482f29673f3ff6e77d4cfe91b6ab9cd41b236d2ae388e7b39ace011df4",
+  "C.x1.a0.f1.aggsec.gB=85451273a0fead852ab8d556dea13f71fd7527a44b584b2d660dd74201e3ed08aa15498e9efc0a0a3bdbdac594e5264b0b1b23791c650974288ff95feef2733a38ddb991c22a0b0cabcd16a7fca05824f74fe1665754accb7639852b8aa18cf9:ab1b23791c650974288ff95feef2733a38ddb991c22a0b0cabcd16a7fca05824f74fe1665754accb7639852b8aa18cf905451273a0fead852ab8d556dea13f71fd7527a44b584b2d660dd74201e3ed08aa15498e9efc0a0a3bdbdac594e5264b",
+  "C.x1.a0.f1.versec.gB=0",
+  "C.x1.a0.f1.aggpk.gB=90d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081:b0d6236ff01363b713aafea5bd8a9d46c3468a524d34e9433fb0aa45e0226ffac3028f56e6d58acd95a2f8581b0f5081",
+  "C.x1.a0.f0=INVALID",
+  "C.x1.a0.unser.gL=throw",
+  "C.x1.a0.unser.gB=throw",
+  "C.x2.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",
+  "C.x2.80.f1.dh=1",
+  "C.x2.80.f1.dh.obj=1049c70692cd71867bb89faaf2e8cedc97054fd57376e961461cf0d0311d332ad97b2731a8cc489453b7ee98a041a1b0:9049c70692cd71867bb89faaf2e8cedc97054fd57376e961461cf0d0311d332ad97b2731a8cc489453b7ee98a041a1b0",
+  "C.x2.80.f1.verL=0",
+  "C.x2.80.f1.verB=0",
+  "C.x2.80.f1.hash.gL=ea2847ad8d04ce1ba5f7fa6d791cb03bdd5dda127d264ba0fe9a862412984e02",
+  "C.x2.80.f1.aggsec.gL=8161a9efcdff2130ab5ccc5a8791a2a05b5da708b534b7769b08c5006136dd21610dc8d16ebd601ad2ae8c3ec6a8992b0d73aae74a9b441d6b8f5f2ad1735d3aa5d24d9969ac0927e619b03af5e8e478d86899a12b4b8b6cfcabf6ef5f51da67:ad73aae74a9b441d6b8f5f2ad1735d3aa5d24d9969ac0927e619b03af5e8e478d86899a12b4b8b6cfcabf6ef5f51da670161a9efcdff2130ab5ccc5a8791a2a05b5da708b534b7769b08c5006136dd21610dc8d16ebd601ad2ae8c3ec6a8992b",
+  "C.x2.80.f1.versec.gL=0",
+  "C.x2.80.f1.aggpk.gL=9901ca644225987400dd5bae336efb080faeca0438960212a9445356ebf881baeb3579f495d0a4efe803e477b02eb498:b901ca644225987400dd5bae336efb080faeca0438960212a9445356ebf881baeb3579f495d0a4efe803e477b02eb498",
+  "C.x2.80.f1.hash.gB=5e6aeeabc6e9dc7c4e4cfa6f1b5c15835e0221729784fde45b4d1888e18bd877",
+  "C.x2.80.f1.aggsec.gB=8d1258cea1a4135808e30f897239e346517dcc7844d46cf8fbe2919267202f92d47b9e81af0587822b159b13bdb3a8630b36460d3ed9ba77300baf9213ea620ef7155b3797995a151eb7fc2e19f0342b73658f0722da43ce406c184d08a9af36:ab36460d3ed9ba77300baf9213ea620ef7155b3797995a151eb7fc2e19f0342b73658f0722da43ce406c184d08a9af360d1258cea1a4135808e30f897239e346517dcc7844d46cf8fbe2919267202f92d47b9e81af0587822b159b13bdb3a863",
+  "C.x2.80.f1.versec.gB=0",
+  "C.x2.80.f1.aggpk.gB=9901ca644225987400dd5bae336efb080faeca0438960212a9445356ebf881baeb3579f495d0a4efe803e477b02eb498:b901ca644225987400dd5bae336efb080faeca0438960212a9445356ebf881baeb3579f495d0a4efe803e477b02eb498",
+  "C.x2.80.f0=INVALID",
+  "C.x2.80.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",
+  "C.x2.80.unser.gB=INVALID",
+  "C.x3.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",
+  "C.x3.80.f1.dh=1",
+  "C.x3.80.f1.dh.obj=0ef198b814a15cb1fb327c40a9162aba2a6adc9891fbdfac35314529f637359ad8b6eba5c20328475bbd01fed36a1317:8ef198b814a15cb1fb327c40a9162aba2a6adc9891fbdfac35314529f637359ad8b6eba5c20328475bbd01fed36a1317",
+  "C.x3.80.f1.verL=0",
+  "C.x3.80.f1.verB=0",
+  "C.x3.80.f1.hash.gL=958051b059b3124423d9f9c8a009f0e2f5d014c50339c8cfa0e97c701a934367",
+  "C.x3.80.f1.aggsec.gL=16a05d082ec4373e26d9e3eb2ede8c68f556fa6d1f80ae0fa0532c2b3fb350c8edda46d9b4f7787a2abd1c968934efd81394480951cac24e57f0fd382649b023e6be8841127c8bbcc93af61d850fbd0aa80e121e8acdef8c4b7a0d3e8818f314:9394480951cac24e57f0fd382649b023e6be8841127c8bbcc93af61d850fbd0aa80e121e8acdef8c4b7a0d3e8818f31416a05d082ec4373e26d9e3eb2ede8c68f556fa6d1f80ae0fa0532c2b3fb350c8edda46d9b4f7787a2abd1c968934efd8",
+  "C.x3.80.f1.versec.gL=0",
+  "C.x3.80.f1.aggpk.gL=92f38154b23f2ecd9b8ad54ec94b66e75ec12e20458c6fab983e17e3343c48f6b1c03ba95efed8d2cb6fdedd4099dfdb:b2f38154b23f2ecd9b8ad54ec94b66e75ec12e20458c6fab983e17e3343c48f6b1c03ba95efed8d2cb6fdedd4099dfdb",
+  "C.x3.80.f1.hash.gB=d394b2a35ec6c748821c6e13d373cccc70718fecf2f9ef1b7bc5511f7b8c9756",
+  "C.x3.80.f1.aggsec.gB=19107724df5e4c4db7e04648253be0edb748a441d90313436d9a3e521185599b12115d4948411cc65d0f7ada86b562870cf7c4a54645429d50399c88fd8a28b0b51387199fd59b652672b7c64d3bb60a5ed93105f43d2cd84c80f2fe37e07019:8cf7c4a54645429d50399c88fd8a28b0b51387199fd59b652672b7c64d3bb60a5ed93105f43d2cd84c80f2fe37e0701919107724df5e4c4db7e04648253be0edb748a441d90313436d9a3e521185599b12115d4948411cc65d0f7ada86b56287",
+  "C.x3.80.f1.versec.gB=0",
+  "C.x3.80.f1.aggpk.gB=92f38154b23f2ecd9b8ad54ec94b66e75ec12e20458c6fab983e17e3343c48f6b1c03ba95efed8d2cb6fdedd4099dfdb:b2f38154b23f2ecd9b8ad54ec94b66e75ec12e20458c6fab983e17e3343c48f6b1c03ba95efed8d2cb6fdedd4099dfdb",
+  "C.x3.80.f0=INVALID",
+  "C.x3.80.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",
+  "C.x3.80.unser.gB=INVALID",
+  "C.x3.00.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",
+  "C.x3.00.f1.dh=1",
+  "C.x3.00.f1.dh.obj=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.x3.00.f1.verL=0",
+  "C.x3.00.f1.verB=0",
+  "C.x3.00.f1.hash.gL=69531d30f957667fdb574ae1b153aead226782224444c88efe40e4f87a3eabe1",
+  "C.x3.00.f1.aggsec.gL=938b56abdd9c93bc70a53416d811fa713e75b49a5362b8e36c5cd00d49da7cf1e3ccec886f4eada3f209218b354e524a047fee4576327c6fa1bf3616aa2891155694974d92c103d4a9462e8d57f7995e2f316c07ac94d47547ac1f649004b3ec:a47fee4576327c6fa1bf3616aa2891155694974d92c103d4a9462e8d57f7995e2f316c07ac94d47547ac1f649004b3ec138b56abdd9c93bc70a53416d811fa713e75b49a5362b8e36c5cd00d49da7cf1e3ccec886f4eada3f209218b354e524a",
+  "C.x3.00.f1.versec.gL=0",
+  "C.x3.00.f1.aggpk.gL=83d4ebd35f7d8832a27af81ba3623d4bc0c86fade4ceea26639790a1e049fb411be773a68b2af2c2a92a76e6b4142900:a3d4ebd35f7d8832a27af81ba3623d4bc0c86fade4ceea26639790a1e049fb411be773a68b2af2c2a92a76e6b4142900",
+  "C.x3.00.f1.hash.gB=958051b059b3124423d9f9c8a009f0e2f5d014c50339c8cfa0e97c701a934367",
+  "C.x3.00.f1.aggsec.gB=17259ef62d9a313a6378efe80123114b90418c60174563abd00e1eed91a6d6d2bc8ee32c0a6d5268837f0a9cc77327c5030a2e535b714417d84f57e8e3fe21856b3ebd7c7757d692f185d59a4836673b9c591412898c37313294d62af780e1bc:830a2e535b714417d84f57e8e3fe21856b3ebd7c7757d692f185d59a4836673b9c591412898c37313294d62af780e1bc17259ef62d9a313a6378efe80123114b90418c60174563abd00e1eed91a6d6d2bc8ee32c0a6d5268837f0a9cc77327c5",
+  "C.x3.00.f1.versec.gB=0",
+  "C.x3.00.f1.aggpk.gB=83d4ebd35f7d8832a27af81ba3623d4bc0c86fade4ceea26639790a1e049fb411be773a68b2af2c2a92a76e6b4142900:a3d4ebd35f7d8832a27af81ba3623d4bc0c86fade4ceea26639790a1e049fb411be773a68b2af2c2a92a76e6b4142900",
+  "C.x3.00.f0=INVALID",
+  "C.x3.00.unser.gL=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",
+  "C.x3.00.unser.gB=INVALID",
+  "C.x5.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",
+  "C.x5.80.f1.dh=1",
+  "C.x5.80.f1.dh.obj=04740b6a83678934415fff2cfa0db62397b60a41792b9622b82f1603ce62c04edcc091fb35a02c025b42eb079a2d996a:84740b6a83678934415fff2cfa0db62397b60a41792b9622b82f1603ce62c04edcc091fb35a02c025b42eb079a2d996a",
+  "C.x5.80.f1.verL=0",
+  "C.x5.80.f1.verB=0",
+  "C.x5.80.f1.hash.gL=86eaaba014629ec4778f5959c0522daf4e82ca86b9d0804099f1acb6c0314cf4",
+  "C.x5.80.f1.aggsec.gL=194b685173c0688f411e87c0184b14344fb3afdaeae1ddb88e57d101cdc721f5da3a706bfca646ff75c9a05b0c68369101df45d0694a305f62f50a53afc3fccf0a0b5ddaecfd2b1942bd768ed742d434cd8e4cebe9ef49b0026301b5f2c2847d:81df45d0694a305f62f50a53afc3fccf0a0b5ddaecfd2b1942bd768ed742d434cd8e4cebe9ef49b0026301b5f2c2847d194b685173c0688f411e87c0184b14344fb3afdaeae1ddb88e57d101cdc721f5da3a706bfca646ff75c9a05b0c683691",
+  "C.x5.80.f1.versec.gL=0",
+  "C.x5.80.f1.aggpk.gL=9420fda9d6ecef400b594537daecb38fce35d36e4874a127caa655cad34ae7e23f07525b3590181f926c2a9f580fdc90:b420fda9d6ecef400b594537daecb38fce35d36e4874a127caa655cad34ae7e23f07525b3590181f926c2a9f580fdc90",
+  "C.x5.80.f1.hash.gB=820b55c8c339e90ab39e1434ed0988666db3b7538c7178961afa565a916a6a52",
+  "C.x5.80.f1.aggsec.gB=8a4161d35fd7c4ee3a43d6e973df3432e8cdf3386cb03abcd01ed7ec67e534d7afe6d36f79be1a177034edd9281483ea114635de3e77e3501f08763ed9aca3dc81587c2b5bcc64ed9dd0a4658cf3b390fd54343b0a44885413153c31377edc30:b14635de3e77e3501f08763ed9aca3dc81587c2b5bcc64ed9dd0a4658cf3b390fd54343b0a44885413153c31377edc300a4161d35fd7c4ee3a43d6e973df3432e8cdf3386cb03abcd01ed7ec67e534d7afe6d36f79be1a177034edd9281483ea",
+  "C.x5.80.f1.versec.gB=0",
+  "C.x5.80.f1.aggpk.gB=9420fda9d6ecef400b594537daecb38fce35d36e4874a127caa655cad34ae7e23f07525b3590181f926c2a9f580fdc90:b420fda9d6ecef400b594537daecb38fce35d36e4874a127caa655cad34ae7e23f07525b3590181f926c2a9f580fdc90",
+  "C.x5.80.f0=INVALID",
+  "C.x5.80.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",
+  "C.x5.80.unser.gB=INVALID",
+  "C.p.00.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.00.f1.dh=1",
+  "C.p.00.f1.dh.obj=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.00.f1.verL=0",
+  "C.p.00.f1.verB=0",
+  "C.p.00.f1.hash.gL=b913674b62d3df1d3ab4f1abccc434a00f239bda9e98d26b86ddd6e79d692631",
+  "C.p.00.f1.aggsec.gL=85a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4116e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f46:b16e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f4605a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4",
+  "C.p.00.f1.versec.gL=0",
+  "C.p.00.f1.aggpk.gL=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.p.00.f1.hash.gB=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.p.00.f1.aggsec.gB=938197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e07b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e:a7b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e138197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e",
+  "C.p.00.f1.versec.gB=0",
+  "C.p.00.f1.aggpk.gB=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.p.00.f0=INVALID",
+  "C.p.00.unser.gL=throw",
+  "C.p.00.unser.gB=throw",
+  "C.p.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.80.f1.dh=1",
+  "C.p.80.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.80.f1.verL=0",
+  "C.p.80.f1.verB=0",
+  "C.p.80.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.p.80.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.p.80.f1.versec.gL=0",
+  "C.p.80.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.p.80.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.p.80.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.p.80.f1.versec.gB=0",
+  "C.p.80.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.p.80.f0=INVALID",
+  "C.p.80.unser.gL=throw",
+  "C.p.80.unser.gB=throw",
+  "C.p.a0.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.a0.f1.dh=1",
+  "C.p.a0.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.p.a0.f1.verL=0",
+  "C.p.a0.f1.verB=0",
+  "C.p.a0.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.p.a0.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.p.a0.f1.versec.gL=0",
+  "C.p.a0.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.p.a0.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.p.a0.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.p.a0.f1.versec.gB=0",
+  "C.p.a0.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.p.a0.f0=INVALID",
+  "C.p.a0.unser.gL=throw",
+  "C.p.a0.unser.gB=throw",
+  "C.pp1.80.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.pp1.80.f1.dh=1",
+  "C.pp1.80.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.pp1.80.f1.verL=0",
+  "C.pp1.80.f1.verB=0",
+  "C.pp1.80.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.pp1.80.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.pp1.80.f1.versec.gL=0",
+  "C.pp1.80.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.pp1.80.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.pp1.80.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.pp1.80.f1.versec.gB=0",
+  "C.pp1.80.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.pp1.80.f0=INVALID",
+  "C.pp1.80.unser.gL=throw",
+  "C.pp1.80.unser.gB=throw",
+  "C.max1f.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.max1f.f1.dh=1",
+  "C.max1f.f1.dh.obj=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.max1f.f1.verL=0",
+  "C.max1f.f1.verB=0",
+  "C.max1f.f1.hash.gL=b913674b62d3df1d3ab4f1abccc434a00f239bda9e98d26b86ddd6e79d692631",
+  "C.max1f.f1.aggsec.gL=85a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4116e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f46:b16e76511736e07ac43cae5c12c617260cfc912940be1e8948d4b3e7b60a61e42340271b4c3471d09255db70d3178f4605a1dd011cd9cd02c54eb6b9a77e027ad76a15f5caa53e44e9d9326d52d96281f56085f4183e9d6fb9bbb5c81c559bf4",
+  "C.max1f.f1.versec.gL=0",
+  "C.max1f.f1.aggpk.gL=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.max1f.f1.hash.gB=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.max1f.f1.aggsec.gB=938197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e07b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e:a7b5e10be643cf322d230803a90dd23c7e674ad984204d7f48b365f9d79f3c84569084d843b3a16f8b05eb2060051b8e138197896e143ac3b7cc1592ed4ec94838c387f10e44ba0cc0115c0430ae0d42e8eed0eb208fab876f3e6620beaae65e",
+  "C.max1f.f1.versec.gB=0",
+  "C.max1f.f1.aggpk.gB=0af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0:8af9321299ad7e3858b3588dc6c370df526493a80b014f403453e7fb6f54298d94f48decaed8757b4b93ad8b27ef76e0",
+  "C.max1f.f0=INVALID",
+  "C.max1f.unser.gL=throw",
+  "C.max1f.unser.gB=throw",
+  "C.max9f.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.max9f.f1.dh=1",
+  "C.max9f.f1.dh.obj=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "C.max9f.f1.verL=0",
+  "C.max9f.f1.verB=0",
+  "C.max9f.f1.hash.gL=9f898b81487ff42c0d7bbae8df2da5b86215c24cc33fa3fe455adca1e516ebfe",
+  "C.max9f.f1.aggsec.gL=8ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad80b0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b165:ab0e1167bc6d594fb5289a00b148ea79b728ca16d60384c9650111eb1f4e090312ff401ea8d7253e954de37390a1b1650ea3561bff307cc18f84cfd1ed813ed0311d51ee4489a51da86d607dc982c1af6aeb285b5d17f3583fbf3264d0e43ad8",
+  "C.max9f.f1.versec.gL=0",
+  "C.max9f.f1.aggpk.gL=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.max9f.f1.hash.gB=1a3828416e912115b984987d1c6d7ba90393eef47e0cd5d2ee16510ff3c579d5",
+  "C.max9f.f1.aggsec.gB=0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc0c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f:8c2f2e966836056650128a11164cb6dfa7c57f3cf4fff2593e9ad7600829e1841a4042cd63e75315a6188962bcc0311f0a5f1268165853b02b4107e1f7efe2696f35bcb81a20274aa6676e6c8ff5496b8ffc14d57439d68d168a8731d8004efc",
+  "C.max9f.f1.versec.gB=0",
+  "C.max9f.f1.aggpk.gB=034a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e:834a683e21a318315f7a6fc8c898e465bac9261c795e8172e8b73c65d4ca6248ff9b4eabf5e86950a947cf0535ebfa9e",
+  "C.max9f.f0=INVALID",
+  "C.max9f.unser.gL=throw",
+  "C.max9f.unser.gB=throw",
+  "C.len47=0",
+  "C.len49=0",
+  "C.len0=0",
+  "D.sigL.f1=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.sigL.f1.verL=1",
+  "D.sigL.f1.verB=0",
+  "D.sigL.f1.hash.gL=0eeb041f261223c4eca8b14d55b6a3dc162758d74e8294e5d9c14b653dfbc124",
+  "D.sigL.f1.ver2.gL=1",
+  "D.sigL.f1.agg.gL=02a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f74314bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f1:94bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f102a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f743",
+  "D.sigL.f1.hash.gB=bdea8e4015a5f5ed9587aecab25868376c999c151e8d61eb896c17e2f6bdc9ab",
+  "D.sigL.f1.ver2.gB=0",
+  "D.sigL.f1.agg.gB=0c04125bd3059fbf99da694488711da18cebfd4e958606e2f2428d17d55be841366ebb58388486d6063d190f65fe06e80ccfe2b3cec875b35f7f4002fbb333b7634f2e4016c0fdd672453d53de8ea0be3bf0ee19502975d100d29f711c470e04:8ccfe2b3cec875b35f7f4002fbb333b7634f2e4016c0fdd672453d53de8ea0be3bf0ee19502975d100d29f711c470e040c04125bd3059fbf99da694488711da18cebfd4e958606e2f2428d17d55be841366ebb58388486d6063d190f65fe06e8",
+  "D.sigL.f0=INVALID",
+  "D.sigL.unser.gL=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.sigL.unser.gB=INVALID",
+  "D.sigB.f1=0f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900:b583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.sigB.f1.verL=0",
+  "D.sigB.f1.verB=0",
+  "D.sigB.f1.hash.gL=c48d05ac1cac7993aa9598d56e1b169495650fcf3989f5951e9f7b76b290db9f",
+  "D.sigB.f1.ver2.gL=0",
+  "D.sigB.f1.agg.gL=80980e54243f22239c356eb0cc3e47d4973989f3ef21843fe09a3ddfc49388d48b1bcb0bd9beeff29b585c144b08bdf2097ea1c6e5ea3b2a3f825ad1a19008f25976a877962e6fb025389455f6414142dbbe096b647030be7ca2077dd4a9cf69:a97ea1c6e5ea3b2a3f825ad1a19008f25976a877962e6fb025389455f6414142dbbe096b647030be7ca2077dd4a9cf6900980e54243f22239c356eb0cc3e47d4973989f3ef21843fe09a3ddfc49388d48b1bcb0bd9beeff29b585c144b08bdf2",
+  "D.sigB.f1.hash.gB=3f92ee1fc1bb162e701feb90e16d69af68982d358fcbe1d5990c05c0a539af27",
+  "D.sigB.f1.ver2.gB=0",
+  "D.sigB.f1.agg.gB=075f6a6eb380a18c9c768359b7a42d12fd988f3ab0e337bf228e28d399ecd4f35d1e5ed573f5aecf3128b7525b551da819c1d1dad47658f14895247d46d0ce27ed064a946a92e2f747ed6ef44f7fa31463babbcb9f9d2420b407ef02aea94857:99c1d1dad47658f14895247d46d0ce27ed064a946a92e2f747ed6ef44f7fa31463babbcb9f9d2420b407ef02aea94857075f6a6eb380a18c9c768359b7a42d12fd988f3ab0e337bf228e28d399ecd4f35d1e5ed573f5aecf3128b7525b551da8",
+  "D.sigB.f0=1583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.sigB.f0.verL=0",
+  "D.sigB.f0.verB=1",
+  "D.sigB.f0.hash.gL=7914fac21621f20c38b5ac123f92333db9b46c1b03c2cab6dd8bab2c026ef9ec",
+  "D.sigB.f0.ver2.gL=0",
+  "D.sigB.f0.agg.gL=0260718c192189667da00dfc9fbc4a502d1dd818e92e5e030b61d12c9c2d0a7536da01bd5f143c6ecd26f36d3189eb5d09d92bf784b341ad239ce8d6d174fad50e5da86238970394c8730f9e817f51c1ddaef5669357645835fbcb58c301d554:89d92bf784b341ad239ce8d6d174fad50e5da86238970394c8730f9e817f51c1ddaef5669357645835fbcb58c301d5540260718c192189667da00dfc9fbc4a502d1dd818e92e5e030b61d12c9c2d0a7536da01bd5f143c6ecd26f36d3189eb5d",
+  "D.sigB.f0.hash.gB=645674323a56e5befb3df538b4b96c25e44fe6df1b8fbcf7999e09b47bdf2226",
+  "D.sigB.f0.ver2.gB=1",
+  "D.sigB.f0.agg.gB=108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b0f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e:8f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b",
+  "D.sigB.unser.gL=INVALID",
+  "D.sigB.unser.gB=1583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.sigL.asB.f1=0e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23:ac1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788",
+  "D.sigL.asB.f1.verL=0",
+  "D.sigL.asB.f1.verB=0",
+  "D.sigL.asB.f1.hash.gL=2db5766dc7259e58d2dee331a3a709ec45bc245f5a13596004adce3545bce979",
+  "D.sigL.asB.f1.ver2.gL=0",
+  "D.sigL.asB.f1.agg.gL=85b344f62d24f742dcaf09127f2a511d5b00f364a36de9975db51d0fd94d51651beb77ca7daaeaa406da275229bdb19c05875a137e31514cea7868f65f3d2b99b13edd975dcd70fe4f7a75d197eabd30cede788b7fcfadd3dab3fec0c3e2ccae:a5875a137e31514cea7868f65f3d2b99b13edd975dcd70fe4f7a75d197eabd30cede788b7fcfadd3dab3fec0c3e2ccae05b344f62d24f742dcaf09127f2a511d5b00f364a36de9975db51d0fd94d51651beb77ca7daaeaa406da275229bdb19c",
+  "D.sigL.asB.f1.hash.gB=13f79e0fc49a27c998901ac39fcfa72b7666e1bd31b1bcecfebfe89d3a5a42d4",
+  "D.sigL.asB.f1.ver2.gB=0",
+  "D.sigL.asB.f1.agg.gB=097acf4614bd511732bd6fefd494288d52ccbdf8d2ec03a116b9a62291e20c0286de1151554228f08a21d3e657942c6012feeff50f4ff8ae4662df6978ae8719ccd81d82d9969412af165430f9ed9436258e0c01428117a5abf2b63a55c68cdf:92feeff50f4ff8ae4662df6978ae8719ccd81d82d9969412af165430f9ed9436258e0c01428117a5abf2b63a55c68cdf097acf4614bd511732bd6fefd494288d52ccbdf8d2ec03a116b9a62291e20c0286de1151554228f08a21d3e657942c60",
+  "D.sigL.asB.f0=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.sigL.asB.f0.verL=1",
+  "D.sigL.asB.f0.verB=0",
+  "D.sigL.asB.f0.hash.gL=0eeb041f261223c4eca8b14d55b6a3dc162758d74e8294e5d9c14b653dfbc124",
+  "D.sigL.asB.f0.ver2.gL=1",
+  "D.sigL.asB.f0.agg.gL=02a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f74314bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f1:94bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f102a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f743",
+  "D.sigL.asB.f0.hash.gB=bdea8e4015a5f5ed9587aecab25868376c999c151e8d61eb896c17e2f6bdc9ab",
+  "D.sigL.asB.f0.ver2.gB=0",
+  "D.sigL.asB.f0.agg.gB=0c04125bd3059fbf99da694488711da18cebfd4e958606e2f2428d17d55be841366ebb58388486d6063d190f65fe06e80ccfe2b3cec875b35f7f4002fbb333b7634f2e4016c0fdd672453d53de8ea0be3bf0ee19502975d100d29f711c470e04:8ccfe2b3cec875b35f7f4002fbb333b7634f2e4016c0fdd672453d53de8ea0be3bf0ee19502975d100d29f711c470e040c04125bd3059fbf99da694488711da18cebfd4e958606e2f2428d17d55be841366ebb58388486d6063d190f65fe06e8",
+  "D.sigL.asB.unser.gL=INVALID",
+  "D.sigL.asB.unser.gB=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.sigB.asL.f1=1583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.sigB.asL.f1.verL=0",
+  "D.sigB.asL.f1.verB=1",
+  "D.sigB.asL.f1.hash.gL=7914fac21621f20c38b5ac123f92333db9b46c1b03c2cab6dd8bab2c026ef9ec",
+  "D.sigB.asL.f1.ver2.gL=0",
+  "D.sigB.asL.f1.agg.gL=0260718c192189667da00dfc9fbc4a502d1dd818e92e5e030b61d12c9c2d0a7536da01bd5f143c6ecd26f36d3189eb5d09d92bf784b341ad239ce8d6d174fad50e5da86238970394c8730f9e817f51c1ddaef5669357645835fbcb58c301d554:89d92bf784b341ad239ce8d6d174fad50e5da86238970394c8730f9e817f51c1ddaef5669357645835fbcb58c301d5540260718c192189667da00dfc9fbc4a502d1dd818e92e5e030b61d12c9c2d0a7536da01bd5f143c6ecd26f36d3189eb5d",
+  "D.sigB.asL.f1.hash.gB=645674323a56e5befb3df538b4b96c25e44fe6df1b8fbcf7999e09b47bdf2226",
+  "D.sigB.asL.f1.ver2.gB=1",
+  "D.sigB.asL.f1.agg.gB=108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b0f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e:8f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b",
+  "D.sigB.asL.f0=INVALID",
+  "D.sigB.asL.unser.gL=1583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.sigB.asL.unser.gB=INVALID",
+  "D.zeros.f1=INVALID",
+  "D.zeros.f0=INVALID",
+  "D.zeros.unser.gL=INVALID",
+  "D.zeros.unser.gB=INVALID",
+  "D.inf.f1=INVALID",
+  "D.inf.f0=INVALID",
+  "D.inf.unser.gL=throw",
+  "D.inf.unser.gB=throw",
+  "D.badinf.f1=INVALID",
+  "D.badinf.f0=INVALID",
+  "D.badinf.unser.gL=throw",
+  "D.badinf.unser.gB=throw",
+  "D.badinf.mid.f1=INVALID",
+  "D.badinf.mid.f0=INVALID",
+  "D.badinf.mid.unser.gL=throw",
+  "D.badinf.mid.unser.gB=throw",
+  "D.ff.f1=INVALID",
+  "D.ff.f0=INVALID",
+  "D.ff.unser.gL=throw",
+  "D.ff.unser.gB=throw",
+  "D.ff.low.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.ff.low.f1.verL=0",
+  "D.ff.low.f1.verB=0",
+  "D.ff.low.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.ff.low.f1.ver2.gL=0",
+  "D.ff.low.f1.agg.gL=948990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b90b272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3:ab272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3148990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b9",
+  "D.ff.low.f1.hash.gB=5e2ed5791c7ffcde68a0dbbbd4c5f0382f1034b9fd000bfb349a1fb51c5811c9",
+  "D.ff.low.f1.ver2.gB=0",
+  "D.ff.low.f1.agg.gB=8146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d032817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d5:a32817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d50146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d",
+  "D.ff.low.f0=INVALID",
+  "D.ff.low.unser.gL=throw",
+  "D.ff.low.unser.gB=throw",
+  "D.L.or40.f1=0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.L.or40.f1.verL=0",
+  "D.L.or40.f1.verB=0",
+  "D.L.or40.f1.hash.gL=43e1177e9f28c012166877784d1d73bfcbe38aeaf4770b1c8dc19b1cbc18f5ab",
+  "D.L.or40.f1.ver2.gL=0",
+  "D.L.or40.f1.agg.gL=084dd14d4ece4b6dee781b9fca7c683b36eecca61a253182a943a13a6755afbd8679ca7bb2646b108020fc7ca08112be0af3d838888f61b19f61e96b9d1200556555b15791f6fb298e79d44a9495e4eb7bfc54c9403ce89be9a373a356098927:8af3d838888f61b19f61e96b9d1200556555b15791f6fb298e79d44a9495e4eb7bfc54c9403ce89be9a373a356098927084dd14d4ece4b6dee781b9fca7c683b36eecca61a253182a943a13a6755afbd8679ca7bb2646b108020fc7ca08112be",
+  "D.L.or40.f1.hash.gB=d8461eb518943d5047290feea8f9e830bd72eccb1dfd51cb8284e77c55929d02",
+  "D.L.or40.f1.ver2.gB=0",
+  "D.L.or40.f1.agg.gB=138941f93349834239f7f5585007bd23f4d835e629ac7040e02716a98dc17fdd27c36a7e21113884e689af3565edc1c21010f8aa13099852bced8c57e9142ec26a6657bd32a7fbbc0dae1a03e0a8b975d5d5f08a2558f3be5996778a00aee602:9010f8aa13099852bced8c57e9142ec26a6657bd32a7fbbc0dae1a03e0a8b975d5d5f08a2558f3be5996778a00aee602138941f93349834239f7f5585007bd23f4d835e629ac7040e02716a98dc17fdd27c36a7e21113884e689af3565edc1c2",
+  "D.L.or40.f0=INVALID",
+  "D.L.or40.unser.gL=throw",
+  "D.L.or40.unser.gB=throw",
+  "D.L.or20.f1=0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.L.or20.f1.verL=0",
+  "D.L.or20.f1.verB=0",
+  "D.L.or20.f1.hash.gL=43e1177e9f28c012166877784d1d73bfcbe38aeaf4770b1c8dc19b1cbc18f5ab",
+  "D.L.or20.f1.ver2.gL=0",
+  "D.L.or20.f1.agg.gL=084dd14d4ece4b6dee781b9fca7c683b36eecca61a253182a943a13a6755afbd8679ca7bb2646b108020fc7ca08112be0af3d838888f61b19f61e96b9d1200556555b15791f6fb298e79d44a9495e4eb7bfc54c9403ce89be9a373a356098927:8af3d838888f61b19f61e96b9d1200556555b15791f6fb298e79d44a9495e4eb7bfc54c9403ce89be9a373a356098927084dd14d4ece4b6dee781b9fca7c683b36eecca61a253182a943a13a6755afbd8679ca7bb2646b108020fc7ca08112be",
+  "D.L.or20.f1.hash.gB=d8461eb518943d5047290feea8f9e830bd72eccb1dfd51cb8284e77c55929d02",
+  "D.L.or20.f1.ver2.gB=0",
+  "D.L.or20.f1.agg.gB=138941f93349834239f7f5585007bd23f4d835e629ac7040e02716a98dc17fdd27c36a7e21113884e689af3565edc1c21010f8aa13099852bced8c57e9142ec26a6657bd32a7fbbc0dae1a03e0a8b975d5d5f08a2558f3be5996778a00aee602:9010f8aa13099852bced8c57e9142ec26a6657bd32a7fbbc0dae1a03e0a8b975d5d5f08a2558f3be5996778a00aee602138941f93349834239f7f5585007bd23f4d835e629ac7040e02716a98dc17fdd27c36a7e21113884e689af3565edc1c2",
+  "D.L.or20.f0=INVALID",
+  "D.L.or20.unser.gL=throw",
+  "D.L.or20.unser.gB=throw",
+  "D.L.orE0.f1=INVALID",
+  "D.L.orE0.f0=INVALID",
+  "D.L.orE0.unser.gL=throw",
+  "D.L.orE0.unser.gB=throw",
+  "D.L.xor80.f1=8c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:ae0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.xor80.f1.verL=0",
+  "D.L.xor80.f1.verB=0",
+  "D.L.xor80.f1.hash.gL=0d566d434c0d206c46fb0ed738965a62e318a44eeb8518cf2b674ef4c8274b39",
+  "D.L.xor80.f1.ver2.gL=0",
+  "D.L.xor80.f1.agg.gL=14f26164ab616e8720704299382b5db53b0f98cd51633aa8bd5544b45cff54580df69c5ddded37bbf74a8c5f8a8f882a1826c73533ee536cdd0a884113e9c52b2be41d7e79033ba20c093b55aed45744dc1868cbbabad47d58d081bf75a6f391:9826c73533ee536cdd0a884113e9c52b2be41d7e79033ba20c093b55aed45744dc1868cbbabad47d58d081bf75a6f39114f26164ab616e8720704299382b5db53b0f98cd51633aa8bd5544b45cff54580df69c5ddded37bbf74a8c5f8a8f882a",
+  "D.L.xor80.f1.hash.gB=9ef3ec4757cd1f579fad0684f29b79496d27344d2228feccb876c34c5cc1e0d9",
+  "D.L.xor80.f1.ver2.gB=0",
+  "D.L.xor80.f1.agg.gB=81e0ebae7a3e8b564e463d0ee01d29fc7571128010a1485b3105a798f521fa61e9a6f2084743ab59c2ce0f0ca4683c38137665e2ee0f1f9340a7fd33765619f086ac90b24e062418d3566b5461006d1d0f641431a0765dac3acdd0fb212e532a:b37665e2ee0f1f9340a7fd33765619f086ac90b24e062418d3566b5461006d1d0f641431a0765dac3acdd0fb212e532a01e0ebae7a3e8b564e463d0ee01d29fc7571128010a1485b3105a798f521fa61e9a6f2084743ab59c2ce0f0ca4683c38",
+  "D.L.xor80.f0=INVALID",
+  "D.L.xor80.unser.gL=8c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:ae0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.xor80.unser.gB=INVALID",
+  "D.L.b48or80.f1=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.b48or80.f1.verL=0",
+  "D.L.b48or80.f1.verB=0",
+  "D.L.b48or80.f1.hash.gL=7f2bc1d858ef5c42cf4f371e3ac1145e3bdd6727f1ec1a9a7c108c08da3719b3",
+  "D.L.b48or80.f1.ver2.gL=0",
+  "D.L.b48or80.f1.agg.gL=101b4c764a815a04b84c34fd316ca3ad87f0e67a9b74813a36d8fc5f77c3f3e2beb3bed10d01f84665e1c309882e0d640b5ec0c9f2ddf8518902534836fb54c0599cc26b6d8f47a3cb066883020a6756b29e40268f92e12a3fa3305484f9be06:8b5ec0c9f2ddf8518902534836fb54c0599cc26b6d8f47a3cb066883020a6756b29e40268f92e12a3fa3305484f9be06101b4c764a815a04b84c34fd316ca3ad87f0e67a9b74813a36d8fc5f77c3f3e2beb3bed10d01f84665e1c309882e0d64",
+  "D.L.b48or80.f1.hash.gB=21cc130db4ea3e85853239e3db52164d39d4812f6678693ba450edf6d3794d44",
+  "D.L.b48or80.f1.ver2.gB=0",
+  "D.L.b48or80.f1.agg.gB=03afd52ce699e9917ecace7b6236f15a5ba18d147bf15277b34219ec820c4fb71d02a6d44a4b8991e402aa8cd47f463a075b217b9ecc6a99a507cb2619681e0c2c29bf9f5bd51a93b147340af908eecf58422f7853c47fe8680631b8874a28bb:875b217b9ecc6a99a507cb2619681e0c2c29bf9f5bd51a93b147340af908eecf58422f7853c47fe8680631b8874a28bb03afd52ce699e9917ecace7b6236f15a5ba18d147bf15277b34219ec820c4fb71d02a6d44a4b8991e402aa8cd47f463a",
+  "D.L.b48or80.f0=INVALID",
+  "D.L.b48or80.unser.gL=throw",
+  "D.L.b48or80.unser.gB=throw",
+  "D.L.b48or40.f1=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.b48or40.f1.verL=0",
+  "D.L.b48or40.f1.verB=0",
+  "D.L.b48or40.f1.hash.gL=7f2bc1d858ef5c42cf4f371e3ac1145e3bdd6727f1ec1a9a7c108c08da3719b3",
+  "D.L.b48or40.f1.ver2.gL=0",
+  "D.L.b48or40.f1.agg.gL=101b4c764a815a04b84c34fd316ca3ad87f0e67a9b74813a36d8fc5f77c3f3e2beb3bed10d01f84665e1c309882e0d640b5ec0c9f2ddf8518902534836fb54c0599cc26b6d8f47a3cb066883020a6756b29e40268f92e12a3fa3305484f9be06:8b5ec0c9f2ddf8518902534836fb54c0599cc26b6d8f47a3cb066883020a6756b29e40268f92e12a3fa3305484f9be06101b4c764a815a04b84c34fd316ca3ad87f0e67a9b74813a36d8fc5f77c3f3e2beb3bed10d01f84665e1c309882e0d64",
+  "D.L.b48or40.f1.hash.gB=21cc130db4ea3e85853239e3db52164d39d4812f6678693ba450edf6d3794d44",
+  "D.L.b48or40.f1.ver2.gB=0",
+  "D.L.b48or40.f1.agg.gB=03afd52ce699e9917ecace7b6236f15a5ba18d147bf15277b34219ec820c4fb71d02a6d44a4b8991e402aa8cd47f463a075b217b9ecc6a99a507cb2619681e0c2c29bf9f5bd51a93b147340af908eecf58422f7853c47fe8680631b8874a28bb:875b217b9ecc6a99a507cb2619681e0c2c29bf9f5bd51a93b147340af908eecf58422f7853c47fe8680631b8874a28bb03afd52ce699e9917ecace7b6236f15a5ba18d147bf15277b34219ec820c4fb71d02a6d44a4b8991e402aa8cd47f463a",
+  "D.L.b48or40.f0=INVALID",
+  "D.L.b48or40.unser.gL=throw",
+  "D.L.b48or40.unser.gB=throw",
+  "D.L.tail.f1=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33789:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337890c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.tail.f1.verL=0",
+  "D.L.tail.f1.verB=0",
+  "D.L.tail.f1.hash.gL=ed9d2cb26214aa8cb4295ed4b4d4985a3d55cedaf4daf42e2b9f1fb37d4e1868",
+  "D.L.tail.f1.ver2.gL=0",
+  "D.L.tail.f1.agg.gL=87ad670a07e9305d0eca5c271f3b5c374015f9817b85249ef04853ce1c817af7a40351df5ba53c9e1f305b7c18fe43121959b90032020847ca81dc9f0436839140530bf909cd86243d357ca2756cf627a90564f8d4449864750603e7ecc47746:b959b90032020847ca81dc9f0436839140530bf909cd86243d357ca2756cf627a90564f8d4449864750603e7ecc4774607ad670a07e9305d0eca5c271f3b5c374015f9817b85249ef04853ce1c817af7a40351df5ba53c9e1f305b7c18fe4312",
+  "D.L.tail.f1.hash.gB=cd39d323b37904cf4636daa985ad9a1b208459841e9b8ee11ea64e7e1fe61f19",
+  "D.L.tail.f1.ver2.gB=0",
+  "D.L.tail.f1.agg.gB=122661ad2e3a5b8372c1007d135c596d2da3b44a5f7690213e27fdbe4a311df96aed75f7d05f6e2aa2c25004a2c28cf4027a9b98712bc5d3b485c7303d0363b78f309bec49974faad4c72a14b64898754e5fb64db37d6bc36e87f13c72f8433f:827a9b98712bc5d3b485c7303d0363b78f309bec49974faad4c72a14b64898754e5fb64db37d6bc36e87f13c72f8433f122661ad2e3a5b8372c1007d135c596d2da3b44a5f7690213e27fdbe4a311df96aed75f7d05f6e2aa2c25004a2c28cf4",
+  "D.L.tail.f0=INVALID",
+  "D.L.tail.unser.gL=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33789:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337890c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "D.L.tail.unser.gB=INVALID",
+  "D.B.xor20.f1=0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900:b583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.B.xor20.f1.verL=0",
+  "D.B.xor20.f1.verB=0",
+  "D.B.xor20.f1.hash.gL=be6c8bac41e1731041bb2433ba844a339c36b90158b65a899ec6974d14342a3a",
+  "D.B.xor20.f1.ver2.gL=0",
+  "D.B.xor20.f1.agg.gL=8ffb7afe30244cf269f020f0515146df52f61380fef50253b68a481c859d4695ed4ae892aaf173a9726cb57cd6dc0e9a0695c7ecc7ccebb840d68275df457f5fb0f98f0430959d4e5e509eaaa13b96ea7bfb4f2005ca8693c9396ad10f9e5a96:a695c7ecc7ccebb840d68275df457f5fb0f98f0430959d4e5e509eaaa13b96ea7bfb4f2005ca8693c9396ad10f9e5a960ffb7afe30244cf269f020f0515146df52f61380fef50253b68a481c859d4695ed4ae892aaf173a9726cb57cd6dc0e9a",
+  "D.B.xor20.f1.hash.gB=7fcd9dfe01cf28eec6333830181859f491a5b7ce0370b71caef1a917f85b3dd6",
+  "D.B.xor20.f1.ver2.gB=0",
+  "D.B.xor20.f1.agg.gB=13a4880758a43fd3bee8a6fb22ab47b4e9a1884a5af138a71fcbcb71bbb1b126452b6398c040f6fc25e549ae8a6a11d9197b71b7928461dd754bf0f6e4f4e8d6f635bf48390e4cd8ad55d6981b1f3154bc8144f7173efaa8e693c20f73ca1bf3:997b71b7928461dd754bf0f6e4f4e8d6f635bf48390e4cd8ad55d6981b1f3154bc8144f7173efaa8e693c20f73ca1bf313a4880758a43fd3bee8a6fb22ab47b4e9a1884a5af138a71fcbcb71bbb1b126452b6398c040f6fc25e549ae8a6a11d9",
+  "D.B.xor20.f0=9583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:af1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.B.xor20.f0.verL=0",
+  "D.B.xor20.f0.verB=0",
+  "D.B.xor20.f0.hash.gL=74b65cc2c9bf16042dd85aedc28e16c343a0544b039f4134d6f726b152d93b31",
+  "D.B.xor20.f0.ver2.gL=0",
+  "D.B.xor20.f0.agg.gL=91a86440e49b59695f7f4adf2d6abff0567bd5afa5d8a3688dff31f583f686585134700644721a5f0393cd8a39bb7b591377c2712419a62b4cafe6705f5060196015cd1e9af9d50b5764919037831c4acd7e9a05a676585cf2a4d2ccf2badde0:b377c2712419a62b4cafe6705f5060196015cd1e9af9d50b5764919037831c4acd7e9a05a676585cf2a4d2ccf2badde011a86440e49b59695f7f4adf2d6abff0567bd5afa5d8a3688dff31f583f686585134700644721a5f0393cd8a39bb7b59",
+  "D.B.xor20.f0.hash.gB=e5a9305206ce46cde8e8acbb16c1f26f92d795e271c4bae41261b697677fded6",
+  "D.B.xor20.f0.ver2.gB=0",
+  "D.B.xor20.f0.agg.gB=8989961db74ea23fc8fdfb6d0966ddc809c12493a4e9857deb80706d1957186a8584308861a106139e1f6ecb9b372fc602e0db9d83b161ff0baa06ca225c2220bfc4a528c689ef8ca109414026f65bbca138f303fb585b0e9aebb26c2a5645bb:a2e0db9d83b161ff0baa06ca225c2220bfc4a528c689ef8ca109414026f65bbca138f303fb585b0e9aebb26c2a5645bb0989961db74ea23fc8fdfb6d0966ddc809c12493a4e9857deb80706d1957186a8584308861a106139e1f6ecb9b372fc6",
+  "D.B.xor20.unser.gL=INVALID",
+  "D.B.xor20.unser.gB=9583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:af1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "D.B.and7f.f1=0f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900:9583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.and7f.f1.verL=0",
+  "D.B.and7f.f1.verB=0",
+  "D.B.and7f.f1.hash.gL=c48d05ac1cac7993aa9598d56e1b169495650fcf3989f5951e9f7b76b290db9f",
+  "D.B.and7f.f1.ver2.gL=0",
+  "D.B.and7f.f1.agg.gL=9662f35831ce65946679b0547a90a9d73325fb20e78e4adbcc4820c01e709ca3e894f343c9d03c54ce83e6d35f41c9e203c87d51663ad2ad03d6a39dfc9357cd8f5561487c09e03c98667884413d39c689cbfe247f7894d27f70e5c06b9ff8cd:a3c87d51663ad2ad03d6a39dfc9357cd8f5561487c09e03c98667884413d39c689cbfe247f7894d27f70e5c06b9ff8cd1662f35831ce65946679b0547a90a9d73325fb20e78e4adbcc4820c01e709ca3e894f343c9d03c54ce83e6d35f41c9e2",
+  "D.B.and7f.f1.hash.gB=74b65cc2c9bf16042dd85aedc28e16c343a0544b039f4134d6f726b152d93b31",
+  "D.B.and7f.f1.ver2.gB=0",
+  "D.B.and7f.f1.agg.gB=0ae06181f6d22ff8054022cb80bccfd72ecbecce4a52fa9de443e730256a2776a1d639914402bbf09b56074381db083804ab042d317de8decb973eb20c7db27f47e81d6fb10f1f1ed4a185c8595c7a24318d07b5cc7a2fcc820c2163fb4adba6:84ab042d317de8decb973eb20c7db27f47e81d6fb10f1f1ed4a185c8595c7a24318d07b5cc7a2fcc820c2163fb4adba60ae06181f6d22ff8054022cb80bccfd72ecbecce4a52fa9de443e730256a2776a1d639914402bbf09b56074381db0838",
+  "D.B.and7f.f0=INVALID",
+  "D.B.and7f.unser.gL=0f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900:9583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.and7f.unser.gB=INVALID",
+  "D.B.or40.f1=INVALID",
+  "D.B.or40.f0=INVALID",
+  "D.B.or40.unser.gL=throw",
+  "D.B.or40.unser.gB=throw",
+  "D.B.b48or80.f1=8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.b48or80.f1.verL=0",
+  "D.B.b48or80.f1.verB=0",
+  "D.B.b48or80.f1.hash.gL=037bcd04b16f20ff4ae1b5c5870189316eda4ab777ea01cabddcce196ca0c394",
+  "D.B.b48or80.f1.ver2.gL=0",
+  "D.B.b48or80.f1.agg.gL=92828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db350008047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b097:a8047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b09712828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db3500",
+  "D.B.b48or80.f1.hash.gB=48b5a5007f2076eded5fe3ec9d4cee0f17c1d65391f5f0bad18a47bd14fcbea9",
+  "D.B.b48or80.f1.ver2.gB=0",
+  "D.B.b48or80.f1.agg.gB=15ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c16972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c12:96972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c1215ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c",
+  "D.B.b48or80.f0=INVALID",
+  "D.B.b48or80.unser.gL=throw",
+  "D.B.b48or80.unser.gB=throw",
+  "D.B.b48or40.f1=8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.b48or40.f1.verL=0",
+  "D.B.b48or40.f1.verB=0",
+  "D.B.b48or40.f1.hash.gL=037bcd04b16f20ff4ae1b5c5870189316eda4ab777ea01cabddcce196ca0c394",
+  "D.B.b48or40.f1.ver2.gL=0",
+  "D.B.b48or40.f1.agg.gL=92828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db350008047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b097:a8047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b09712828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db3500",
+  "D.B.b48or40.f1.hash.gB=48b5a5007f2076eded5fe3ec9d4cee0f17c1d65391f5f0bad18a47bd14fcbea9",
+  "D.B.b48or40.f1.ver2.gB=0",
+  "D.B.b48or40.f1.agg.gB=15ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c16972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c12:96972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c1215ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c",
+  "D.B.b48or40.f0=INVALID",
+  "D.B.b48or40.unser.gL=throw",
+  "D.B.b48or40.unser.gB=throw",
+  "D.B.b48or20.f1=8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.b48or20.f1.verL=0",
+  "D.B.b48or20.f1.verB=0",
+  "D.B.b48or20.f1.hash.gL=037bcd04b16f20ff4ae1b5c5870189316eda4ab777ea01cabddcce196ca0c394",
+  "D.B.b48or20.f1.ver2.gL=0",
+  "D.B.b48or20.f1.agg.gL=92828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db350008047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b097:a8047fae57d84151786c9e274cdb0fcd439dbb73b5b800cf72f833070c1b045f26bf0ef570f873552c1ac38e1f26b09712828ceb7a4d55ec170e7255262e90056687cd14a171996a5b99a1a7a7839e215774ae244a33c28b58a47aaf64db3500",
+  "D.B.b48or20.f1.hash.gB=48b5a5007f2076eded5fe3ec9d4cee0f17c1d65391f5f0bad18a47bd14fcbea9",
+  "D.B.b48or20.f1.ver2.gB=0",
+  "D.B.b48or20.f1.agg.gB=15ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c16972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c12:96972939ad9eccac2904435376afce52549cc37d49c03957de94a5c9db7479b6f038af068f1179d522b3382905b70c1215ee052657f9c52bd3140cd659be7da85030c47c78c8479fc237c1cf68d8f0002f5e94e1bc0fc55853231c05065daf5c",
+  "D.B.b48or20.f0=INVALID",
+  "D.B.b48or20.unser.gL=throw",
+  "D.B.b48or20.unser.gB=throw",
+  "D.B.tail.f1=0f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61901:b583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619010f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4",
+  "D.B.tail.f1.verL=0",
+  "D.B.tail.f1.verB=0",
+  "D.B.tail.f1.hash.gL=0a3af091fad3a18ccc96b175e67feb1e172d7ddff27148ce0a805e989526dcbe",
+  "D.B.tail.f1.ver2.gL=0",
+  "D.B.tail.f1.agg.gL=0d647b701ef933e58136c02176257a7e013b8543d2ae5250016b04ca47002247c2175c08edf0427b4114fa49d11b68ab01ba10b3d4551f1ec1d67aa2848d30a41597ef888afcda1d7d46330912380ce41dc3c1e76a6efd224c0e5fc2499d1a3c:81ba10b3d4551f1ec1d67aa2848d30a41597ef888afcda1d7d46330912380ce41dc3c1e76a6efd224c0e5fc2499d1a3c0d647b701ef933e58136c02176257a7e013b8543d2ae5250016b04ca47002247c2175c08edf0427b4114fa49d11b68ab",
+  "D.B.tail.f1.hash.gB=1bd265912ff8d36d21c2115865094cf5c94a46f17a96b048f4a5146ebe9afd6a",
+  "D.B.tail.f1.ver2.gB=0",
+  "D.B.tail.f1.agg.gB=984ff87d888d4d3f8eedce0a9d6043641845fe79f0422d7fa5553a310034c0b4d2572e4c9c91b4370accaf5e8d0318b3068ff086a5af5cb1ccb7d105de204c16f9389c971c55e2cb42f985ff32eb3272db3b841c37da99f26c760467dc2d6845:a68ff086a5af5cb1ccb7d105de204c16f9389c971c55e2cb42f985ff32eb3272db3b841c37da99f26c760467dc2d6845184ff87d888d4d3f8eedce0a9d6043641845fe79f0422d7fa5553a310034c0b4d2572e4c9c91b4370accaf5e8d0318b3",
+  "D.B.tail.f0=INVALID",
+  "D.B.tail.unser.gL=throw",
+  "D.B.tail.unser.gB=throw",
+  "D.x0.80.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.x0.80.f1.verL=0",
+  "D.x0.80.f1.verB=0",
+  "D.x0.80.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.x0.80.f1.ver2.gL=0",
+  "D.x0.80.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.x0.80.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.x0.80.f1.ver2.gB=0",
+  "D.x0.80.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.x0.80.f0=INVALID",
+  "D.x0.80.unser.gL=throw",
+  "D.x0.80.unser.gB=throw",
+  "D.x0.a0.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.x0.a0.f1.verL=0",
+  "D.x0.a0.f1.verB=0",
+  "D.x0.a0.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.x0.a0.f1.ver2.gL=0",
+  "D.x0.a0.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.x0.a0.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.x0.a0.f1.ver2.gB=0",
+  "D.x0.a0.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.x0.a0.f0=INVALID",
+  "D.x0.a0.unser.gL=throw",
+  "D.x0.a0.unser.gB=throw",
+  "D.c0.1.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+  "D.c0.1.f1.verL=0",
+  "D.c0.1.f1.verB=0",
+  "D.c0.1.f1.hash.gL=f4a1f3435ef0b005e12b28498c2876e5f350f1987f1aaf72e6b176b607a7f984",
+  "D.c0.1.f1.ver2.gL=0",
+  "D.c0.1.f1.agg.gL=064eea5354df349462e0e74d61d867e29e20fca5f7c9799e72664bf84e6f8c8e98690e6769cc5fe321515964a7d5ca230241928ef543c774063460b31150d71347b64c3952a8332d9a32cc162a01782b3c443ad75e762fd20dbb70e72431fa45:8241928ef543c774063460b31150d71347b64c3952a8332d9a32cc162a01782b3c443ad75e762fd20dbb70e72431fa45064eea5354df349462e0e74d61d867e29e20fca5f7c9799e72664bf84e6f8c8e98690e6769cc5fe321515964a7d5ca23",
+  "D.c0.1.f1.hash.gB=76600ad133d990292cb06aa3ecc078476ce5dce61e70591c4b2fdbbd8b08acbe",
+  "D.c0.1.f1.ver2.gB=0",
+  "D.c0.1.f1.agg.gB=02ad1ec2dbd2261040d6f9fa4a627a84ec24bac7ed62b402cb513f1182c06735b5e516cfd6959d409881c10e72ea4a1312804f4fdbd772184e5874b837db2a4707c7daaa9fc9929a3de34f12f5ba604f6de4c7f7c2f50974d35a8a34002a62e9:92804f4fdbd772184e5874b837db2a4707c7daaa9fc9929a3de34f12f5ba604f6de4c7f7c2f50974d35a8a34002a62e902ad1ec2dbd2261040d6f9fa4a627a84ec24bac7ed62b402cb513f1182c06735b5e516cfd6959d409881c10e72ea4a13",
+  "D.c0.1.f0=INVALID",
+  "D.c0.1.unser.gL=throw",
+  "D.c0.1.unser.gB=throw",
+  "D.c1.1.f1=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c1.1.f1.verL=0",
+  "D.c1.1.f1.verB=0",
+  "D.c1.1.f1.hash.gL=815b279d49164ada2bb65991115f7e889950b9a5833648eea56908c0bf7956e7",
+  "D.c1.1.f1.ver2.gL=0",
+  "D.c1.1.f1.agg.gL=0135b5135b638eeab09405bf18cb9c8f2f69b8582e360556dab942f0dd4a5c86f881ae237d5887a66a1f65fe3f8746ba11de6b71fa3cf06aa0b71c4c0ae64479f52d374cbf4bc326a62cf05ed491cf69b50a15510ed5b0c0d5a5e13cbcecc5d4:91de6b71fa3cf06aa0b71c4c0ae64479f52d374cbf4bc326a62cf05ed491cf69b50a15510ed5b0c0d5a5e13cbcecc5d40135b5135b638eeab09405bf18cb9c8f2f69b8582e360556dab942f0dd4a5c86f881ae237d5887a66a1f65fe3f8746ba",
+  "D.c1.1.f1.hash.gB=710c60d3d7c4edb79495dd364c684b8882c8f5e472172372643eabdc2c9cbce5",
+  "D.c1.1.f1.ver2.gB=0",
+  "D.c1.1.f1.agg.gB=1614333445d9fc00189836bd75c2f6f10269e0800cc45aab5775c181e83d33d22cbb07e024c84c9435a9b672aee9e226023699f224f7e92bc668a136b19ed62f9367ebf58bf018cccb479742eb28bffdcedef61e43c3a3628194590675322ea1:823699f224f7e92bc668a136b19ed62f9367ebf58bf018cccb479742eb28bffdcedef61e43c3a3628194590675322ea11614333445d9fc00189836bd75c2f6f10269e0800cc45aab5775c181e83d33d22cbb07e024c84c9435a9b672aee9e226",
+  "D.c1.1.f0=INVALID",
+  "D.c1.1.unser.gL=800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c1.1.unser.gB=INVALID",
+  "D.c0.1.a0.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c0.1.a0.f1.verL=0",
+  "D.c0.1.a0.f1.verB=0",
+  "D.c0.1.a0.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.c0.1.a0.f1.ver2.gL=0",
+  "D.c0.1.a0.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.c0.1.a0.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.c0.1.a0.f1.ver2.gB=0",
+  "D.c0.1.a0.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.c0.1.a0.f0=INVALID",
+  "D.c0.1.a0.unser.gL=throw",
+  "D.c0.1.a0.unser.gB=throw",
+  "D.c0.p.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c0.p.f1.verL=0",
+  "D.c0.p.f1.verB=0",
+  "D.c0.p.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.c0.p.f1.ver2.gL=0",
+  "D.c0.p.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.c0.p.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.c0.p.f1.ver2.gB=0",
+  "D.c0.p.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.c0.p.f0=INVALID",
+  "D.c0.p.unser.gL=throw",
+  "D.c0.p.unser.gB=throw",
+  "D.c1.p.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c1.p.f1.verL=0",
+  "D.c1.p.f1.verB=0",
+  "D.c1.p.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.c1.p.f1.ver2.gL=0",
+  "D.c1.p.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.c1.p.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.c1.p.f1.ver2.gB=0",
+  "D.c1.p.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.c1.p.f0=INVALID",
+  "D.c1.p.unser.gL=throw",
+  "D.c1.p.unser.gB=throw",
+  "D.c0.p.00.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c0.p.00.f1.verL=0",
+  "D.c0.p.00.f1.verB=0",
+  "D.c0.p.00.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.c0.p.00.f1.ver2.gL=0",
+  "D.c0.p.00.f1.agg.gL=948990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b90b272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3:ab272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3148990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b9",
+  "D.c0.p.00.f1.hash.gB=5e2ed5791c7ffcde68a0dbbbd4c5f0382f1034b9fd000bfb349a1fb51c5811c9",
+  "D.c0.p.00.f1.ver2.gB=0",
+  "D.c0.p.00.f1.agg.gB=8146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d032817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d5:a32817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d50146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d",
+  "D.c0.p.00.f0=INVALID",
+  "D.c0.p.00.unser.gL=throw",
+  "D.c0.p.00.unser.gB=throw",
+  "D.c1.p.00.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.c1.p.00.f1.verL=0",
+  "D.c1.p.00.f1.verB=0",
+  "D.c1.p.00.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.c1.p.00.f1.ver2.gL=0",
+  "D.c1.p.00.f1.agg.gL=948990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b90b272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3:ab272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3148990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b9",
+  "D.c1.p.00.f1.hash.gB=5e2ed5791c7ffcde68a0dbbbd4c5f0382f1034b9fd000bfb349a1fb51c5811c9",
+  "D.c1.p.00.f1.ver2.gB=0",
+  "D.c1.p.00.f1.agg.gB=8146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d032817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d5:a32817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d50146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d",
+  "D.c1.p.00.f0=INVALID",
+  "D.c1.p.00.unser.gL=throw",
+  "D.c1.p.00.unser.gB=throw",
+  "D.pp.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.pp.f1.verL=0",
+  "D.pp.f1.verB=0",
+  "D.pp.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.pp.f1.ver2.gL=0",
+  "D.pp.f1.agg.gL=043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f310fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be:8fda6ba7901882bd70d69fe6fb170a25224b9bdac3df7899ed15eff533bf4be194c4c71029e2252f2bfdcb8bf45f21be043138fcd077a0c2d6b6905a3765daca8355bbce092f7099a5405425d05d6da295a0ed6b704654c012e18841f2163f31",
+  "D.pp.f1.hash.gB=ced309b53c135e415d2dae81622ca59f05d10fd060fe37bb56a9ef96b6447b93",
+  "D.pp.f1.ver2.gB=0",
+  "D.pp.f1.agg.gB=92f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d9861636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c5:b636fbaadd4f6edd17637e5018454da6a5a8ddffacebd27432b3a2a01de675129c90115747519ea95a42978d98de37c512f496d595335ab9682be15748a896b32f30b1c3c06b83d1158283ec1867718a04f4c495e4058de4ae5d41381e69d986",
+  "D.pp.f0=INVALID",
+  "D.pp.unser.gL=throw",
+  "D.pp.unser.gB=throw",
+  "D.max.f1=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "D.max.f1.verL=0",
+  "D.max.f1.verB=0",
+  "D.max.f1.hash.gL=3a464e1e43410c7add1dd81c3f10486f41eb473bb43e8d64feca3c7f0c8028d3",
+  "D.max.f1.ver2.gL=0",
+  "D.max.f1.agg.gL=948990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b90b272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3:ab272980cdbdc2ffff34179652c477148b58cce0da3a50e54f30c65e870b4cbdea8abac7fd34bffdb602bca98e389cd3148990e74b02b46065262873d0d12945e2327fb5cb7d30b55d68dcfe5dfd4b85e21a11fd20be5bac49acc45851ebb7b9",
+  "D.max.f1.hash.gB=5e2ed5791c7ffcde68a0dbbbd4c5f0382f1034b9fd000bfb349a1fb51c5811c9",
+  "D.max.f1.ver2.gB=0",
+  "D.max.f1.agg.gB=8146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d032817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d5:a32817db08d44d6c3b3e4414e2b62f147ae76026a856158566cd510162f8b3739a2645086a637ecf01751bdb195b71d50146ff16e98abbb13077a2f97b54ba5e45f31a60ab0843978dc083543d38cdd1ecdff7e49f278511b1e3e88f01ac971d",
+  "D.max.f0=INVALID",
+  "D.max.unser.gL=throw",
+  "D.max.unser.gB=throw",
+  "D.len95=0",
+  "D.len97=0",
+  "D.len0=0",
+  "E.sig.0.0.f1=0c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e230e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f33788:8e0ec2ae3cab605e040a93437b87c47ecde8c5462f1923a1157a8db32d9292cc9fab0a9bc679bcef4636d0e389f337880c1a8451fbad947a55ced6a637613a541e98f493e6abd3b888b8742cf7cc1dea5d3f169626adc3216f56feaea4f02e23",
+  "E.sig.0.0.f0=1583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c619000f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e4:8f1ebd6e08ff2921b36870eeffba21931ab14226bc41d139a34a7afb228466ef043d5b77dd65a9cd316eaccdf827f2e41583dd347de82a6336b4f93957445f97c8fc363e978d234418be3a1eed394063cd124ebc9fa87c6162cee68063c61900",
+  "E.sig.0.1.f1=95997d428c3f41f02ccc2d319b906f334ee19dac76a13cd90c75741c5fd8cdb38fd12c84c7206ab5a668769f4fdb81e2120dafc47b44b183d460bca5b19dac345a7ece1956c58fadcc754a1913c87c6adfcea81e9d5440dd5507c1b22e52b10a:b20dafc47b44b183d460bca5b19dac345a7ece1956c58fadcc754a1913c87c6adfcea81e9d5440dd5507c1b22e52b10a15997d428c3f41f02ccc2d319b906f334ee19dac76a13cd90c75741c5fd8cdb38fd12c84c7206ab5a668769f4fdb81e2",
+  "E.sig.0.1.f0=84ff79962e73e02116fe047fbb41fd3679fe00d9e12d640f74c0abcbbc3b6b249cd92f8be92f0bc9c5160c976c1f3b4e087f8dc770588782a88cb2c6c39d368f87ef82b131917c8fea0f50af81f54252e44b32f12aa681cd74010581ab7e89df:a87f8dc770588782a88cb2c6c39d368f87ef82b131917c8fea0f50af81f54252e44b32f12aa681cd74010581ab7e89df04ff79962e73e02116fe047fbb41fd3679fe00d9e12d640f74c0abcbbc3b6b249cd92f8be92f0bc9c5160c976c1f3b4e",
+  "E.sig.1.0.f1=15481b44ce2f169e1ba109ca93e2b68e241077ba0df56fe070e2f4f081cdd0d66ad0cbb8094c4677e2e97a51692d34fe155b0f361b94296b8c79da3a4dd602ccb0d722f7eae83bfcef1de717e009e5bf8fc030fd18294cb88475cca4e8fb6722:955b0f361b94296b8c79da3a4dd602ccb0d722f7eae83bfcef1de717e009e5bf8fc030fd18294cb88475cca4e8fb672215481b44ce2f169e1ba109ca93e2b68e241077ba0df56fe070e2f4f081cdd0d66ad0cbb8094c4677e2e97a51692d34fe",
+  "E.sig.1.0.f0=0de52801916bcd8dec48eae702d3391af64d8b71f2538a9ccaf1e34f6fb58b927e3280869e858202ead75f79d2b6672f165396b218f0387c93050b10363db20272f4f050a43d89eac35c6d39405ae946749578fadcd7b6aa0fa8006be6ee06e9:965396b218f0387c93050b10363db20272f4f050a43d89eac35c6d39405ae946749578fadcd7b6aa0fa8006be6ee06e90de52801916bcd8dec48eae702d3391af64d8b71f2538a9ccaf1e34f6fb58b927e3280869e858202ead75f79d2b6672f",
+  "E.sig.1.1.f1=93de48a349d65c51cd014eb5c082aa63f882b39eeb9ad1d2c367c147f0136cf032e995716403be8e6c608dab63f3209312e6612e23a67800daf5fbef0587274c7d8577576b4c30049a45e13121481ecf9e7c90fb1718f23de0f2d601df5168a6:b2e6612e23a67800daf5fbef0587274c7d8577576b4c30049a45e13121481ecf9e7c90fb1718f23de0f2d601df5168a613de48a349d65c51cd014eb5c082aa63f882b39eeb9ad1d2c367c147f0136cf032e995716403be8e6c608dab63f32093",
+  "E.sig.1.1.f0=132737b1f2d22aaf5a34b468381853ec9ba57c4dbc94bfd1dce8e930ba5d85056029d4e454fcf40e7f90c8dbb2fc9b720abbbf02a8c65c053e3bdde66e0189e52e7402eb6cd69e85ee9fb1a922f0d5096f38cb57582469790f51f66b1f8b1a95:8abbbf02a8c65c053e3bdde66e0189e52e7402eb6cd69e85ee9fb1a922f0d5096f38cb57582469790f51f66b1f8b1a95132737b1f2d22aaf5a34b468381853ec9ba57c4dbc94bfd1dce8e930ba5d85056029d4e454fcf40e7f90c8dbb2fc9b72",
+  "E.sig.2.0.f1=8e1253b4602cb403ec1254293b3104bf6b4bce5494d7106ccf3637b02113c9826950930b7066af04cfa8c6098b38632f18e8ab7472850673426ebc1765aecf85b445fa187d06afb1d71055eff2dc8ef00a103384babd91ccccdbc3ece07eedcb:b8e8ab7472850673426ebc1765aecf85b445fa187d06afb1d71055eff2dc8ef00a103384babd91ccccdbc3ece07eedcb0e1253b4602cb403ec1254293b3104bf6b4bce5494d7106ccf3637b02113c9826950930b7066af04cfa8c6098b38632f",
+  "E.sig.2.0.f0=9811122bad7fb88a37923b6315b03c1a6e6661de4bb367acaa057b714051566d79bb9625205696a1cf158f557652e1f9019e11c4ce5f7083c90d7d84ae595c535288e0dd7aa8162fed672b3513fb81a6375b5166f63784ed573d5b3a6447f07a:a19e11c4ce5f7083c90d7d84ae595c535288e0dd7aa8162fed672b3513fb81a6375b5166f63784ed573d5b3a6447f07a1811122bad7fb88a37923b6315b03c1a6e6661de4bb367acaa057b714051566d79bb9625205696a1cf158f557652e1f9",
+  "E.sig.2.1.f1=126fefddb55de088d7b90d31488a0df7a83ac3fa282cc7ce23963fdeb85f830d1656ef550863d90e3c86c213162c5dd90529da7a4512314c005b97618d299907cb1233f7f3e343f98f896235cc40302b76bbc1a366caeaee1c5be1f898c36f3c:8529da7a4512314c005b97618d299907cb1233f7f3e343f98f896235cc40302b76bbc1a366caeaee1c5be1f898c36f3c126fefddb55de088d7b90d31488a0df7a83ac3fa282cc7ce23963fdeb85f830d1656ef550863d90e3c86c213162c5dd9",
+  "E.sig.2.1.f0=0e4c0332155edc3af108b9b0d368a2fdd636a8ccecef8d9cc7a31641c81e01b25ec3ba8cc7e12a01a0cbeb1bff8c5ef70629e2406f5bb0e725288e608ba711c5fe4ca0181ec6294004701773acac0b411cd7558c8e27a70b067fce917800e044:8629e2406f5bb0e725288e608ba711c5fe4ca0181ec6294004701773acac0b411cd7558c8e27a70b067fce917800e0440e4c0332155edc3af108b9b0d368a2fdd636a8ccecef8d9cc7a31641c81e01b25ec3ba8cc7e12a01a0cbeb1bff8c5ef7",
+  "E.ver.f1.ok=1",
+  "E.ver.f1.wrongmsg=0",
+  "E.ver.f1.wrongpk=0",
+  "E.ver.f1.cross=0",
+  "E.ver.f1.invalidpk=0",
+  "E.ver.f1.invalidsig=0",
+  "E.ver.f1.global.gL=1",
+  "E.ver.f1.global.gB=0",
+  "E.ver.f0.ok=1",
+  "E.ver.f0.wrongmsg=0",
+  "E.ver.f0.wrongpk=0",
+  "E.ver.f0.cross=0",
+  "E.ver.f0.invalidpk=0",
+  "E.ver.f0.invalidsig=0",
+  "E.ver.f0.global.gL=0",
+  "E.ver.f0.global.gB=1",
+  "F.gL.agg2.sk=171fec9020e331d6bf37635fab39f18e4a0d447120c69a55cb0a4125f1ff9fa1:171fec9020e331d6bf37635fab39f18e4a0d447120c69a55cb0a4125f1ff9fa1",
+  "F.gL.agg2.pk=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "F.gL.agg2.sig=02a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f74314bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f1:94bd0d7090b283f982c1295824370ac60de9dcb3f47bf480f5e32fcc16d3bd92c694e66a28d26c3c4af05b13a7fb46f102a2346043bd126b3c70dba09248ffb906cb6d41e49533117dc14653d3ab1ff115d5df3ca4570fc17250d0963525f743",
+  "F.gL.agg2.sk.static=1",
+  "F.gL.agg2.pk.static=1",
+  "F.gL.agg2.sig.static=1",
+  "F.gL.agg2.pk.fromsk=1",
+  "F.gL.agg2.ver=1",
+  "F.gL.agg3.sk=55ea4a006607a267bcb7c769096942c41a008f2748158cd27b9ff6955c65bafa:55ea4a006607a267bcb7c769096942c41a008f2748158cd27b9ff6955c65bafa",
+  "F.gL.agg3.pk=0c90582723f099be135abe7824143d7e28ad7c07ae28b37d61226e5310c72bfb1ec49f1c4cd3c0c16e5944ea23104c71:8c90582723f099be135abe7824143d7e28ad7c07ae28b37d61226e5310c72bfb1ec49f1c4cd3c0c16e5944ea23104c71",
+  "F.gL.agg3.sig=9285f7b2760e32c268d8e73ac5c62a22289ff915388546910746c84e5fc2bdb28975be7020c9895bb10f742f35b1bf5b10b02217f108a51b3bc9a0812df02a4b48e03f03a8bd0d411f9ffc6932f25cedaf0786aa0d2bf87c0df35d55e5d38b3a:b0b02217f108a51b3bc9a0812df02a4b48e03f03a8bd0d411f9ffc6932f25cedaf0786aa0d2bf87c0df35d55e5d38b3a1285f7b2760e32c268d8e73ac5c62a22289ff915388546910746c84e5fc2bdb28975be7020c9895bb10f742f35b1bf5b",
+  "F.gL.agg3.sk.static=1",
+  "F.gL.agg3.pk.static=1",
+  "F.gL.agg3.sig.static=1",
+  "F.gL.agg3.pk.fromsk=1",
+  "F.gL.agg3.ver=1",
+  "F.gL.agg4.sk=07de53e457021728aa721499940bee6d5392f9dd3625584b4533729fe78944e1:07de53e457021728aa721499940bee6d5392f9dd3625584b4533729fe78944e1",
+  "F.gL.agg4.pk=8a96d935392c81d5f47cccb003231239d6c3b718b80618aa0918427e01785d50d300209808cab564e32767f02de165d3:aa96d935392c81d5f47cccb003231239d6c3b718b80618aa0918427e01785d50d300209808cab564e32767f02de165d3",
+  "F.gL.agg4.sig=84c6b34799d118b366cc11c7f74346f5157bd699a0ece215cac1a03044737d7cff7765e2072d66e7e6c6689df02ce8501281b11cfdff5629b0edad09eeeaf7d8d8d6387bfb455e85004ddb764627d0e2ca2b6f90e090777457618c055964f768:b281b11cfdff5629b0edad09eeeaf7d8d8d6387bfb455e85004ddb764627d0e2ca2b6f90e090777457618c055964f76804c6b34799d118b366cc11c7f74346f5157bd699a0ece215cac1a03044737d7cff7765e2072d66e7e6c6689df02ce850",
+  "F.gL.agg4.sk.static=1",
+  "F.gL.agg4.pk.static=1",
+  "F.gL.agg4.sig.static=1",
+  "F.gL.agg4.pk.fromsk=1",
+  "F.gL.agg4.ver=1",
+  "F.gL.agg0.sk=INVALID",
+  "F.gL.agg0.pk=INVALID",
+  "F.gL.agg0.sig=INVALID",
+  "F.gL.agg1.sk=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "F.gL.sub=136926ccdc743fc45271c50e00463446db9781f9743df8d2e934e25dd7f87b8d4bc631e03881b59e89dcd6466196d3a809b89a3291a260b9bac5400c3b5eb75f6de837b2af4376a499710283db1aa16bef9b6d25c6304c505cd42491817564ba:89b89a3291a260b9bac5400c3b5eb75f6de837b2af4376a499710283db1aa16bef9b6d25c6304c505cd42491817564ba136926ccdc743fc45271c50e00463446db9781f9743df8d2e934e25dd7f87b8d4bc631e03881b59e89dcd6466196d3a8",
+  "F.gL.sub.ver=1",
+  "F.gL.infsig=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "F.gL.infsig.hash=0cafdf5bf641631bc43f11a8642541fa81b9a0e6d4f0e6dccda6c947a81d5495",
+  "F.gL.neg.dh=1",
+  "F.gL.neg=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "F.gL.infpk=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "F.gL.infpk.hash=a3f8d86aa7c14fc6dfe72ff1ecfb2529fe2abde052c539bcbaca163d681e5579",
+  "F.gL.inf.ver.f1=1",
+  "F.gL.inf.ver.pk0.f1=0",
+  "F.gL.inf.ver.sig0.f1=0",
+  "F.gL.inf.ver.f0=1",
+  "F.gL.inf.ver.pk0.f0=0",
+  "F.gL.inf.ver.sig0.f0=0",
+  "F.gL.inf.eq.default=0",
+  "F.gL.inf.agg.neutral=1",
+  "F.gL.vagg.distinct=86f2650c2658eb769789c57121a4477f4c7ca93659045c773f02866c37a6a7715ad07c7853e1406adf82b3ab2f5ff869114da60a17806e384febdc3c870877fc3a3dfac761faba4e5be1b3f2d1c80f5e3f36f56b7c88b5a0160a31700a18ed2b:b14da60a17806e384febdc3c870877fc3a3dfac761faba4e5be1b3f2d1c80f5e3f36f56b7c88b5a0160a31700a18ed2b06f2650c2658eb769789c57121a4477f4c7ca93659045c773f02866c37a6a7715ad07c7853e1406adf82b3ab2f5ff869",
+  "F.gL.vagg.distinct.ver=1",
+  "F.gL.vagg.distinct.wrongmsg=0",
+  "F.gL.vagg.dup.ver=1",
+  "F.gL.vagg.dup2.ver=1",
+  "F.gL.vagg.single.ver=1",
+  "F.gL.vagg.wrongpk=0",
+  "F.gL.sec.agg=01b004e7311e875a27516e7240e3b8508705ad22f669cb1135afcd6cf8f98bb6021e73359ea5dda66c3fa460aeff64ab14fa8c4a60df7d29e663be782db25f921fb757a2d9236fdddd744aa13fefa609760fa0e4d789a4ba8a7e4ff5d8428221:94fa8c4a60df7d29e663be782db25f921fb757a2d9236fdddd744aa13fefa609760fa0e4d789a4ba8a7e4ff5d842822101b004e7311e875a27516e7240e3b8508705ad22f669cb1135afcd6cf8f98bb6021e73359ea5dda66c3fa460aeff64ab",
+  "F.gL.sec.ver=1",
+  "F.gL.sec.ver.shuffled=1",
+  "F.gL.sec.agg.shuffled=1",
+  "F.gL.sec.ver.wrongmsg=0",
+  "F.gL.sec.ver.subset=0",
+  "F.gL.sec.ver.insecureagg=0",
+  "F.gL.sec.dup.agg=81edc2466257f1e3c2a4135354225617b4e99a7d01c7c9514ec4b061f8312c19207ef0f389874bc56792d55e8e96e2010c2d6c52b1cc282d3d40b74b48142ab02d8fba7b6f92fd379a512bde08fcd2bd14ffbf1113c43ea0b567ffaefa4b0d1f:ac2d6c52b1cc282d3d40b74b48142ab02d8fba7b6f92fd379a512bde08fcd2bd14ffbf1113c43ea0b567ffaefa4b0d1f01edc2466257f1e3c2a4135354225617b4e99a7d01c7c9514ec4b061f8312c19207ef0f389874bc56792d55e8e96e201",
+  "F.gL.sec.dup.ver=1",
+  "F.gL.sec.single.agg=0a9341f397c563ee8c62a47cafbb1c0dfd17fff8fb33b1325e3d90ad2f2cd9589d780ece3b31ced7aea4cd39fc5f657c0714b8e781adb916e05d3abe31b44472ead8fe76ba78e4169736e7f4cf1ccf603838c96b9a6489256537d7e6ff8fe8e5:8714b8e781adb916e05d3abe31b44472ead8fe76ba78e4169736e7f4cf1ccf603838c96b9a6489256537d7e6ff8fe8e50a9341f397c563ee8c62a47cafbb1c0dfd17fff8fb33b1325e3d90ad2f2cd9589d780ece3b31ced7aea4cd39fc5f657c",
+  "F.gL.sec.single.ver=1",
+  "F.gL.sec.single.eq=0",
+  "F.gL.sec.empty=INVALID",
+  "F.gL.sec.mismatch=INVALID",
+  "F.gL.sec.ver.empty=0",
+  "F.gL.sec.ver.invalidsig=0",
+  "F.gL.sec.ver.otherscheme=0",
+  "F.gB.agg2.sk=171fec9020e331d6bf37635fab39f18e4a0d447120c69a55cb0a4125f1ff9fa1:171fec9020e331d6bf37635fab39f18e4a0d447120c69a55cb0a4125f1ff9fa1",
+  "F.gB.agg2.pk=91aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9:b1aad39e089fbfa6bc57e63b6eb870cf51d05b15d1c8db7e8d19a684335472cc4319211934210086790d771caa8c6bf9",
+  "F.gB.agg2.sig=108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b0f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e:8f2a8684d58c9fbda103f08053b25ba84a55d01657afae08cb2893cecf3c347297a2e5fa330d8677359665c5da995d9e108a6b78a115642bbc9f4a7da576ffb80a22ee12df1f51261f9a28587f9fd65b59c58509a28b9f421954ae6f3dbc967b",
+  "F.gB.agg2.sk.static=1",
+  "F.gB.agg2.pk.static=1",
+  "F.gB.agg2.sig.static=1",
+  "F.gB.agg2.pk.fromsk=1",
+  "F.gB.agg2.ver=1",
+  "F.gB.agg3.sk=55ea4a006607a267bcb7c769096942c41a008f2748158cd27b9ff6955c65bafa:55ea4a006607a267bcb7c769096942c41a008f2748158cd27b9ff6955c65bafa",
+  "F.gB.agg3.pk=0c90582723f099be135abe7824143d7e28ad7c07ae28b37d61226e5310c72bfb1ec49f1c4cd3c0c16e5944ea23104c71:8c90582723f099be135abe7824143d7e28ad7c07ae28b37d61226e5310c72bfb1ec49f1c4cd3c0c16e5944ea23104c71",
+  "F.gB.agg3.sig=8589d8a27016c22c6ff67fc46101688821b9c4d57d5640199f2381eb1ed9445fd2a214f1ca8b9d49e8637a2ef549be0801f3b1d323f9956c6d69a77011bbec8fc68368e81d1940a0dac4590ba593261ec9f08b52f524a441c96ff9bba0f3f235:a1f3b1d323f9956c6d69a77011bbec8fc68368e81d1940a0dac4590ba593261ec9f08b52f524a441c96ff9bba0f3f2350589d8a27016c22c6ff67fc46101688821b9c4d57d5640199f2381eb1ed9445fd2a214f1ca8b9d49e8637a2ef549be08",
+  "F.gB.agg3.sk.static=1",
+  "F.gB.agg3.pk.static=1",
+  "F.gB.agg3.sig.static=1",
+  "F.gB.agg3.pk.fromsk=1",
+  "F.gB.agg3.ver=1",
+  "F.gB.agg4.sk=07de53e457021728aa721499940bee6d5392f9dd3625584b4533729fe78944e1:07de53e457021728aa721499940bee6d5392f9dd3625584b4533729fe78944e1",
+  "F.gB.agg4.pk=8a96d935392c81d5f47cccb003231239d6c3b718b80618aa0918427e01785d50d300209808cab564e32767f02de165d3:aa96d935392c81d5f47cccb003231239d6c3b718b80618aa0918427e01785d50d300209808cab564e32767f02de165d3",
+  "F.gB.agg4.sig=9281dd4b30799af3da0fa35cadd780cb023011cb06312b74180ad9aaa1f70baa108806670e719bfa021daf23429dfb6e0cd3b60e9604a88b625d70ed7ee59d7cd078ca740644401b77dfb9b233a929493dc8bd27d5a326b366509fe4ca7933ee:acd3b60e9604a88b625d70ed7ee59d7cd078ca740644401b77dfb9b233a929493dc8bd27d5a326b366509fe4ca7933ee1281dd4b30799af3da0fa35cadd780cb023011cb06312b74180ad9aaa1f70baa108806670e719bfa021daf23429dfb6e",
+  "F.gB.agg4.sk.static=1",
+  "F.gB.agg4.pk.static=1",
+  "F.gB.agg4.sig.static=1",
+  "F.gB.agg4.pk.fromsk=1",
+  "F.gB.agg4.ver=1",
+  "F.gB.agg0.sk=INVALID",
+  "F.gB.agg0.pk=INVALID",
+  "F.gB.agg0.sig=INVALID",
+  "F.gB.agg1.sk=0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd:0154dc8648cb16d1dd0186bd6d97d156a0278c0c6f9c20e9f5b4e35961bddfdd",
+  "F.gB.sub=98b63d7dae40e2ea4271e1b75c73cdbb6a56fc878362a2cec0a0b8b8c86c425323977310b446f0777bf56dfd5ff32afe028fba2c8b35f82600bacafda8734c8597b16a92b4886551cadace6540f727197c77bcdc99608f9620e66fe7c947ab36:a28fba2c8b35f82600bacafda8734c8597b16a92b4886551cadace6540f727197c77bcdc99608f9620e66fe7c947ab3618b63d7dae40e2ea4271e1b75c73cdbb6a56fc878362a2cec0a0b8b8c86c425323977310b446f0777bf56dfd5ff32afe",
+  "F.gB.sub.ver=1",
+  "F.gB.infsig=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "F.gB.infsig.hash=0cafdf5bf641631bc43f11a8642541fa81b9a0e6d4f0e6dccda6c947a81d5495",
+  "F.gB.neg.dh=1",
+  "F.gB.neg=914ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0:b14ea4700338fd77a33a892e50ab3834b9589ab42318c7f053a0ec78d889bbb19067795aff029e67b4ceade9573a73a0",
+  "F.gB.infpk=c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "F.gB.infpk.hash=a3f8d86aa7c14fc6dfe72ff1ecfb2529fe2abde052c539bcbaca163d681e5579",
+  "F.gB.inf.ver.f1=1",
+  "F.gB.inf.ver.pk0.f1=0",
+  "F.gB.inf.ver.sig0.f1=0",
+  "F.gB.inf.ver.f0=1",
+  "F.gB.inf.ver.pk0.f0=0",
+  "F.gB.inf.ver.sig0.f0=0",
+  "F.gB.inf.eq.default=0",
+  "F.gB.inf.agg.neutral=1",
+  "F.gB.vagg.distinct=903d85479b837762e0e381e2f6899fadea2543a6bc0c40b7cebad283abc7f55db518a82592f57dbad159d7d24fa14c1517deaa02afe340f5eb727a6e8574f70f51e3be8c1082cfaab58498c3431382e5e343db3092a8c86990440e3de87c8091:b7deaa02afe340f5eb727a6e8574f70f51e3be8c1082cfaab58498c3431382e5e343db3092a8c86990440e3de87c8091103d85479b837762e0e381e2f6899fadea2543a6bc0c40b7cebad283abc7f55db518a82592f57dbad159d7d24fa14c15",
+  "F.gB.vagg.distinct.ver=1",
+  "F.gB.vagg.distinct.wrongmsg=0",
+  "F.gB.vagg.dup.ver=0",
+  "F.gB.vagg.dup2.ver=0",
+  "F.gB.vagg.single.ver=1",
+  "F.gB.vagg.wrongpk=0",
+  "F.gB.sec.agg=8e4054ff707faff1d2ed9642e9f817adaadd52fce6f80c6aecd5ecb22cdc1f23ee0f09732327c8e9a412325b589d2ad60d2f22882a3594abf088243891cc8561fe681e20b5e49cdce8369fc4d8fef497f86da153bc462e1bdef4cff38c19449d:ad2f22882a3594abf088243891cc8561fe681e20b5e49cdce8369fc4d8fef497f86da153bc462e1bdef4cff38c19449d0e4054ff707faff1d2ed9642e9f817adaadd52fce6f80c6aecd5ecb22cdc1f23ee0f09732327c8e9a412325b589d2ad6",
+  "F.gB.sec.ver=1",
+  "F.gB.sec.ver.shuffled=1",
+  "F.gB.sec.agg.shuffled=1",
+  "F.gB.sec.ver.wrongmsg=0",
+  "F.gB.sec.ver.subset=0",
+  "F.gB.sec.ver.insecureagg=0",
+  "F.gB.sec.dup.agg=0ca4421c3f1c1e9dfd3fe32cdca66fa6a558e395069bf9b8dd0e475b1fe828b9c47f721b71de69be4629c86a47156c680806a5e6e526fdc0750d38b319427dc42efcf2572d090e69115c22f1fde77f4a966757d2b19c58b98ab4bade45345e1f:8806a5e6e526fdc0750d38b319427dc42efcf2572d090e69115c22f1fde77f4a966757d2b19c58b98ab4bade45345e1f0ca4421c3f1c1e9dfd3fe32cdca66fa6a558e395069bf9b8dd0e475b1fe828b9c47f721b71de69be4629c86a47156c68",
+  "F.gB.sec.dup.ver=1",
+  "F.gB.sec.single.agg=17cb056c6c0f796643e327d42b6a4b2d84e841f2d3bb7085cb40b1567e340fb4e0b590c63a0a09fb9c32b5d34ffc5b060a9df63fd643f8293940d571849d31b59383c16d315f626a49d1a5c73c9589ba16ec4f5ce4665681999a121ae6f87353:8a9df63fd643f8293940d571849d31b59383c16d315f626a49d1a5c73c9589ba16ec4f5ce4665681999a121ae6f8735317cb056c6c0f796643e327d42b6a4b2d84e841f2d3bb7085cb40b1567e340fb4e0b590c63a0a09fb9c32b5d34ffc5b06",
+  "F.gB.sec.single.ver=1",
+  "F.gB.sec.single.eq=0",
+  "F.gB.sec.empty=INVALID",
+  "F.gB.sec.mismatch=INVALID",
+  "F.gB.sec.ver.empty=0",
+  "F.gB.sec.ver.invalidsig=0",
+  "F.gB.sec.ver.otherscheme=0",
+  "G.share0.sk.ok=1",
+  "G.share0.sk=5dccdbff7208d406ca08b6d96062aa433a8a20ea4f59286c659cb077d3a32b50:5dccdbff7208d406ca08b6d96062aa433a8a20ea4f59286c659cb077d3a32b50",
+  "G.share0.pk.ok=1",
+  "G.share0.pk=8c57f956fd8112b0274bd6fe24c13d9596cf691776a0eb75c91696bdffb1549be4853343c4e50dbe5469fe50fd340619:ac57f956fd8112b0274bd6fe24c13d9596cf691776a0eb75c91696bdffb1549be4853343c4e50dbe5469fe50fd340619",
+  "G.share0.pk.consistent=1",
+  "G.share1.sk.ok=1",
+  "G.share1.sk=07138203b162d916a3659bceb9dad5c6d603d8afdbc0514dd08e8058f7e172c2:07138203b162d916a3659bceb9dad5c6d603d8afdbc0514dd08e8058f7e172c2",
+  "G.share1.pk.ok=1",
+  "G.share1.pk=944031e5fbadeda3160c1e61e1cb72d5d251241e2c8f0cd2e6636452f65d51f66aceb2264fa67498fd23a5ac9fda0dc0:b44031e5fbadeda3160c1e61e1cb72d5d251241e2c8f0cd2e6636452f65d51f66aceb2264fa67498fd23a5ac9fda0dc0",
+  "G.share1.pk.consistent=1",
+  "G.share2.sk.ok=1",
+  "G.share2.sk=1503d087c575d57a97df272896c8f382e064bf568f750081ccdf3e36f1f89a12:1503d087c575d57a97df272896c8f382e064bf568f750081ccdf3e36f1f89a12",
+  "G.share2.pk.ok=1",
+  "G.share2.pk=00e4aeb78281b0da28d205788cfc3f7ac78dc837247747ffce5abce83d16868db2c111a29dcb280e18424db9d6761d61:80e4aeb78281b0da28d205788cfc3f7ac78dc837247747ffce5abce83d16868db2c111a29dcb280e18424db9d6761d61",
+  "G.share2.pk.consistent=1",
+  "G.share3.sk.ok=1",
+  "G.share3.sk=0187ec4c8bdf4b0970777457e5a239284dcd6be830eb30978895df87ed9b984b:0187ec4c8bdf4b0970777457e5a239284dcd6be830eb30978895df87ed9b984b",
+  "G.share3.pk.ok=1",
+  "G.share3.pk=05a7e68120e2df5ca1322e096f5083ee13dabe6095b9a8ba69d84acc38ab64c7fbdd58ac01430df30656e5dcd06d72eb:85a7e68120e2df5ca1322e096f5083ee13dabe6095b9a8ba69d84acc38ab64c7fbdd58ac01430df30656e5dcd06d72eb",
+  "G.share3.pk.consistent=1",
+  "G.share4.sk.ok=1",
+  "G.share4.sk=531cb3124d4d16f43535112f7ae377c18652dd55762cd9b39102cf764dff41d2:531cb3124d4d16f43535112f7ae377c18652dd55762cd9b39102cf764dff41d2",
+  "G.share4.pk.ok=1",
+  "G.share4.pk=825b927574e725edade1ca9fc9a0bb9da9e9899a1505cf3ddd7e21aff514ab8914178337d8b6ccaa7263531cb5b5747f:a25b927574e725edade1ca9fc9a0bb9da9e9899a1505cf3ddd7e21aff514ab8914178337d8b6ccaa7263531cb5b5747f",
+  "G.share4.pk.consistent=1",
+  "G.f1.sigshare0=983838fcae0c9ad387344fb0dc7f8a94b8e935b2474025c2c792c3c51b5c3457849a228d122ab53010708d9a4d5499d7083f6999e2162083643248210212e0a222d484777a044fc63a9df46a457f730be1312da2b73e85d9975a8b7a47133401:a83f6999e2162083643248210212e0a222d484777a044fc63a9df46a457f730be1312da2b73e85d9975a8b7a47133401183838fcae0c9ad387344fb0dc7f8a94b8e935b2474025c2c792c3c51b5c3457849a228d122ab53010708d9a4d5499d7",
+  "G.f1.sigshare0.ver=1",
+  "G.f1.sigshare1=9093386f714d8d31553f259a13a2b8e5361c6fb369c0c8b3b94668f61a54586542ab62a83b6d337136656700e5ee66fa1031dfec9b2ee65785f0e2f6554d0db8dee4fef3fc6815862bd853516e7d55b15e3107e5001b84128a18524ba9786b3d:b031dfec9b2ee65785f0e2f6554d0db8dee4fef3fc6815862bd853516e7d55b15e3107e5001b84128a18524ba9786b3d1093386f714d8d31553f259a13a2b8e5361c6fb369c0c8b3b94668f61a54586542ab62a83b6d337136656700e5ee66fa",
+  "G.f1.sigshare1.ver=1",
+  "G.f1.sigshare2=95098e72f79fb0d5b4b96b1e6013b8741a2e40600e3906f9d9ab9e7fcee94970cd0c01543d84d2d2999f084860fb6b520c775cf315a703d230488875d118eb11c08e6261acd9e0cd932681b9417369f0cffce546189499614aaef2d1e864f1a4:ac775cf315a703d230488875d118eb11c08e6261acd9e0cd932681b9417369f0cffce546189499614aaef2d1e864f1a415098e72f79fb0d5b4b96b1e6013b8741a2e40600e3906f9d9ab9e7fcee94970cd0c01543d84d2d2999f084860fb6b52",
+  "G.f1.sigshare2.ver=1",
+  "G.f1.sigshare3=074a03a2a105295126fc6c5ceb6f6df121b794462a8a03996b69c8c118b053b309a93864fc30641ab33ac3d3198ae2130069abd1103d2bcfe91d1cfa51a0671a6687938d1c9017170fa7687c6d4a2b962a7432d8c445d690319311c2c66846ec:8069abd1103d2bcfe91d1cfa51a0671a6687938d1c9017170fa7687c6d4a2b962a7432d8c445d690319311c2c66846ec074a03a2a105295126fc6c5ceb6f6df121b794462a8a03996b69c8c118b053b309a93864fc30641ab33ac3d3198ae213",
+  "G.f1.sigshare3.ver=1",
+  "G.f1.sigshare4=081d990e60b49fd4c66b23589e8439f93137c425c6fc800a1928f7843ecb8f3f50124f0e6e0f0b905f48cd2cc4891f6608c65c6d22959289bb6fb0673d95ecebf298836cfd3d541f9bdef46cbeefbaaa1ef5d6517de99d173e164a06b978bd94:88c65c6d22959289bb6fb0673d95ecebf298836cfd3d541f9bdef46cbeefbaaa1ef5d6517de99d173e164a06b978bd94081d990e60b49fd4c66b23589e8439f93137c425c6fc800a1928f7843ecb8f3f50124f0e6e0f0b905f48cd2cc4891f66",
+  "G.f1.sigshare4.ver=1",
+  "G.f1.rec012.ok=1",
+  "G.f1.rec012=90f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e94817b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade709:b7b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade70910f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e948",
+  "G.f1.rec012.master=1",
+  "G.f1.rec123.ok=1",
+  "G.f1.rec123=90f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e94817b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade709:b7b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade70910f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e948",
+  "G.f1.rec123.master=1",
+  "G.f1.rec420.ok=1",
+  "G.f1.rec420=90f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e94817b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade709:b7b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade70910f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e948",
+  "G.f1.rec420.master=1",
+  "G.f1.rec01.ok=1",
+  "G.f1.rec01=0fa0bb7724c7aa3ea7e15e01843ec70336705279a64eadc212c180aae5d75d1fdcd316ffa61dcb9a1df1b71cbc6a43160cc2e750cccbf12d3219ff64e40ac9596a3e699e3434f1ecc766e304a14380eb4980a7893415eea939f5cad41ce2274f:8cc2e750cccbf12d3219ff64e40ac9596a3e699e3434f1ecc766e304a14380eb4980a7893415eea939f5cad41ce2274f0fa0bb7724c7aa3ea7e15e01843ec70336705279a64eadc212c180aae5d75d1fdcd316ffa61dcb9a1df1b71cbc6a4316",
+  "G.f1.rec01.master=0",
+  "G.f1.rec0.ok=0",
+  "G.f1.rec0=INVALID",
+  "G.f1.rec0.master=0",
+  "G.f1.rec0123.ok=1",
+  "G.f1.rec0123=90f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e94817b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade709:b7b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade70910f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e948",
+  "G.f1.rec0123.master=1",
+  "G.f1.rec001.ok=0",
+  "G.f1.rec001=INVALID",
+  "G.f1.rec001.master=0",
+  "G.f1.rec01234.ok=1",
+  "G.f1.rec01234=90f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e94817b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade709:b7b42516007cbe9d5a087fb4e15cdd5cdf1fbbaf42b7dec29547813102b89042ad07b9c48c20092538abfd1a3cade70910f7b81c7c6a5cee396e6ef3fae5976fc87df546d964e372b03686be542ff521de7d531144d57b1ae99cd2bd2a97e948",
+  "G.f1.rec01234.master=1",
+  "G.f1.rec.mismatch=0",
+  "G.f1.rec.zeroid=0",
+  "G.f1.rec.invalidid=0",
+  "G.f1.rec.invalidsig=0",
+  "G.f1.rec.orderid=0",
+  "G.f0.sigshare0=1790be0c3ce7bf082f3524c4053fdc25735a1b39e6ef75b211e9a1f66db0e11ecf12705155cffb5c98f0f51c43e5a92703be79c02eaf6c4497d6b65185be81147f86bdea0b16ddc971e26d2d5a55112a1b89d48bbef9813b074827f60608effc:83be79c02eaf6c4497d6b65185be81147f86bdea0b16ddc971e26d2d5a55112a1b89d48bbef9813b074827f60608effc1790be0c3ce7bf082f3524c4053fdc25735a1b39e6ef75b211e9a1f66db0e11ecf12705155cffb5c98f0f51c43e5a927",
+  "G.f0.sigshare0.ver=1",
+  "G.f0.sigshare1=870dff788daa4052de6af2b21e59f47fac4f840504536fa8b81655156411f4b2e4b111f2fdc2eed905c5485b471ebd2708013958538b849a05bc24f9be09bbbb6aa6bdbfa7616076be9ff3d57292dd2a8e5283516e65775f3889b9433e3ba1a5:a8013958538b849a05bc24f9be09bbbb6aa6bdbfa7616076be9ff3d57292dd2a8e5283516e65775f3889b9433e3ba1a5070dff788daa4052de6af2b21e59f47fac4f840504536fa8b81655156411f4b2e4b111f2fdc2eed905c5485b471ebd27",
+  "G.f0.sigshare1.ver=1",
+  "G.f0.sigshare2=04968721ad81c1b52f1bc848b9396b6dc591535983a70284480672c2505fa937418b1a6e915421bb7535d86d5daabc1f0dbaeacb416e3eddddcfd62de9b3b3be9232e825ac4052d44b98600f2a10c2dfcf7e671482ce67a426deb652ac2fcae8:8dbaeacb416e3eddddcfd62de9b3b3be9232e825ac4052d44b98600f2a10c2dfcf7e671482ce67a426deb652ac2fcae804968721ad81c1b52f1bc848b9396b6dc591535983a70284480672c2505fa937418b1a6e915421bb7535d86d5daabc1f",
+  "G.f0.sigshare2.ver=1",
+  "G.f0.sigshare3=85e0c322227df1f920ffe1ef88e6e7ffc0e0395328a9f813cd090183fda24de9b4d5484f07ffe00b4b51ed85abadf49c0a354b597932aa76a91f402acde35c45c4bff6c2f206f25e68da465368e808ae06b6ef89ae87f12e4243a6589efdd128:aa354b597932aa76a91f402acde35c45c4bff6c2f206f25e68da465368e808ae06b6ef89ae87f12e4243a6589efdd12805e0c322227df1f920ffe1ef88e6e7ffc0e0395328a9f813cd090183fda24de9b4d5484f07ffe00b4b51ed85abadf49c",
+  "G.f0.sigshare3.ver=1",
+  "G.f0.sigshare4=0acfe9ed4b694aa59a9efefd8e2af897f82137b3abbb0ffadb683fdabdcc2402ffd9c73e47932c05b1db1d514ea9524c027f7c2ac660a9baed1aa6f71011b410454e04cb913edb14ef3f9f207b8ac30e7d2de16eb489b6442c105e0d9f910d35:827f7c2ac660a9baed1aa6f71011b410454e04cb913edb14ef3f9f207b8ac30e7d2de16eb489b6442c105e0d9f910d350acfe9ed4b694aa59a9efefd8e2af897f82137b3abbb0ffadb683fdabdcc2402ffd9c73e47932c05b1db1d514ea9524c",
+  "G.f0.sigshare4.ver=1",
+  "G.f0.rec012.ok=1",
+  "G.f0.rec012=07c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a417bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce93887:97bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce9388707c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a4",
+  "G.f0.rec012.master=1",
+  "G.f0.rec123.ok=1",
+  "G.f0.rec123=07c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a417bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce93887:97bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce9388707c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a4",
+  "G.f0.rec123.master=1",
+  "G.f0.rec420.ok=1",
+  "G.f0.rec420=07c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a417bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce93887:97bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce9388707c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a4",
+  "G.f0.rec420.master=1",
+  "G.f0.rec01.ok=1",
+  "G.f0.rec01=0d3c93d2727b6780cbf3aa17335ea0f19c1a4a987cd7d00656a221d5585e9fc83bdf7d87a2d659395b25d02d138cb3e3001e47ba28d032d41527faec9ec15862f38b73bac240fd9d6a833d2d3a8c80eb83acf22d39c72907386133fd0abb7ea5:801e47ba28d032d41527faec9ec15862f38b73bac240fd9d6a833d2d3a8c80eb83acf22d39c72907386133fd0abb7ea50d3c93d2727b6780cbf3aa17335ea0f19c1a4a987cd7d00656a221d5585e9fc83bdf7d87a2d659395b25d02d138cb3e3",
+  "G.f0.rec01.master=0",
+  "G.f0.rec0.ok=0",
+  "G.f0.rec0=INVALID",
+  "G.f0.rec0.master=0",
+  "G.f0.rec0123.ok=1",
+  "G.f0.rec0123=07c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a417bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce93887:97bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce9388707c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a4",
+  "G.f0.rec0123.master=1",
+  "G.f0.rec001.ok=0",
+  "G.f0.rec001=INVALID",
+  "G.f0.rec001.master=0",
+  "G.f0.rec01234.ok=1",
+  "G.f0.rec01234=07c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a417bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce93887:97bd916aba4084961e6df414ea6ea3e71a8976e22c9c44bf57b1ef183314b9060f33e9f855a9e5e94a154aaf3ce9388707c8a6a49ab106d7f6a55b557523e4c39037bb73f53ead13d66ead169c5b010664b264d3509f7e5c6529ecb5e6b622a4",
+  "G.f0.rec01234.master=1",
+  "G.f0.rec.mismatch=0",
+  "G.f0.rec.zeroid=0",
+  "G.f0.rec.invalidid=0",
+  "G.f0.rec.invalidsig=0",
+  "G.f0.rec.orderid=0",
+  "G.id.zero.sk.ok=1",
+  "G.id.zero.sk=2c6cbe490bb95f693ca27b83c73826fbb7706da33d435219cf4fbbf6066260fe:2c6cbe490bb95f693ca27b83c73826fbb7706da33d435219cf4fbbf6066260fe",
+  "G.id.zero.pk.ok=1",
+  "G.id.zero.pk=8848bb094e31a7a9a3469537239076e59ab89a61dc92d5d8d18767a86b313698c9700269e6b1357890f82d774509e72c:a848bb094e31a7a9a3469537239076e59ab89a61dc92d5d8d18767a86b313698c9700269e6b1357890f82d774509e72c",
+  "G.id.one.sk.ok=1",
+  "G.id.one.sk=068695f493ab9527c179fbc0d50dcf2d587162c329c8af87cc74862b6b5d34ef:068695f493ab9527c179fbc0d50dcf2d587162c329c8af87cc74862b6b5d34ef",
+  "G.id.one.pk.ok=1",
+  "G.id.one.pk=963fa3a6dd31ee88127b4e19e3c97132fbedf986347fdd04e2d3314571d384a512e94417f325456c6c865863063b5220:b63fa3a6dd31ee88127b4e19e3c97132fbedf986347fdd04e2d3314571d384a512e94417f325456c6c865863063b5220",
+  "G.id.five.sk.ok=1",
+  "G.id.five.sk=1ef0de91409567e18b2381fe0388a6f73b57accb39a7792a37d0e5d477e26159:1ef0de91409567e18b2381fe0388a6f73b57accb39a7792a37d0e5d477e26159",
+  "G.id.five.pk.ok=1",
+  "G.id.five.pk=843593b3bf12bbaf4fbbd64570af62231ff9acbf8bd89730bd5b5ea7ecdcfb24efe1e87942b136173ce381bfe0816ab7:a43593b3bf12bbaf4fbbd64570af62231ff9acbf8bd89730bd5b5ea7ecdcfb24efe1e87942b136173ce381bfe0816ab7",
+  "G.id.rp5.sk.ok=1",
+  "G.id.rp5.sk=1ef0de91409567e18b2381fe0388a6f73b57accb39a7792a37d0e5d477e26159:1ef0de91409567e18b2381fe0388a6f73b57accb39a7792a37d0e5d477e26159",
+  "G.id.rp5.pk.ok=1",
+  "G.id.rp5.pk=843593b3bf12bbaf4fbbd64570af62231ff9acbf8bd89730bd5b5ea7ecdcfb24efe1e87942b136173ce381bfe0816ab7:a43593b3bf12bbaf4fbbd64570af62231ff9acbf8bd89730bd5b5ea7ecdcfb24efe1e87942b136173ce381bfe0816ab7",
+  "G.id.r.sk.ok=1",
+  "G.id.r.sk=2c6cbe490bb95f693ca27b83c73826fbb7706da33d435219cf4fbbf6066260fe:2c6cbe490bb95f693ca27b83c73826fbb7706da33d435219cf4fbbf6066260fe",
+  "G.id.r.pk.ok=1",
+  "G.id.r.pk=8848bb094e31a7a9a3469537239076e59ab89a61dc92d5d8d18767a86b313698c9700269e6b1357890f82d774509e72c:a848bb094e31a7a9a3469537239076e59ab89a61dc92d5d8d18767a86b313698c9700269e6b1357890f82d774509e72c",
+  "G.id.rm1.sk.ok=1",
+  "G.id.rm1.sk=446f0d0b9273c19ec8ea1c034f32abeadcb02fb09fff82565b10413ffb3010e0:446f0d0b9273c19ec8ea1c034f32abeadcb02fb09fff82565b10413ffb3010e0",
+  "G.id.rm1.pk.ok=1",
+  "G.id.rm1.pk=8c3f42e0572013f97717133a5714d97f66a8fc59a4b6a2ed770925b1944425e65cb9928342caf77dbbab33bf35a58b2b:ac3f42e0572013f97717133a5714d97f66a8fc59a4b6a2ed770925b1944425e65cb9928342caf77dbbab33bf35a58b2b",
+  "G.id.ff.sk.ok=1",
+  "G.id.ff.sk=477fe4eb4af06f2070213973e39742df39e51bdcf7cba60f5bda10ad7c13a302:477fe4eb4af06f2070213973e39742df39e51bdcf7cba60f5bda10ad7c13a302",
+  "G.id.ff.pk.ok=1",
+  "G.id.ff.pk=8100156a5c8246d951bd4b9c8c8f4753a39c525317a2b9092892e1c5db74ba1513ce3111c916088965421ba70eb65155:a100156a5c8246d951bd4b9c8c8f4753a39c525317a2b9092892e1c5db74ba1513ce3111c916088965421ba70eb65155",
+  "G.id.congruent=1",
+  "G.id.congruent.rec=0",
+  "G.msk1.sk.ok=0",
+  "G.msk1.sk=INVALID",
+  "G.msk1.pk.ok=0",
+  "G.msk1.pk=INVALID",
+  "G.mskinv.sk.ok=0",
+  "G.mskinv.sk.valid=0",
+  "G.mpkinv.pk.ok=0",
+  "G.idinv.sk.ok=0",
+  "G.idinv.pk.ok=0",
+  "G.msk0.sk.ok=0",
+  "H.0.0.ok=1",
+  "H.0.0=0f2780c8a3d62790853164d2d3dcb659e74f841a781a4158f5f6c7aacf54e9cef07024776e0da3132c4f4fb9f16cc8d8:8f2780c8a3d62790853164d2d3dcb659e74f841a781a4158f5f6c7aacf54e9cef07024776e0da3132c4f4fb9f16cc8d8",
+  "H.0.0.sym=1",
+  "H.0.1.ok=1",
+  "H.0.1=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "H.0.1.sym=1",
+  "H.0.2.ok=1",
+  "H.0.2=88170c079b099e346af6c9dc645c97bedb717bb6f7c5d34faeee48eb94447cd0683c6aebd6588c6ff8c7bb657bbd0fc3:a8170c079b099e346af6c9dc645c97bedb717bb6f7c5d34faeee48eb94447cd0683c6aebd6588c6ff8c7bb657bbd0fc3",
+  "H.0.2.sym=1",
+  "H.1.0.ok=1",
+  "H.1.0=0b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580:8b38632a7eaedfddbe2f995aa14304aca8c94f9ac68aace57bcf41673a7431e124c057d8fbd45dfded41a24ac4d9e580",
+  "H.1.0.sym=1",
+  "H.1.1.ok=1",
+  "H.1.1=96cc3d0c9508c9ae6fef31b876551d8b607e4cb87773044da421934f84cd7168d79db48107227adb96f9dba368bfb0f9:b6cc3d0c9508c9ae6fef31b876551d8b607e4cb87773044da421934f84cd7168d79db48107227adb96f9dba368bfb0f9",
+  "H.1.1.sym=1",
+  "H.1.2.ok=1",
+  "H.1.2=9274c99b34442d071f52fd2d819c15e16e82e1532d2cdb8e0bfd3d41eb13e5bc2b56d7f1cce9b099434534748d19a3f9:b274c99b34442d071f52fd2d819c15e16e82e1532d2cdb8e0bfd3d41eb13e5bc2b56d7f1cce9b099434534748d19a3f9",
+  "H.1.2.sym=1",
+  "H.invalidsk=0",
+  "H.invalidpk=0",
+  "H.one=1",
+  "H.one.eq=1",
+  "I.gL.sk.ser=3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59",
+  "I.gL.pk.ser=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.sig.ser=86088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad33109b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c145602",
+  "I.gL.id.ser=3f08dd31212c5090d9832a98497438c736b6f03ed25eb4ee6c32d69c45da546e",
+  "I.gL.sk.rt=3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59:3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59",
+  "I.gL.pk.rt=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.sig.rt=86088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad33109b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c145602:a9b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c14560206088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad331",
+  "I.gL.pk.opposite=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:ad53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.sig.opposite=INVALID",
+  "I.gL.pk.garbage=throw",
+  "I.gL.sig.garbage=throw",
+  "I.gL.pk.zeros=INVALID",
+  "I.gL.sig.zeros=INVALID",
+  "I.gL.sk.zeros=INVALID",
+  "I.gL.pk.short=throw",
+  "I.gL.vw.f1=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c86088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad33109b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c145602",
+  "I.gL.vw.f1.rt=1",
+  "I.gL.vw.f1.opposite=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:ad53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.vw.f0=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5ca9b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c14560206088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad331",
+  "I.gL.vw.f0.rt=1",
+  "I.gL.vw.f0.opposite=INVALID",
+  "I.gL.lazy.f1.default.legacy=1",
+  "I.gL.lazy.f1.default.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gL.lazy.f1.default.get=INVALID",
+  "I.gL.lazy.f1.legacy=1",
+  "I.gL.lazy.f1.ser=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.hash=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gL.lazy.f1.str=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.ser.other=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.legacy.after=0",
+  "I.gL.lazy.f1.hash.after=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gL.lazy.f1.eq.otherscheme=1",
+  "I.gL.lazy.f1.hash.eq.otherscheme=1",
+  "I.gL.lazy.f1.eq.same=1",
+  "I.gL.lazy.f1.unser.opposite.get=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:ad53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.unser.opposite.ser=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.unser.get=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f1.unser.eq=1",
+  "I.gL.lazy.f1.unser.hash=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gL.lazy.f1.unser.garbage.get=INVALID",
+  "I.gL.lazy.f1.unser.garbage.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gL.lazy.f1.unser.zeros.get=INVALID",
+  "I.gL.lazy.f1.unser.zeros.eq.default=1",
+  "I.gL.lazy.f1.sig.ser=86088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad33109b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c145602",
+  "I.gL.lazy.f1.sig.hash=3d0dc014110c5aba4f59e96682b82a74b91f10f064d9e6d02c11953d59fd9b75",
+  "I.gL.lazy.f1.lazyvw=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f0.default.legacy=1",
+  "I.gL.lazy.f0.default.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gL.lazy.f0.default.get=INVALID",
+  "I.gL.lazy.f0.legacy=0",
+  "I.gL.lazy.f0.ser=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f0.hash=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gL.lazy.f0.str=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f0.ser.other=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f0.legacy.after=1",
+  "I.gL.lazy.f0.hash.after=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gL.lazy.f0.eq.otherscheme=1",
+  "I.gL.lazy.f0.hash.eq.otherscheme=1",
+  "I.gL.lazy.f0.eq.same=1",
+  "I.gL.lazy.f0.unser.opposite.get=INVALID",
+  "I.gL.lazy.f0.unser.opposite.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gL.lazy.f0.unser.get=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gL.lazy.f0.unser.eq=1",
+  "I.gL.lazy.f0.unser.hash=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gL.lazy.f0.unser.garbage.get=INVALID",
+  "I.gL.lazy.f0.unser.garbage.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gL.lazy.f0.unser.zeros.get=INVALID",
+  "I.gL.lazy.f0.unser.zeros.eq.default=1",
+  "I.gL.lazy.f0.sig.ser=a9b66f7d840cc84ee66595ac4ab95304cae68d8b0d054e4bbca4ad3de8fb6b9f6377d4880cdf4f26f7a985905c14560206088240b61982491fb92a931e8a595eea31fd4347eac145f52c272bef5092ae5f20a317ee2d9dafc48157d7401ad331",
+  "I.gL.lazy.f0.sig.hash=61221be29562db57e15c04530fb6e119a6462409ab88ae5570efd72414076f32",
+  "I.gL.lazy.f0.lazyvw=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.sk.ser=3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59",
+  "I.gB.pk.ser=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.sig.ser=a6944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa19c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e2",
+  "I.gB.id.ser=3f08dd31212c5090d9832a98497438c736b6f03ed25eb4ee6c32d69c45da546e",
+  "I.gB.sk.rt=3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59:3eca5d7045247090fd8064095e2f5135cff34ab6274ef27cb095b56f6a661b59",
+  "I.gB.pk.rt=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.sig.rt=99c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e206944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa:a6944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa19c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e2",
+  "I.gB.pk.opposite=INVALID",
+  "I.gB.sig.opposite=INVALID",
+  "I.gB.pk.garbage=throw",
+  "I.gB.sig.garbage=throw",
+  "I.gB.pk.zeros=INVALID",
+  "I.gB.sig.zeros=INVALID",
+  "I.gB.sk.zeros=INVALID",
+  "I.gB.pk.short=throw",
+  "I.gB.vw.f1=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c99c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e206944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa",
+  "I.gB.vw.f1.rt=1",
+  "I.gB.vw.f1.opposite=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:ad53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.vw.f0=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5ca6944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa19c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e2",
+  "I.gB.vw.f0.rt=1",
+  "I.gB.vw.f0.opposite=INVALID",
+  "I.gB.lazy.f1.default.legacy=0",
+  "I.gB.lazy.f1.default.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gB.lazy.f1.default.get=INVALID",
+  "I.gB.lazy.f1.legacy=1",
+  "I.gB.lazy.f1.ser=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.hash=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gB.lazy.f1.str=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.ser.other=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.legacy.after=0",
+  "I.gB.lazy.f1.hash.after=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gB.lazy.f1.eq.otherscheme=1",
+  "I.gB.lazy.f1.hash.eq.otherscheme=1",
+  "I.gB.lazy.f1.eq.same=1",
+  "I.gB.lazy.f1.unser.opposite.get=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:ad53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.unser.opposite.ser=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.unser.get=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f1.unser.eq=1",
+  "I.gB.lazy.f1.unser.hash=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gB.lazy.f1.unser.garbage.get=INVALID",
+  "I.gB.lazy.f1.unser.garbage.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gB.lazy.f1.unser.zeros.get=INVALID",
+  "I.gB.lazy.f1.unser.zeros.eq.default=1",
+  "I.gB.lazy.f1.sig.ser=99c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e206944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa",
+  "I.gB.lazy.f1.sig.hash=086ac5fb1a3ddbbdcf985eb9f1222c04e0aa83bc0103d92a03e4fa68848257cf",
+  "I.gB.lazy.f1.lazyvw=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f0.default.legacy=0",
+  "I.gB.lazy.f0.default.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gB.lazy.f0.default.get=INVALID",
+  "I.gB.lazy.f0.legacy=0",
+  "I.gB.lazy.f0.ser=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f0.hash=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gB.lazy.f0.str=8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f0.ser.other=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f0.legacy.after=1",
+  "I.gB.lazy.f0.hash.after=749dc7fd3741fab92bafd90921a978c90ab69d7d82cc1935cdeef5bcce9eeb61",
+  "I.gB.lazy.f0.eq.otherscheme=1",
+  "I.gB.lazy.f0.hash.eq.otherscheme=1",
+  "I.gB.lazy.f0.eq.same=1",
+  "I.gB.lazy.f0.unser.opposite.get=INVALID",
+  "I.gB.lazy.f0.unser.opposite.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gB.lazy.f0.unser.get=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c:8d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "I.gB.lazy.f0.unser.eq=1",
+  "I.gB.lazy.f0.unser.hash=add3a8338fbb22691d1e93e3f91be696bb2c11bb9404c55651ef3210bbd8be04",
+  "I.gB.lazy.f0.unser.garbage.get=INVALID",
+  "I.gB.lazy.f0.unser.garbage.ser=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "I.gB.lazy.f0.unser.zeros.get=INVALID",
+  "I.gB.lazy.f0.unser.zeros.eq.default=1",
+  "I.gB.lazy.f0.sig.ser=a6944351eedc6a53c2f3529de0ca0b4a6a46168056deb34e9b3314cdb9daf90dc5f98a88c7676556d605bd322e11aefa19c401270d633d6060aec77d35ae7118b0009009d0ceb570ee854f5338f001808e5ebc84be7759953ea611bec18602e2",
+  "I.gB.lazy.f0.sig.hash=432ce86ca6f87db0f8aa66fedb5d5b05b10a7e28fe33cbba69c83030d51ea745",
+  "I.gB.lazy.f0.lazyvw=0d53058ff1d53308a5c47010231a4d8cb2e8004b210d14b025f04af8927804b0d96d3611b3c9d89a0032a58ccebe6c5c",
+  "J.gL.enc0=1",
+  "J.gL.enc1=1",
+  "J.gL.blob0=a2892482c2546f80bd1f8a3b5cf3f2c14818217499ac962de9603540712beb4da038bd02aad68907be30df75186ee33fbe0fa60e6f4f0a743d6b29f45fe3b1a1",
+  "J.gL.blob1=ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gL.ser=97072310e88a971322d86b18be70df8571ee9aa19615dcc9ab68da58bca573d2fd4b7369d19fde3801c5832b839e2b684f97bd723dc0653f99b702f6912210a3ba19a6b26d0f2a54aa3a8fb8d23de4920240a2892482c2546f80bd1f8a3b5cf3f2c14818217499ac962de9603540712beb4da038bd02aad68907be30df75186ee33fbe0fa60e6f4f0a743d6b29f45fe3b1a140ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gL.dec0=1",
+  "J.gL.dec0.eq=1",
+  "J.gL.dec1=1",
+  "J.gL.dec1.eq=1",
+  "J.gL.dec0.wrongkey=1",
+  "J.gL.dec0.wrongkey.data=cd634187c5f2c8d7ae89bde4a0c2e9bf72b7dae5660badfffc702950cd609d71bef3c7bc77320ecb81f1a2e3a3e51c0bfbf38bd8552f97dac200560800c6033a",
+  "J.gL.dec.invalidkey=0",
+  "J.gL.dec.oob=0",
+  "J.gL.single.ser=97072310e88a971322d86b18be70df8571ee9aa19615dcc9ab68da58bca573d2fd4b7369d19fde3801c5832b839e2b684f97bd723dc0653f99b702f6912210a3ba19a6b26d0f2a54aa3a8fb8d23de49240ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gL.single.valid=1",
+  "J.gL.single.dec=1",
+  "J.gL.single.dec.eq=1",
+  "J.gL.rt.dec0=1",
+  "J.gB.enc0=1",
+  "J.gB.enc1=1",
+  "J.gB.blob0=a2892482c2546f80bd1f8a3b5cf3f2c14818217499ac962de9603540712beb4da038bd02aad68907be30df75186ee33fbe0fa60e6f4f0a743d6b29f45fe3b1a1",
+  "J.gB.blob1=ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gB.ser=b7072310e88a971322d86b18be70df8571ee9aa19615dcc9ab68da58bca573d2fd4b7369d19fde3801c5832b839e2b684f97bd723dc0653f99b702f6912210a3ba19a6b26d0f2a54aa3a8fb8d23de4920240a2892482c2546f80bd1f8a3b5cf3f2c14818217499ac962de9603540712beb4da038bd02aad68907be30df75186ee33fbe0fa60e6f4f0a743d6b29f45fe3b1a140ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gB.dec0=1",
+  "J.gB.dec0.eq=1",
+  "J.gB.dec1=1",
+  "J.gB.dec1.eq=1",
+  "J.gB.dec0.wrongkey=1",
+  "J.gB.dec0.wrongkey.data=cd634187c5f2c8d7ae89bde4a0c2e9bf72b7dae5660badfffc702950cd609d71bef3c7bc77320ecb81f1a2e3a3e51c0bfbf38bd8552f97dac200560800c6033a",
+  "J.gB.dec.invalidkey=0",
+  "J.gB.dec.oob=0",
+  "J.gB.single.ser=b7072310e88a971322d86b18be70df8571ee9aa19615dcc9ab68da58bca573d2fd4b7369d19fde3801c5832b839e2b684f97bd723dc0653f99b702f6912210a3ba19a6b26d0f2a54aa3a8fb8d23de49240ce74c9b9001105525aca863ff9d037dce62178e26b5dd005461c7a12a2a3ccac516bf179a5fb2bb111b107510cdecd11cbe1da0e19fc175f1c8f5b9cf37a9631",
+  "J.gB.single.valid=1",
+  "J.gB.single.dec=1",
+  "J.gB.single.dec.eq=1",
+  "J.gB.rt.dec0=1",
+  "K.gL.s0.f0.badsources=2,3,",
+  "K.gL.s0.f0.badmessages=",
+  "K.gL.s0.f0.allvalid=1",
+  "K.gL.s0.f1.badsources=2,3,",
+  "K.gL.s0.f1.badmessages=20,31,",
+  "K.gL.s0.f1.allvalid=1",
+  "K.gL.s1.f0.badsources=2,3,",
+  "K.gL.s1.f0.badmessages=",
+  "K.gL.s1.f0.allvalid=1",
+  "K.gL.s1.f1.badsources=2,3,",
+  "K.gL.s1.f1.badmessages=20,31,",
+  "K.gL.s1.f1.allvalid=1",
+  "K.gB.s0.f0.badsources=2,3,",
+  "K.gB.s0.f0.badmessages=",
+  "K.gB.s0.f0.allvalid=1",
+  "K.gB.s0.f1.badsources=2,3,",
+  "K.gB.s0.f1.badmessages=20,31,",
+  "K.gB.s0.f1.allvalid=1",
+  "K.gB.s1.f0.badsources=2,3,",
+  "K.gB.s1.f0.badmessages=",
+  "K.gB.s1.f0.allvalid=1",
+  "K.gB.s1.f1.badsources=2,3,",
+  "K.gB.s1.f1.badmessages=20,31,",
+  "K.gB.s1.f1.allvalid=1"
+]
diff --git a/test/lint/lint-files.py b/test/lint/lint-files.py
index ee09cea93235..6bd73c3c96b7 100755
--- a/test/lint/lint-files.py
+++ b/test/lint/lint-files.py
@@ -21,7 +21,7 @@
 ALLOWED_FILENAME_REGEXP = "^[a-zA-Z0-9/_.@][a-zA-Z0-9/_.@-]*$"
 ALLOWED_SOURCE_FILENAME_REGEXP = "^[a-z0-9_./-]+$"
 ALLOWED_SOURCE_FILENAME_EXCEPTION_REGEXP = (
-    "^src/(dashbls/|immer/|secp256k1/|minisketch/|test/fuzz/FuzzedDataProvider.h)"
+    "^src/(immer/|mimalloc/|secp256k1/|minisketch/|test/fuzz/FuzzedDataProvider.h)"
 )
 ALLOWED_PERMISSION_NON_EXECUTABLES = 0o644
 ALLOWED_PERMISSION_EXECUTABLES = 0o755
diff --git a/test/lint/lint-format-strings.py b/test/lint/lint-format-strings.py
index 6992343d6cf6..f73e750677c3 100755
--- a/test/lint/lint-format-strings.py
+++ b/test/lint/lint-format-strings.py
@@ -82,7 +82,7 @@ def main():
 
         matching_files_filtered = []
         for matching_file in matching_files:
-            if not re.search('^src/(dashbls|leveldb|secp256k1|minisketch|tinyformat|test/fuzz/strprintf.cpp|clientversion.cpp)', matching_file):
+            if not re.search('^src/(leveldb|mimalloc|secp256k1|minisketch|tinyformat|test/fuzz/strprintf.cpp|clientversion.cpp)', matching_file):
                 matching_files_filtered.append(matching_file)
         matching_files_filtered.sort()
 
diff --git a/test/lint/lint-include-guards.py b/test/lint/lint-include-guards.py
index c5de3b4394a5..1a4744eca06e 100755
--- a/test/lint/lint-include-guards.py
+++ b/test/lint/lint-include-guards.py
@@ -26,7 +26,7 @@
                              'src/bls',
                              'src/crypto/x11/sph',
                              'src/ctpl_stl.h',
-                             'src/dashbls',
+                             'src/mimalloc',
                              'src/gsl',
                              'src/immer'] + SHARED_EXCLUDED_SUBTREES
 
diff --git a/test/lint/lint-locale-dependence.py b/test/lint/lint-locale-dependence.py
index 0ee4c4566b0a..72ffa9bd0961 100755
--- a/test/lint/lint-locale-dependence.py
+++ b/test/lint/lint-locale-dependence.py
@@ -61,7 +61,7 @@
     "src/secp256k1/",
     "src/minisketch/",
     "src/tinyformat.h",
-    "src/dashbls/",
+    "src/mimalloc/",
     "src/immer/"
 ]
 
diff --git a/test/lint/lint-python.py b/test/lint/lint-python.py
index d4c750147e7a..9938591e4e10 100755
--- a/test/lint/lint-python.py
+++ b/test/lint/lint-python.py
@@ -21,7 +21,7 @@
 
 DEPS = ['flake8', 'lief', 'mypy', 'pyzmq']
 FILES_ARGS = ['git', 'ls-files', '--','test/functional/*.py', 'contrib/devtools/*.py', ':(exclude)contrib/devtools/github-merge.py']
-EXCLUDE_DIRS = ['src/dashbls/',
+EXCLUDE_DIRS = ['src/mimalloc/',
                 'src/immer/']
 
 ENABLED = (
diff --git a/test/lint/lint-shell-locale.py b/test/lint/lint-shell-locale.py
index 77f6d79f3529..2895019d481f 100755
--- a/test/lint/lint-shell-locale.py
+++ b/test/lint/lint-shell-locale.py
@@ -41,7 +41,7 @@ def main():
     exit_code = 0
     shell_files = get_shell_files_list()
     for file_path in shell_files:
-        if re.search('src/(dashbls|secp256k1|minisketch)/', file_path):
+        if re.search('src/(mimalloc|secp256k1|minisketch)/', file_path):
             continue
 
         with open(file_path, 'r', encoding='utf-8') as file_obj:
diff --git a/test/lint/lint-shell.py b/test/lint/lint-shell.py
index 4be1f297fa11..183bd1ee79cc 100755
--- a/test/lint/lint-shell.py
+++ b/test/lint/lint-shell.py
@@ -68,7 +68,7 @@ def main():
     ]
     files = get_files(files_cmd)
     # remove everything that doesn't match this regex
-    reg = re.compile(r'src/[dashbls,immer,leveldb,secp256k1,minisketch]')
+    reg = re.compile(r'src/[mimalloc,immer,leveldb,secp256k1,minisketch]')
     files[:] = [file for file in files if not reg.match(file)]
 
     # build the `shellcheck` command
diff --git a/test/lint/lint-whitespace.py b/test/lint/lint-whitespace.py
index 78c145bd004e..89824e815504 100755
--- a/test/lint/lint-whitespace.py
+++ b/test/lint/lint-whitespace.py
@@ -23,7 +23,7 @@
                  "src/crc32c/",
                  "src/secp256k1/",
                  "src/minisketch/",
-                 "src/dashbls/",
+                 "src/mimalloc/",
                  "src/immer/",
                  "doc/release-notes/",
                  "src/qt/locale"]
diff --git a/test/lint/lint_ignore_dirs.py b/test/lint/lint_ignore_dirs.py
index 54440d824bd7..2258b5400605 100644
--- a/test/lint/lint_ignore_dirs.py
+++ b/test/lint/lint_ignore_dirs.py
@@ -4,5 +4,5 @@
                  "src/minisketch/",
                  "src/immer/",
                  "src/crypto/x11/",
-                 "src/dashbls/",
+                 "src/mimalloc/",
                 ]